simple_model_translations 0.1.7 → 0.1.8

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/Gemfile

@@ -1,10 +1,2 @@
 source :rubygems
-
-gem 'activerecord', '~> 3.0.0'
-
-group :test do
-  gem 'database_cleaner', '~> 0.5.2'
-  gem 'sqlite3-ruby', '~> 1.3.1'
-  gem 'shoulda', '~> 2.11.3'
-  gem 'rspec', '~> 2.0.0'
-end
+gemspec

data/Gemfile.lock

@@ -1,3 +1,9 @@
+PATH
+  remote: .
+  specs:
+    simple_model_translations (0.1.8)
+      activerecord (~> 3.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -39,4 +45,5 @@ DEPENDENCIES
   database_cleaner (~> 0.5.2)
   rspec (~> 2.0.0)
   shoulda (~> 2.11.3)
+  simple_model_translations!
   sqlite3-ruby (~> 1.3.1)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Pavel Forkert
+Copyright (c) 2010 Pavel Forkert
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,13 +1,12 @@
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'simple_model_translations/version'
 
 require 'rubygems'
 require 'rake'
-require 'simple_model_translations/version'
 require 'rspec/core/rake_task'
 require 'rake/rdoctask'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.rspec_opts = %w(-fs --color)
 end
 
 Rake::RDocTask.new do |rdoc|

data/lib/simple_model_translations.rb

@@ -1,3 +1,4 @@
+require 'active_record'
 require 'simple_model_translations/base'
 require 'simple_model_translations/class_methods'
 require 'simple_model_translations/instance_methods'

data/lib/simple_model_translations/base.rb

@@ -53,7 +53,8 @@ module SimpleModelTranslations
         has_many :translations, :class_name => translation_class.name, :dependent => :destroy, :autosave => true
         
         if options[:attributes]
-          accepts_nested_attributes_for :translations, :allow_destroy => true
+          nested_attributes = options[:attributes].is_a?(Hash) ? options[:attributes] : {}
+          accepts_nested_attributes_for :translations, nested_attributes.reverse_merge(:allow_destroy => true)
         end
       end
   end

data/lib/simple_model_translations/version.rb

@@ -1,3 +1,3 @@
 module SimpleModelTranslations
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/simple_model_translations.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.summary          = 'Simple ActiveRecord translations for Rails 3'
   s.description      = 'Simple ActiveRecord translations for Rails 3'
   s.require_path     = 'lib'
-  s.files            = Dir.glob('{spec,lib}/**/*') + %w(Gemfile Gemfile.lock LICENSE Rakefile README.rdoc simple_model_translations.gemspec)
+  s.files            = Dir.glob('{spec,lib}/**/*') + %w(Gemfile Gemfile.lock LICENSE Rakefile README.rdoc simple_model_translations.gemspec .rspec)
   s.test_files       = Dir.glob('spec/**/*')
   s.extra_rdoc_files = %w(LICENSE README.rdoc)
 

data/spec/data/schema.rb

@@ -32,13 +32,18 @@ ActiveRecord::Schema.define do
     t.string :name
   end
   
-  create_table :categories, :force => true do |t|
-  end
-
+  create_table :categories, :force => true
   create_table :category_translations, :force => true do |t|
     t.string :locale
     t.references :category
     t.string :name
   end
+  
+  create_table :some_models, :force => true
+  create_table :some_model_translations, :force => true do |t|
+    t.string :locale
+    t.references :some_models
+    t.string :name
+  end
 end
 

data/spec/nested_attributes_spec.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe SimpleModelTranslations do
+  context 'when generating nested attributes' do
+    before do
+      SomeModel = Class.new(ActiveRecord::Base)
+    end
+    
+    after do
+      Object.send(:remove_const, :SomeModel)
+    end
+    
+    it 'can use options[:attributes] as a Hash' do
+      options = { :reject_if => lambda { |attrs| attrs[:name].blank? } }
+      SomeModel.should_receive(:accepts_nested_attributes_for).with(:translations, options.merge(:allow_destroy => true))
+      SomeModel.translates :name, :attributes => options
+    end
+    
+    it 'can use options[:attributes] as a Boolean' do
+      SomeModel.should_receive(:accepts_nested_attributes_for).with(:translations, { :allow_destroy => true })
+      SomeModel.translates :name, :attributes => true
+    end
+    
+    it "should enable translations' deletion by default" do
+      SomeModel.should_receive(:accepts_nested_attributes_for).with(:translations, { :allow_destroy => true })
+      SomeModel.translates :name, :attributes => true
+    end
+    
+    it "should allow to disable translations' deletion" do
+      SomeModel.should_receive(:accepts_nested_attributes_for).with(:translations, { :allow_destroy => false })
+      SomeModel.translates :name, :attributes => { :allow_destroy => false }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,5 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'bundler'
-Bundler.require(:default, :test)
-
-require 'rspec'
-require 'shoulda'
-require 'active_record'
-require 'simple_model_translations'
+Bundler.require(:default, :development)
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 DatabaseCleaner.strategy = :transaction

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_model_translations
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Pavel Forkert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-23 00:00:00 +03:00
+date: 2010-11-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,6 +113,7 @@ files:
 - spec/class_methods_spec.rb
 - spec/data/models.rb
 - spec/data/schema.rb
+- spec/nested_attributes_spec.rb
 - spec/simple_model_translations_spec.rb
 - spec/spec_helper.rb
 - spec/validations_spec.rb
@@ -129,6 +130,7 @@ files:
 - Rakefile
 - README.rdoc
 - simple_model_translations.gemspec
+- .rspec
 has_rdoc: true
 homepage: http://github.com/fxposter/simple_model_translations
 licenses: []
@@ -171,6 +173,7 @@ test_files:
 - spec/class_methods_spec.rb
 - spec/data/models.rb
 - spec/data/schema.rb
+- spec/nested_attributes_spec.rb
 - spec/simple_model_translations_spec.rb
 - spec/spec_helper.rb
 - spec/validations_spec.rb