rails_dictionary 0.0.6 → 0.0.7

data/README.rdoc

@@ -103,7 +103,7 @@ In short,when you confused with the debug data,try running "rails tmp:clear" fir
 
 = TODO & Problems
 There are no convention and implemention to map Class like Ckeditor::Asset to a method.
-Add generators.
+Add generators. Rewrite Testing,make it more maintainable.
 
 = Help
 Need an friendly english native guy to help me improve this readme to make it more clear and readable.

data/lib/rails_dictionary/acts_as_dictionary.rb

@@ -9,7 +9,15 @@ module ActsAsDictionary
       belongs_to :dict_type
       after_save :delete_dicts_cache
       after_destroy :delete_dicts_cache
-      scope :dict_type_name_eq,lambda {|method_name| joins(:dict_type).where("dict_types.name" => method_name).all}
+
+      # Return an instance of array
+      def dict_type_name_eq(method_name)
+        joins(:dict_type).where("dict_types.name" => method_name).all
+      end
+      #Following design is not successed with sqlite3 in test
+      # scope :dict_type_name_eq,lambda {|method_name| joins(:dict_type).where("dict_types.name" => method_name)}
+      # remove the all seems not pass test,return following errors
+      # TypeError: no marshal_dump is defined for class SQLite3::Database
       include InstanceMethods
       # Generate methods like Dictionary.student_city
       # Dictionary.student_city - a list of dictionary object which dict type is student_city
@@ -19,8 +27,9 @@ module ActsAsDictionary
       def self.method_missing(method_id,options={},&block)
         method_name=method_id.to_s.downcase
         if DictType.all_types.include? method_id.to_s
-          Rails.cache.fetch("Dictionary.#{method_name}") { Dictionary.dict_type_name_eq(method_name) }
+          Rails.cache.fetch("Dictionary.#{method_name}") { dict_type_name_eq(method_name) }
           listed_attr=Rails.cache.read("Dictionary.#{method_name}").dup
+          # Instance of activerelation can not be dup?
           if options.keys.include? :locale or options.keys.include? "locale"
             locale="name_#{ options[:locale] }"
             listed_attr.map! { |a| [a.send(locale),a.id] }

data/lib/rails_dictionary/version.rb

@@ -1,3 +1,3 @@
 module RailsDictionary
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/rails_dictionary_test.rb

@@ -95,14 +95,6 @@ class DictTypeTest < Test::Unit::TestCase
     assert_equal "student_school",DictType.revert(@dt_stu_school.id)
   end
 
-  def test_dictionary_method_missing
-    assert_equal [["shanghai",1],["beijing",2]],Dictionary.student_city(:locale => :en)
-  end
-
-  def test_dictionary_method_missing_with_locale
-    assert_equal [["上海", 1], ["北京", 2]],Dictionary.student_city(:locale => :zh)
-  end
-
   # test dynamic instance methods in slave model
   def test_named_city
     Student.acts_as_dict_slave
@@ -119,6 +111,14 @@ class DictTypeTest < Test::Unit::TestCase
     assert_equal "Pékin",@stu_beijing.named_city
   end
 
+  def test_dictionary_method_missing
+    assert_equal [["shanghai",1],["beijing",2]],Dictionary.student_city(:locale => :en)
+  end
+
+  def test_dictionary_method_missing_with_locale
+    assert_equal [["上海", 1], ["北京", 2]],Dictionary.student_city(:locale => :zh)
+  end
+
   def test_delete_dicts_cache
     @dy_wuhan=Dictionary.create! name_en: "wuhan",name_zh: "武汉",name_fr: "wuhan",dict_type_id: @dt_stu_city.id
     assert_equal [["shanghai", 1], ["beijing", 2], ["wuhan", 3]],Dictionary.student_city(:locale => :en)

metadata

@@ -2,7 +2,7 @@
 name: rails_dictionary
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - raykin