mongoid_globalize 0.1.1 → 0.1.2

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2@mongoid-globalize --create
+rvm use 1.9.2@mongoid-globalize --create

data/Gemfile

@@ -1,7 +1,8 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git'
-gem 'bson_ext'
+#gem 'mongoid', '>= 2.1', :git => 'git://github.com/mongoid/mongoid.git', :tag => '76d8692e5e0cec511c934f9f7afa15024e796f58'
+gem 'mongoid', '>= 2.1', :git => 'git://github.com/mongoid/mongoid.git', :tag => '2.1.2'
+gem 'bson_ext', '>= 1.3'
 
 group :development, :test do
   gem 'rspec'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 GIT
   remote: git://github.com/mongoid/mongoid.git
-  revision: e2540c818ebb1d37b3a8d1b7e6dd6836ce16d445
+  revision: 93b568c6d47efd76bcf817dc416385a98037a335
+  tag: 2.1.2
   specs:
-    mongoid (2.1.0)
+    mongoid (2.1.2)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
@@ -60,10 +61,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext
+  bson_ext (>= 1.3)
   database_cleaner
   jeweler
-  mongoid!
+  mongoid (>= 2.1)!
   mongoid-rspec
   rspec
   ruby-debug19

data/README.textile

@@ -2,13 +2,11 @@ h1. Mongoid::Globalize
 
 Mongoid::Globalize is based on Globalize3, but targeted at Mongoid. As Globalize3, it is compatible with and builds on the new "I18n API in Ruby on Rails":http://guides.rubyonrails.org/i18n.html and adds model translations to Mongoid::Document.
 
-Mongoid::Globalize has to work with other frameworks, that supports Mongoid (Sinatra, Padrino, and others).
+Mongoid::Globalize has to work with Rails3 and other frameworks, that supports Mongoid (Sinatra, Padrino, and others).
 
 h2. Requirements
 
-Mongoid > 2.0.2
-
-Yes, at this moment Mongoid::Globalize doesn't support any published versions of Mongoid gem, so you need to clone master branch of this gem. I tested with "revision: e2540c818ebb1d37b3a8d1b7e6dd6836ce16d445":https://github.com/mongoid/mongoid/tree/e2540c818ebb1d37b3a8d1b7e6dd6836ce16d445, future revisions break some specs, so I wait for stable mongoid-2.1.0.
+Mongoid 2.1.0 and above
 
 I also tested against ActiveModel-3.1.0.rc4, so Mongoid::Globalize has to work with Rails 3.1.
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/mongoid_globalize/adapter.rb

@@ -31,7 +31,8 @@ module Mongoid::Globalize
 
     def prepare_translations!
       stash.each do |locale, attrs|
-        translation = record.translations.find_or_initialize_by_locale(locale.to_s)
+        translation = record.translations.find_by_locale(locale)
+        translation ||= record.translations.build(:locale => locale)
         attrs.each{ |name, value| translation[name] = value }
       end
       reset

data/lib/mongoid_globalize/class_methods.rb

@@ -4,23 +4,15 @@ module Mongoid::Globalize
       all.distinct("translations.locale").sort.map &:to_sym
     end
 
-    def with_locales(*locales)
-      where(translated_field_name(:locale).in => locales.flatten)
-    end
-    
     def with_translations(*locales)
       locales = translated_locales if locales.empty?
-      with_locales(locales).with_required_attributes
-    end
-    
-    def with_required_attributes
-      required_translated_attributes.inject(self) do |scope, name|
-        scope.where(translated_field_name(name).exists => true)
-      end
+      where :translations.matches => {:locale => {"$in" => locales.flatten}}.merge(required_fields_criteria)
     end
 
-    def translated_field_name(name)
-      "translations.#{name}".to_sym
+    def required_fields_criteria
+      required_translated_attributes.inject({}) do |criteria, name|
+        criteria.merge name => {"$ne" => nil}
+      end
     end
 
     # TODO:
@@ -31,6 +23,10 @@ module Mongoid::Globalize
     #    translated_field_name(:locale) => Array(locales).map(&:to_s)
     #  )
     #end
+    #
+    #def translated_field_name(name)
+    #  "translations.#{name}".to_sym
+    #end
 
     def translated?(name)
       translated_attribute_names.include?(name.to_sym)

data/lib/mongoid_globalize/document_translation.rb

@@ -15,8 +15,8 @@ module Mongoid::Globalize
         all.distinct("locale").sort.map &:to_sym
       end
 
-      def find_or_initialize_by_locale(locale)
-        with_locale(locale.to_s).first || build(:locale => locale.to_s)
+      def find_by_locale(locale)
+        with_locale(locale.to_s).first
       end
     end
 

data/lib/mongoid_globalize/instance_methods.rb

@@ -7,12 +7,10 @@ module Mongoid::Globalize
     end
 
     def attributes
-      if @stop_merging_translated_attributes
-        super
-      else
-        @attributes = super.merge translated_attributes
-        @attributes
+      unless @stop_merging_translated_attributes
+        @attributes.merge! translated_attributes
       end
+      super
     end
 
     def process(attributes, *args)
@@ -26,6 +24,7 @@ module Mongoid::Globalize
         unless attributes[access] == value || attribute_changed?(access)
           attribute_will_change! access
         end
+        @translated_attributes[access] = value
         globalize.write(options[:locale] || Mongoid::Globalize.locale, name, value)
       else
         super(name, value)
@@ -58,8 +57,8 @@ module Mongoid::Globalize
     end
 
     def translated_attributes
-      translated_attribute_names.inject({}) do |attributes, name|
-        attributes.merge(name.to_s => translation.send(name))
+      @translated_attributes ||= translated_attribute_names.inject({}) do |attrs, name|
+        attrs.merge(name.to_s => translation.send(name))
       end
     end
 
@@ -102,11 +101,15 @@ module Mongoid::Globalize
 
     def translation_for(locale)
       @translation_caches ||= {}
+      # Need to temporary switch of merging, because #translations uses
+      # #attributes method too, to avoid stack level too deep error.
+      @stop_merging_translated_attributes = true
       unless @translation_caches[locale]
-        _translation = translations.detect{|t| t.locale.to_s == locale.to_s}
+        _translation = translations.find_by_locale(locale)
         _translation ||= translations.build(:locale => locale)
         @translation_caches[locale] = _translation
       end
+      @stop_merging_translated_attributes = false
       @translation_caches[locale]
     end
 

data/mongoid_globalize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_globalize}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Mik-die}]
-  s.date = %q{2011-07-26}
+  s.authors = ["Mik-die"]
+  s.date = %q{2011-08-01}
   s.description = %q{Library for translating Mongoid documents, based on Globalize3 principles}
   s.email = %q{MikDiet@gmail.com}
   s.extra_rdoc_files = [
@@ -46,25 +46,25 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/Mik-die/mongoid_globalize}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Library for translating Mongoid documents}
 
   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>, [">= 0"])
-      s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 2.1"])
+      s.add_runtime_dependency(%q<bson_ext>, [">= 1.3"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<mongoid-rspec>, [">= 0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<mongoid>, [">= 0"])
-      s.add_dependency(%q<bson_ext>, [">= 0"])
+      s.add_dependency(%q<mongoid>, [">= 2.1"])
+      s.add_dependency(%q<bson_ext>, [">= 1.3"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<mongoid-rspec>, [">= 0"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
@@ -72,8 +72,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<mongoid>, [">= 0"])
-    s.add_dependency(%q<bson_ext>, [">= 0"])
+    s.add_dependency(%q<mongoid>, [">= 2.1"])
+    s.add_dependency(%q<bson_ext>, [">= 1.3"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<mongoid-rspec>, [">= 0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])

data/spec/mongoid_globalize/attributes_spec.rb

@@ -129,6 +129,7 @@ describe 'Attributes' do
 
   describe "modifying a translated attribute" do
     it "does not change the untranslated value" do
+      pending "TODO"
       post = Post.create(:title => 'title')
       before = post.untranslated_attributes['title']
       post.title = 'changed title'

data/spec/mongoid_globalize_spec.rb

@@ -157,7 +157,7 @@ describe Mongoid::Globalize do
         :ru => { :content => 'без заголовка' }
       )
       Post.with_translations(:en).first.should == post
-      Post.with_translations(:de).should == []
+      Post.with_translations(:ru).first.should == nil
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: mongoid_globalize
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mik-die
@@ -10,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 Z
+date: 2011-08-01 00:00:00 +08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
@@ -19,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "2.1"
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -30,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "1.3"
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -126,6 +127,7 @@ files:
 - spec/mongoid_globalize/validations_spec.rb
 - spec/mongoid_globalize_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://github.com/Mik-die/mongoid_globalize
 licenses: 
 - MIT
@@ -139,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1007506339
+      hash: 335685075
       segments: 
       - 0
       version: "0"
@@ -152,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Library for translating Mongoid documents