translate_columns 1.1.1 → 1.2.0

data/Gemfile

@@ -1,4 +1,2 @@
-
 source :rubygems
-gemspec
-
+gemspec

data/Gemfile.lock

@@ -1,36 +1,39 @@
 PATH
   remote: .
   specs:
-    translate_columns (1.1.0)
-      activerecord (~> 3.0.0)
+    translate_columns (1.2.0)
+      activerecord (~> 3.2.12)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    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.7)
-    builder (2.1.2)
-    i18n (0.5.0)
-    mocha (0.9.10)
-      rake
-    rake (0.8.7)
-    sqlite3 (1.3.3)
-    tzinfo (0.3.24)
+    activemodel (3.2.12)
+      activesupport (= 3.2.12)
+      builder (~> 3.0.0)
+    activerecord (3.2.12)
+      activemodel (= 3.2.12)
+      activesupport (= 3.2.12)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    i18n (0.6.4)
+    metaclass (0.0.1)
+    mocha (0.13.3)
+      metaclass (~> 0.0.1)
+    multi_json (1.6.1)
+    rake (10.0.3)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.0)
-  mocha (~> 0.9.3)
-  sqlite3 (~> 1.3.3)
+  mocha (~> 0.13.3)
+  rake (~> 10.0.3)
+  sqlite3 (~> 1.3.7)
   translate_columns!

data/README.rdoc

@@ -1,6 +1,6 @@
 = Translate Columns Plugin
 
-Copyright (c) 2007-2011 Samuel Lown <me (AT) samlown.com>
+Copyright (c) 2007-2013 Samuel Lown <me (AT) samlown.com>
 
 This Plugin is released under the MIT license, as Rails itself. Please see the 
 attached LICENSE file for further details.
@@ -23,6 +23,10 @@ added to an existing application.
 
 == Updates
 
+=== v1.2 - 12th March 2013
+
+- Updated to support Rails 3.2.12. Please hold back if you are not running this version of Rails. Thanks Matthias Frick (@mattherick)
+
 === v1.1 - 21st January 2011
 
 - Now only supports ActiveRecord 3

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -20,4 +20,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
-end
+end

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/init.rb

@@ -1,3 +1 @@
-
-require 'translate_columns'
-
+require 'translate_columns'

data/install.rb

@@ -1 +1 @@
-# Install hook code here
+# Install hook code here

data/lib/translate_columns.rb

@@ -167,7 +167,7 @@ module TranslateColumns
         if !@translation || (@translation.locale != translation_locale)
           raise MissingParent, "Cannot create translations without a stored parent" if new_record?
           # try to find translation or build a new one
-          @translation = translations.find_by_locale(translation_locale) || translations.build(:locale => translation_locale)
+          @translation = translations.where(:locale => translation_locale).first || translations.build(:locale => translation_locale)
         end
         @translation
       else
@@ -225,4 +225,4 @@ module TranslateColumns
     end
 
   end
-end
+end

data/test/fixtures/document.rb

@@ -4,8 +4,7 @@ class Document < ActiveRecord::Base
   has_many :translations, :class_name => 'DocumentTranslation'
   translate_columns :title, :body
 
-  validates_presence_of :title
-  validates_length_of :title, :within => 3..200
+  validates :title, :presence => true, :length => { :in => 3..200 }
+  validates :body, :length => { :in => 3..500 }
 
-  validates_length_of :body, :within => 3..500
-end
+end

data/test/fixtures/document_translation.rb

@@ -1,3 +1,3 @@
 class DocumentTranslation < ActiveRecord::Base
 
-end
+end

data/test/fixtures/document_translations.yml

@@ -10,5 +10,4 @@ translation2:
   document_id: 1
   locale: fr
   title: Un title en francais
-  body:
-  
+  body:

data/test/fixtures/documents.yml

@@ -9,5 +9,4 @@ document2:
   title: Test Document Number 2
   locale: en
   body: This is a second test document with some random content for the body.
-  published_at: "2009-09-23 21:53:46"
-
+  published_at: "2009-09-23 21:53:46"

data/test/fixtures/schema.rb

@@ -14,5 +14,4 @@ ActiveRecord::Schema.define do
     t.column "body", :text
     t.timestamps
   end
-end
-
+end

data/test/lib/activerecord_connector.rb

@@ -2,5 +2,4 @@ require 'active_record'
 require 'active_record/fixtures'
 
 conf = YAML::load(File.open(File.dirname(__FILE__) + '/../database.yml'))
-ActiveRecord::Base.establish_connection(conf['sqlite3'])
-
+ActiveRecord::Base.establish_connection(conf['sqlite3'])

data/test/lib/activerecord_test_helper.rb

@@ -1,4 +1,3 @@
-
 require 'activerecord_connector'
 require File.join(File.dirname(__FILE__), '../fixtures/schema.rb')
 
@@ -6,5 +5,4 @@ module ActiverecordTestHelper
   FIXTURES_PATH = File.join(File.dirname(__FILE__), '/../fixtures')
   dep = defined?(ActiveSupport::Dependencies) ? ActiveSupport::Dependencies : ::Dependencies
   dep.autoload_paths.unshift FIXTURES_PATH
-end
-
+end

data/test/translate_columns_test.rb

@@ -2,7 +2,7 @@
 
 require 'bundler/setup'
 require 'test/unit'
-require 'mocha'
+require "mocha/setup"
 
 require 'activerecord_test_helper'
 require 'translate_columns'
@@ -12,11 +12,11 @@ class TranslateColumnsTest < Test::Unit::TestCase
   include ActiverecordTestHelper
 
   def setup
-    @docs = Fixtures.create_fixtures(FIXTURES_PATH, ['documents', 'document_translations'])
+    @docs = ActiveRecord::Fixtures.create_fixtures(FIXTURES_PATH, ['documents', 'document_translations'])
   end
 
   def teardown
-    Fixtures.reset_cache
+    ActiveRecord::Fixtures.reset_cache
   end
 
   def test_basic_document_fields
@@ -150,4 +150,4 @@ class TranslateColumnsTest < Test::Unit::TestCase
     assert doc.save
   end
   
-end
+end

data/translate_columns.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
   
-  s.add_dependency("activerecord", "~> 3.0.0")
-  s.add_development_dependency(%q<mocha>, "~> 0.9.3")
-  s.add_development_dependency(%q<sqlite3>, "~> 1.3.3")
-end
-
+  s.add_dependency("activerecord", "~> 3.2.12")
+  s.add_development_dependency("rake", "~> 10.0.3")
+  s.add_development_dependency("mocha", "~> 0.13.3")
+  s.add_development_dependency("sqlite3", "~> 1.3.7")
+end

metadata

@@ -1,77 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: translate_columns
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 1
-  version: 1.1.1
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Sam Lown
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-21 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-01-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+      - !ruby/object:Gem::Version
+        version: 3.2.12
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 3
-        version: 0.9.3
+      - !ruby/object:Gem::Version
+        version: 3.2.12
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.3
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.13.3
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
+      - !ruby/object:Gem::Version
+        version: 1.3.7
   type: :development
-  version_requirements: *id003
-description: Automatically translate ActiveRecord columns using a second model containing the translations.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.7
+description: Automatically translate ActiveRecord columns using a second model containing
+  the translations.
 email: me@samlown.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -93,39 +105,37 @@ files:
 - test/lib/activerecord_test_helper.rb
 - test/translate_columns_test.rb
 - translate_columns.gemspec
-has_rdoc: true
 homepage: http://github.com/samlown/translate_columns
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 5
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Use fields from other translation models easily
-test_files: []
-
+test_files:
+- test/database.yml
+- test/fixtures/document.rb
+- test/fixtures/document_translation.rb
+- test/fixtures/document_translations.yml
+- test/fixtures/documents.yml
+- test/fixtures/schema.rb
+- test/lib/activerecord_connector.rb
+- test/lib/activerecord_test_helper.rb
+- test/translate_columns_test.rb