translated_attributes 0.5.5 → 0.6.0

data/Gemfile

@@ -0,0 +1,10 @@
+source :rubygems
+
+gem 'activerecord', ENV['AR']
+
+group :dev do
+  gem 'sqlite3'
+  gem 'rake'
+  gem 'rspec', '~>2'
+  gem 'jeweler'
+end

data/Gemfile.lock

@@ -0,0 +1,32 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.11)
+      activesupport (= 2.3.11)
+    activesupport (2.3.11)
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.9.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  jeweler
+  rake
+  rspec (~> 2)
+  sqlite3

data/Rakefile

@@ -1,15 +1,20 @@
-task :default => :spec
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+task :default do
+  sh "rspec spec"
+end
+
+task :all do
+  sh "AR=2.3.12 bundle && bundle exec rake"
+  sh "AR=3.0.8 bundle && bundle exec rake"
+  sh "AR=3.1.0.rc4 bundle && bundle exec rake"
+end
 
 begin
-  project_name = 'translated_attributes'
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = project_name
+    gem.name = 'translated_attributes'
     gem.summary = "ActiveRecord/Rails simple translatable attributes"
-    gem.email = "grosser.michael@gmail.com"
-    gem.homepage = "http://github.com/grosser/#{project_name}"
+    gem.email = "michael@grosser.it"
+    gem.homepage = "http://github.com/grosser/#{gem.name}"
     gem.authors = ["Michael Grosser"]
     gem.add_dependency ['activerecord']
   end
@@ -17,4 +22,4 @@ begin
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end
+end

data/{README.markdown → Readme.md}

@@ -5,9 +5,9 @@ Validations work like normal with current field (e.g. title) or any translation
 
 Usage
 =====
- - As Rails plugin  `script/plugin install git://github.com/grosser/translated_attributes.git`
- - As gem `sudo gem install translated_attributes`
- - generate migrations: `rails generate translated_attributes`(Rails2: [do it by manually](http://github.com/grosser/translated_attributes/blob/master/lib/generators/translated_attributes/templates/migration.rb))
+ - As Rails plugin  `rails plugin install git://github.com/grosser/translated_attributes.git`
+ - As gem `gem install translated_attributes`
+ - generate migrations: `rails generate translated_attributes`(Rails2: [do it by hand](http://github.com/grosser/translated_attributes/blob/master/lib/generators/translated_attributes/templates/migration.rb))
  - `rake db:migrate`
 
 Adding attributes:
@@ -40,9 +40,10 @@ Usage with saving works exactly like normal saving, e.g. new/create/update_attri
 Options
 =======
     translated_attributes :title, :heading,
-    :table_name => 'user_translations', #default is translations
-    :nil_to_blank => true, #return unfound translations as blank strings ('') instead of nil (default false),
-    :translatable_name => 'translated' #name of the associated translatable (Product has_many :translations a Translation belongs_to XXX), default is :translatable
+    :table_name => 'user_translations', # default is translations
+    :nil_to_blank => true, # return unfound translations as blank strings ('') instead of nil (default false),
+    :translatable_name => 'translated' # name of the associated translatable (Product has_many :translations a Translation belongs_to XXX), default is :translatable
+    :attribute_column => 'attribute' # switch to the old Rails 2 default (default: translated_attribute)
 
 Author
 ======
@@ -50,6 +51,6 @@ Author
 ###Contributors
  - [Stefano Diem Benatti](http://github.com/teonimesic)
 
-[Michael Grosser](http://pragmatig.wordpress.com)  
-grosser.michael@gmail.com  
-Hereby placed under public domain, do what you want, just do not hold me accountable...
+[Michael Grosser](http://grosser.it)<br/>
+michael@grosser.it<br/>
+Hereby placed under public domain, do what you want, just do not hold me accountable...

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.6.0

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

@@ -6,7 +6,7 @@ class AddTranslations < ActiveRecord::Migration
       t.integer :translatable_id, :null=>false
       t.string :translatable_type, :limit=>40, :null=>false
       t.string :language, :limit=>2, :null=>false
-      t.string :attribute, :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

@@ -1,10 +1,13 @@
+require 'active_record'
+
 module TranslatedAttributes
   module ClassMethods
     # translated_attributes :title, :description, :table_name=>'my_translations'
     def translated_attributes(*args)
       #store options
       cattr_accessor :translated_attributes_options
-      options = args.extract_options! || {}
+      options = (args.extract_options! || {}).dup
+      options[:attribute_column] ||= :translated_attribute
       self.translated_attributes_options = options.merge(:fields=>args.map(&:to_sym))
 
       #create translations class
@@ -117,10 +120,11 @@ 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!(:attribute=>attribute, :text=>value, :language=>locale)
+          translations.create!(translated_attributes_options[:attribute_column] => attribute, :text=>value, :language=>locale)
         end
       end
       @translated_attributes_changed = false
+      true
     end
 
     private
@@ -129,7 +133,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.attribute] = t.text
+        translated_attributes_for(t.language)[t[translated_attributes_options[:attribute_column]]] = t.text
       end
     end
 

data/spec/models.rb

@@ -1,5 +1,6 @@
 ActiveRecord::Schema.define(:version => 1) do
   create_table :users do |t|
+    t.integer :version, :default => 0, :null => false
   end
 
   create_table :products do |t|
@@ -10,7 +11,7 @@ ActiveRecord::Schema.define(:version => 1) do
       t.integer :translatable_id, :null=>false
       t.string :translatable_type, :limit=>40, :null=>false
       t.string :language, :limit=>2, :null=>false
-      t.string :attribute, :limit=>40, :null=>false
+      t.string :translated_attribute, :limit=>40, :null=>false
       t.text :text, :null=>false
     end
   end
@@ -19,6 +20,11 @@ end
 #create model
 class User < ActiveRecord::Base
   translated_attributes :name, :table_name=>:user_translations, :nil_to_blank=>true
+  after_save :inc_version
+
+  def inc_version
+    self.version += 1
+  end
 end
 
 class Shop < ActiveRecord::Base
@@ -28,4 +34,4 @@ end
 
 class Product < ActiveRecord::Base
   translated_attributes :title, :description
-end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-# ---- requirements
-require 'rubygems'
-require 'spec'
 require 'active_record'
 
 $LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
@@ -15,4 +12,4 @@ ActiveRecord::Base.establish_connection({
 
 require File.expand_path("../init", File.dirname(__FILE__))
 
-require 'spec/models'
+require 'spec/models'

data/spec/translated_attributes_spec.rb

@@ -197,6 +197,11 @@ describe 'Translated attributes' do
       Product.last.title.should == 't2'
       Product.last.description.should == 'd2'
     end
+
+    it "does not cancel callbacks on parent" do
+      u = User.create!(:name => 'NAME')
+      u.version.should == 1
+    end
   end
 
   describe 'classes' do
@@ -319,4 +324,4 @@ describe 'Translated attributes' do
       Product.new.respond_to?(:new_record?).should == true
     end
   end
-end
+end

data/translated_attributes.gemspec

@@ -1,57 +1,51 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{translated_attributes}
-  s.version = "0.5.5"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-07-15}
-  s.email = %q{grosser.michael@gmail.com}
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
+  s.date = %q{2011-06-23}
+  s.email = %q{michael@grosser.it}
   s.files = [
-    "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "init.rb",
-     "lib/generators/translated_attributes/USAGE",
-     "lib/generators/translated_attributes/templates/migration.rb",
-     "lib/generators/translated_attributes/translated_attributes_generator.rb",
-     "lib/translated_attributes.rb",
-     "spec/integration_spec.rb",
-     "spec/models.rb",
-     "spec/spec_helper.rb",
-     "spec/translated_attributes_spec.rb",
-     "translated_attributes.gemspec"
+    "Gemfile",
+    "Gemfile.lock",
+    "Rakefile",
+    "Readme.md",
+    "VERSION",
+    "init.rb",
+    "lib/generators/translated_attributes/USAGE",
+    "lib/generators/translated_attributes/templates/migration.rb",
+    "lib/generators/translated_attributes/translated_attributes_generator.rb",
+    "lib/translated_attributes.rb",
+    "spec/integration_spec.rb",
+    "spec/models.rb",
+    "spec/spec_helper.rb",
+    "spec/translated_attributes_spec.rb",
+    "translated_attributes.gemspec"
   ]
   s.homepage = %q{http://github.com/grosser/translated_attributes}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{ActiveRecord/Rails simple translatable attributes}
-  s.test_files = [
-    "spec/models.rb",
-     "spec/translated_attributes_spec.rb",
-     "spec/integration_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
   end
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: translated_attributes
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
-  - 5
-  - 5
-  version: 0.5.5
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,32 +15,50 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +02:00
+date: 2011-06-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
+  name: activerecord
   version_requirements: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  name: activerecord
+  version_requirements: *id002
+  prerelease: false
 description: 
-email: grosser.michael@gmail.com
+email: michael@grosser.it
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.markdown
+extra_rdoc_files: []
+
 files: 
-- README.markdown
+- Gemfile
+- Gemfile.lock
 - Rakefile
+- Readme.md
 - VERSION
 - init.rb
 - lib/generators/translated_attributes/USAGE
@@ -56,33 +75,34 @@ homepage: http://github.com/grosser/translated_attributes
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ActiveRecord/Rails simple translatable attributes
-test_files: 
-- spec/models.rb
-- spec/translated_attributes_spec.rb
-- spec/integration_spec.rb
-- spec/spec_helper.rb
+test_files: []
+