mongoid_i18n 0.1.8 → 0.2.0

data/.rvmrc

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

data/Gemfile

@@ -1,8 +1,8 @@
 source :gemcutter
 
-gem 'bson_ext'
-gem 'mongoid', '>= 2.0.0.beta.9'
-gem 'rspec', '>= 2.0.0.beta.8'
+gem 'bson_ext', "~> 1.2"
+gem 'mongoid', '>= 2.0.0'
+gem 'rspec'
 gem 'mocha'
 gem 'jeweler'
 gem 'bundler'

data/Gemfile.lock

@@ -1,49 +1,48 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.3)
-    bson (1.1.2)
-    bson_ext (1.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.6)
+    bson (1.3.0)
+    bson_ext (1.3.0)
     builder (2.1.2)
     diff-lcs (1.1.2)
     git (1.2.5)
-    i18n (0.4.2)
-    jeweler (1.5.1)
+    i18n (0.5.0)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    mocha (0.9.9)
-      rake
-    mongo (1.1.2)
-      bson (>= 1.1.1)
-    mongoid (2.0.0.beta.20)
+    mocha (0.9.12)
+    mongo (1.3.0)
+      bson (>= 1.3.0)
+    mongoid (2.0.1)
       activemodel (~> 3.0)
-      mongo (~> 1.1)
+      mongo (~> 1.3)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
     rake (0.8.7)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    tzinfo (0.3.23)
+    rspec-mocks (2.5.0)
+    tzinfo (0.3.26)
     will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext
+  bson_ext (~> 1.2)
   bundler
   jeweler
   mocha
-  mongoid (>= 2.0.0.beta.9)
-  rspec (>= 2.0.0.beta.8)
+  mongoid (>= 2.0.0)
+  rspec

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.2.0

data/lib/mongoid/i18n/criterion/selector.rb

@@ -0,0 +1,10 @@
+module Mongoid
+  module Criterion
+    class Selector< Hash
+      def []=(key, value)
+        key = "#{key}.#{::I18n.locale}" if fields[key.to_s].type == Mongoid::I18n::LocalizedField
+        super
+      end
+    end
+  end
+end

data/lib/mongoid/i18n.rb

@@ -1,5 +1,5 @@
 require 'mongoid/i18n/localized_field'
-require 'mongoid/i18n/localized_criteria'
+require 'mongoid/i18n/criterion/selector'
 
 module Mongoid
   module I18n
@@ -10,11 +10,6 @@ module Mongoid
         field name, options.merge(:type => LocalizedField)
       end
 
-      def criteria
-        scope = scope_stack.last rescue nil
-        scope || I18n::LocalizedCriteria.new(self)
-      end
-
       protected
       def create_accessors(name, meth, options = {})
         if options[:type] == LocalizedField

data/mongoid_i18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid_i18n}
-  s.version = "0.1.8"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rodrigo \303\201lvarez"]
-  s.date = %q{2010-11-19}
+  s.date = %q{2011-04-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.
@@ -29,43 +29,38 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/mongoid/i18n.rb",
-    "lib/mongoid/i18n/localized_criteria.rb",
+    "lib/mongoid/i18n/criterion/selector.rb",
     "lib/mongoid/i18n/localized_field.rb",
     "mongoid_i18n.gemspec",
     "spec/.rspec",
     "spec/integration/mongoid/i18n_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/unit/mongoid/i18n/localized_criteria_spec.rb",
-    "spec/unit/mongoid/i18n_spec.rb"
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/Papipo/mongoid_i18n}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Mongoid plugin to deal with localizable fields}
   s.test_files = [
     "spec/integration/mongoid/i18n_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/unit/mongoid/i18n/localized_criteria_spec.rb",
-    "spec/unit/mongoid/i18n_spec.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
-      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.9"])
-      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
+      s.add_runtime_dependency(%q<bson_ext>, ["~> 1.2"])
+      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<mocha>, [">= 0"])
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<bundler>, [">= 0"])
       s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.20"])
       s.add_development_dependency(%q<rspec>, ["= 2.1.0"])
     else
-      s.add_dependency(%q<bson_ext>, [">= 0"])
-      s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.9"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
+      s.add_dependency(%q<bson_ext>, ["~> 1.2"])
+      s.add_dependency(%q<mongoid>, [">= 2.0.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -73,9 +68,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["= 2.1.0"])
     end
   else
-    s.add_dependency(%q<bson_ext>, [">= 0"])
-    s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.9"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.8"])
+    s.add_dependency(%q<bson_ext>, ["~> 1.2"])
+    s.add_dependency(%q<mongoid>, [">= 2.0.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])

data/spec/integration/mongoid/i18n_spec.rb

@@ -6,7 +6,6 @@ class Entry
   include Mongoid::I18n
 
   localized_field :title
-  field :published, :type => Boolean
 end
 
 describe Mongoid::I18n, "localized_field" do
@@ -133,10 +132,6 @@ describe Mongoid::I18n, 'criteria on embeds_many association' do
     @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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongoid_i18n
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Rodrigo \xC3\x81lvarez"
@@ -15,64 +15,58 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +01:00
+date: 2011-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: bson_ext
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
-        - 0
-        version: "0"
-  requirement: *id001
+        - 1
+        - 2
+        version: "1.2"
+  name: bson_ext
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: mongoid
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196465
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 9
-        version: 2.0.0.beta.9
-  requirement: *id002
+        version: 2.0.0
+  name: mongoid
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196467
+        hash: 3
         segments: 
-        - 2
-        - 0
         - 0
-        - beta
-        - 8
-        version: 2.0.0.beta.8
-  requirement: *id003
+        version: "0"
+  name: rspec
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: mocha
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,12 +75,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  name: mocha
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -95,12 +89,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  name: jeweler
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: bundler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,12 +103,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  name: bundler
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  name: mongoid
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -127,12 +121,12 @@ dependencies:
         - beta
         - 20
         version: 2.0.0.beta.20
-  requirement: *id007
+  name: mongoid
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  name: rspec
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -143,7 +137,8 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id008
+  name: rspec
+  version_requirements: *id008
 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: []
@@ -163,14 +158,12 @@ files:
 - Rakefile
 - VERSION
 - lib/mongoid/i18n.rb
-- lib/mongoid/i18n/localized_criteria.rb
+- lib/mongoid/i18n/criterion/selector.rb
 - lib/mongoid/i18n/localized_field.rb
 - mongoid_i18n.gemspec
 - spec/.rspec
 - spec/integration/mongoid/i18n_spec.rb
 - spec/spec_helper.rb
-- spec/unit/mongoid/i18n/localized_criteria_spec.rb
-- spec/unit/mongoid/i18n_spec.rb
 has_rdoc: true
 homepage: http://github.com/Papipo/mongoid_i18n
 licenses: []
@@ -201,12 +194,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Mongoid plugin to deal with localizable fields
 test_files: 
 - spec/integration/mongoid/i18n_spec.rb
 - spec/spec_helper.rb
-- spec/unit/mongoid/i18n/localized_criteria_spec.rb
-- spec/unit/mongoid/i18n_spec.rb

data/lib/mongoid/i18n/localized_criteria.rb

@@ -1,19 +0,0 @@
-module Mongoid
-  module I18n
-    class LocalizedCriteria < Mongoid::Criteria
-      def where(selector = nil)
-        super
-        expand_localized_fields_in_selector if selector.is_a?(Hash)
-        self
-      end
-      
-      protected
-      
-      def expand_localized_fields_in_selector
-        @klass.fields.select { |k,f| @selector.keys.include?(k.to_sym) && f.type == LocalizedField }.each do |k,v|
-          @selector["#{k}.#{::I18n.locale}"] = @selector.delete(k.to_sym)
-        end
-      end
-    end
-  end
-end

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

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe Mongoid::I18n::LocalizedCriteria do
-  describe "where" do
-    before do
-      @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
-    
-    it "should expand fields that are LocalizedFields" do
-      @criteria.instance_variable_get("@selector").should == {'title.en' => {'$in' => ['Title']}, :published => true}
-    end
-  end
-end

data/spec/unit/mongoid/i18n_spec.rb

@@ -1,17 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe Mongoid::I18n do
-  before do
-    @class = Class.new do
-      include Mongoid::I18n
-    end
-    I18n.stubs(:locale).returns(:en)
-  end
-  
-  describe "criteria" do
-    it "should return a LocalizedCriteria" do
-      @class.criteria.should be_a(Mongoid::I18n::LocalizedCriteria)
-    end
-  end
-end