simple_model_translations 0.1.4 → 0.1.6

data/Gemfile

@@ -1,14 +1,10 @@
 source :rubygems
 
-gem 'activerecord', '>= 3.0.0'
+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
-
-group :console do
-  gem 'jeweler', '>= 1.5.0.pre5'
+  gem 'database_cleaner', '~> 0.5.2'
+  gem 'sqlite3-ruby', '~> 1.3.1'
+  gem 'shoulda', '~> 2.11.3'
+  gem 'rspec', '~> 2.0.0'
 end

data/Gemfile.lock

@@ -1,38 +1,32 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.0)
+    activesupport (3.0.1)
     arel (1.0.1)
       activesupport (~> 3.0.0)
     builder (2.1.2)
     database_cleaner (0.5.2)
     diff-lcs (1.1.2)
-    git (1.2.5)
     i18n (0.4.1)
-    jeweler (1.5.0.pre5)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
     shoulda (2.11.3)
     sqlite3-ruby (1.3.1)
     tzinfo (0.3.23)
@@ -41,9 +35,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.0.0)
-  database_cleaner (>= 0.5.2)
-  jeweler (>= 1.5.0.pre5)
-  rspec (>= 2.0.0)
-  shoulda (>= 2.11.3)
-  sqlite3-ruby (>= 1.3.1)
+  activerecord (~> 3.0.0)
+  database_cleaner (~> 0.5.2)
+  rspec (~> 2.0.0)
+  shoulda (~> 2.11.3)
+  sqlite3-ruby (~> 1.3.1)

data/README.rdoc

@@ -51,6 +51,22 @@ Now you are able to translate values for the attributes :title and :description
   
 Additional features can be discovered by searching the code and specs. Documentation is not available yet. I hope, it'll be done when releasing zn.ua. :)
 
+== Nested attributes
+
+Usually, when creating bootstrap data (e.g. seeds.rb) you want to pass all translations in one statement.
+You can do it using Rails' nested attributes, and we propose a very convenient option for that:
+
+  class Category < ActiveRecord::Base
+    translates :name, :attributes => true
+  end
+
+Usage:
+
+  Category.create!(:translations_attributes => [
+      { :locale => :en, :name => 'Science' },
+      { :locale => :ru, :name => 'Наука' }
+    ])
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -1,45 +1,30 @@
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+
 require 'rubygems'
 require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "simple_model_translations"
-    gem.summary = %Q{Simple ActiveRecord translations for Rails 3}
-    gem.description = %Q{Simple ActiveRecord translations for Rails 3}
-    gem.email = "fxposter@gmail.com"
-    gem.homepage = "http://github.com/fxposter/simple_model_translations"
-    gem.authors = ["Pavel Forkert"]
-    
-    gem.add_development_dependency 'database_cleaner', '>= 0.5.2'
-    gem.add_development_dependency 'sqlite3-ruby', '>= 1.3.1'
-    gem.add_development_dependency 'shoulda', '>= 2.11.3'
-    gem.add_development_dependency 'rspec', '>= 2.0.0'
-    gem.add_development_dependency 'jeweler', '>= 1.5.0.pre5'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler --pre"
-end
-
+require 'simple_model_translations/version'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-end
+require 'rake/rdoctask'
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.rcov = true
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = %w(-fs --color)
 end
 
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "simple_model_translations #{version}"
+  rdoc.title = "simple_model_translations #{SimpleModelTranslations::VERSION}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :build do
+  system 'gem build simple_model_translations.gemspec'
+  system 'mkdir pkg' unless File.exists?('pkg')
+  system "mv simple_model_translations-#{SimpleModelTranslations::VERSION}.gem pkg"
+end
+ 
+task :release => :build do
+  system "gem push pkg/simple_model_translations-#{SimpleModelTranslations::VERSION}.gem"
+end
+
+task :default => :spec

data/lib/simple_model_translations/base.rb

@@ -15,7 +15,7 @@ module SimpleModelTranslations
     # Configure translated attributes.
     # Eg:
     # class Post < ActiveRecord::Base
-    #   translates :title, :description
+    #   translates :title, :description, :attributes => true
     # end
     def translates(*attributes)
       configure_translations(attributes.extract_options!)
@@ -52,7 +52,7 @@ module SimpleModelTranslations
         
         has_many :translations, :class_name => translation_class.name, :dependent => :destroy, :autosave => true
         
-        if options[:accepts_nested_attributes]
+        if options[:attributes]
           accepts_nested_attributes_for :translations, :allow_destroy => true
         end
       end

data/lib/simple_model_translations/validations.rb

@@ -1,6 +1,6 @@
 module SimpleModelTranslations
   module Validations
-    class TranslationsValidator < ActiveModel::Validator
+    class TranslationsValidator < ::ActiveModel::Validator
       def validate(record)
         locales = options[:locales]
         locales = [locales] unless locales.respond_to?(:each)

data/lib/simple_model_translations/version.rb

@@ -0,0 +1,3 @@
+module SimpleModelTranslations
+  VERSION = '0.1.6'
+end

data/simple_model_translations.gemspec

@@ -1,86 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
-
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+ 
+require 'simple_model_translations/version'
+ 
 Gem::Specification.new do |s|
-  s.name = %q{simple_model_translations}
-  s.version = "0.1.4"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Pavel Forkert"]
-  s.date = %q{2010-10-14}
-  s.description = %q{Simple ActiveRecord translations for Rails 3}
-  s.email = %q{fxposter@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/simple_model_translations.rb",
-    "lib/simple_model_translations/attributes.rb",
-    "lib/simple_model_translations/base.rb",
-    "lib/simple_model_translations/class_methods.rb",
-    "lib/simple_model_translations/instance_methods.rb",
-    "lib/simple_model_translations/validations.rb",
-    "simple_model_translations.gemspec",
-    "spec/attributes_spec.rb",
-    "spec/auto_generated_translation_classes_spec.rb",
-    "spec/class_methods_spec.rb",
-    "spec/data/models.rb",
-    "spec/data/schema.rb",
-    "spec/simple_model_translations_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/validations_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/fxposter/simple_model_translations}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simple ActiveRecord translations for Rails 3}
-  s.test_files = [
-    "spec/attributes_spec.rb",
-    "spec/auto_generated_translation_classes_spec.rb",
-    "spec/class_methods_spec.rb",
-    "spec/data/models.rb",
-    "spec/data/schema.rb",
-    "spec/simple_model_translations_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/validations_spec.rb"
-  ]
+  s.name             = 'simple_model_translations'
+  s.version          = SimpleModelTranslations::VERSION
+  s.author           = 'Pavel Forkert'
+  s.email            = 'fxposter@gmail.com'
+  s.homepage         = 'http://github.com/fxposter/simple_model_translations'
+  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.test_files       = Dir.glob('spec/**/*')
+  s.extra_rdoc_files = %w(LICENSE README.rdoc)
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_development_dependency(%q<database_cleaner>, [">= 0.5.2"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
-      s.add_development_dependency(%q<shoulda>, [">= 2.11.3"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.5.0.pre5"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_dependency(%q<database_cleaner>, [">= 0.5.2"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
-      s.add_dependency(%q<shoulda>, [">= 2.11.3"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 1.5.0.pre5"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-    s.add_dependency(%q<database_cleaner>, [">= 0.5.2"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
-    s.add_dependency(%q<shoulda>, [">= 2.11.3"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 1.5.0.pre5"])
-  end
+  s.required_rubygems_version = '>= 1.3.6'
+  s.add_runtime_dependency('activerecord', '~> 3.0.0')
+  s.add_development_dependency('database_cleaner', '~> 0.5.2')
+  s.add_development_dependency('sqlite3-ruby', '~> 1.3.1')
+  s.add_development_dependency('shoulda', '~> 2.11.3')
+  s.add_development_dependency('rspec', '~> 2.0.0')
 end
-

data/spec/attributes_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Article do
@@ -95,3 +97,18 @@ end
 describe ArticleTranslation do
   it { should belong_to :article }
 end
+
+describe Category do
+  it { should respond_to(:translations_attributes=) }
+  it 'should accept array of translation attributes' do
+    category = Category.create!(:translations_attributes => [
+                  { :locale => :en, :name => 'Science' },
+                  { :locale => :ru, :name => 'Наука' }
+                ])
+    category.should have_translation(:ru)
+    category.should have_translation(:en)
+    category.should have_translated_attribute(:en, :name, 'Science')
+    category.should have_translated_attribute(:ru, :name, 'Наука')
+  end
+end
+

data/spec/data/models.rb

@@ -17,4 +17,8 @@ end
 
 class Tag < ActiveRecord::Base
   translates :name
-end
+end
+
+class Category < ActiveRecord::Base
+  translates :name, :attributes => true
+end

data/spec/data/schema.rb

@@ -31,5 +31,14 @@ ActiveRecord::Schema.define do
     t.references :tag
     t.string :name
   end
+  
+  create_table :categories, :force => true do |t|
+  end
+
+  create_table :category_translations, :force => true do |t|
+    t.string :locale
+    t.references :category
+    t.string :name
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_model_translations
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Pavel Forkert
@@ -15,17 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +03:00
+date: 2010-10-22 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 7
         segments: 
@@ -33,15 +32,15 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  requirement: *id001
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   name: database_cleaner
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -49,15 +48,15 @@ dependencies:
         - 5
         - 2
         version: 0.5.2
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 25
         segments: 
@@ -65,15 +64,15 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 37
         segments: 
@@ -81,15 +80,15 @@ dependencies:
         - 11
         - 3
         version: 2.11.3
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -97,24 +96,8 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  name: jeweler
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: -1876988220
-        segments: 
-        - 1
-        - 5
-        - 0
-        - pre5
-        version: 1.5.0.pre5
-  requirement: *id006
+  version_requirements: *id005
 description: Simple ActiveRecord translations for Rails 3
 email: fxposter@gmail.com
 executables: []
@@ -125,20 +108,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- lib/simple_model_translations.rb
-- lib/simple_model_translations/attributes.rb
-- lib/simple_model_translations/base.rb
-- lib/simple_model_translations/class_methods.rb
-- lib/simple_model_translations/instance_methods.rb
-- lib/simple_model_translations/validations.rb
-- simple_model_translations.gemspec
 - spec/attributes_spec.rb
 - spec/auto_generated_translation_classes_spec.rb
 - spec/class_methods_spec.rb
@@ -147,6 +116,19 @@ files:
 - spec/simple_model_translations_spec.rb
 - spec/spec_helper.rb
 - spec/validations_spec.rb
+- lib/simple_model_translations/attributes.rb
+- lib/simple_model_translations/base.rb
+- lib/simple_model_translations/class_methods.rb
+- lib/simple_model_translations/instance_methods.rb
+- lib/simple_model_translations/validations.rb
+- lib/simple_model_translations/version.rb
+- lib/simple_model_translations.rb
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- Rakefile
+- README.rdoc
+- simple_model_translations.gemspec
 has_rdoc: true
 homepage: http://github.com/fxposter/simple_model_translations
 licenses: []
@@ -170,10 +152,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/VERSION

@@ -1 +0,0 @@
-0.1.4