rails_dictionary 0.1.2 → 0.2

data/.gitignore

@@ -1,3 +1,6 @@
 pkg/
 .git/
 .gitignore
+Gemfile.lock
+tmp/*
+.idea/

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.2
+  Add Support For Rails4
+
 0.1.2
   Remove Engine cause it's never used.
 

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 group :development,:test do
   gem 'rspec', '>= 2.5.0'
-  gem 'rails', '>= 3.0.0'
+  gem 'debugger'
+  gem "rspec-rails"
   gem 'sqlite3'
-end
+end

data/README.rdoc

@@ -5,9 +5,10 @@ This gem can map these static data to a Dictionary#method like Dictionary#studen
 
 = Usage
 == Installation
-Version 1.0 support Rails3.1
+Version 0.2 support Rails4
+
+Version 0.1 support Rails3.1
 
-Rail3
         gem 'rails_dictionary'
 or
         gem "rails_dictionary", :git => 'git://github.com/raykin/rails_dictionary'
@@ -74,7 +75,8 @@ Here is what should be like.Student model can be other models.
       end
 
       class Student < ActiveRecord::Base
-        acts_as_dict_slave
+        # use acts_as_dict_slave when your rails_dictionary version < 0.2
+        acts_as_dict_consumer
       end
 
 == Features (relies on the above data) :
@@ -126,6 +128,5 @@ In short,when you confused with the debug data,try running "rails tmp:clear" fir
 Remove engine. Becase for the view layer we can use gem rails_admin. so this gem did not need rails engine.
 Is there any exist low level method to monitor the change of descendents?
 Add test code for cache DictType.tab_and_column,then uncomment the cache code.
-Remove gems/rails_dictionary-0.0.9.4/app/views from rails view path
 
 There are no conventions and implemention to map Class like Ckeditor::Asset to a legal method name.

data/Rakefile

@@ -1,9 +1,10 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+task :default => [:test]
+
 desc "Running Test"
 task :test do
   # system "ruby -I . test/rails_dictionary_test.rb " # used with version 0.0.8 or before it
   system "rspec spec/rails_dictionary_spec.rb"
 end
-

data/lib/rails_dictionary/models/active_record_extension.rb

@@ -42,6 +42,7 @@ module RailsDictionary
         end
       end
 
+      alias_method :acts_as_dict_consumer, :acts_as_dict_slave
     end
   end
 end

data/lib/rails_dictionary/models/acts_as_dictionary.rb

@@ -25,7 +25,7 @@ module RailsDictionary
       def method_missing(method_id,options={})
         if DictType.all_types.include? method_id
           method_name=method_id.to_s.downcase
-          Rails.cache.fetch("Dictionary.#{method_name}") { dict_type_name_eq(method_name).all }
+          Rails.cache.fetch("Dictionary.#{method_name}") { dict_type_name_eq(method_name).to_a }
           listed_attr=Rails.cache.read("Dictionary.#{method_name}").dup  # Instance of ActiveRecord::Relation can not be dup?
           build_scope_method(method_id)
           if options.keys.include? :locale or options.keys.include? "locale"
@@ -45,8 +45,7 @@ module RailsDictionary
         if options.keys.include? :locale or options.keys.include? "locale"
           locale="name_#{ options[:locale] }"
           if options[:locale].to_sym == :zh
-            conv = Iconv.new("GBK", "utf-8")
-            Proc.new { |a,b| conv.iconv(a.send(locale)) <=> conv.iconv(b.send(locale)) }
+            Proc.new { |a,b| a.send(locale).encode('GBK') <=> b.send(locale).encode('GBK') }
           else
             Proc.new { |a,b| a.send(locale).downcase <=> b.send(locale).downcase }
           end
@@ -55,6 +54,10 @@ module RailsDictionary
         end
       end
 
+      def respond_to?(name, include_private=false)
+        DictType.all_types.include?(name) || super
+      end
+
       private
 
       def build_scope_method(name)

data/lib/rails_dictionary/version.rb

@@ -1,3 +1,3 @@
 module RailsDictionary
-  VERSION = "0.1.2"
+  VERSION = "0.2"
 end

data/lib/rails_dictionary.rb

@@ -1,9 +1,10 @@
-require 'iconv'
-
 require File.join(File.dirname(__FILE__), "rails_dictionary/array_core_ext")
 require File.join(File.dirname(__FILE__), "rails_dictionary/models/active_record_extension")
 require File.join(File.dirname(__FILE__), "rails_dictionary/models/acts_as_dict_type")
 require File.join(File.dirname(__FILE__), "rails_dictionary/models/acts_as_dictionary")
 require File.join(File.dirname(__FILE__), "rails_dictionary/models/acts_as_dict_slave")
 
+# rake tasks not autoload in Rails4
+Dir[File.expand_path('../tasks/**/*.rake',__FILE__)].each { |ext| load ext } if defined?(Rake)
+
 ::ActiveRecord::Base.send :include, RailsDictionary::ActiveRecordExtension

data/spec/rails_dictionary_spec.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+require 'debugger'
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe RailsDictionary::ActiveRecordExtension do
@@ -40,6 +41,10 @@ describe RailsDictionary do
   end
 
   describe Dictionary do
+    it "should respond to student_city" do
+      Dictionary.should respond_to(:student_city)
+    end
+
     it "generate student_city method" do
       Dictionary.student_city.should == [dy_shanghai,dy_beijing]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_dictionary
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &24997520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *24997520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &24997020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,7 +37,12 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *24997020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Rails plugin for mapping static data of web application to Dictionary
   class
 email:
@@ -54,7 +64,6 @@ files:
 - lib/rails_dictionary/models/acts_as_dictionary.rb
 - lib/rails_dictionary/version.rb
 - lib/tasks/dicts.rake
-- log/development.log
 - rails_dictionary.gemspec
 - spec/fake_app.rb
 - spec/rails_dictionary_spec.rb
@@ -79,9 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rails_dictionary
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: dictionary data for web application
 test_files: []
-has_rdoc: 

data/log/development.log

@@ -1,2 +0,0 @@
-
-***** Debugger requested, but was not available (ensure ruby-debug is listed in Gemfile/installed as gem): Start server with --debugger to enable *****