Merge pull request #436 from vim-jp/rename-revital-of

Rename vital#{plugin-name}#of() to vital#{plugin-name}#new()

Changes

@@ -1,3 +1,6 @@
+aabb291268c0977e1444b0901e816db4467d6806
+	Modules: *
+	'vital#{plugin-name}#of()' was renamed to 'vital#{plugin-name}#new()'.
 982d3cb87ef788f4607fc61f1fd20ec2e3975479
 	Modules: Vim.Guard
 	Guard.store() API has changed to take a single List instance instead of arguments, due to the

autoload/vital/_vital.vim

@@ -1,5 +1,5 @@
 let s:_plugin_name = expand('<sfile>:t:r')
 
 function! vital#{s:_plugin_name}#new() abort
-  return vital#{s:_plugin_name[1:]}#of()
+  return vital#{s:_plugin_name[1:]}#new()
 endfunction

autoload/vital/vital.vim

@@ -21,7 +21,7 @@ else
   endfunction
 endif
 
-function! vital#{s:plugin_name}#of() abort
+function! vital#{s:plugin_name}#new() abort
   return s:new(s:plugin_name)
 endfunction
 
@@ -170,7 +170,7 @@ function! s:_import(name) abort dict
   let s:loaded[a:name] = export_module
   if has_key(module, '_vital_loaded')
     try
-      call module._vital_loaded(vital#{s:plugin_name}#of())
+      call module._vital_loaded(vital#{s:plugin_name}#new())
     catch
       unlet s:loaded[a:name]
       throw 'vital: fail to call ._vital_loaded(): ' . v:exception

autoload/vitalizer.vim

@@ -8,7 +8,7 @@ let s:LOADER_FILES = [
 \   'autoload/vital/vital.vim',
 \   'autoload/vital/_vital.vim',
 \ ]
-let s:V = vital#vital#of()
+let s:V = vital#vital#new()
 let s:P = s:V.import('Prelude')
 let s:L = s:V.import('Data.List')
 let s:S = s:V.import('Data.String')

test/Bitwise.vimspec

@@ -1,6 +1,6 @@
 Describe Bitwise
   Before all
-    let B = vital#of('vital').import('Bitwise')
+    let B = vital#vital#new().import('Bitwise')
   End
 
   Describe .lshift()

test/ConcurrentProcess.vim

@@ -4,7 +4,7 @@ let s:suite = themis#suite('ConcurrentProcess')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:CP = vital#of('vital').import('ConcurrentProcess')
+  let s:CP = vital#vital#new().import('ConcurrentProcess')
 endfunction
 
 function! s:suite.before_each() abort

test/Data/Base64.vimspec

@@ -1,6 +1,6 @@
 Describe Data.Base64
   Before all
-    let B = vital#of('vital').import('Data.Base64')
+    let B = vital#vital#new().import('Data.Base64')
   End
 
   Describe .encode()

test/Data/BigNum.vim

@@ -2,7 +2,7 @@ let s:suite = themis#suite('Data.BigNum')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:BigNum = vital#of('vital').import('Data.BigNum')
+  let s:BigNum = vital#vital#new().import('Data.BigNum')
 endfunction
 
 function! s:suite.after()

test/Data/Closure.vimspec

@@ -1,6 +1,6 @@
 Describe Data.Closure
   Before all
-    let C = vital#of('vital').import('Data.Closure')
+    let C = vital#vital#new().import('Data.Closure')
   End
 
   Describe .build()

test/Data/Counter.vimspec

@@ -1,6 +1,6 @@
 Describe Data.Counter
   Before all
-    let Counter = vital#of('vital').import('Data.Counter')
+    let Counter = vital#vital#new().import('Data.Counter')
   End
 
   Describe .new()

test/Data/Dict.vimspec

@@ -1,6 +1,6 @@
 Describe Data.Dict
   Before all
-    let D = vital#of('vital').import('Data.Dict')
+    let D = vital#vital#new().import('Data.Dict')
   End
 
   Describe .make()

test/Data/LazyList.vimspec

@@ -1,6 +1,6 @@
 Describe Data.LazyList
   Before all
-    let LazyList = vital#of('vital').import('Data.LazyList')
+    let LazyList = vital#vital#new().import('Data.LazyList')
   End
 
   Describe .from_list()

test/Data/List.vimspec

@@ -1,6 +1,6 @@
 Describe Data.List
   Before all
-    let List = vital#of('vital').import('Data.List')
+    let List = vital#vital#new().import('Data.List')
   End
 
   Describe .pop()

test/Data/Optional.vimspec

@@ -1,6 +1,6 @@
 Describe Data.Optional
   Before all
-    let O = vital#of('vital').import('Data.Optional')
+    let O = vital#vital#new().import('Data.Optional')
   End
 
   Describe .none()
@@ -169,7 +169,7 @@ Describe Data.Optional
         " Note:
         " This is workaround because 'O' is defined in outer 'Before all'
         " and it can't be refered here.
-        let O = vital#of('vital').import('Data.Optional')
+        let O = vital#vital#new().import('Data.Optional')
 
         if a:b == 0
           return O.none()

test/Data/OrderedSet.vimspec

@@ -1,6 +1,6 @@
 Describe Data.OrderedSet
   Before all
-    let OrderedSet = vital#of('vital').import('Data.OrderedSet')
+    let OrderedSet = vital#vital#new().import('Data.OrderedSet')
   End
 
   Describe .push()

test/Data/Set.vim

@@ -2,7 +2,7 @@ let s:suite = themis#suite('Data.Set')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:S = vital#of('vital').import('Data.Set')
+  let s:S = vital#vital#new().import('Data.Set')
   let s:xs = s:S.set([1,2,3,4,5])
   let s:ys = s:S.set([3,4,5,6,7])
   call themis#func_alias({'set': s:S.set()})

test/Data/String.vim

@@ -5,7 +5,7 @@ let s:suite = themis#suite('Data.String')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:String = vital#of('vital').import('Data.String')
+  let s:String = vital#vital#new().import('Data.String')
 endfunction
 
 function! s:suite.after()

test/Data/String.vimspec

@@ -1,7 +1,7 @@
 
 Describe Data.String
   Before all
-    let Vital = vital#of('vital')
+    let Vital = vital#vital#new()
     let Path = Vital.import('System.Filepath')
     let String = Vital.import('Data.String')
   End

test/Data/String/Interpolation.vimspec

@@ -1,7 +1,7 @@
 Describe Data.String.Interpolation
 
   Before all
-    let g:I = vital#of('vital').import('Data.String.Interpolation')
+    let g:I = vital#vital#new().import('Data.String.Interpolation')
 
     function! InterpolationFunc() abort
       let year = 2015

test/Database/SQLite.vimspec

@@ -2,7 +2,7 @@ scriptencoding utf-8
 
 Describe Database.SQLite
   Before all
-    let SQLite = vital#of('vital').import('Database.SQLite')
+    let SQLite = vital#vital#new().import('Database.SQLite')
   End
 
   Describe .is_available()

test/DateTime.vimspec

@@ -1,6 +1,6 @@
 Describe DateTime
   Before all
-    let DT = vital#of('vital').import('DateTime')
+    let DT = vital#vital#new().import('DateTime')
     " TODO set timezone for test here
   End
 

test/Interpreter/Brainf__k.vimspec

@@ -2,7 +2,7 @@ scriptencoding utf-8
 
 Describe Interpreter.Brainf__k
   Before all
-    let BF = vital#of('vital').import('Interpreter.Brainf__k')
+    let BF = vital#vital#new().import('Interpreter.Brainf__k')
   End
 
   Describe .run_vim_parse_execute()

test/Locale/Message.vimspec

@@ -4,7 +4,7 @@ let s:text_path = 'test/Locale/MessageText/%s.txt'
 
 Describe Locale.Message
   Before all
-    let M = vital#of('vital').import('Locale.Message')
+    let M = vital#vital#new().import('Locale.Message')
   End
 
   Before each

test/Math.vim

@@ -4,7 +4,7 @@ let s:suite = themis#suite('Math')
 let s:assert = themis#helper('assert')
 
 function! s:suite.before()
-  let s:M = vital#of('vital').import('Math')
+  let s:M = vital#vital#new().import('Math')
 endfunction
 
 function! s:suite.modulo()

test/OptionParser.vimspec

@@ -28,7 +28,7 @@ endfunction
 Describe OptionParser
 
   Before all
-    let O = vital#of('vital').import('OptionParser')
+    let O = vital#vital#new().import('OptionParser')
   End
 
   Describe .new()

test/Prelude.vimspec

@@ -2,7 +2,7 @@ scriptencoding utf-8
 
 Describe Prelude
   Before all
-    let P = vital#of('vital').import('Prelude')
+    let P = vital#vital#new().import('Prelude')
   End
 
   Describe .is_numeric()

test/Process.vimspec

@@ -3,7 +3,7 @@ scriptencoding utf-8
 
 Describe Process
   Before all
-    let Process = vital#of('vital').import('Process')
+    let Process = vital#vital#new().import('Process')
   End
 
   Describe .system()

test/ProcessManager.vimspec

@@ -1,11 +1,11 @@
 Describe ProcessManager
   Before all
-    let PM = vital#of('vital').import('ProcessManager')
+    let PM = vital#vital#new().import('ProcessManager')
   End
 
   Describe .is_available()
     It behaves the same as has_vimproc()
-      let P = vital#of('vital').import('Process')
+      let P = vital#vital#new().import('Process')
       Assert Equals(P.has_vimproc(), PM.is_available())
     End
   End

test/Random.vimspec

@@ -1,6 +1,6 @@
 Describe Random
   Before all
-    let R = vital#of('vital').import('Random')
+    let R = vital#vital#new().import('Random')
   End
 
   Describe .next()

test/Random/Mt19937ar.vimspec

@@ -1,6 +1,6 @@
 Describe Random.Mt19937ar
   Before all
-    let M = vital#of('vital').import('Random.Mt19937ar')
+    let M = vital#vital#new().import('Random.Mt19937ar')
   End
 
   After all

test/Random/Xor128.vimspec

@@ -1,6 +1,6 @@
 Describe Random.Xor128
   Before all
-    let X = vital#of('vital').import('Random.Xor128')
+    let X = vital#vital#new().import('Random.Xor128')
   End
 
   Describe .rand()

test/System/Cache.vimspec

@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:F = s:V.import('System.File')
 
 Describe System.Cache

test/System/Cache/Base.vimspec

@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 
 Describe System.Cache.Base
   let s:C = s:V.import('System.Cache.Base')

test/System/Cache/Dummy.vimspec

@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 
 Describe System.Cache.Dummy
   let s:C = s:V.import('System.Cache.Dummy')

test/System/Cache/File.vimspec

@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:F = s:V.import('System.File')
 let s:P = s:V.import('System.Filepath')
 

test/System/Cache/Memory.vimspec

@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 
 Describe System.Cache.Memory
   let s:C = s:V.import('System.Cache.Memory')

test/System/Cache/SingleFile.vimspec

@@ -1,5 +1,5 @@
 " Use vim-themis to execute this test
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:F = s:V.import('System.File')
 let s:P = s:V.import('System.Filepath')
 

test/System/Filepath.vimspec

@@ -1,4 +1,4 @@
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:is_windows = has('win16') || has('win32') || has('win64') || has('win95')
 
 Describe System.Filepath

test/System/Process.vimspec

@@ -1,6 +1,6 @@
 scriptencoding utf-8
 
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:Prelude = s:V.import('Prelude')
 let s:Path = s:V.import('System.Filepath')
 let s:Guard = s:V.import('Vim.Guard')

test/System/Process/Mock.vimspec

@@ -1,4 +1,4 @@
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 
 Describe System.Process.Mock
   Before

test/System/Process/System.vimspec

@@ -1,6 +1,6 @@
 scriptencoding utf-8
 
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:Prelude = s:V.import('Prelude')
 let s:Path = s:V.import('System.Filepath')
 let s:testdata = './test/_testdata/System/Process/'

test/System/Process/Vimproc.vimspec

@@ -1,6 +1,6 @@
 scriptencoding utf-8
 
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 let s:Prelude = s:V.import('Prelude')
 let s:Path = s:V.import('System.Filepath')
 let s:ProcessVimproc = s:V.import('System.Process.Vimproc')

test/Text/CSV.vimspec

@@ -1,7 +1,7 @@
 
 Describe Text.CSV
   Before all
-    let CSV = vital#of('vital').import('Text.CSV')
+    let CSV = vital#vital#new().import('Text.CSV')
     let testdata_dir = expand('<sfile>:p:h') . '/test/_testdata/Text/CSV'
     let sample_file_in = testdata_dir . '/csv-sample-in.txt'
     let sample_file_out = testdata_dir . '/csv-sample-out.txt'

test/Text/INI.vimspec

@@ -1,4 +1,4 @@
-let s:V = vital#of('vital')
+let s:V = vital#vital#new()
 call s:V.unload()
 let s:I = s:V.import('Text.INI')
 let s:P = s:V.import('System.Filepath')

test/Text/LTSV.vimspec

@@ -1,6 +1,6 @@
 Describe Text.LTSV
   Before all
-    let LTSV = vital#of('vital').import('Text.LTSV')
+    let LTSV = vital#vital#new().import('Text.LTSV')
     let sample_file = g:root . '/test/_testdata/Text/LTSV/sample.ltsv'
     let expect_data = [
     \   {'name': 'Web.HTTP', 'maintainer': 'mattn'},

test/Text/Lexer.vimspec

@@ -1,7 +1,7 @@
 
 Describe Text.Lexer
   Before all
-    let Lexer = vital#of('vital').import('Text.Lexer')
+    let Lexer = vital#vital#new().import('Text.Lexer')
     let patterns = [
     \ ['WHITE_SPACES','\s\+'],
     \ ['WORD','[a-zA-Z]\+'],