has_many_translations 0.3.8 → 0.4.3

data/Gemfile

@@ -0,0 +1,16 @@
+source "http://rubygems.org"
+group :development do
+  gem 'activesupport'
+  gem 'activerecord'
+  gem 'shoulda'
+  gem 'mocha'
+  gem 'rspec'
+  gem 'cucumber'
+  gem 'launchy'
+  gem 'pickler'
+  gem 'jeweler'
+end
+
+gem 'artforge-rtranslate', '>=1.3.4'
+gem 'activequeue'
+gem 'settingslogic'

data/Gemfile.lock

@@ -0,0 +1,73 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activequeue (0.2.0)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    artforge-rtranslate (1.3.4)
+      json (>= 1.1.3)
+    builder (2.1.2)
+    configuration (1.2.0)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
+    git (1.2.5)
+    i18n (0.5.0)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    json (1.4.6)
+    launchy (0.3.7)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
+    mocha (0.9.10)
+      rake
+    pickler (0.1.5)
+      activesupport (>= 2.0.0)
+      cucumber (>= 0.8.0)
+    rake (0.8.7)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    settingslogic (2.0.6)
+    shoulda (2.11.3)
+    term-ansicolor (1.0.5)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activequeue
+  activerecord
+  activesupport
+  artforge-rtranslate (>= 1.3.4)
+  cucumber
+  jeweler
+  launchy
+  mocha
+  pickler
+  rspec
+  settingslogic
+  shoulda

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rcov/rcovtask'
+# require 'rcov/rcovtask'
 require 'rake/rdoctask'
 
 begin
@@ -10,9 +10,9 @@ begin
     g.name = 'has_many_translations'
     g.summary = %(Makes models' speak in tongues)
     g.description = %(Keep a DRY multilingual translation of your ActiveRecord models' textual attributes)
-    g.email = 'adam@artforge.com'
-    g.homepage = 'http://github.com/opengotham/has_many_translations'
-    g.authors = ["opengotham","Artforge"]
+    g.email = 'mjording@opengotham.com'
+    g.homepage = 'http://github.com/artforge/has_many_translations'
+    g.authors = ["OpenGotham","Artforge"]
     g.add_dependency 'activerecord', '>= 2.1.0'
     g.add_development_dependency 'shoulda'
     g.add_development_dependency 'mocha'
@@ -30,10 +30,10 @@ Rake::TestTask.new do |t|
   t.pattern = 'test/**/*_test.rb'
 end
 
-Rcov::RcovTask.new do |t|
-  t.libs = %w(test)
-  t.pattern = 'test/**/*_test.rb'
-end
+# Rcov::RcovTask.new do |t|
+#   t.libs = %w(test)
+#   t.pattern = 'test/**/*_test.rb'
+# end
 
 task :test => :check_dependencies
 task :default => :test

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.4.3

data/features/allow_overide_of_default_language_options_at_model_level.feature

@@ -0,0 +1,5 @@
+@https://www.pivotaltracker.com/story/show/8303995
+Feature: allow overide of default language options at model level
+  As a developer.
+  I want to override default_languages for individual models.
+  So model specific default languages can be specified.

data/features/bypass_hmt_if_current_lang_native_language.feature

@@ -0,0 +1,5 @@
+@https://www.pivotaltracker.com/story/show/8304163
+Feature: bypass hmt if current lang  == native language
+  As a user.
+  when user language equals the models current language.
+  I want to prevent translation requests.

data/features/extend_initializer_with_default_language_options.feature

@@ -0,0 +1,5 @@
+@https://www.pivotaltracker.com/story/show/8303803
+Feature: extend initializer with default language options
+  As a developer
+  I want to set default_languages as an initialization setting
+  So assumed languages can be limited

data/features/extend_initializer_with_predefined_language_options.feature

@@ -0,0 +1,5 @@
+@https://www.pivotaltracker.com/story/show/8303649 @init,options
+Feature: extend initializer with predefined language options
+  As a developer.
+  I want to define configuration settings within an rails/rack initializer.
+  So model translation settings are customizable.

data/features/tracker.yml

@@ -0,0 +1,2 @@
+project_id: 192345
+ssl: true

data/generators/has_many_translations/templates/migration.rb

@@ -9,7 +9,7 @@ class CreateTranslations < ActiveRecord::Migration
     
     create_table :translations do |t|
       t.belongs_to :translated, :polymorphic => true
-      t.string   :attribute
+      t.string   :model_attribute
       t.text     :value
       t.string   :locale_code
       t.string   :locale_name
@@ -17,7 +17,7 @@ class CreateTranslations < ActiveRecord::Migration
       t.boolean  :machine_translation
       t.timestamps
     end
-    add_index :translations, [:locale_code, :attribute]
+    add_index :translations, [:locale_code, :model_attribute]
     add_index :translations, [:translated_id, :translated_type]
     
     change_table :users do |t|

data/has_many_translations.gemspec

@@ -5,22 +5,29 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_many_translations}
-  s.version = "0.3.8"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["opengotham", "Artforge"]
-  s.date = %q{2010-09-29}
+  s.authors = ["OpenGotham", "Artforge"]
+  s.date = %q{2011-01-26}
   s.description = %q{Keep a DRY multilingual translation of your ActiveRecord models' textual attributes}
-  s.email = %q{adam@artforge.com}
+  s.email = %q{mjording@opengotham.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "History.txt",
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "features/allow_overide_of_default_language_options_at_model_level.feature",
+     "features/bypass_hmt_if_current_lang_native_language.feature",
+     "features/extend_initializer_with_default_language_options.feature",
+     "features/extend_initializer_with_predefined_language_options.feature",
+     "features/tracker.yml",
      "generators/has_many_translations/has_many_translations_generator.rb",
      "generators/has_many_translations/templates/initializer.rb",
      "generators/has_many_translations/templates/migration.rb",
@@ -37,13 +44,18 @@ Gem::Specification.new do |s|
      "lib/has_many_translations/translation_jobs.rb",
      "lib/has_many_translations/translations.rb",
      "lib/translation_spec.rb",
+     "spec/has_many_translations.spec",
+     "spec/spec_helper.rb",
      "tasks/has_many_translations_tasks.rake"
   ]
-  s.homepage = %q{http://github.com/opengotham/has_many_translations}
+  s.homepage = %q{http://github.com/artforge/has_many_translations}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Makes models' speak in tongues}
+  s.test_files = [
+    "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/has_many_translations.rb

@@ -22,6 +22,7 @@ module HasManyTranslations
       include Options
       include TranslationJobs
       include Creation
+      include Control
       include Translations
       prepare_translated_options(options)
       has_many :translations, options, &block

data/lib/has_many_translations/control.rb

@@ -5,12 +5,29 @@ module HasManyTranslations
     def self.included(base) # :nodoc:
       base.class_eval do
         include InstanceMethods
-        alias_method_chain :create_translation?, :control
-        alias_method_chain :update_translation?, :control
+        # alias_method_chain :create_translation?, :control
+        #         alias_method_chain :update_translation?, :control
       end
     end
     
     module InstanceMethods
+      def force_update
+        with_translation_flag(:force_update) do
+          yield if block_given?
+          save
+        end
+      end
+      def force_update!
+        with_translation_flag(:force_update) do
+          yield if block_given?
+          update_translations!
+        end
+      end
+      
+      def force_update?
+        !!@force_update
+      end
+      
       def skip_translation
         with_translation_flag(:skip_translation) do
           yield if block_given?
@@ -19,7 +36,7 @@ module HasManyTranslations
       end
       
       def skip_translation!
-        with_version_flag(:skip_translation) do
+        with_translation_flag(:skip_translation) do
           yield if block_given?
           save!
         end
@@ -37,10 +54,10 @@ module HasManyTranslations
         # block raising an exception.
         def with_translation_flag(flag)
           begin
-            instance_variable_set("@#{flag}", true)
+            instance_variable_set("@#{flag}", !instance_variable_get("@#{flag}"))
             yield
-          ensure
-            instance_variable_set("@#{flag}", nil)
+          # ensure
+          #             instance_variable_set("@#{flag}", nil)
           end
         end
         

data/lib/has_many_translations/creation.rb

@@ -29,14 +29,12 @@ module HasManyTranslations
           #unless try(name)
             define_method name, lambda { |*args|
               #
-              unless self.translations.blank? || self.translations.first.origin_locale_code == self.hmt_locale || read_attribute(name.to_sym).nil?
-                trans = self.translations.first(:conditions => {:locale_code => self.hmt_locale, :attribute => name})
+              if self.translations.blank? || self.translations.first.origin_locale_code == self.hmt_locale || read_attribute(name.to_sym).nil?
+                read_attribute(name.to_sym)
+              else
+                trans = self.translations.first(:conditions => {:locale_code => self.hmt_locale, :model_attribute => name})
                 val = trans.nil? ? read_attribute(name.to_sym) : trans.value
                 #self.hmt_locale
-              else
-                #self.id
-                read_attribute(name.to_sym)
-                #try(name)
               end
               #HasManyTranslations.fetch(args.first || self.class.locale || I18n.locale, name)
             }
@@ -49,7 +47,12 @@ module HasManyTranslations
 
         self.has_many_translations_options[:only] = Array(options.delete(:only)).map(&:to_s).uniq if options[:only]
         self.has_many_translations_options[:except] = Array(options.delete(:except)).map(&:to_s).uniq if options[:except]
-        #self.has_many_translations_options[:locales] = Array(options.delete(:locales)).map(&:to_s).uniq if options[:locales]
+        self.has_many_translations_options[:locales] = Array(options.delete(:locales)).map(&:to_s).uniq if options[:locales]
+        self.has_many_translations_options[:default_languages] = options[:default_languages] ? Array(options.delete(:default_languages)).map(&:to_s).uniq : nil
+        self.has_many_translations_options[:languages] = options[:languages] ? Array(options.delete(:languages)).map(&:to_s).uniq : nil
+        # self.has_many_translations_options[:force_on_update] = options[:force_on_update] ? Array(options.delete(:force_on_update)).map(&:to_s).uniq : nil
+        
+        
         result
       end
       
@@ -65,6 +68,10 @@ module HasManyTranslations
           @translator.key = Settings.google_api_key
         end
         
+        def force_on_update?
+          return false
+        end
+        
         def allowed_locales
           t = TranslationSpec.first(:conditions => {:translated_id => self.id,  :translated_type  => self.class.to_s})
           t.blank? ? nil : t.codes.split(',').map{|c| c.to_sym}
@@ -120,9 +127,7 @@ module HasManyTranslations
           #reset_translation
         end
 
-        # Returns whether the last translation should be updated upon updating the parent record.
-        # This method is overridden in HasManyTranslations::Control to account for a control block that
-        # merges changes onto the previous translation.
+        
         def update_translations!
            #translated_columns.each do |attrib|
               self.locales.each do |loc|
@@ -134,11 +139,14 @@ module HasManyTranslations
            #end
         end
         
+        # Returns whether the last translation should be updated upon updating the parent record.
+        # This method is overridden in HasManyTranslations::Control to account for a control block that
+        # merges changes onto the previous translation.
         def update_translation?
           unless self.translations.blank? || self.translations.first.origin_locale_code == self.hmt_locale
             dirty_translations = self.translations.all(:conditions => {:translated_id => self.id, :locale_code => self.hmt_locale})
             dirty_translations.each do |dt|
-              dt.value = try(dt.attribute)
+              dt.value = try(dt.model_attribute)
               dt.save
             end
             return false
@@ -153,7 +161,7 @@ module HasManyTranslations
         
         # Updates the last translation's changes by appending the current translation changes.
         def update_translation(attrib, loc, origin_locale)
-          unless translations.first(:conditions => {:attribute => attrib, :locale_code => loc.to_s})
+          if !translations.first(:conditions => {:model_attribute => attrib, :locale_code => loc.to_s}) || self.force_on_update?
             update_translation!(attrib, loc, origin_locale.to_s)
           end
         end
@@ -163,10 +171,8 @@ module HasManyTranslations
            if defined? HmtSettings
              @translator.key = HmtSettings.google_api_key
            end
-           # translation_val = @translator.translate(try(attrib), :from => origin_locale.to_s, :to => loc.to_s)
-           translation_val = @translator.post_translate(try(attrib), :from => origin_locale.to_s, :to => loc.to_s)
-           # translation_val = @translator.translate(try(attrib), origin_locale.to_s, loc.to_s, {:method => :post})
-           translations.create(:attribute => attrib, :locale_code => loc.to_s, :value => translation_val, :locale_name => Google::Language::Languages[loc.to_s], :machine_translation => true, :origin_locale_code => origin_locale ) unless translation_val.nil? || translation_val.match('Error: ')
+           translation_val = @translator.translate(try(attrib), :from => origin_locale.to_s, :to => loc.to_s)
+           translations.create(:model_attribute => attrib, :locale_code => loc.to_s, :value => translation_val, :locale_name => Google::Language::Languages[loc.to_s], :machine_translation => true, :origin_locale_code => origin_locale ) unless translation_val.nil? || translation_val.match('Error: ')
         end
         
         
@@ -178,8 +184,13 @@ module HasManyTranslations
         # columns maintained by Rails are never translationed.
         def translated_columns
           textual_columns = self.class.columns.map{|c|c.type == :string || c.type == :text ? c.name : nil}.compact
-          textual_columns = self.has_many_translations_options[:only] ? textual_columns & self.has_many_translations_options[:only] : textual_columns
-          textual_columns = self.has_many_translations_options[:except] ? textual_columns - self.has_many_translations_options[:except] : textual_columns
+          
+          if self.has_many_translations_options[:except] 
+            textual_columns = textual_columns - self.has_many_translations_options[:except]
+          elsif self.has_many_translations_options[:only] 
+            textual_columns = textual_columns & self.has_many_translations_options[:only]
+          end
+          
           return textual_columns
         end
         
@@ -195,15 +206,16 @@ module HasManyTranslations
         
         def locales
           if allowed_locales
-            retloc = allowed_locales.map{|l|l.to_s}
+            retloc = has_many_translations_options[:default_locales] ? (has_many_translations_options[:default_locales] & allowed_locales.map{|l|l.to_s}) : allowed_locales.map{|l|l.to_s}
           elsif super_locales.present? 
             super_locales.each do |sloc|
               retloc.nil? ? retloc = eval("self.#{sloc}.locales") : retloc | eval("self.#{sloc}.locales")
             end
-          else
-            retloc = has_many_translations_options[:locales] && I18n && Google ? has_many_translations_options[:locales] & Google::Language::Languages.keys : Google::Language::Languages.keys & I18n.available_locales.map{|l|l.to_s}
           end
-          return retloc
+          retloc ||= (has_many_translations_options[:locales] && I18n && Google) ? (has_many_translations_options[:locales] & Google::Language::Languages.keys) : (Google::Language::Languages.keys & I18n.available_locales.map{|l|l.to_s})
+          if has_many_translations_options[:languages]
+            retloc = retloc.empty? ? has_many_translations_options[:languages] : (has_many_translations_options[:languages] & retloc) 
+          end
           # I18n.available_locales.map(&:to_s)
         end
         

data/lib/has_many_translations/hmt_settings.rb

@@ -1,4 +1,24 @@
-class HmtSettings < Settingslogic
-  source "#{Rails.root}/config/settings.yml"
-  namespace Rails.env
+class HmtSettings
+  @@google_api_key = ""
+  @@languages = []
+  @@default_languages = []
+  
+  def self.google_api_key=(key)
+    @@google_api_key = key
+  end
+  def self.google_api_key
+    @@google_api_key
+  end
+  def self.languages=(langs)
+    @@languages = langs
+  end
+  def self.languages
+    @@languages
+  end
+  def self.default_languages=(langs)
+    @@default_languages = langs
+  end
+  def self.default_languages
+    @@default_languages
+  end
 end

data/lib/has_many_translations/options.rb

@@ -35,6 +35,10 @@ module HasManyTranslations
         self.translator = Translate::RTranslate.new
         if defined? HmtSettings
           self.translator.key = HmtSettings.google_api_key
+          options[:default_languages] = HmtSettings.default_languages ? HmtSettings.default_languages : nil
+          options[:languages] = HmtSettings.languages ? HmtSettings.languages : nil
+          # options[:force_on_update] = HmtSettings.force_on_update ? HmtSettings.force_on_update : nil
+          
         end
         self.has_many_translations_options = options.dup
 

data/spec/has_many_translations.spec

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe "HasManyTranslations" do
+  it "fails" do
+      false.should be_true
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+
+
+require 'fileutils'
+require 'rspec'

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: has_many_translations
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 9
   prerelease: false
   segments: 
   - 0
+  - 4
   - 3
-  - 8
-  version: 0.3.8
+  version: 0.4.3
 platform: ruby
 authors: 
-- opengotham
+- OpenGotham
 - Artforge
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 -04:00
+date: 2011-01-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,7 +108,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 description: Keep a DRY multilingual translation of your ActiveRecord models' textual attributes
-email: adam@artforge.com
+email: mjording@opengotham.com
 executables: []
 
 extensions: []
@@ -117,10 +117,17 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - History.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- features/allow_overide_of_default_language_options_at_model_level.feature
+- features/bypass_hmt_if_current_lang_native_language.feature
+- features/extend_initializer_with_default_language_options.feature
+- features/extend_initializer_with_predefined_language_options.feature
+- features/tracker.yml
 - generators/has_many_translations/has_many_translations_generator.rb
 - generators/has_many_translations/templates/initializer.rb
 - generators/has_many_translations/templates/migration.rb
@@ -137,9 +144,11 @@ files:
 - lib/has_many_translations/translation_jobs.rb
 - lib/has_many_translations/translations.rb
 - lib/translation_spec.rb
+- spec/has_many_translations.spec
+- spec/spec_helper.rb
 - tasks/has_many_translations_tasks.rake
 has_rdoc: true
-homepage: http://github.com/opengotham/has_many_translations
+homepage: http://github.com/artforge/has_many_translations
 licenses: []
 
 post_install_message: 
@@ -172,5 +181,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Makes models' speak in tongues
-test_files: []
-
+test_files: 
+- spec/spec_helper.rb