mongoid_i18n 0.3.1 → 0.4.0

data/.rvmrc

@@ -1 +1 @@
-rvm 1.8.7-p334
+rvm 1.8.7

data/Gemfile

@@ -1,6 +1,6 @@
 source :gemcutter
 
-gem "mongoid", '>= 2.0.0'
+gem "mongoid", '>= 2.1.0'
 gem "bson_ext"
 
 group :development, :test do

data/Gemfile.lock

@@ -1,11 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activesupport (3.0.9)
+    activesupport (3.0.10)
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (2.1.2)
@@ -19,7 +19,7 @@ GEM
     mocha (0.9.12)
     mongo (1.3.1)
       bson (>= 1.3.1)
-    mongoid (2.0.2)
+    mongoid (2.1.8)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
@@ -42,5 +42,5 @@ DEPENDENCIES
   bundler
   jeweler
   mocha
-  mongoid (>= 2.0.0)
+  mongoid (>= 2.1.0)
   rspec

data/Rakefile

@@ -30,7 +30,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/mongoid/i18n/localized_field.rb

@@ -1,6 +1,49 @@
 module Mongoid
   module I18n
-    class LocalizedField < Hash
+    class LocalizedField
+      include Mongoid::Fields::Serializable
+
+      # Return translated values of field, accoring to current locale.
+      # If :use_default_if_empty is set, then in case when there no
+      # translation available for current locale, if will try to
+      # get translation for defalt_locale.
+      def deserialize(object)
+        lookups = [self.locale]
+
+        # TODO: Add I18n.fallbacks support instead of :use_default_if_empty
+        if options[:use_default_if_empty]
+          lookups.push ::I18n.default_locale.to_s
+        end
+
+        # Find first localized value in lookup path and return corresponding value
+        object[lookups.find{|locale| object[locale]}]
+      end
+
+      # Return translations as keys. If :clear_empty_values is set to true
+      # pairs with empty values will be rejected
+      def to_hash(object)
+        if options[:clear_empty_values]
+          object.reject!{|k,v| v.blank?}
+        end
+
+        object
+      end
+
+      # Assing new translation to translation table.
+      def assign(object, value)
+        object.merge(locale => value)
+      end
+
+      # Replace translation hash with new one. If :clear_empty_values is set to
+      # pairs with empty values will be reject
+      def replace(object, values)
+        self.to_hash(values)
+      end
+
+      # Return current locale as string
+      def locale
+        ::I18n.locale.to_s
+      end
     end
   end
 end

data/lib/mongoid/i18n.rb

@@ -11,7 +11,7 @@ module Mongoid
 
     module ClassMethods
       def localized_field(name, options = {})
-        field name, options.merge(:type => LocalizedField, :default => LocalizedField.new)
+        field name, options.merge(:type => LocalizedField, :default => {})
       end
 
       def validates_default_locale(names, options = {})
@@ -28,30 +28,36 @@ module Mongoid
 
       protected
       def create_accessors(name, meth, options = {})
-        if options[:type] == LocalizedField
-          if options[:use_default_if_empty]
-            define_method(meth) { read_attribute(name)[::I18n.locale.to_s] || read_attribute(name)[::I18n.default_locale.to_s] rescue ''}
-          else
-            define_method(meth) { read_attribute(name)[::I18n.locale.to_s] rescue '' }
-          end
+        # Let Mongoid do all stuff
+        super
+
+        # Skip if create_accessors called on non LocalizedField field
+        return if LocalizedField != options[:type]
+
+        # Get field to retain incapsulation of LocalizedField class
+        field = fields[name]
+
+        generated_field_methods.module_eval do
+
+          # Redefine writer method, since it's impossible to correctly implement
+          # = method on field itself
           define_method("#{meth}=") do |value|
-            value = if value.is_a?(Hash)
-              (@attributes[name] || {}).merge(value)
-            else
-              (@attributes[name] || {}).merge(::I18n.locale.to_s => value)
-            end
-            value = value.delete_if { |key, value| value.blank? } if options[:clear_empty_values]
-            write_attribute(name, value)
+            hash = field.assign(read_attribute(name), value)
+            write_attribute(name, hash)
           end
-          define_method("#{meth}_translations") { read_attribute(name) }
-          if options[:clear_empty_values]
-            define_method("#{meth}_translations=") { |value| write_attribute(name, value.delete_if { |key, value| value.blank? }) }
-          else
-            define_method("#{meth}_translations=") { |value| write_attribute(name, value) }
+
+          # Return list of attribute translations
+          define_method("#{meth}_translations") do
+            field.to_hash(read_attribute(name))
+          end
+
+          # Mass-assign translations
+          define_method("#{meth}_translations=") do |values|
+            hash = field.replace(read_attribute(name), values)
+            write_attribute(name, hash)
           end
-        else
-          super
         end
+
       end
     end
   end

data/mongoid_i18n.gemspec

@@ -4,17 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{mongoid_i18n}
-  s.version = "0.3.1"
+  s.name = "mongoid_i18n"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodrigo \303\201lvarez"]
-  s.date = %q{2011-07-08}
-  s.description = %q{This gem aims to be a transparent way to deal with localizable fields.
-      Basically use localized_field() instead of field() and that's it.
-      It will take care of locales for you when using find or criteria.
-      }
-  s.email = %q{papipo@gmail.com}
+  s.date = "2011-10-06"
+  s.description = "This gem aims to be a transparent way to deal with localizable fields.\n      Basically use localized_field() instead of field() and that's it.\n      It will take care of locales for you when using find or criteria.\n      "
+  s.email = "papipo@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -38,23 +35,23 @@ Gem::Specification.new do |s|
     "spec/integration/mongoid/i18n_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/Papipo/mongoid_i18n}
+  s.homepage = "http://github.com/Papipo/mongoid_i18n"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Mongoid plugin to deal with localizable fields}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Mongoid plugin to deal with localizable fields"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 2.1.0"])
       s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
     else
-      s.add_dependency(%q<mongoid>, [">= 2.0.0"])
+      s.add_dependency(%q<mongoid>, [">= 2.1.0"])
       s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
@@ -62,7 +59,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<mongoid>, [">= 2.0.0"])
+    s.add_dependency(%q<mongoid>, [">= 2.1.0"])
     s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])

data/spec/integration/mongoid/i18n_spec.rb

@@ -5,6 +5,8 @@ class Entry
   include Mongoid::Document
   include Mongoid::I18n
 
+  field :weight, :type => Integer, :default => 60
+
   localized_field :title
   localized_field :title_with_default, :use_default_if_empty => true
   localized_field :title_without_empty_values, :clear_empty_values => true
@@ -173,7 +175,7 @@ describe Mongoid::I18n, 'localized field in embedded document' do
     @entry = Entry.new
     @entry.create_sub_entry(:subtitle => 'Oxford Street')
   end
-  
+
   it "should store the title in the right locale" do
     @entry.reload.sub_entry.subtitle.should == 'Oxford Street'
   end
@@ -364,3 +366,21 @@ describe Mongoid::I18n, "localized_field with validation 'validates_all_locales'
     end
   end
 end
+
+describe Mongoid::I18n, "create_accessors" do
+  before do
+    I18n.locale = :en
+    @entry = Entry.new
+  end
+
+  it "should not affect other fields accessors" do
+    @entry.weight.should == 60
+
+    @entry.weight = 70
+    @entry.weight.should == 70
+  end
+
+  it "should not define own methods on for fields" do
+    @entry.should_not respond_to :weight_translations
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid_i18n
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - "Rodrigo \xC3\x81lvarez"
@@ -15,28 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 +02:00
-default_executable: 
+date: 2011-10-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 11
         segments: 
         - 2
+        - 1
         - 0
-        - 0
-        version: 2.0.0
-  name: mongoid
+        version: 2.1.0
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: mongoid
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +43,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: bson_ext
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: bson_ext
   prerelease: false
-  type: :development
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,11 +57,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rspec
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -74,11 +71,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mocha
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  name: mocha
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,11 +85,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: jeweler
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  name: jeweler
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,8 +99,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: bundler
   version_requirements: *id006
+  name: bundler
+  prerelease: false
+  type: :development
 description: "This gem aims to be a transparent way to deal with localizable fields.\n      Basically use localized_field() instead of field() and that's it.\n      It will take care of locales for you when using find or criteria.\n      "
 email: papipo@gmail.com
 executables: []
@@ -131,7 +130,6 @@ files:
 - spec/.rspec
 - spec/integration/mongoid/i18n_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/Papipo/mongoid_i18n
 licenses: []
 
@@ -161,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Mongoid plugin to deal with localizable fields