alpaca_complete 0.1.1 → 0.1.2

data/Gemfile

@@ -10,5 +10,9 @@ group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler"
   gem "jeweler", "~> 1.8.4"
+end
+
+group :test do
   gem 'simplecov'
+  gem 'fuubar'
 end

data/Gemfile.lock

@@ -2,6 +2,10 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
+    fuubar (1.1.0)
+      rspec (~> 2.0)
+      rspec-instafail (~> 0.2.0)
+      ruby-progressbar (~> 1.0.0)
     git (1.2.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -20,7 +24,9 @@ GEM
     rspec-core (2.8.0)
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
+    rspec-instafail (0.2.4)
     rspec-mocks (2.8.0)
+    ruby-progressbar (1.0.2)
     simplecov (0.6.4)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
@@ -31,6 +37,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
+  fuubar
   jeweler (~> 1.8.4)
   rdoc (~> 3.12)
   rspec (~> 2.8.0)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/autoload/neocomplcache/sources/locale_complete.vim

@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: locale_complete.Vim
 " AUTHOR:  Hiroyuki Ishii <alprhcp666@gmail.com>
-" Last Modified: 2012-09-26
+" Last Modified: 2012-10-25
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -27,80 +27,158 @@
 let s:save_cpo = &cpo
 set cpo&vim
 
+" config
+""{{{
 let s:source = {
       \ 'name' : 'locale_complete_locale',
       \ 'kind' : 'ftplugin',
-      \ 'filetypes' : { 'ruby' : 1, 'eruby' : 1 },
+      \ 'filetypes' : {
+      \   'ruby'       : 1,
+      \   'eruby'      : 1,
+      \   'haml'       : 1,
+      \   'yaml'       : 1,
+      \   'javascript' : 1,
+      \   'coffee'     : 1,
+      \ },
       \}
 
-if !exists('g:source_alpaca_rails_length')
-  let g:source_alpaca_rails_length = 2
+if !exists('g:source_locale_complete_length')
+  let g:source_locale_complete_length = 1
 endif
 
-if !exists('g:source_alpaca_rails_rank')
-  let g:source_alpaca_rails_rank = 200
+if !exists('g:source_locale_complete_rank')
+  let g:source_locale_complete_rank = 200
 endif
 
-" TODO change
-if !exists('g:source_alpaca_rails_bin')
+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()
-  call neocomplcache#set_completion_length('alpaca_rails', g:source_alpaca_rails_length)
+  call neocomplcache#set_completion_length('locale_complete', g:source_locale_complete_length)
   call neocomplcache#set_dictionary_helper(g:neocomplcache_source_rank,
-        \ 'alpaca_rails', g:source_alpaca_rails_rank)
+        \ 'locale_complete', g:source_locale_complete_rank)
+
+  " Initialize.
+  let s:complete_list = {}
+
+  " Create cache directory.
+  if !isdirectory(neocomplcache#get_temporary_directory() . '/alpaca_complete')
+    call mkdir(neocomplcache#get_temporary_directory() . '/alpaca_complete')
+  endif
+
+  " Initialize check.
+  " au User Rails call s:check_recache()
+  autocmd BufReadPost * call s:check_recache()
 endfunction
 
 function! s:source.finalize()
-  " TODO chaching
 endfunction
 
-function! s:source.get_keyword_pos(cur_text)
+function! s:source.get_keyword_pos(cur_text)"{{{
+  " XXX vim-ref の availableみたいな機構ないのかな。
+  if !exists('b:rails_root')
+    return -1
+  endif
   if a:cur_text =~ '.*I18n\.t.*'
     let cur_pos  = match(a:cur_text, '[a-zA-Z]\+[a-zA-Z._:]*$')
 
     return cur_pos < 0 ? -1 : cur_pos
   end
   return -1
-endfunction
+endfunction"}}}
 
-function! s:source.get_complete_words(cur_keyword_pos, cur_keyword_str)
-  " TODO caching
+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"
+  if input_obj ==# '' || input_obj ==# "\s" || !exists('b:rails_root')
     return []
   endif
 
-  " RoRの補完プラグインを使う
+  if !has_key(s:complete_list, s:get_cache_name())
+    let keyword_lists = neocomplcache#cache#index_load_from_cache(
+          \ 'alpaca_complete', s:get_cache_name())
+    if !empty(keyword_lists)
+      " Caching from cache.
+      let s:complete_list[s:get_cache_name()] = keyword_lists
+      return neocomplcache#dictionary_filter(keyword_lists, input_obj)
+    else
+      return []
+    endif
+  else
+    let s:complete_list[s:get_cache_name()] = keyword_lists
+    return neocomplcache#dictionary_filter(s:complete_list[s:get_cache_name()], input_obj)
+  endif
+endfunction"}}}
+
+function! s:check_recache()
+  if !exists('b:rails_root')| return -1 |endif
+
+  if !has_key(s:complete_list, s:get_cache_name())
+    call s:caching()
+  endif
+endfunction
+
+function! s:get_cache_name()
+  return "locale_" . b:rails_root . "_locale"
+endfunction
+
+function! neocomplcache#sources#locale_complete#get_cur_text()"{{{
+  return [line('.')]
+endfunction"}}}
+
+function! neocomplcache#sources#locale_complete#define()"{{{
+  return s:source
+endfunction"}}}
+
+" caching
+""{{{
+function! s:caching()
+  " RoRの補完プラグインalpaca_completeを使う
   let mf0     = neocomplcache#system( 'alpaca_complete -l -f ' . expand("%:p") )
   let mf_list = split(mf0, '\n')
 
   let result  = []
+  let key_str   = ':key =>'
+  let value_str = ':value =>'
+  let key_len = strlen(key_str)
+  let value_len = strlen(key_str)
   for locale_name in mf_list
-    let locale_setting = substitute(locale_name, '^\([a-zA-Z_]*\)\..*', '\1', 'g')
-    let complete_pos   = strlen(locale_setting) + 1
+    let key_end     = match( locale_name, value_str) - 2 " ' :'という文字列分引く
+    let value_start = key_end + value_len + 2 + 2
+
+    let locale      = {}
+    let locale.key  = locale_name[key_len : key_end]
+    "=> ja.error.messages
+    let locale.type = substitute(locale.key, '^\([a-za-z_]*\)\..*', '\1', 'g')
+    "=> ja en
+    let locale.value= locale_name[value_start :]
+    "=> ログイン情報を入力してください
+
     let result         = add(result, {
-          \ "word" : locale_name[complete_pos :],
-          \ "abbr" : locale_name[complete_pos :],
-          \ "kind" : "[alpL]",
-          \ "menu" : locale_setting
+          \ "word" : locale.key[strlen(locale.type) + 1 :],
+          \ "kind" : "[alpl_" . locale.type . "]",
+          \ "menu" : locale.value,
+          \ "dup"  : g:source_locale_complete_enable_dup
           \})
   endfor
 
-  return neocomplcache#keyword_filter(result, input_obj)
-endfunction
-
-function! neocomplcache#sources#locale_complete#define()
-  return s:source
-endfunction
+  if empty( result )
+    return -1
+  endif
 
-function! neocomplcache#sources#locale_complete#get_cur_text()
-  return [line('.')]
+  " caching
+  call neocomplcache#cache#save_cache('alpaca_complete', s:get_cache_name(), result)
 endfunction
+"}}}
 
 let &cpo = s:save_cpo
 unlet s:save_cpo

data/autoload/neocomplcache/sources/{yaml_complete → yaml_complete.vim}

@@ -47,9 +47,9 @@ 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)
+  " 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()
@@ -59,14 +59,30 @@ 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 path = neocomplcache#system( 'alpaca_complete -d ' . expand("%:p") )
   let line = a:cur_keyword_str
 
   let input_first  = match(line, '[a-zA-Z._:]*$')
@@ -76,26 +92,27 @@ function! s:source.get_complete_words(cur_keyword_pos, cur_keyword_str)
     return []
   endif
 
-  " RoRの補完プラグインを使う
-  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! s:get_locate()
-  " TODO 自動取得
-  return 'ja'
+  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()

data/bin/alpaca_complete

@@ -5,8 +5,8 @@ require 'AlpacaComplete'
 opt = AlpacaComplete::Utils.option_parser ARGV
 if opt[:locale] == true
   locales = AlpacaComplete::LocaleComplete.complete opt[:path], opt[:word]
-  locales.each do |locale|
-    puts locale
+  locales.each do |k, v|
+    puts ":key =>#{k} :value =>#{v}"
   end
 elsif opt[:dict] == true
   locales = AlpacaComplete::DictComplete.complete opt[:path], opt[:word]

data/dictionary/migration_3_2_1.yml

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

data/lib/AlpacaComplete.rb

@@ -13,9 +13,10 @@ class Object
 end
 
 module AlpacaComplete
-  Dir['./lib/**/*.rb'].each {|f|  require f }
+  Version = "0.1.1"
 
   autoload :LocaleComplete, 'AlpacaComplete/locale_complete'
+  autoload :Dictionary,     'AlpacaComplete/dictionary'
   autoload :Utils,          'AlpacaComplete/utils'
   autoload :Detect,         'AlpacaComplete/detect'
 end

data/lib/AlpacaComplete/dictionary.rb

@@ -0,0 +1,18 @@
+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/lib/AlpacaComplete/locale_complete.rb

@@ -53,7 +53,7 @@ module AlpacaComplete::LocaleComplete
     opt = { "path" => path}
     comp = Regexp.new("^#{word}")
 
-    get_locale_list( opt ).select {|v|
+    get_locale_hash( opt ).select {|v|
       v.match comp
     }
   end
@@ -84,8 +84,13 @@ module AlpacaComplete::LocaleComplete
     locales = Hash.new
 
     Dir.glob( "#{locale_path}/**/*.yml" ).each do |file|
-      locale_hash = YAML::load_file( file )
-      locales.deep_merge!(locale_hash)
+      begin
+        locale_hash = YAML::load_file( file )
+        locales.deep_merge!(locale_hash)
+      rescue
+        # TODO yamlにエラーがあった場合の処理
+
+      end
     end
 
     locales

data/lib/AlpacaComplete/utils.rb

@@ -62,7 +62,7 @@ module AlpacaComplete::Utils
     end
   end
 
-  def self.load_yaml( path )
+  def load_yaml( path )
     return nil until File.exist?(path)
 
     YAML::load_file( path )

data/spec/dictionary_spec.rb

@@ -0,0 +1,14 @@
+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

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require './lib/AlpacaComplete'
 require 'rspec'
+require 'fuubar'
 require 'rubygems'
 require 'rspec/autorun'
 

data/spec/utils_spec.rb

@@ -12,12 +12,14 @@ describe AlpacaComplete::Utils do
     let(:yaml_dir) { 'spec/supports/dict' }
 
     it 'return nil if yaml isnt exist' do
-      yaml_data = AlpacaComplete::Utils.load_yaml "#{yaml_dir}/non_existent.yml"
+      extend AlpacaComplete::Utils
+      yaml_data = load_yaml "#{yaml_dir}/non_existent.yml"
       yaml_data.should eql(nil)
     end
 
     it 'return hash if yaml is exist' do
-      yaml_data = AlpacaComplete::Utils.load_yaml "#{yaml_dir}/existent.yml"
+      extend AlpacaComplete::Utils
+      yaml_data = load_yaml "#{yaml_dir}/existent.yml"
       yaml_data.is_a?(Hash).should == true
     end
 

data/spec/version_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe AlpacaComplete::VERSION do
-  it { should >= "0.0.1" }
+describe AlpacaComplete::Version do
+  it { should == "0.1.1" }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alpaca_complete
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -75,22 +75,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: rails complete for  editor
 email: alprhcp666@gmail.com
 executables:
@@ -112,14 +96,16 @@ files:
 - VERSION
 - alpaca_complete.gemspec
 - autoload/neocomplcache/sources/locale_complete.vim
-- autoload/neocomplcache/sources/yaml_complete
+- 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
-- lib/AlpacaComplete/version.rb
 - spec/detect_spec.rb
+- spec/dictionary_spec.rb
 - spec/locale_complete_spec.rb
 - spec/spec_helper.rb
 - spec/supports/dict/existent.yml
@@ -191,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2164592348720935884
+      hash: -2551976939518646737
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/AlpacaComplete/version.rb

@@ -1,5 +0,0 @@
-# coding: utf-8
-
-module AlpacaComplete
-  VERSION = "0.0.1"
-end