rails_dictionary 0.2 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 29704f4fcfc7b1a4a58b808a271d6121d790ed0c
+  data.tar.gz: 9f58740b71f9b150134c87b44e3d112c62b83c5d
+SHA512:
+  metadata.gz: 2c1fd60db8d10a661fe7ab9f0925e51c874685816af149a57e9a914778ee88ea55c6f9137cf0929d924c6921cdb932398116f70752f1a22ee385641e6722af45
+  data.tar.gz: 4cf139cf52ad990394c9686365e639a1f81803f6503460cf3fac17f716a9ad903c7243ab1facd0a5b6fbe159f3190cffa636bb6c8b29144fc22a0876789cf207

data/Gemfile

@@ -4,8 +4,8 @@ source "http://rubygems.org"
 gemspec
 
 group :development,:test do
-  gem 'rspec', '>= 2.5.0'
-  gem 'debugger'
-  gem "rspec-rails"
+  gem 'rspec', '~> 2.14.0'
+  gem 'byebug'
+  gem "rspec-rails", '2.14.2'
   gem 'sqlite3'
 end

data/README.rdoc

@@ -1,3 +1,6 @@
+= Plan
+I plan wrote a new gem to replace it. The new gem will use rails STI. so we dont need maintenance dict_types table. It should be a better solution.
+
 = Intro
 There are always some static data(not static page) in application.For example product type or student diploma type.
 

data/lib/rails_dictionary/models/acts_as_dict_slave.rb

@@ -35,27 +35,54 @@ module RailsDictionary
 
       # add a belongs_to(Dictionary) association and a named_{column} method
       def add_dynamic_column_method
-        dict_mapping_columns.each { |e| belongs_to "#{e.to_s}_dict".to_sym,class_name: "Dictionary",foreign_key: e.to_sym }
+        dict_mapping_columns.each { |e| belongs_to "#{e}_dict".to_sym, class_name: "Dictionary", foreign_key: e.to_sym }
         dict_mapping_columns.each { |ele| named_dict_value ele.to_sym }
+        dict_mapping_columns.each { |ele| dict_name_equal ele.to_sym }
       end
 
-      # Generate dynamic instance method named_column to slave model
+      # Generate dynamic instance method named_column to consumer model
       # def named_city(locale=nil)
       #   locale = locale.presence || default_dict_locale.presence || :en
       #   locale = "name_#{locale}"
       #   self.send(city_dict).try(:send,locale)
       # end
+      # alias_method :city_name, :named_city
       def named_dict_value(method_name)
-        belongs_to_name="#{method_name.to_s}_dict".to_sym
-        method_name="named_#{method_name.to_s}"
+        belongs_to_name="#{method_name}_dict".to_sym
+        origin_method_name = method_name
+        method_name="named_#{method_name}"
         define_method(method_name) do | locale=nil |
           locale = locale.presence || default_dict_locale.presence || :en
           locale = "name_#{locale}"
           self.send(belongs_to_name).try(:send,locale)
         end
+        alias_method "#{origin_method_name}_name".to_sym, method_name.to_sym
       end
 
-    end
+      # Build dynamic method column_name= to the consumer model
+      #
+      # def city_name=(value, options = {})
+      #
+      #
+      # end
+      def dict_name_equal(colname)
+        method_name = "#{colname}_name="
+        belongs_to_name="#{colname}_dict".to_sym
+        define_method(method_name) do |value, options={}|
+          options.merge!(name_en: value)
+          dict_type_id = DictType.revert("#{self.class.table_name.singularize}_#{colname}")
+          options.merge!(dict_type_id: dict_type_id)
+          exist_dictionary = Dictionary.where(options)
+          if exist_dictionary.present?
+            exist_id = exist_dictionary.first.id
+          else
+            exist_id = send("create_#{belongs_to_name}!", options).id
+          end
+          send "#{colname}=", exist_id
+        end
+      end
+
+    end # END ClassMethods
 
   end
 end

data/lib/rails_dictionary/models/acts_as_dict_type.rb

@@ -2,20 +2,19 @@ module RailsDictionary
   module ActsAsDictType
     def self.included(base)
       base.extend(ClassMethods)
-      base.send :include,InstanceMethods
+      base.send :include, InstanceMethods
+      base.mattr_accessor :whole_types
     end
 
     module ClassMethods
 
       def all_types
-        Rails.cache.fetch("DictType.all_types") { all.map(&:name).map(&:to_sym) }.dup
-      end
-
-      def cached_all
-        Rails.cache.fetch("DictType.cached_all") { all }.dup
+        whole_types ||
+          self.whole_types = all.map(&:name).map(&:to_sym)
       end
 
       # short method to transfer id to name or name to id
+      # TODO: cache it
       def revert(arg)
         if arg.is_a?(String)
           DictType.where(name: arg).first.try(:id)
@@ -48,8 +47,7 @@ module RailsDictionary
 
     module InstanceMethods
       def delete_all_caches
-        Rails.cache.delete("DictType.all_types")
-        Rails.cache.delete("DictType.cached_all")
+        self.whole_types = nil
         return true
       end
     end

data/lib/rails_dictionary/models/acts_as_dictionary.rb

@@ -25,6 +25,7 @@ module RailsDictionary
       def method_missing(method_id,options={})
         if DictType.all_types.include? method_id
           method_name=method_id.to_s.downcase
+          # TODO: If cache engine is failed, then the code will failed with null cant dup
           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)
@@ -64,7 +65,9 @@ module RailsDictionary
         scope_method_name = "scoped_#{name}".to_sym
         unless respond_to? scope_method_name
           define_singleton_method scope_method_name do
-            dict_type_name_eq(name).scoped
+            # see http://stackoverflow.com/questions/18198963/with-rails-4-model-scoped-is-deprecated-but-model-all-cant-replace-it
+            # for usage of where(nil)
+            dict_type_name_eq(name).where(nil)
           end
         end
       end

data/lib/rails_dictionary/version.rb

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

data/rails_dictionary.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "rails_dictionary"
 
   s.add_runtime_dependency 'rails', '> 3.0'
-  s.add_development_dependency 'rails', '> 3.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/fake_app.rb

@@ -1,11 +1,12 @@
 
 # database
 ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
-ActiveRecord::Base.establish_connection('test')
+ActiveRecord::Base.establish_connection(:test)
 
 # config
 app = Class.new(Rails::Application)
 app.config.active_support.deprecation = :log
+app.config.eager_load = false
 app.initialize!
 
 # models

data/spec/rails_dictionary_spec.rb

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-require 'debugger'
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe RailsDictionary::ActiveRecordExtension do
@@ -34,6 +33,8 @@ describe RailsDictionary do
     end
 
     it "after one record removed" do
+      DictType.all_types
+      DictType.whole_types.should == [:student_city, :student_school]
       dt_stu_school.destroy
       DictType.all_types.should == [:student_city]
       DictType.tab_and_column.should == Hash[:student,["city"]]
@@ -78,10 +79,31 @@ describe RailsDictionary do
 
     it "named_city with different locale" do
       stu_shanghai.named_city(:en).should == "shanghai"
+      stu_shanghai.city_name(:en).should == "shanghai"
+      stu_shanghai.city_name.should == "shanghai"
       stu_shanghai.named_city("").should == "shanghai"
       stu_beijing.named_city(:fr).should == "Pékin"
     end
 
+    it "update city by set city_name to a value" do
+      stu_shanghai.update_attributes city_name: "wuhan"
+      stu_shanghai.reload.city_name.should == "wuhan"
+      Dictionary.student_city.map(&:name_en).include?("wuhan").should be_true
+    end
+
+    it "update city by set city_name to an exist dictionary name" do
+      Dictionary.where(name_en: "beijing").count.should eq(1)
+      stu_shanghai.update_attributes city_name: "beijing"
+      stu_shanghai.reload.city_name.should eq('beijing')
+      Dictionary.where(name_en: "beijing").count.should eq(1)
+    end
+
+    it "create a student with shanghai city" do
+      s = Student.create(city_name: "shanghai")
+      s.reload
+      s.city_name.should == "shanghai"
+    end
+
     it "override default locale" do
       Student.acts_as_dict_slave :locale => :fr
       stu_beijing.named_city.should == "Pékin"

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # copy and modify the test design of kaminari(a paginate gem for Rails3)
+RAILS_ENV = 'test'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rails'
@@ -17,3 +18,5 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = true
   CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'dict_types'
 end
+
+require 'byebug'

metadata

@@ -1,46 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rails_dictionary
 version: !ruby/object:Gem::Version
-  version: '0.2'
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Raykin Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  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
@@ -51,7 +32,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG
 - Gemfile
 - README.rdoc
@@ -70,26 +51,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/raykin/rails_dictionary
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rails_dictionary
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: dictionary data for web application
 test_files: []
+has_rdoc: