alpaca_complete 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/autoload/neocomplcache/sources/locale_complete.vim

@@ -54,9 +54,6 @@ if !exists('g:source_locale_complete_enable_dup')
   let g:source_locale_complete_enable_dup = 1
 endif
 
-if !executable('alpaca_complete')
-  finish
-endif
 "}}}
 
 function! s:source.initialize()
@@ -120,7 +117,7 @@ function! s:source.get_complete_words(cur_keyword_pos, cur_keyword_str)"{{{
 endfunction"}}}
 
 function! s:check_recache()
-  if !exists('b:rails_root')| return -1 |endif
+  if !exists('b:rails_root')||!executable('alpaca_complete')| return -1 |endif
 
   if !has_key(s:complete_list, s:get_cache_name())
     call s:caching()

data/lib/AlpacaComplete.rb

@@ -13,10 +13,9 @@ class Object
 end
 
 module AlpacaComplete
-  Version = "0.1.1"
+  Version = "0.1.3"
 
   autoload :LocaleComplete, 'AlpacaComplete/locale_complete'
-  autoload :Dictionary,     'AlpacaComplete/dictionary'
   autoload :Utils,          'AlpacaComplete/utils'
   autoload :Detect,         'AlpacaComplete/detect'
 end

data/spec/version_spec.rb

@@ -1,5 +1,9 @@
 require 'spec_helper'
 
 describe AlpacaComplete::Version do
-  it { should == "0.1.1" }
+  before do
+    version = File.open("VERSION").read
+    @version = version.gsub("\r", '')
+  end
+  it { should == @version }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alpaca_complete
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -96,16 +96,12 @@ files:
 - VERSION
 - alpaca_complete.gemspec
 - autoload/neocomplcache/sources/locale_complete.vim
-- autoload/neocomplcache/sources/yaml_complete.vim
 - bin/alpaca_complete
-- dictionary/migration_3_2_1.yml
 - lib/AlpacaComplete.rb
 - lib/AlpacaComplete/detect.rb
-- lib/AlpacaComplete/dictionary.rb
 - lib/AlpacaComplete/locale_complete.rb
 - lib/AlpacaComplete/utils.rb
 - spec/detect_spec.rb
-- spec/dictionary_spec.rb
 - spec/locale_complete_spec.rb
 - spec/spec_helper.rb
 - spec/supports/dict/existent.yml
@@ -177,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2551976939518646737
+      hash: -458434146859851818
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/autoload/neocomplcache/sources/yaml_complete.vim

@@ -1,129 +0,0 @@
-"=============================================================================
-" FILE: yaml_complete.Vim
-" AUTHOR:  Hiroyuki Ishii <alprhcp666@gmail.com>
-" Last Modified: 2012-09-26
-" License: MIT license  {{{
-"     Permission is hereby granted, free of charge, to any person obtaining
-"     a copy of this software and associated documentation files (the
-"     "Software"), to deal in the Software without restriction, including
-"     without limitation the rights to use, copy, modify, merge, publish,
-"     distribute, sublicense, and/or sell copies of the Software, and to
-"     permit persons to whom the Software is furnished to do so, subject to
-"     the following conditions:
-"
-"     The above copyright notice and this permission notice shall be included
-"     in all copies or substantial portions of the Software.
-"
-"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-" }}}
-"=============================================================================
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-let s:source = {
-      \ 'name' : 'yaml_complete_locale',
-      \ 'kind' : 'ftplugin',
-      \ 'filetypes' : { 'ruby' : 1, 'eruby' : 1 },
-      \}
-if !exists('g:source_yaml_dir')
-  " TODO error
-  let g:source_yaml_dir = ''
-endif
-
-if !exists('g:source_yaml_complete_length')
-  let g:source_yaml_complete_length = 2
-endif
-
-if !exists('g:source_yaml_complete_rank')
-  let g:source_yaml_complete_rank = 200
-endif
-
-function! s:source.initialize()
-  " TODO chaching
-  " call neocomplcache#set_completion_length('yaml_complete', g:source_alpaca_rails_length)
-  " call neocomplcache#set_dictionary_helper(g:neocomplcache_source_rank,
-  "       \ 'yaml_complete', g:source_yaml_complete_rank)
-endfunction
-
-function! s:source.finalize()
-  " TODO chaching
-endfunction
-
-function! s:source.get_keyword_pos(cur_text)
-  if a:cur_text =~ '\s*[a-zA-Z._:]'
-    let cur_pos  = match(a:cur_text, '[a-zA-Z:_]\+[a-zA-Z._:]*$')
-    return cur_pos < 0 ? -1 : cur_pos
-  end
-
-  return -1
-endfunction
-
-function! s:get_rails_type()
-  let filepath = expand("%:p")
-  if     filepath =~ 'models/[a-zA-Z_]\+.rb$'
-    return "models"
-  elseif filepath =~ 'views\/[a-zA-Z_]\+.rb$'
-    return "views"
-  elseif filepath =~ 'controllers\/[a-zA-Z_]\+.rb$'
-    return "controllers"
-  elseif filepath =~ 'db\/migrate\/[a-zA-Z0-9_]\+.rb$'
-    return "migrate"
-  elseif filepath =~ 'spec\/[a-zA-Z0-9_/]\+_spec.rb$'
-    return "rspec"
-  endif
-
-  return 0
-endfunction
-
-function! s:source.get_complete_words(cur_keyword_pos, cur_keyword_str)
-  let line = a:cur_keyword_str
-
-  let input_first  = match(line, '[a-zA-Z._:]*$')
-  let input_obj    = line[input_first :]
-
-  if input_obj ==# '' || input_obj ==# "\s"
-    return []
-  endif
-
-  let cmd = s:get_rails_type()
-
-  return []
-  " " RoRの補完プラグインを使う
-  " TODO alpaca_completeでyamlデータ読み込み
-  " webapi#json_parseでdictにする
-  " let  = neocomplcache#system( 'alpaca_complete -d ' . expand("%:p") )
-  " let mf0     = s:get_dict_yaml(
-  " let mf_list = split(mf0, '\n')
-  " let result  = []
-  " for locale_name in mf_list
-  "   " s:get_locate() => ja + "."
-  "   let complete_pos = strlen(s:get_locate()) + 1
-  "   let result = add(result, {
-  "         \ "word" : locale_name[complete_pos :],
-  "         \ "abbr" : locale_name[complete_pos :],
-  "         \ "kind" : "[locale]"
-  "         \})
-  " endfor
-
-  " return neocomplcache#keyword_filter(result, input_obj)
-endfunction
-
-function! neocomplcache#sources#yaml_complete#define()
-  return s:source
-endfunction
-
-function! neocomplcache#sources#yaml_complete#get_cur_text()
-  return [line('.')]
-endfunction
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vimfoldmethod=marker

data/dictionary/migration_3_2_1.yml

@@ -1,13 +0,0 @@
-migration:
-  methods:
-    -
-      word: create_table
-      arguments:
-        -
-          word: :id
-          arguments:
-            -
-              true,
-              false
-  valiables:
-  constant:

data/lib/AlpacaComplete/dictionary.rb

@@ -1,18 +0,0 @@
-module AlpacaComplete::Dictionary
-  NEWEST_VERSION = "3.2"
-  DICTIONARY_PATH = 'dictionary'
-  extend AlpacaComplete::Utils
-
-
-  def self.switch_dict(type, version=NEWEST_VERSION)
-    case type
-    when "migration"
-      "migration_3_2_1"
-    end
-  end
-
-  def self.load_dictionary(type, version=NEWEST_VERSION)
-    file_name = switch_dict(type, version)
-    load_yaml("#{DICTIONARY_PATH}/#{file_name}.yml")
-  end
-end

data/spec/dictionary_spec.rb

@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe AlpacaComplete::Dictionary do
-  context :switch_dict do
-    type = AlpacaComplete::Dictionary.switch_dict("migration", "3.2")
-    type.should == "migration_3_2_1"
-  end
-
-  context :load_dictionary do
-    dict = AlpacaComplete::Dictionary.load_dictionary("migration", "3.2")
-    puts '----------------------------------------'
-    puts dict
-  end
-end