single_table_globalize3 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26717252049728b19cb768820301e55d01b6d0d9
-  data.tar.gz: ddd3692c29e5a96c960150c36209df54ee1c0286
+  metadata.gz: 33ca5e81c9622281ce0a4674c337e6fa0399641f
+  data.tar.gz: 066d2a063adac33286d5597776e065b0de92e4a6
 SHA512:
-  metadata.gz: b73332cb50bfe6a2d706a6ad4450fb471c64dc102264a2310171e12f1ee78d43dfaf59ed8fe8bc14ebddc26cbbcbea5e711b4638057c38168a06266bc90d4745
-  data.tar.gz: 238fbd2b8c9bb11dec4c5cc3a58a8d529f734171f896d86f1109dd66d38248b31ba36c196b35d6567253ac55d49aec26dcd1ba276245f285dfc6fa906fe33475
+  metadata.gz: 54898f214c051bff48fb7969c4d1817da7903a0da432fa6c8b1c916c7bdacb02b00d6dee27f37824351eefc9086e3890296ddb052cd7b0f081346be5825a4d71
+  data.tar.gz: 2b8b6a664a08362909499b4ea9b2dba7593449101b1b1a6dd16cf2d91f9a8ebb8ac80e7c40da1c599d58fc94beed3b7ae417d45e65ed5d5c44d1cf5e7e37e8f3

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-

data/Gemfile.lock

@@ -1,40 +1,67 @@
 PATH
   remote: .
   specs:
-    single_table_globalize3 (0.0.1)
-      activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
+    single_table_globalize3 (0.0.3)
+      activemodel (~> 3.0.0)
+      activerecord (~> 3.0.0)
+      paper_trail (~> 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
+    abstract (1.0.0)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.20)
+    arel (2.0.10)
+    builder (2.1.2)
     database_cleaner (0.6.7)
-    i18n (0.6.1)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
     json (1.7.7)
     metaclass (0.0.1)
     mocha (0.13.2)
       metaclass (~> 0.0.1)
-    multi_json (1.6.1)
+    paper_trail (2.7.1)
+      activerecord (~> 3.0)
+      railties (~> 3.0)
     pathname_local (0.0.2)
+    rack (1.2.8)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
     rake (10.0.3)
-    rdoc (3.12.1)
+    rdoc (3.12.2)
       json (~> 1.4)
     sqlite3 (1.3.7)
     test_declarative (0.0.5)
-    tzinfo (0.3.35)
+    thor (0.14.6)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby

data/lib/generators/single_table_globalize3/migration_generator.rb

@@ -4,9 +4,12 @@ module SingleTableGlobalize3
   class MigrationGenerator < ::ActiveRecord::Generators::Base
     source_root File.expand_path("../templates", __FILE__)
     argument :name, :type => :string, :default => "application"
+    class_option :with_versioning, :type => :boolean, :default => false, :desc => "Generate migration for versioning"
 
-    def copy_devise_migration
+    def create_migration_file
       migration_template "migration.rb", "db/migrate/create_globalize_translations"
+      generate "paper_trail:install #{"--force" if options.force?}" if options.with_versioning?
+      migration_template "add_locale_column_to_versions.rb", "db/migrate/add_locale_column_to_versions" if options.with_versioning?
     end
   end
 end

data/lib/generators/single_table_globalize3/templates/add_locale_column_to_versions.rb

@@ -0,0 +1,9 @@
+class AddLocaleColumnToVersions < ActiveRecord::Migration
+  def up
+    add_column :versions, :locale, :string
+  end
+
+  def down
+    remove_column :versions, :locale
+  end
+end

data/lib/single_table_globalize3/active_record/act_macro.rb

@@ -25,10 +25,7 @@ module SingleTableGlobalize3
 
       protected
       def setup_translates!(options)
-        class_attribute :translated_attribute_names, :translation_options, :fallbacks_for_empty_translations
-        self.translated_attribute_names = []
-        self.translation_options        = options
-        self.fallbacks_for_empty_translations = options[:fallbacks_for_empty_translations]
+        setup_class_attributes(options)
 
         include InstanceMethods
         extend  ClassMethods
@@ -40,6 +37,27 @@ module SingleTableGlobalize3
 
         after_create :save_translations!
         after_update :save_translations!
+
+        setup_locale_attribute
+
+        setup_versioning if options[:versioning]
+      end
+
+      def setup_class_attributes(options)
+        class_attribute :translated_attribute_names, :translation_options, :fallbacks_for_empty_translations
+        self.translated_attribute_names       = []
+        self.translation_options              = options
+        self.fallbacks_for_empty_translations = options[:fallbacks_for_empty_translations]
+      end
+
+      def setup_versioning
+        ::ActiveRecord::Base.extend(SingleTableGlobalize3::Versioning::PaperTrail)
+        has_paper_trail :meta => {:locale => lambda{|record| record.locale}}
+      end
+
+      def setup_locale_attribute
+        attr_accessor :locale unless self.attribute_names.include?('locale')
+
         # if attr_accessible is explicitly defined in the class, add locale to it
         attr_accessible :locale if self.accessible_attributes.to_a.present?
       end

data/lib/single_table_globalize3/active_record/attribute_read_write.rb

@@ -55,7 +55,7 @@ module SingleTableGlobalize3
 
       def translated_attributes
         translated_attribute_names.inject({}) do |attributes, name|
-          attributes.merge(name.to_s => translation[name.to_s].try(:value))
+          attributes.merge(name.to_s => read_attribute(name))
         end
       end
 

data/lib/single_table_globalize3/active_record/class_methods.rb

@@ -13,6 +13,16 @@ module SingleTableGlobalize3
         end
       end
 
+      unless respond_to?(:attribute_names)
+        def attribute_names
+          @attribute_names ||= if !abstract_class? && table_exists?
+                                 column_names
+                               else
+                                 []
+                               end
+        end
+      end
+
       def supported_on_missing?(method_id)
         return super unless RUBY_VERSION < '1.9' || respond_to?(:translated_attribute_names)
         match = defined?(::ActiveRecord::DynamicFinderMatch) && (::ActiveRecord::DynamicFinderMatch.match(method_id) || ::ActiveRecord::DynamicScopeMatch.match(method_id))

data/lib/single_table_globalize3/active_record/instance_methods.rb

@@ -64,6 +64,23 @@ module SingleTableGlobalize3
         return obj
       end
 
+      def dup
+        obj = super
+
+        obj.instance_variable_set(:@translations, nil)
+        obj.instance_variable_set(:@globalize, nil )
+        each_locale_and_translated_attribute do |locale, name|
+          obj.globalize.write(locale, name, globalize.fetch(locale, name) )
+        end
+
+        return obj
+      end
+
+      def rollback
+        instance_variable_set('@globalize', previous_version.try(:globalize))
+        self.version = versions.for_this_locale.last
+      end
+
       def translation
         translations_for_locale(::SingleTableGlobalize3.locale)
       end
@@ -124,6 +141,7 @@ module SingleTableGlobalize3
       def save_translations!
         globalize.save_translations!
         translation_caches.clear
+        self.locale = nil unless self.class.attribute_names.include?('locale')
       end
 
       def with_given_locale(attributes, &block)

data/lib/single_table_globalize3/version.rb

@@ -1,3 +1,3 @@
 module SingleTableGlobalize3
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
 end

data/lib/single_table_globalize3/versioning/paper_trail.rb

@@ -0,0 +1,52 @@
+require 'paper_trail'
+
+module SingleTableGlobalize3
+  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
+
+      def previous_version
+        preceding_version = source_version ? source_version.previous : send(self.class.versions_association_name).for_this_locale.last
+        preceding_version.reify if preceding_version
+      end
+
+      def source_version
+        version = send(self.class.version_association_name)
+        return version if version.try(:locale) == SingleTableGlobalize3.locale.to_s
+      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 SingleTableGlobalize3::Versioning::PaperTrail
+    end
+    alias_method_chain :has_paper_trail, :globalize
+  end
+end
+
+Version.class_eval do
+
+  before_save do |version|
+    version.locale ||= SingleTableGlobalize3.locale.to_s
+  end
+
+  attr_accessible :locale
+
+  def self.for_this_locale
+    locale_str = SingleTableGlobalize3.locale.to_s
+    where(:locale => locale_str)
+  end
+
+  def sibling_versions_with_locales
+    sibling_versions_without_locales.for_this_locale
+  end
+  alias_method_chain :sibling_versions, :locales
+end

data/lib/single_table_globalize3/versioning.rb

@@ -0,0 +1,5 @@
+module SingleTableGlobalize3
+  module Versioning
+    autoload :PaperTrail, 'single_table_globalize3/versioning/paper_trail'
+  end
+end

data/lib/single_table_globalize3.rb

@@ -4,6 +4,7 @@ require 'patches/active_record/uniqueness_validator'
 
 module SingleTableGlobalize3
   autoload :ActiveRecord, 'single_table_globalize3/active_record'
+  autoload :Versioning,   'single_table_globalize3/versioning'
 
   class << self
     def locale

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: single_table_globalize3
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Sven Fuchs
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,6 +44,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: paper_trail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/generators/single_table_globalize3/migration_generator.rb
+- lib/generators/single_table_globalize3/templates/add_locale_column_to_versions.rb
 - lib/generators/single_table_globalize3/templates/migration.rb
 - lib/i18n/missing_translations_log_handler.rb
 - lib/i18n/missing_translations_raise_handler.rb
@@ -166,6 +181,8 @@ files:
 - lib/single_table_globalize3/active_record/with_translations.rb
 - lib/single_table_globalize3/active_record.rb
 - lib/single_table_globalize3/version.rb
+- lib/single_table_globalize3/versioning/paper_trail.rb
+- lib/single_table_globalize3/versioning.rb
 - lib/single_table_globalize3.rb
 - Gemfile
 - Gemfile.lock
@@ -190,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: '[none]'
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Rails I18n de-facto standard library for ActiveRecord 3 model/data translation