mongoid_globalize 0.1.2 → 0.1.3

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+  - jruby
+  - rbx
+  - rbx-2.0
+  - ree

data/Gemfile

@@ -1,13 +1,14 @@
 source 'http://rubygems.org'
 
 #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 'mongoid', '>= 2.1', :git => 'git://github.com/mongoid/mongoid.git', :tag => 'v2.3.0'
 gem 'bson_ext', '>= 1.3'
 
 group :development, :test do
+  gem 'rdoc'
   gem 'rspec'
   gem 'mongoid-rspec'
   gem 'database_cleaner'
-  gem 'ruby-debug19'
+  gem 'ruby-debug19' if RUBY_VERSION == "1.9.2"
   gem 'jeweler'
 end

data/Gemfile.lock

@@ -1,42 +1,47 @@
 GIT
   remote: git://github.com/mongoid/mongoid.git
-  revision: 93b568c6d47efd76bcf817dc416385a98037a335
-  tag: 2.1.2
+  revision: 3c702e6d92bb99782bf7b8a35f1e0da3bacddc93
+  tag: v2.3.0
   specs:
-    mongoid (2.1.2)
-      activemodel (~> 3.0)
-      mongo (~> 1.3)
+    mongoid (2.3.0)
+      activemodel (~> 3.1)
+      mongo (~> 1.4)
       tzinfo (~> 0.3.22)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.9)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
-    bson (1.3.1)
-    bson_ext (1.3.1)
-    builder (2.1.2)
+    bcrypt-ruby (3.0.1)
+    bson (1.4.0)
+    bson_ext (1.4.0)
+    builder (3.0.0)
     columnize (0.3.4)
     database_cleaner (0.6.7)
     diff-lcs (1.1.2)
     git (1.2.5)
-    i18n (0.5.0)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
+    mongo (1.4.0)
+      bson (= 1.4.0)
     mongoid-rspec (1.4.4)
       mongoid (~> 2.0)
       rspec (~> 2)
+    multi_json (1.0.3)
     rake (0.9.2)
+    rdoc (3.9.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -55,7 +60,7 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    tzinfo (0.3.29)
+    tzinfo (0.3.30)
 
 PLATFORMS
   ruby
@@ -66,5 +71,6 @@ DEPENDENCIES
   jeweler
   mongoid (>= 2.1)!
   mongoid-rspec
+  rdoc
   rspec
   ruby-debug19

data/README.textile

@@ -1,4 +1,4 @@
-h1. Mongoid::Globalize
+h1. "!https://secure.travis-ci.org/Mik-die/mongoid_globalize.png!":http://travis-ci.org/Mik-die/mongoid_globalize 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.
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/mongoid_globalize.rb

@@ -7,7 +7,25 @@ require 'mongoid_globalize/fields_builder'
 require 'mongoid_globalize/instance_methods'
 
 module Mongoid::Globalize
+
+  # When Mongoid::Globalize included into Mongoid document class, for this class
+  # code inside +included+ block will be executed, methods from
+  # Mongoid::Globalize::ClassMethods module become class methods, and methods
+  # from Mongoid::Globalize::InstanceMethods become instance methods, due to
+  # ActiveSupport::Concern mechanism.
   extend ActiveSupport::Concern
+
+  # Define some class attributes: +translated_attribute_names+ will be contain
+  # attributes' names, when its will be registered as translated.
+  # +fallbacks_for_empty_translations+ contains condition to show fallbacks for
+  # blank value of attribute or not.
+  #
+  # Then one side for embeded relationship with translation documents is
+  # created, and some callbacks for processing changed translations are defined.
+  #
+  # And then Mongoid document class extended by Mongoid::Globalize::ActMacro
+  # module which contains macro method +translates+ for defining translated
+  # fields, translations options etc.
   included do
     class_attribute :translated_attribute_names, :fallbacks_for_empty_translations
     self.translated_attribute_names = []
@@ -19,14 +37,28 @@ module Mongoid::Globalize
   end
 
   class << self
+    # Get current locale. If curent locale doesn't set obviously for
+    # Mongoid::Globalize, returns I18n locale
+    #     Mongoid::Globalize.locale   #=> :en
+    # Returns Symbol
     def locale
       read_locale || I18n.locale
     end
 
+    # Set current locale by saving it in current thread.
+    #     Mongoid::Globalize.locale = 'ru'    #=> :ru
+    # Param String or Symbol
+    # Returns Symbol or nil
     def locale=(locale)
       set_locale(locale)
     end
 
+    # Runs block as if given locale is setted. Don't touch current locale. Yelds
+    # locale into block.
+    #     Mongoid::Globalize.with_locale(:de) { post.title = 'Titel' }
+    # Param String or Symbol
+    # Param Proc
+    # Returns result from block
     def with_locale(locale, &block)
       previous_locale = read_locale
       set_locale(locale)
@@ -35,25 +67,36 @@ module Mongoid::Globalize
       result
     end
 
+    # Runs block for each given locale.
+    #     Mongoid::Globalize.with_locale(:ru, [:de, :fr]) { post.title = 'Title' }
+    # Params String or Symbol or Array of Strings or Symbols
+    # Param Proc
+    # Returns Array with results from block for each locale
     def with_locales(*locales, &block)
       locales.flatten.map do |locale|
         with_locale(locale, &block)
       end
     end
 
+    # Checks whether I18n respond to +fallbacks+ method.
+    # Returns true or false
     def fallbacks?
       I18n.respond_to?(:fallbacks)
     end
 
+    # Returns fallback locales for given locale if any.
+    # Returns Array of Symbols
     def fallbacks(locale = self.locale)
       fallbacks? ? I18n.fallbacks[locale] : [locale.to_sym]
     end
 
   protected
+    # Reads locale from current thread
     def read_locale
       Thread.current[:globalize_locale]
     end
 
+    # Writes locale to current thread
     def set_locale(locale)
       Thread.current[:globalize_locale] = locale.to_sym rescue nil
     end

data/lib/mongoid_globalize/act_macro.rb

@@ -1,9 +1,14 @@
 module Mongoid::Globalize
   module ActMacro
-    #    translates do
-    #      field :title
-    #      field :visible, type: Boolean
-    #    end
+    # Determines translation parameters: fields and options. Available inside
+    # block methods are defined in Mongoid::Globalize::FieldsBuilder.
+    #     translates do
+    #       field :title
+    #       field :visible, type: Boolean
+    #       fallbacks_for_empty_translations!
+    #     end
+    #
+    # Param Proc
     def translates(&block)
       builder = FieldsBuilder.new(self)
       builder.instance_exec(&block)

data/lib/mongoid_globalize/adapter.rb

@@ -1,62 +1,81 @@
 module Mongoid::Globalize
+  # The +Adapter+ class used for stashing translates and changes in its before
+  # they will be persisted or rejected.
   class Adapter
     attr_accessor :record, :stash, :translations
     private :record=, :stash=
 
+    # Initialises new instance of +Adapter+. Creates empty stash for storing
+    # translates.
+    # Param: translatable Class
     def initialize(record)
       self.record = record
       self.stash = Attributes.new
     end
 
+    # Returns value of attribute from stash for given locale.
+    # Param: String or Symbol - name of locale
+    # Param: String or Symbol - name of attribute
+    # Returns nil if no value finded
     def fetch_stash(locale, name)
       value = stash.read(locale, name)
       return value if value
       return nil
     end
 
+    # Returns value of attribute for given locale or it's fallbacks.
+    # Param: String or Symbol - name of locale
+    # Param: String or Symbol - name of attribute
+    # Returns nil if no value finded
     def fetch(locale, name)
       Mongoid::Globalize.fallbacks(locale).each do |fallback|
         value = fetch_stash(fallback, name) || fetch_attribute(fallback, name)
-        unless fallbacks_for?(value)
-          set_metadata(value, :locale => fallback, :requested_locale => locale)
-          return value
-        end
+        return value unless fallbacks_for?(value)
       end
       return nil
     end
 
+    # Writes value of attribute for given locale into stash.
+    # Param: String or Symbol - name of locale
+    # Param: String or Symbol - name of attribute
+    # Param: Object - value of attribute
     def write(locale, name, value)
       stash.write(locale, name, value)
     end
 
+    # Prepares data from stash for persisting in embeded Translation documents.
+    # Also clears stash for further operations.
     def prepare_translations!
       stash.each do |locale, attrs|
-        translation = record.translations.find_by_locale(locale)
-        translation ||= record.translations.build(:locale => locale)
-        attrs.each{ |name, value| translation[name] = value }
+        if attrs.any?
+          translation = record.translations.find_by_locale(locale)
+          translation ||= record.translations.build(:locale => locale)
+          attrs.each{ |name, value| translation[name] = value }
+        end
       end
       reset
     end
 
+    # Clears stash.
     def reset
       stash.clear
     end
 
   protected
+    # Returns persisted value of attribute for given locale or nil.
     def fetch_attribute(locale, name)
       translation = record.translation_for(locale)
       return translation && translation.send(name)
     end
 
-    def set_metadata(object, metadata)
-      object.translation_metadata.merge!(meta_data) if object.respond_to?(:translation_metadata)
-      object
-    end
-
+    # Checks if +object+ needs fallbacks
+    # Param: Object
+    # Result: true or false
     def fallbacks_for?(object)
       object.nil? || (fallbacks_for_empty_translations? && object.blank?)
     end
 
+    # Checks option +fallbacks_for_empty_translations+
     def fallbacks_for_empty_translations?
       record.fallbacks_for_empty_translations
     end

data/lib/mongoid_globalize/attributes.rb

@@ -3,20 +3,36 @@
 
 module Mongoid::Globalize
   class Attributes < Hash # TODO: Think about using HashWithIndifferentAccess ?
+    # Returns translations for given locale. Creates empty hash for locale, if
+    # given locale doesn't present.
+    # Param: String or Symbol - locale
+    # Result: Hash of translations
     def [](locale)
       locale = locale.to_sym
       self[locale] = {} unless has_key?(locale)
       self.fetch(locale)
     end
 
+    # Checks that given locale has translation for given name.
+    # Param: String or Symbol - locale
+    # Param: String or Symbol - name of field
+    # Result: true or false
     def contains?(locale, name)
       self[locale].has_key?(name.to_s)
     end
 
+    # Returns translation for given name and given locale.
+    # Param: String or Symbol - locale
+    # Param: String or Symbol - name of field
+    # Result: Object
     def read(locale, name)
       self[locale][name.to_s]
     end
 
+    # Writes translation for given name and given locale.
+    # Param: String or Symbol - locale
+    # Param: String or Symbol - name of field
+    # Param: Object
     def write(locale, name, value)
       #raise 'z' if value.nil? # TODO
       self[locale][name.to_s] = value

data/lib/mongoid_globalize/class_methods.rb

@@ -1,14 +1,22 @@
 module Mongoid::Globalize
   module ClassMethods
+    # Returns all locales used for translation all of documents of this class.
+    # Return Array of Symbols
     def translated_locales
       all.distinct("translations.locale").sort.map &:to_sym
     end
 
+    # Finds documents where translations for given locales are present and where
+    # attributes with presence validations aren't nil
+    # Params String or Symbol or Array of Strings or Symbols
+    # Returns Mongoid::Criteria
     def with_translations(*locales)
       locales = translated_locales if locales.empty?
       where :translations.matches => {:locale => {"$in" => locales.flatten}}.merge(required_fields_criteria)
     end
 
+    # Returns structures hash of attributes with presence validations for using
+    # in +with_translations+
     def required_fields_criteria
       required_translated_attributes.inject({}) do |criteria, name|
         criteria.merge name => {"$ne" => nil}
@@ -28,18 +36,27 @@ module Mongoid::Globalize
     #  "translations.#{name}".to_sym
     #end
 
+    # Checks whether field with given name is translated field.
+    # Param String or Symbol
+    # Returns true or false
     def translated?(name)
       translated_attribute_names.include?(name.to_sym)
     end
 
+    # 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
     end
 
+    # Return Array of translated attribute names with presence validations
     def required_translated_attributes
       translated_attribute_names & required_attributes
     end
 
+    # Returns translation class
+    # First use creates this class as subclass of document's class based on
+    # Mongoid::Globalize::DocumentTranslation, creates other side for embeded
+    # relationship.
     def translation_class
       @translation_class ||= begin
         klass = self.const_get(:Translation) rescue nil
@@ -52,6 +69,7 @@ module Mongoid::Globalize
       end
     end
 
+    # Generates accessor methods for translated attributes
     def translated_attr_accessor(name)
       define_method(:"#{name}=") do |value|
         write_attribute(name, value)

data/lib/mongoid_globalize/document_translation.rb

@@ -1,29 +1,46 @@
 module Mongoid::Globalize
+  # Base class for storing translations. All Translation classes are inherited
+  # from it.
   class DocumentTranslation
     include Mongoid::Document
+
     field :locale
+
     class << self
+      # Accessor to document class which translated
       attr_accessor :translated_klass
 
+      # Scope for searching only in given locales
+      # Params: String or Symbol - locales
+      # Returns Mongoid::Criteria
       def with_locales(*locales)
         locales = locales.flatten.map(&:to_s)
         where(:locale.in => locales)
       end
       alias with_locale with_locales
 
+      # Returns all locales used for translation.
+      # Return Array of Symbols
       def translated_locales
-        all.distinct("locale").sort.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
+      # Param: String or Symbol - locale
+      # Return: Translation
       def find_by_locale(locale)
         with_locale(locale.to_s).first
       end
     end
 
+    # Reader for +locale+ attribute
+    # Return Symbol
     def locale
       read_attribute(:locale).to_sym
     end
 
+    # Writer for +locale+ attribute
+    # Param: String or Symbol - locale
     def locale=(locale)
       write_attribute(:locale, locale.to_s)
     end

data/lib/mongoid_globalize/fields_builder.rb

@@ -1,15 +1,21 @@
 module Mongoid::Globalize
   class FieldsBuilder
+    # Initializes new istance of FieldsBuilder.
+    # Param Class
     def initialize(model)
       @model = model
     end
 
+    # Creates new field in translation document.
+    # Param String or Symbol
+    # Other params are the same as for Mongoid's +field+
     def field(name, *params)
       @model.translated_attribute_names.push name.to_sym
       @model.translated_attr_accessor(name)
       @model.translation_class.field name, *params
     end
 
+    # Sets +fallbacks_for_empty_translations+ option.
     def fallbacks_for_empty_translations!
       @model.fallbacks_for_empty_translations = true
     end

data/lib/mongoid_globalize/instance_methods.rb

@@ -2,10 +2,17 @@ module Mongoid::Globalize
   module InstanceMethods
     delegate :translated_locales, :to => :translations
 
+    # Reader for adapter, where translations stashing during lifecicle. At first
+    # use creates new one.
+    # Return: Mongoid::Globalize::Adapter
     def globalize
       @globalize ||= Adapter.new(self)
     end
 
+    # The most trouble method of Mongoid::Globalize :-(
+    # Extends reader for @attributes. Mixes translated attributes to Mongoid
+    # @attributes.
+    # Return: Hash
     def attributes
       unless @stop_merging_translated_attributes
         @attributes.merge! translated_attributes
@@ -13,10 +20,21 @@ module Mongoid::Globalize
       super
     end
 
+    # Extends Mongoid::Document's method +process+. Pocesses given attributes in
+    # consideration of possible :locale key. Used by Mongoid for all attribute-
+    # related operations, such as +create+, +update+ etc.
+    # Param: Hash of attributes
+    # Other params will be transmitted into Mongoid::Document's method +process+
+    # as is.
     def process(attributes, *args)
       with_given_locale(attributes) { super }
     end
 
+    # Extends Mongoid::Document's method +write_attribute+. If writed attribute
+    # is translateble, it is placed into adapter's stash.
+    # Param: String or Symbol - name of attribute
+    # Param: Object - value of attribute
+    # Param: Hash of options
     def write_attribute(name, value, options = {})
       if translated?(name)
         options = {:locale => nil}.merge(options)
@@ -25,12 +43,19 @@ module Mongoid::Globalize
           attribute_will_change! access
         end
         @translated_attributes[access] = value
-        globalize.write(options[:locale] || Mongoid::Globalize.locale, name, value)
+        the_locale = options[:locale] || Mongoid::Globalize.locale
+        self.translations.reject!{ |t| t.new_record? && t.locale != the_locale }
+        globalize.write(the_locale, name, value)
       else
         super(name, value)
       end
     end
 
+    # Extends Mongoid::Document's method +read_attribute+. If writed attribute
+    # is translateble, it is readed from adapter's stash.
+    # Param: String or Symbol - name of attribute
+    # Param: Hash of options
+    # Return: Object - value of attribute
     def read_attribute(name, options = {})
       options = {:translated => true, :locale => nil}.merge(options)
       if translated?(name) and options[:translated]
@@ -47,21 +72,28 @@ module Mongoid::Globalize
 
     # Mongoid documents haven't attribute_names method, so I replace +super+
     # with +@attributes.keys.sort+. So this method returns only translated and
-    # existing attribute names (but not all available names as in AR or G3) 
+    # existing attribute names (but not all available names as in AR or G3)
     def attribute_names
       translated_attribute_names.map(&:to_s) + @attributes.keys.sort
     end
 
+    # Checks whether field with given name is translated field.
+    # Param String or Symbol
+    # Returns true or false
     def translated?(name)
       self.class.translated?(name)
     end
 
+    # Returns translations for current locale. Is used for initial mixing into
+    # @attributes hash. Actual translations are in @translated_attributes hash.
+    # Return Hash
     def translated_attributes
       @translated_attributes ||= translated_attribute_names.inject({}) do |attrs, name|
         attrs.merge(name.to_s => translation.send(name))
       end
     end
 
+    # TODO:
     def untranslated_attributes
       attrs = {}
       attribute_names.each do |name|
@@ -70,6 +102,13 @@ module Mongoid::Globalize
       attrs
     end
 
+    # Updates fields separately for each given locale
+    #     post.set_translations(
+    #       :en => { :title => "updated title" },
+    #       :de => { :content => "geänderter Inhalt" }
+    #     )
+    # Param: Hash, where keys are locales and values are Hashes of name-value
+    # pairs for fields.
     def set_translations(options)
       options.keys.each do |locale|
         translation = translation_for(locale) || translations.build(:locale => locale.to_s)
@@ -77,17 +116,19 @@ module Mongoid::Globalize
       end
     end
 
+    # Extends Mongoid::Document's method +reload+. Resets all translation
+    # changes.
     def reload
       translated_attribute_names.each { |name| @attributes.delete(name.to_s) }
       globalize.reset
       super
     end
 
+    # Extends Mongoid::Document's method +clone+. Adds to cloned object all
+    # translations from original object.
     def clone
       obj = super
       return obj unless respond_to?(:translated_attribute_names)
-
-      # obj.instance_variable_set(:@translations, nil) if new_record?
       obj.instance_variable_set(:@globalize, nil )
       each_locale_and_translated_attribute do |locale, name|
         obj.globalize.write(locale, name, globalize.fetch(locale, name) )
@@ -95,10 +136,13 @@ module Mongoid::Globalize
       return obj
     end
 
+    # Returns instance of Translation for current locale.
     def translation
       translation_for(Mongoid::Globalize.locale)
     end
 
+    # Returns instance of Translation for given locale.
+    # Param String or Symbol
     def translation_for(locale)
       @translation_caches ||= {}
       # Need to temporary switch of merging, because #translations uses
@@ -114,6 +158,8 @@ module Mongoid::Globalize
     end
 
   protected
+    # Executes given block for each locale and translated attribute name for
+    # this document.
     def each_locale_and_translated_attribute
       used_locales.each do |locale|
         translated_attribute_names.each do |name|
@@ -122,12 +168,15 @@ module Mongoid::Globalize
       end
     end
 
+    # Return Array with locales, used for translation of this document
     def used_locales
       locales = globalize.stash.keys.concat(globalize.stash.keys).concat(translations.translated_locales)
       locales.uniq!
       locales
     end
 
+    # Before save callback. Cleans @attributes hash from translated attributes
+    # and prepares them for persisting.
     def prepare_translations!
       @stop_merging_translated_attributes = true
       translated_attribute_names.each do |name|
@@ -137,11 +186,15 @@ module Mongoid::Globalize
       globalize.prepare_translations!
     end
 
+    # After save callback. Reset some values.
     def clear_translations!
       @translation_caches = {}
       @stop_merging_translated_attributes = nil
     end
 
+    # Detects locale in given attributes and executes given block for it.
+    # Param: Hash of attributes
+    # Param: Proc
     def with_given_locale(attributes, &block)
       attributes.symbolize_keys! if attributes.respond_to?(:symbolize_keys!)
       if locale = attributes.try(:delete, :locale)

data/mongoid_globalize.gemspec

@@ -4,20 +4,21 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{mongoid_globalize}
-  s.version = "0.1.2"
+  s.name = "mongoid_globalize"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   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.date = "2011-10-09"
+  s.description = "Library for translating Mongoid documents, based on Globalize3 principles"
+  s.email = "MikDiet@gmail.com"
   s.extra_rdoc_files = [
     "README.textile"
   ]
   s.files = [
     ".rspec",
     ".rvmrc",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "MIT-LICENSE",
@@ -45,11 +46,11 @@ Gem::Specification.new do |s|
     "spec/mongoid_globalize_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/Mik-die/mongoid_globalize}
+  s.homepage = "http://github.com/Mik-die/mongoid_globalize"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Library for translating Mongoid documents}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Library for translating Mongoid documents"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -57,6 +58,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mongoid>, [">= 2.1"])
       s.add_runtime_dependency(%q<bson_ext>, [">= 1.3"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<mongoid-rspec>, [">= 0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
@@ -65,6 +67,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<mongoid>, [">= 2.1"])
       s.add_dependency(%q<bson_ext>, [">= 1.3"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<mongoid-rspec>, [">= 0"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
@@ -74,6 +77,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<mongoid>, [">= 2.1"])
     s.add_dependency(%q<bson_ext>, [">= 1.3"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<mongoid-rspec>, [">= 0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])

data/spec/data/models.rb

@@ -5,8 +5,8 @@ class Post
   translates do
     field :title
     field :content
-    field :published, type: Boolean
-    field :published_at, type: DateTime
+    field :published, :type => Boolean
+    field :published_at, :type => DateTime
   end
   validates_presence_of :title
   scope :with_some_title, :conditions => { :title => 'some_title' }
@@ -17,8 +17,8 @@ class PostTranslation
   field :locale
   field :title
   field :content
-  field :published, type: Boolean
-  field :published_at, type: DateTime
+  field :published, :type => Boolean
+  field :published_at, :type => DateTime
   embedded_in :post
 
   def existing_method

data/spec/mongoid_globalize/fallbacks_spec.rb

@@ -17,7 +17,7 @@ describe "Fallbacks" do
     I18n.backend = @previous_backend
   end
 
-  it "keep one field in new locale when other field is changed" do
+  it "keeps one field in new locale when other field is changed" do
     I18n.fallbacks.map('de-DE' => [ 'en-US' ])
     post = Post.create :title => 'foo'
     I18n.locale = 'de-DE'
@@ -25,7 +25,7 @@ describe "Fallbacks" do
     post.title.should == 'foo'
   end
 
-  it "modify non-required field in a new locale" do
+  it "modifies non-required field in a new locale" do
     I18n.fallbacks.map 'de-DE' => [ 'en-US' ]
     post = Post.create :title => 'foo'
     I18n.locale = 'de-DE'
@@ -33,7 +33,7 @@ describe "Fallbacks" do
     post.save.should be_true
   end
 
-  it "resolve a simple fallback" do
+  it "resolves a simple fallback" do
     I18n.locale = 'de-DE'
     post = Post.create :title => 'foo'
 
@@ -47,7 +47,7 @@ describe "Fallbacks" do
     post.content.should == 'bar'
   end
 
-  it "resolve a simple fallback without reloading" do
+  it "resolves a simple fallback without reloading" do
     I18n.locale = 'de-DE'
     post = Post.new :title => 'foo'
 
@@ -60,7 +60,7 @@ describe "Fallbacks" do
     post.content.should == 'bar'
   end
 
-  it "resolve a complex fallback without reloading" do
+  it "resolves a complex fallback without reloading" do
     I18n.fallbacks.map 'de' => %w(en he)
     I18n.locale = 'de'
     post = Post.new
@@ -74,7 +74,7 @@ describe "Fallbacks" do
     post.content.should == 'bar'
   end
 
-  it 'work with lots of locale switching' do
+  it 'works with lots of locale switching' do
     I18n.fallbacks.map :'de-DE' => [ :'en-US' ]
     post = Post.create :title => 'foo'
     I18n.locale = :'de-DE'
@@ -86,7 +86,7 @@ describe "Fallbacks" do
     post.title.should == 'bar'
   end
 
-  it 'work with lots of locale switching 2' do
+  it 'works with lots of locale switching 2' do
     I18n.fallbacks.map :'de-DE' => [ :'en-US' ]
     child = Child.create :content => 'foo'
     I18n.locale = :'de-DE'
@@ -98,7 +98,7 @@ describe "Fallbacks" do
     child.content.should == 'bar'
   end
 
-  it 'work with nil translations' do
+  it 'works with nil translations' do
     I18n.fallbacks.map :'de-DE' => [ :'en-US' ]
     post = Post.create :title => 'foo'
     I18n.locale = :'de-DE'
@@ -108,7 +108,7 @@ describe "Fallbacks" do
     post.title.should == 'foo'
   end
 
-  it 'work with empty translations' do
+  it 'works with empty translations' do
     I18n.fallbacks.map :'de-DE' => [ :'en-US' ]
     task = Task.create :name => 'foo'
     I18n.locale = :'de-DE'
@@ -118,7 +118,7 @@ describe "Fallbacks" do
     task.name.should == 'foo'
   end
 
-  it 'work with empty translations 2' do
+  it 'works with empty translations 2' do
     I18n.fallbacks.map :'de-DE' => [ :'en-US' ]
     task = Task.create :name => 'foo'
     post = Post.create :title => 'foo'
@@ -132,4 +132,15 @@ describe "Fallbacks" do
     post.update_attribute :title, ''
     post.title.should == ''
   end
+
+  it "creates just one translation when fallbacks set" do
+    I18n.fallbacks.clear
+    I18n.fallbacks.map :de => [:fr]
+    I18n.locale = :de
+    task = Task.create :name => 'foo'
+    task.translations.should be_any(&:persisted?)
+
+    task.save
+    task.translations.map(&:locale).sort.should == [:de]
+  end
 end

data/spec/mongoid_globalize/set_translations_spec.rb

@@ -10,10 +10,8 @@ describe "#set_translations" do
       :de => { :title => 'geänderter Titel', :content => 'geänderter Inhalt' }
     )
     post.reload
-    post.should be_translated(:en).for([:title, :content])
-                .as(['updated title', 'updated content'])
-    post.should be_translated(:de).for([:title, :content])
-                .as(['geänderter Titel', 'geänderter Inhalt'])
+    post.should be_translated(:en).for([:title, :content]).as(['updated title', 'updated content'])
+    post.should be_translated(:de).for([:title, :content]).as(['geänderter Titel', 'geänderter Inhalt'])
   end
 
   it "does not touch existing translations for other locales" do
@@ -21,8 +19,7 @@ describe "#set_translations" do
     post.update_attributes(:title => 'Titel', :content => 'Inhalt', :locale => :de)
     post.set_translations(:en => { :title => 'updated title', :content => 'updated content' })
     post.reload
-    post.should be_translated(:en).for([:title, :content])
-                .as(['updated title', 'updated content'])
+    post.should be_translated(:en).for([:title, :content]).as(['updated title', 'updated content'])
     post.should be_translated(:de).for([:title, :content]).as(['Titel', 'Inhalt'])
   end
 

data/spec/spec_helper.rb

@@ -5,7 +5,9 @@ require 'mongoid'
 Mongoid.configure do |config|
   name = "mongoid_globalize_test"
   config.autocreate_indexes = true
-  config.master = Mongo::Connection.new.db(name)
+  db = Mongo::Connection.new.db(name)
+  db.add_user("mongoid", "test")
+  config.master = db
   config.logger = Logger.new($stdout, :warn)
 end
 

metadata

@@ -1,106 +1,114 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongoid_globalize
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Mik-die
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-01 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70187719513460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.1"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70187719513460
+- !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70187719512860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70187719512860
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70187719512220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70187719512220
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70187719511620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70187719511620
+- !ruby/object:Gem::Dependency
   name: mongoid-rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70187719511020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70187719511020
+- !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70187719510440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70187719510440
+- !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70187719509840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70187719509840
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70187719509300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *70187719509300
 description: Library for translating Mongoid documents, based on Globalize3 principles
 email: MikDiet@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -127,36 +135,32 @@ 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: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 335685075
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2938896699039716932
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Library for translating Mongoid documents
 test_files: []
-