teonimesic-translated_attributes 0.5.7 → 0.5.8

data/README.markdown

@@ -1,4 +1,4 @@
-This is an adaptation on Michael Grosser's translated attributes, but lightly adapted for rails 3 and my own needs.
+This is an adaptation on Michael Grosser's translated attributes, but lightly adapted for rails 3 and ruby 1.9 and my own needs, and it may not work properly with older versions.
 
 Rails plugin/ActiveRecord gem that creates 'virtual' attributes, which can be added on the fly without overhead or migrations, while storing all the data in a never-changing translations table.
 This keeps the attatched model light and allows to add/remove fields on the fly without migrations.

data/Rakefile

@@ -11,8 +11,8 @@ begin
     gem.email = "stefano.diem@gmail.com"
     gem.homepage = "http://github.com/teonimesic/#{project_name}"
     gem.authors = ["Michael Grosser","Stefano Diem Benatti"]
-    gem.add_dependency 'activerecord'
-    gem.add_dependency 'rspec-core', '>= 2.0.0.beta.13'
+    gem.add_dependency 'activerecord', '>= 3.0.0.beta4'
+    gem.add_development_dependency "rspec-core", ">= 2.0.0.beta.13"
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/lib/generators/translated_attributes/templates/migration.rb

@@ -3,10 +3,10 @@ class AddTranslations < ActiveRecord::Migration
     #you can remove the limit/null constrains
     #this is simply my recommended way of setting things up (save + limits needed storage space)
     create_table :translations do |t|
-      t.integer :translatable_id, :null=>false
+      t.belongs_to :translatable, :null=>false
       t.string :translatable_type, :limit=>40, :null=>false
       t.string :language, :limit=>2, :null=>false
-      t.string :attr, :limit=>40, :null=>false
+      t.string :translated_attribute, :limit=>40, :null=>false
       t.text :text, :null=>false
     end
     add_index :translations, [:translatable_id, :translatable_type]

data/lib/translated_attributes.rb

@@ -52,23 +52,11 @@ module TranslatedAttributes
     end
     
     def attributes=(new_attributes, *args)
-      if I18n.available_locales.any?{|locale| new_attributes.stringify_keys.include? locale.to_s }
-        non_serialized_attributes = new_attributes
-        I18n.available_locales.each do |l|
-          new_attributes = get_language_attributes(l,non_serialized_attributes)
-          self.class.language(l){ super }
-        end
-      else
-        super
-      end
-    end
-
-    def get_language_attributes(lang, params)
-      local_params = {}
-      if (params.include?(lang) || params.include?(lang.to_s) ) && I18n.available_locales.include?(lang.to_sym)
-        local_params = params.stringify_keys[lang.to_s]
+      unless ( translations_hash = new_attributes.select{|k,v| is_translated_attribute_hash?(k) } ).blank?
+        @translated_attributes = translations_hash.with_indifferent_access
+        new_attributes.delete_if{|k,v| is_translated_attribute_hash?(k) }
       end
-      params.reject{|k,v| I18n.available_locales.include? k.to_sym }.merge(local_params)
+      super
     end
 
     def get_translated_attribute(locale, field)
@@ -95,7 +83,7 @@ module TranslatedAttributes
 
     def set_translated_attribute(locale, field, value)
       old_value = translated_attributes_for(locale)[field]
-      return if old_value == value
+      return if old_value.to_s == value.to_s
       changed_attributes.merge!("#{field}_in_#{locale}" => old_value)
       translated_attributes_for(locale)[field] = value
       @translated_attributes_changed = true
@@ -137,7 +125,7 @@ module TranslatedAttributes
         attributes.each do |attribute, value|
           next if value.blank?
           next unless self.class.translated_attributes_options[:fields].include? attribute.to_sym
-          translations.create!(:attr=>attribute, :text=>value, :language=>locale)
+          translations.create!(:translated_attribute=>attribute, :text=>value, :language=>locale)
         end
       end
       @translated_attributes_changed = false
@@ -149,7 +137,7 @@ module TranslatedAttributes
       return if new_record? or @db_translations_merged
       @db_translations_merged = true
       translations.each do |t|
-        translated_attributes_for(t.language)[t.attr] = t.text
+        translated_attributes_for(t.language)[t.translated_attribute] = t.text
       end
     end
 
@@ -164,6 +152,10 @@ module TranslatedAttributes
       fields = self.class.translated_attributes_options[:fields]
       fields.include? method_name.sub('=','').to_sym
     end
+    
+    def is_translated_attribute_hash?(key)
+      I18n.available_locales.include?(key.to_s) || I18n.available_locales.include?(key.to_sym)
+    end
 
     def translated_attributes_for(locale)
       translated_attributes[locale] ||= {}.with_indifferent_access

data/spec/models.rb

@@ -7,12 +7,13 @@ ActiveRecord::Schema.define(:version => 1) do
 
   %w[translations user_translations].each do |table|
     create_table table do |t|
-      t.integer :translatable_id, :null=>false
+      t.belongs_to :translatable, :null=>false
       t.string :translatable_type, :limit=>40, :null=>false
       t.string :language, :limit=>2, :null=>false
-      t.string :attr, :limit=>40, :null=>false
+      t.string :translated_attribute, :limit=>40, :null=>false
       t.text :text, :null=>false
     end
+    #add_index :translations, [:translatable_id, :translatable_type]
   end
 end
 

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rspec'
 require 'active_record'
 
-$:.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 
 # ---- setup environment/plugin
 ActiveRecord::Base.establish_connection({

data/spec/translated_attributes_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require_relative 'spec_helper'
 require_relative 'models' 
 
@@ -25,7 +27,7 @@ describe 'Translated attributes' do
       p.title.should == 'def'
     end
 
-    it "ca be unset" do
+    it "can be unset" do
       p = Product.new
       p.title = 'abc'
       p.title = nil
@@ -46,6 +48,21 @@ describe 'Translated attributes' do
       p.title = 'bcd'
       p.title_in_de.should == 'bcd'
     end
+    
+    it "can be set in a hash flavour syntax" do
+      I18n.available_locales = [:en, :pt]
+      p = Product.new(
+        en: { title: 'TitleInEn', description: 'DescriptionInEn' },
+        pt: { title: 'TítuloEmPt', description: 'DescriçãoEmPt'}
+      )
+      p.title.should == 'TitleInEn'
+      p.title_in_pt.should == 'TítuloEmPt'
+    end
+    
+    it "cannot be set in a hash flavour syntax if not present in available locales" do
+      I18n.available_locales = []
+      lambda{ Product.new( en: { title: 'TitleInEn', description: 'DescriptionInEn' } ) }.should raise_error
+    end
 
     it "returns current language when current can be found" do
       I18n.locale = :de
@@ -68,6 +85,24 @@ describe 'Translated attributes' do
       p.title_in_de = 'abc'
       p.title.should == 'abc'
     end
+
+    it "records a change" do
+      p = Product.new
+      p.title = 'abc'
+      p.send(:changed_attributes).should == {'title_in_en' => nil}
+    end
+
+    it "does not record changes for nil to blank" do
+      p = Product.new
+      p.title = ''
+      p.send(:changed_attributes).should == {}
+    end
+
+    it "does not record changes for unchanged" do
+      p = Product.create!(:title_in_en => 'abc')
+      p.title = 'abc'
+      p.send(:changed_attributes).should == {}
+    end
   end
 
   describe 'storing' do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 -03:00
+date: 2010-07-15 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -46,7 +49,7 @@ dependencies:
         - beta
         - 13
         version: 2.0.0.beta.13
-  type: :runtime
+  type: :development
   version_requirements: *id002
 description: 
 email: stefano.diem@gmail.com