globalize3 0.1.0 → 0.2.0.beta1

data/Gemfile.lock

@@ -1,13 +1,28 @@
 PATH
   remote: .
   specs:
-    globalize3 (0.1.0.beta2)
+    globalize3 (0.2.0.beta1)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
+      paper_trail (~> 2)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
     activemodel (3.0.7)
       activesupport (= 3.0.7)
       builder (~> 2.1.2)
@@ -17,20 +32,52 @@ GEM
       activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
     activesupport (3.0.7)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     builder (2.1.2)
     columnize (0.3.2)
     database_cleaner (0.5.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     i18n (0.5.0)
-    linecache19 (0.5.11)
+    linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
     mocha (0.9.10)
       rake
+    paper_trail (2.2.4)
+      rails (~> 3)
     pathname_local (0.0.2)
+    polyglot (0.3.1)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
+      bundler (~> 1.0)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
-    ruby-debug-base19 (0.11.24)
+    ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -38,10 +85,13 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
+    ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
     sqlite3-ruby (1.3.2)
     test_declarative (0.0.5)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
     tzinfo (0.3.27)
 
 PLATFORMS

data/lib/globalize/active_record/act_macro.rb

@@ -22,6 +22,13 @@ module Globalize
         after_create :save_translations!
         after_update :save_translations!
 
+        if options[:versioning]
+          ::ActiveRecord::Base.extend(Globalize::Versioning::PaperTrail)
+
+          translation_class.has_paper_trail
+          delegate :version, :versions, :to => :translation
+        end
+
         attr_names.each { |attr_name| translated_attr_accessor(attr_name) }
       end
 

data/lib/globalize/active_record/adapter.rb

@@ -70,8 +70,7 @@ module Globalize
       end
 
       def fetch_attribute(locale, name)
-        translations ||= record.translations
-        translation = translations.detect{|t| t.locale == locale}
+        translation = record.translation_for(locale)
         return translation && translation.send(name)
       end
 

data/lib/globalize/active_record/class_methods.rb

@@ -45,10 +45,7 @@ module Globalize
             klass = self.const_set(:Translation, Class.new(Globalize::ActiveRecord::Translation))
           end
 
-          if klass.table_name == 'translations'
-            klass.set_table_name(translation_options[:table_name])
-            klass.belongs_to name.underscore.gsub('/', '_')
-          end
+          klass.belongs_to name.underscore.gsub('/', '_')
           klass
         end
       end

data/lib/globalize/active_record/instance_methods.rb

@@ -65,7 +65,7 @@ module Globalize
 
       def translated_attributes
         translated_attribute_names.inject({}) do |attributes, name|
-          attributes.merge(name.to_s => send(name))
+          attributes.merge(name.to_s => translation.send(name))
         end
       end
 
@@ -81,7 +81,7 @@ module Globalize
 
       def set_translations(options)
         options.keys.each do |locale|
-          translation = translations.find_by_locale(locale.to_s) ||
+          translation = translation_for(locale) ||
             translations.build(:locale => locale.to_s)
           translation.update_attributes!(options[locale])
         end
@@ -106,6 +106,24 @@ module Globalize
         return obj
       end
 
+      def translation
+        translation_for(::Globalize.locale)
+      end
+
+      def translation_for(locale)
+        @translation_caches ||= {}
+        unless @translation_caches[locale]
+          _translation = translations.with_locale(locale).first
+          _translation ||= translations.build(:locale => locale)
+          @translation_caches[locale] = _translation
+        end
+        @translation_caches[locale]
+      end
+
+      def rollback
+        @translation_caches[::Globalize.locale] = translation.previous_version
+      end
+
     protected
 
       def each_locale_and_translated_attribute
@@ -124,6 +142,7 @@ module Globalize
 
       def save_translations!
         globalize.save_translations!
+        @translation_caches = {}
       end
 
       def with_given_locale(attributes, &block)
@@ -136,4 +155,4 @@ module Globalize
       end
     end
   end
-end
+end

data/lib/globalize/active_record/translation.rb

@@ -24,4 +24,12 @@ module Globalize
       end
     end
   end
-end
+end
+
+# Setting this will force polymorphic associations to subclassed objects
+# to use their table_name rather than the parent object's table name,
+# which will allow you to get their models back in a more appropriate
+# format.
+#
+# See http://www.ruby-forum.com/topic/159894 for details.
+Globalize::ActiveRecord::Translation.abstract_class = true

data/lib/globalize/versioning.rb

@@ -1,5 +1,5 @@
 module Globalize
   module Versioning
-    autoload :VestalVersions, 'globalize/versioning/vestal_versions'
+    autoload :PaperTrail, 'globalize/versioning/paper_trail'
   end
 end

data/lib/globalize/versioning/paper_trail.rb

@@ -0,0 +1,41 @@
+require 'paper_trail'
+
+module Globalize
+  module Versioning
+    module PaperTrail
+      # At present this isn't used but we may use something similar in paper trail
+      # shortly, so leaving it around to reference easily.
+      #def versioned_columns
+        #super + self.class.translated_attribute_names
+      #end
+    end
+  end
+end
+
+ActiveRecord::Base.class_eval do
+  class << self
+    def has_paper_trail_with_globalize(*args)
+      has_paper_trail_without_globalize(*args)
+      include Globalize::Versioning::PaperTrail
+    end
+    alias_method_chain :has_paper_trail, :globalize
+  end
+end
+
+Version.class_eval do
+
+  before_save do |version|
+    version.locale = Globalize.locale.to_s
+  end
+
+  def self.locale_conditions_to_sql
+    "locale = '#{Globalize.locale.to_s}'"
+  end
+
+  scope :for_this_locale, lambda{ { :conditions => locale_conditions_to_sql } }
+
+  def sibling_versions_with_locales
+    sibling_versions_without_locales.for_this_locale
+  end
+  alias_method_chain :sibling_versions, :locales
+end

data/lib/globalize3/version.rb

@@ -1,3 +1,3 @@
 module Globalize3
-  VERSION = '0.1.0'
+  VERSION = '0.2.0.beta1'
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: globalize3
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.0
+  prerelease: 6
+  version: 0.2.0.beta1
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -39,29 +39,29 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: database_cleaner
+  name: paper_trail
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.2
-  type: :development
+        version: "2"
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: database_cleaner
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.2
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: pathname_local
+  name: mocha
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -72,7 +72,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: test_declarative
+  name: pathname_local
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -83,7 +83,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
+  name: test_declarative
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -94,7 +94,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: ruby-debug19
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -104,6 +104,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id009
 description: "Rails I18n: de-facto standard library for ActiveRecord 3 model/data translation."
 email: nobody@globalize-rails.org
 executables: []
@@ -122,7 +133,7 @@ files:
 - lib/globalize/active_record/migration.rb
 - lib/globalize/active_record/translation.rb
 - lib/globalize/active_record.rb
-- lib/globalize/versioning/vestal_versions.rb
+- lib/globalize/versioning/paper_trail.rb
 - lib/globalize/versioning.rb
 - lib/globalize.rb
 - lib/globalize3/version.rb
@@ -154,9 +165,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: "[none]"

data/lib/globalize/versioning/vestal_versions.rb

@@ -1,35 +0,0 @@
-require 'vestal_versions'
-
-module Globalize
-  module Versioning
-    module VestalVersions
-      def versioned_columns
-        super + self.class.translated_attribute_names
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.class_eval do
-  class << self
-    def versioned_with_globalize(*args)
-      versioned_without_globalize(*args)
-      include Globalize::Versioning::VestalVersions
-    end
-    alias_method_chain :versioned, :globalize
-  end
-end
-
-VestalVersions::Version.class_eval do
-  before_save do |version|
-    version.locale = Globalize.locale.to_s
-  end
-
-  class Condition
-    def to_sql
-      "locale = '#{Globalize.locale.to_s}'"
-    end
-  end
-
-  default_scope(:conditions => Condition.new)
-end