has_localization_table 0.2.0 → 0.3.3

data/.gitignore

@@ -1,3 +1,4 @@
+.idea
 *.gem
 *.rbc
 .bundle

data/lib/has_localization_table/active_record/relation.rb

@@ -3,7 +3,8 @@ module HasLocalizationTable
     module Relation
       def self.extended(klass)
         klass.send(:include, InstanceMethods)
-        
+        klass.send(:create_localization_associations!)
+
         # Alias the scoping method to use the actual association name
         alias_method :"with_#{klass.localization_association_name}", :with_localizations
       end
@@ -17,12 +18,32 @@ module HasLocalizationTable
             join_sql
         )
       end
-    
-      def create_localization_association!
+
+    private
+
+      def create_localization_associations!
+        create_has_many_association
+        create_has_one_association
+      end
+
+      # Collect the localization for the current locale
+      def create_has_one_association
+        table_name = localization_class.table_name
+        foreign_key = HasLocalizationTable.locale_foreign_key
+
+        has_one_options = localization_table_options.except(:association_name, :required, :optional, :dependent).
+          merge({ conditions: Proc.new { "#{table_name}.#{foreign_key} = #{HasLocalizationTable.current_locale.id}"} })
+
+        self.has_one localization_association_name.to_s.singularize.to_sym, has_one_options
+      end
+
+      # Collect all localizations for the object
+      def create_has_many_association
         self.has_many localization_association_name, localization_table_options.except(:association_name, :required, :optional)
       end
-      private :create_localization_association!
-      
+
+    public
+
       module InstanceMethods
         # Add localization objects for any available locale that doesn't have one 
         def build_missing_localizations!

data/lib/has_localization_table/active_record.rb

@@ -19,7 +19,6 @@ module HasLocalizationTable
       extend Relation, FinderMethods, OrderedBy, Callbacks, Validations, MetaMethods
       include Attributes
       
-      create_localization_association!
       setup_localization_callbacks!
       setup_localization_validations!
     end

data/lib/has_localization_table/version.rb

@@ -1,3 +1,3 @@
 module HasLocalizationTable
-  VERSION = "0.2.0"
+  VERSION = "0.3.3"
 end

data/spec/active_record/attributes_spec.rb

@@ -13,7 +13,7 @@ describe HasLocalizationTable do
     Article = Class.new(ActiveRecord::Base)
     Article.has_localization_table
   end
-  
+
   let(:a) { Article.new(name: "Test", description: "Description") }
   
   it "should set localized attributes" do

data/spec/active_record/relation_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+#require 'active_record/relation'
 
 describe HasLocalizationTable do
   before do
@@ -10,11 +11,48 @@ describe HasLocalizationTable do
     end
 
     Object.send(:remove_const, :Article) rescue nil
-    Article = Class.new(ActiveRecord::Base)
+    Article = Class.new(ActiveRecord::Base) do
+      def self.localization_association_name; :strings; end
+      def self.localization_table_options; {}; end
+      def self.localization_class; ArticleLocalization; end
+    end
+  end
+
+  subject do
+    Article.send(:extend, HasLocalizationTable::ActiveRecord::Relation)
+    Article
   end
-  
+
   it "should alias with_localizations with the actual association name" do
-    Article.has_localization_table :strings
-    assert Article.respond_to? :with_strings
+    assert subject.respond_to? :with_strings
+  end
+
+  it "should create a has_many association" do
+    reflection = subject.reflect_on_association(:strings)
+    refute_nil reflection
+    reflection.macro.must_equal :has_many
+  end
+
+  it "should create a has_one association" do
+    reflection = subject.reflect_on_association(:string)
+    refute_nil reflection
+    reflection.macro.must_equal :has_one
+  end
+
+  it "should use the current locale for the has_one association" do
+    locale = MiniTest::Mock.new
+    locale.expect :id, 2
+
+    conditions = subject.reflect_on_association(:string).options[:conditions]
+
+    HasLocalizationTable.stub :current_locale, locale do
+      conditions.call.must_equal "article_localizations.locale_id = 2"
+    end
+
+    locale.expect :id, 3
+
+    HasLocalizationTable.stub :current_locale, locale do
+      conditions.call.must_equal "article_localizations.locale_id = 3"
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+gem "minitest" # Use the gem version
 require 'minitest/autorun'
 require 'active_record'
 require 'has_localization_table'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_localization_table
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,52 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2013-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &10582840 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *10582840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &10581980 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *10581980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &10581320 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *10581320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &10580720 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *10580720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: Automatically sets up usage of a relational table to contain user-created
   multi-locale string attributes
 email:
@@ -95,20 +115,20 @@ 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
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sets up associations and attribute methods for AR models that have a relational