mongoid_globalize 0.1.5 → 0.2.0

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
-gem 'mongoid', '~> 2.3', :git => 'git://github.com/mongoid/mongoid.git', :tag => 'v2.3.4'
-gem 'bson_ext', '>= 1.3'
+gem 'mongoid', '~> 2.4', :git => 'git://github.com/mongoid/mongoid.git', :tag => 'v2.4.1'
+gem 'bson_ext', '~> 1.5'
 
 group :development, :test do
   gem 'rdoc'

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: git://github.com/mongoid/mongoid.git
-  revision: d8aa8a7730d8c352ecf5027a57764ebf92c0f363
-  tag: v2.3.4
+  revision: 0abef29ade4fe81c4e83be773cd6cfd6c02364f9
+  tag: v2.4.1
   specs:
-    mongoid (2.3.4)
+    mongoid (2.4.1)
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
@@ -22,15 +22,16 @@ GEM
     bson_ext (1.5.2)
       bson (= 1.5.2)
     builder (3.0.0)
-    columnize (0.3.4)
-    database_cleaner (0.6.7)
-    diff-lcs (1.1.2)
+    columnize (0.3.6)
+    database_cleaner (0.7.0)
+    diff-lcs (1.1.3)
     git (1.2.5)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    json (1.6.4)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     mongo (1.5.2)
@@ -39,16 +40,17 @@ GEM
       mongoid (~> 2.0)
       rspec (~> 2)
     multi_json (1.0.4)
-    rake (0.9.2)
-    rdoc (3.9.4)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.8.0)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -65,10 +67,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext (>= 1.3)
+  bson_ext (~> 1.5)
   database_cleaner
   jeweler
-  mongoid (~> 2.3)!
+  mongoid (~> 2.4)!
   mongoid-rspec
   rdoc
   rspec

data/README.textile

@@ -2,13 +2,11 @@ h1. "!https://secure.travis-ci.org/Mik-die/mongoid_globalize.png!":http://travis
 
 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 Rails3 and 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.1.0 and above
-
-I also tested against ActiveModel-3.1.0.rc4, so Mongoid::Globalize has to work with Rails 3.1.
+Mongoid 2.3. Mongoid 2.4 break some specs, so it's not supported yet. Though you can use master branch of gem.
 
 h2. Installation
 

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/mongoid_globalize/class_methods.rb

@@ -45,7 +45,7 @@ module Mongoid::Globalize
 
     # Return Array of attribute names with presence validations
     def required_attributes
-      validators.map{ |v| v.attributes if v.is_a?(ActiveModel::Validations::PresenceValidator) }.flatten.compact
+      validators.map{ |v| v.attributes if v.is_a?(Mongoid::Validations::PresenceValidator) }.flatten.compact
     end
 
     # Return Array of translated attribute names with presence validations

data/lib/mongoid_globalize/document_translation.rb

@@ -4,7 +4,7 @@ module Mongoid::Globalize
   class DocumentTranslation
     include Mongoid::Document
 
-    field :locale
+    field :locale, :type => String
 
     class << self
       # Accessor to document class which translated
@@ -22,7 +22,7 @@ module Mongoid::Globalize
       # Returns all locales used for translation.
       # Return Array of Symbols
       def translated_locales
-        all.distinct("locale").sort{ |x,y| x.to_s <=> y.to_s }.map &:to_sym
+        all.distinct("locale").sort{ |x,y| x.to_s <=> y.to_s }.map(&:to_sym)
       end
 
       # Returns translation document for given locale

data/lib/mongoid_globalize/instance_methods.rb

@@ -44,7 +44,7 @@ module Mongoid::Globalize
         end
         @translated_attributes[access] = value
         the_locale = options[:locale] || Mongoid::Globalize.locale
-        self.translations.reject!{ |t| t.new_record? && t.locale != the_locale }
+        self.translations.reject!{ |t| t.new_record? && t.locale != the_locale } if self.class.fallbacks_for_empty_translations
         globalize.write(the_locale, name, value)
       else
         super(name, value)
@@ -181,7 +181,7 @@ module Mongoid::Globalize
       @stop_merging_translated_attributes = true
       translated_attribute_names.each do |name|
         @attributes.delete name.to_s
-        @changed_attributes.delete name.to_s
+        @changed_attributes.delete name.to_s if @changed_attributes
       end
       globalize.prepare_translations!
     end

data/mongoid_globalize.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mongoid_globalize"
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mik-die"]
-  s.date = "2012-01-10"
+  s.date = "2012-01-16"
   s.description = "Library for translating Mongoid documents, based on Globalize3 principles"
   s.email = "MikDiet@gmail.com"
   s.extra_rdoc_files = [
@@ -56,8 +56,8 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, ["~> 2.3"])
-      s.add_runtime_dependency(%q<bson_ext>, [">= 1.3"])
+      s.add_runtime_dependency(%q<mongoid>, ["~> 2.4"])
+      s.add_runtime_dependency(%q<bson_ext>, ["~> 1.5"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<mongoid-rspec>, [">= 0"])
@@ -65,8 +65,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<mongoid>, ["~> 2.3"])
-      s.add_dependency(%q<bson_ext>, [">= 1.3"])
+      s.add_dependency(%q<mongoid>, ["~> 2.4"])
+      s.add_dependency(%q<bson_ext>, ["~> 1.5"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<mongoid-rspec>, [">= 0"])
@@ -75,8 +75,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<mongoid>, ["~> 2.3"])
-    s.add_dependency(%q<bson_ext>, [">= 1.3"])
+    s.add_dependency(%q<mongoid>, ["~> 2.4"])
+    s.add_dependency(%q<bson_ext>, ["~> 1.5"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<mongoid-rspec>, [">= 0"])

data/spec/mongoid_globalize/attributes_spec.rb

@@ -94,7 +94,7 @@ describe 'Attributes' do
     it "works for translated attributes" do
       post = Post.create(:title => 'title')
       post.update_attributes(:title => "Titel", :locale => :de)
-  
+
       with_locale(:en) { post.title_before_type_cast.should == 'title' }
       with_locale(:de) { post.title_before_type_cast.should == 'Titel' }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_globalize
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000Z
+date: 2012-01-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70300989947300 !ruby/object:Gem::Requirement
+  requirement: &70298047768640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70300989947300
+  version_requirements: *70298047768640
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70300989946000 !ruby/object:Gem::Requirement
+  requirement: &70298047768140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70300989946000
+  version_requirements: *70298047768140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70300989944300 !ruby/object:Gem::Requirement
+  requirement: &70298047767620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300989944300
+  version_requirements: *70298047767620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70300989943000 !ruby/object:Gem::Requirement
+  requirement: &70298047767120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300989943000
+  version_requirements: *70298047767120
 - !ruby/object:Gem::Dependency
   name: mongoid-rspec
-  requirement: &70300989941580 !ruby/object:Gem::Requirement
+  requirement: &70298047654720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300989941580
+  version_requirements: *70298047654720
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70300989939720 !ruby/object:Gem::Requirement
+  requirement: &70298047654240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300989939720
+  version_requirements: *70298047654240
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70300989922720 !ruby/object:Gem::Requirement
+  requirement: &70298047653660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300989922720
+  version_requirements: *70298047653660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70300989920920 !ruby/object:Gem::Requirement
+  requirement: &70298047653160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300989920920
+  version_requirements: *70298047653160
 description: Library for translating Mongoid documents, based on Globalize3 principles
 email: MikDiet@gmail.com
 executables: []
@@ -150,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4218096881243705814
+      hash: -2711224385223325308
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: