mongoid_i18n 0.1.5 → 0.1.6

data/Gemfile.lock

@@ -0,0 +1,54 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.0.rc)
+      activesupport (= 3.0.0.rc)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activesupport (3.0.0.rc)
+    bson (1.0.4)
+    bson_ext (1.0.4)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    i18n (0.4.1)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    mocha (0.9.8)
+      rake
+    mongo (1.0.7)
+      bson (>= 1.0.4)
+    mongoid (2.0.0.beta.16)
+      activemodel (= 3.0.0.rc)
+      bson (= 1.0.4)
+      mongo (= 1.0.7)
+      tzinfo (= 0.3.22)
+      will_paginate (~> 3.0.pre)
+    rake (0.8.7)
+    rspec (2.0.0.beta.19)
+      rspec-core (= 2.0.0.beta.19)
+      rspec-expectations (= 2.0.0.beta.19)
+      rspec-mocks (= 2.0.0.beta.19)
+    rspec-core (2.0.0.beta.19)
+    rspec-expectations (2.0.0.beta.19)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.19)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    tzinfo (0.3.22)
+    will_paginate (3.0.pre2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bson_ext
+  bundler
+  jeweler
+  mocha
+  mongoid (>= 2.0.0.beta.9)
+  rspec (>= 2.0.0.beta.8)

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/mongoid/i18n.rb

@@ -4,21 +4,22 @@ require 'mongoid/i18n/localized_criteria'
 module Mongoid
   module I18n
     extend ActiveSupport::Concern
-    
+
     module ClassMethods
       def localized_field(name, options = {})
         field name, options.merge(:type => LocalizedField)
       end
-      
+
       def criteria
-        I18n::LocalizedCriteria.new(self)
+        scope = scope_stack.last rescue nil
+        scope || I18n::LocalizedCriteria.new(self)
       end
-    
+
       protected
       def create_accessors(name, meth, options = {})
         if options[:type] == LocalizedField
           define_method(meth) { read_attribute(name)[::I18n.locale.to_s] rescue '' }
-          define_method("#{meth}=") do |value| 
+          define_method("#{meth}=") do |value|
             write_attribute(name, (@attributes[name] || {}).merge(::I18n.locale.to_s => value))
           end
           define_method("#{meth}_translations") { read_attribute(name) }

data/mongoid_i18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_i18n}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodrigo \303\201lvarez"]
-  s.date = %q{2010-07-29}
+  s.date = %q{2010-08-18}
   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.
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     ".document",
      ".gitignore",
      "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -40,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/Papipo/mongoid_i18n}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Mongoid plugin to deal with localizable fields}
   s.test_files = [
     "spec/integration/mongoid/i18n_spec.rb",
@@ -53,7 +54,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.9"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
     else

data/spec/integration/mongoid/i18n_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 class Entry
   include Mongoid::Document
   include Mongoid::I18n
-  
+
   localized_field :title
   field :published, :type => Boolean
 end
@@ -13,68 +13,68 @@ describe Mongoid::I18n, "localized_field" do
   before do
     I18n.locale = :en
   end
-  
+
   describe "without an assigned value" do
     before do
       @entry = Entry.new
     end
-    
+
     it "should return blank" do
       @entry.title.should be_blank
     end
   end
-  
+
   describe "with an assigned value" do
     before do
       @entry = Entry.new(:title => 'Title')
     end
-    
+
     describe "and persisted" do
       before do
         @entry.save
       end
-      
+
       describe "where() criteria" do
         it "should use the current locale value" do
           Entry.where(:title => 'Title').first.should == @entry
         end
       end
-      
+
       describe "find(:first) with :conditions" do
         it "should use the current locale value" do
           Entry.find(:first, :conditions => {:title => 'Title'}).should == @entry
         end
       end
     end
-    
+
     it "should return that value" do
       @entry.title.should == 'Title'
     end
-    
+
     describe "when the locale is changed" do
       before do
         I18n.locale = :es
       end
-      
+
       it "should return a blank value" do
         @entry.title.should be_blank
       end
-      
+
       describe "a new value is assigned" do
         before do
           @entry.title = 'Título'
         end
-        
+
         it "should return the new value" do
           @entry.title.should == 'Título'
         end
-        
+
         describe "persisted and retrieved from db" do
           before do
             @entry.save
             @entry = Entry.find(:first, :conditions => {:title => 'Título'})
           end
-          
+
           it "the localized field value should be ok" do
             @entry.title.should == 'Título'
             I18n.locale = :en
@@ -82,32 +82,32 @@ describe Mongoid::I18n, "localized_field" do
             @entry.title_translations.should == {'en' => 'Title', 'es' => 'Título'}
           end
         end
-        
+
         describe "getter.translations" do
           it "should return all translations" do
             @entry.title_translations.should == {'en' => 'Title', 'es' => 'Título'}
           end
         end
-        
+
         describe "getter.translations=" do
           before do
             @entry.title_translations = {'en' => 'New title', 'es' => 'Nuevo título'}
           end
-          
+
           it "should accept new translations" do
             @entry.title_translations.should == {'en' => 'New title', 'es' => 'Nuevo título'}
           end
-          
+
           it "the getter should return the new translation" do
             @entry.title.should == 'Nuevo título'
           end
         end
-        
+
         describe "and we go back to the original locale" do
           before do
             I18n.locale = :en
           end
-          
+
           it "should return the original value" do
             @entry.title.should == 'Title'
           end
@@ -115,4 +115,29 @@ describe Mongoid::I18n, "localized_field" do
       end
     end
   end
+end
+
+describe Mongoid::I18n, 'criteria on embeds_many association' do
+  before do
+    class Entry
+      embeds_many :sub_entries
+    end
+
+    class SubEntry
+      include Mongoid::Document
+      include Mongoid::I18n
+      localized_field :title
+      embedded_in :entry, :inverse_of => :sub_entries
+    end
+    @entry = Entry.new
+    @sub_entries = (0..2).map { @entry.sub_entries.build }
+  end
+
+  it "should return a LocalizedCriteria" do
+    @entry.sub_entries.criteria.should be_a(Mongoid::I18n::LocalizedCriteria)
+  end
+
+  it "should contain the embedded documents" do
+    @entry.sub_entries.criteria.instance_variable_get("@documents").should == @sub_entries
+  end
 end

data/spec/unit/mongoid/i18n/localized_criteria_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Mongoid::I18n::LocalizedCriteria do
   describe "where" do
     before do
-      klass = stub(:fields => {'title' => mock(:type => Mongoid::I18n::LocalizedField), 'published' => mock(:type => Boolean)})
+      @title = Mongoid::Field.new(:title, :type => Mongoid::I18n::LocalizedField)
+      @published = Mongoid::Field.new(:published, :type => Boolean)
+      klass = stub(:fields => {'title' => @title, 'published' => @published})
       @criteria = Mongoid::I18n::LocalizedCriteria.new(klass)
       @criteria.where(:title.in => ['Title'], :published => true)
     end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid_i18n
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - "Rodrigo \xC3\x81lvarez"
@@ -14,14 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 +02:00
+date: 2010-08-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: mongoid
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196465
         segments: 
         - 2
         - 0
@@ -29,15 +34,17 @@ dependencies:
         - beta
         - 9
         version: 2.0.0.beta.9
-  requirement: *id001
-  prerelease: false
   type: :runtime
-  name: mongoid
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196467
         segments: 
         - 2
         - 0
@@ -45,10 +52,8 @@ dependencies:
         - beta
         - 8
         version: 2.0.0.beta.8
-  requirement: *id002
-  prerelease: false
   type: :development
-  name: rspec
+  version_requirements: *id002
 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: []
@@ -62,6 +67,7 @@ files:
 - .document
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -85,23 +91,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Mongoid plugin to deal with localizable fields