rails_i18n_record 1.0.4 → 1.0.5

data/README.rdoc

@@ -42,4 +42,3 @@ If you want to save multiple translations:
           %li
             = ff.label :prop
             = ff.text_field :prop
-  

data/lib/rails_i18n_record/active_record/base.rb

@@ -0,0 +1,79 @@
+module RailsI18nRecord
+  module ActiveRecord
+    module Base
+      module NonTranslatable
+        
+        def translatable?
+          not defined?(@translatable_attrs).nil?
+        end
+      
+        def attr_translatable(*args)
+          make_translatable unless translatable?
+          args.each do |name| 
+            define_translatable_attribute_methods(name)
+            @translatable_attrs << name
+          end
+        end 
+
+        protected
+
+        def make_translatable
+          send :include, RailsI18nRecord::ActiveRecord::Base::Translatable
+          default_scope :include => :translations
+          attr_accessible :translations_attributes
+          has_many :translations, :class_name => "#{name}Translation", :autosave => true, :dependent => :destroy    
+          accepts_nested_attributes_for :translations                                        
+          @translatable_attrs = []                  
+        end
+
+        def define_translatable_attribute_methods(attr)
+          ['set', 'get'].each do |method|
+            send "define_translatable_attribute_method_#{method}", attr
+          end
+        end
+
+        def define_translatable_attribute_method_set(attr)
+          define_method "#{attr}=" do |value|  
+            t = translation_by_locale(current_locale)
+            t ? t.send("#{attr}=".to_sym, value) : translations.build(:locale => current_locale.to_s, attr.to_sym => value)        
+          end        
+        end
+
+        def define_translatable_attribute_method_get(attr)
+          ['', '_was', '_changed?'].each do |suffix|
+            define_method "#{attr}#{suffix}" do
+              t = translation_by_locale(current_locale)
+              t ? t.send("#{attr}#{suffix}".to_sym) : nil
+            end           
+          end
+        end
+
+      end    
+      module Translatable
+        
+        def with_locale(locale)
+          @locale = locale
+        end
+        
+        def build_translations
+          I18n.available_locales.each do |locale| 
+            t = translations.find_by_locale(locale)
+            translations.build :locale => locale.to_s unless t
+          end
+        end   
+        
+        protected
+        
+        def current_locale
+          defined?(@locale).nil? ? I18n.locale.to_s : @locale
+        end
+        
+        def translation_by_locale(locale)
+          t = translations.find { |t| t.locale == locale.to_s }
+          t ? t : translations.find_by_locale(locale)
+        end
+        
+      end
+    end
+  end
+end

data/lib/rails_i18n_record/railtie.rb

@@ -2,7 +2,7 @@ module RailsI18nRecord
   class Railtie < Rails::Railtie
 
     initializer 'rails_i18n_record' do
-      ::ActiveRecord::Base.send :extend, RailsI18nRecord::Base::NonTranslatable
+      ::ActiveRecord::Base.send :extend, RailsI18nRecord::ActiveRecord::Base::NonTranslatable
     end
 
   end

data/lib/rails_i18n_record/version.rb

@@ -1,5 +1,5 @@
 module RailsI18nRecord
   
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 
 end

data/lib/rails_i18n_record.rb

@@ -1,4 +1,4 @@
-require 'rails_i18n_record/base'
+require 'rails_i18n_record/active_record/base'
 require 'rails_i18n_record/railtie'
 require 'rails_i18n_record/version'
 

data/test/dummy/log/test.log

@@ -2294,3 +2294,104 @@ Connecting to database specified by database.yml
    (0.1ms)  UPDATE "models_i18n" SET "name" = 'new name', "updated_at" = '2013-04-05 12:40:36.749030' WHERE "models_i18n"."id" = 1
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.1ms)  rollback transaction
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+   (3.2ms)  select sqlite_version(*)
+   (0.3ms)  CREATE TABLE "models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  CREATE TABLE "models_i18n" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "model_id" integer NOT NULL, "locale" varchar(255) NOT NULL, "name" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  CREATE INDEX "index_models_i18n_on_created_at" ON "models_i18n" ("created_at")
+   (0.1ms)  CREATE INDEX "index_models_i18n_on_locale" ON "models_i18n" ("locale")
+   (0.1ms)  CREATE INDEX "index_models_i18n_on_model_id" ON "models_i18n" ("model_id")
+   (0.1ms)  CREATE INDEX "index_models_i18n_on_name" ON "models_i18n" ("name")
+   (0.1ms)  CREATE INDEX "index_models_i18n_on_updated_at" ON "models_i18n" ("updated_at")
+   (0.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.0ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130404161713')
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+  ModelTranslation Load (19.9ms)  SELECT "models_i18n".* FROM "models_i18n" WHERE "models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en' LIMIT 1
+   (0.1ms)  SAVEPOINT active_record_1
+  ModelTranslation Exists (0.1ms)  SELECT 1 AS one FROM "models_i18n" WHERE ("models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en') LIMIT 1
+  SQL (48.8ms)  INSERT INTO "models" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00], ["updated_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00]]
+  SQL (0.5ms)  INSERT INTO "models_i18n" ("created_at", "locale", "model_id", "name", "updated_at") VALUES (?, ?, ?, ?, ?)  [["created_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00], ["locale", "en"], ["model_id", 1], ["name", "name"], ["updated_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+  ModelTranslation Load (0.1ms)  SELECT "models_i18n".* FROM "models_i18n" WHERE "models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+  ModelTranslation Exists (0.1ms)  SELECT 1 AS one FROM "models_i18n" WHERE ("models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en') LIMIT 1
+  SQL (0.2ms)  INSERT INTO "models" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00], ["updated_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00]]
+  SQL (0.2ms)  INSERT INTO "models_i18n" ("created_at", "locale", "model_id", "name", "updated_at") VALUES (?, ?, ?, ?, ?)  [["created_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00], ["locale", "en"], ["model_id", 1], ["name", "name"], ["updated_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  DELETE FROM "models_i18n" WHERE "models_i18n"."id" = ?  [["id", 1]]
+  SQL (0.1ms)  DELETE FROM "models" WHERE "models"."id" = ?  [["id", 1]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  ModelTranslation Load (0.2ms)  SELECT "models_i18n".* FROM "models_i18n" WHERE "models_i18n"."model_id" = 1 LIMIT 1
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  ModelTranslation Load (0.2ms)  SELECT "models_i18n".* FROM "models_i18n" WHERE "models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en' LIMIT 1
+   (0.1ms)  SAVEPOINT active_record_1
+  ModelTranslation Exists (0.1ms)  SELECT 1 AS one FROM "models_i18n" WHERE ("models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en') LIMIT 1
+  SQL (0.3ms)  INSERT INTO "models" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00], ["updated_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00]]
+  SQL (0.2ms)  INSERT INTO "models_i18n" ("created_at", "locale", "model_id", "name", "updated_at") VALUES (?, ?, ?, ?, ?)  [["created_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00], ["locale", "en"], ["model_id", 1], ["name", "name"], ["updated_at", Sat, 06 Apr 2013 18:10:53 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  ModelTranslation Exists (0.1ms)  SELECT 1 AS one FROM "models_i18n" WHERE ("models_i18n"."model_id" = 1 AND "models_i18n"."id" != 1 AND "models_i18n"."locale" = 'en') LIMIT 1
+   (0.1ms)  UPDATE "models_i18n" SET "name" = 'new name', "updated_at" = '2013-04-06 18:10:53.988752' WHERE "models_i18n"."id" = 1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  rollback transaction
+Connecting to database specified by database.yml
+   (1.8ms)  select sqlite_version(*)
+   (0.3ms)  CREATE TABLE "models" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  CREATE TABLE "models_i18n" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "model_id" integer NOT NULL, "locale" varchar(255) NOT NULL, "name" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  CREATE INDEX "index_models_i18n_on_created_at" ON "models_i18n" ("created_at")
+   (0.1ms)  CREATE INDEX "index_models_i18n_on_locale" ON "models_i18n" ("locale")
+   (0.1ms)  CREATE INDEX "index_models_i18n_on_model_id" ON "models_i18n" ("model_id")
+   (0.1ms)  CREATE INDEX "index_models_i18n_on_name" ON "models_i18n" ("name")
+   (0.1ms)  CREATE INDEX "index_models_i18n_on_updated_at" ON "models_i18n" ("updated_at")
+   (0.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.0ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20130404161713')
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+  ModelTranslation Load (1.6ms)  SELECT "models_i18n".* FROM "models_i18n" WHERE "models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en' LIMIT 1
+   (0.1ms)  SAVEPOINT active_record_1
+  ModelTranslation Exists (0.1ms)  SELECT 1 AS one FROM "models_i18n" WHERE ("models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en') LIMIT 1
+  SQL (5.9ms)  INSERT INTO "models" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", Sat, 06 Apr 2013 18:30:29 UTC +00:00], ["updated_at", Sat, 06 Apr 2013 18:30:29 UTC +00:00]]
+  SQL (0.3ms)  INSERT INTO "models_i18n" ("created_at", "locale", "model_id", "name", "updated_at") VALUES (?, ?, ?, ?, ?)  [["created_at", Sat, 06 Apr 2013 18:30:29 UTC +00:00], ["locale", "en"], ["model_id", 1], ["name", "name"], ["updated_at", Sat, 06 Apr 2013 18:30:29 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  ModelTranslation Load (0.1ms)  SELECT "models_i18n".* FROM "models_i18n" WHERE "models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+  ModelTranslation Exists (0.1ms)  SELECT 1 AS one FROM "models_i18n" WHERE ("models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en') LIMIT 1
+  SQL (0.2ms)  INSERT INTO "models" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", Sat, 06 Apr 2013 18:30:29 UTC +00:00], ["updated_at", Sat, 06 Apr 2013 18:30:29 UTC +00:00]]
+  SQL (0.2ms)  INSERT INTO "models_i18n" ("created_at", "locale", "model_id", "name", "updated_at") VALUES (?, ?, ?, ?, ?)  [["created_at", Sat, 06 Apr 2013 18:30:29 UTC +00:00], ["locale", "en"], ["model_id", 1], ["name", "name"], ["updated_at", Sat, 06 Apr 2013 18:30:29 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  DELETE FROM "models_i18n" WHERE "models_i18n"."id" = ?  [["id", 1]]
+  SQL (0.1ms)  DELETE FROM "models" WHERE "models"."id" = ?  [["id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  ModelTranslation Load (0.1ms)  SELECT "models_i18n".* FROM "models_i18n" WHERE "models_i18n"."model_id" = 1 LIMIT 1
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  ModelTranslation Load (0.1ms)  SELECT "models_i18n".* FROM "models_i18n" WHERE "models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+  ModelTranslation Exists (0.1ms)  SELECT 1 AS one FROM "models_i18n" WHERE ("models_i18n"."model_id" IS NULL AND "models_i18n"."locale" = 'en') LIMIT 1
+  SQL (0.2ms)  INSERT INTO "models" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", Sat, 06 Apr 2013 18:30:30 UTC +00:00], ["updated_at", Sat, 06 Apr 2013 18:30:30 UTC +00:00]]
+  SQL (0.2ms)  INSERT INTO "models_i18n" ("created_at", "locale", "model_id", "name", "updated_at") VALUES (?, ?, ?, ?, ?)  [["created_at", Sat, 06 Apr 2013 18:30:30 UTC +00:00], ["locale", "en"], ["model_id", 1], ["name", "name"], ["updated_at", Sat, 06 Apr 2013 18:30:30 UTC +00:00]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  ModelTranslation Exists (0.1ms)  SELECT 1 AS one FROM "models_i18n" WHERE ("models_i18n"."model_id" = 1 AND "models_i18n"."id" != 1 AND "models_i18n"."locale" = 'en') LIMIT 1
+   (0.1ms)  UPDATE "models_i18n" SET "name" = 'new name', "updated_at" = '2013-04-06 18:30:30.012902' WHERE "models_i18n"."id" = 1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  rollback transaction

data/test/generators_test.rb

@@ -9,7 +9,7 @@ class I18nGeneratorTest < Rails::Generators::TestCase
   tests I18nGenerator
   destination File.expand_path('../tmp', File.dirname(__FILE__))
   
-  test 'should exists' do
+  test "should exists" do
     run_generator %w(something)
     assert_file 'app/models/something_translation.rb'
     assert_migration 'db/migrate/create_somethings_i18n.rb'    

data/test/rails_i18n_record_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class RailsI18nRecordTest < ActiveSupport::TestCase
 
-  test 'truth' do
+  test "truth" do
     assert_kind_of Module, RailsI18nRecord
   end
 

data/test/records_test.rb

@@ -4,16 +4,16 @@ class RecrodsTest < ActiveSupport::TestCase
 
   setup :create_record
 
-  test 'should create associated translation' do
+  test "should create associated translation" do
     assert_equal @record.name, 'name'
   end
 
-  test 'should edit associated translation' do
+  test "should edit associated translation" do
     @record.update_attributes :name => 'new name'
     assert_equal @record.name, 'new name'
   end
 
-  test 'should delete associated translation' do
+  test "should delete associated translation" do
     @record.destroy
     assert_equal ModelTranslation.find_by_model_id(@record.id), nil
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_i18n_record
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.8
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.8
 - !ruby/object:Gem::Dependency
@@ -54,7 +54,7 @@ files:
 - lib/generators/i18n_generator.rb
 - lib/generators/templates/migration.erb
 - lib/generators/templates/model.erb
-- lib/rails_i18n_record/base.rb
+- lib/rails_i18n_record/active_record/base.rb
 - lib/rails_i18n_record/railtie.rb
 - lib/rails_i18n_record/version.rb
 - lib/rails_i18n_record.rb

data/lib/rails_i18n_record/base.rb

@@ -1,77 +0,0 @@
-module RailsI18nRecord
-  module Base
-    module NonTranslatable
-      
-      def translatable?
-        not defined?(@translatable_attrs).nil?
-      end
-    
-      def attr_translatable(*args)
-        make_translatable unless translatable?
-        args.each do |name| 
-          define_translatable_attribute_methods(name)
-          @translatable_attrs << name
-        end
-      end 
-
-      protected
-
-      def make_translatable
-        send :include, RailsI18nRecord::Base::Translatable
-        default_scope :include => :translations
-        attr_accessible :translations_attributes
-        has_many :translations, :class_name => "#{name}Translation", :autosave => true, :dependent => :destroy    
-        accepts_nested_attributes_for :translations                                        
-        @translatable_attrs = []                  
-      end
-
-      def define_translatable_attribute_methods(attr)
-        ['set', 'get'].each do |method|
-          send "define_translatable_attribute_method_#{method}", attr
-        end
-      end
-
-      def define_translatable_attribute_method_set(attr)
-        define_method "#{attr}=" do |value|  
-          t = translation_by_locale(current_locale)
-          t ? t.send("#{attr}=".to_sym, value) : translations.build(:locale => current_locale.to_s, attr.to_sym => value)        
-        end        
-      end
-
-      def define_translatable_attribute_method_get(attr)
-        ['', '_was', '_changed?'].each do |suffix|
-          define_method "#{attr}#{suffix}" do
-            t = translation_by_locale(current_locale)
-            t ? t.send("#{attr}#{suffix}".to_sym) : nil
-          end           
-        end
-      end
-
-    end    
-    module Translatable
-      
-      def with_locale(locale)
-        @locale = locale
-      end
-      
-      def build_translations
-        I18n.available_locales.each do |locale| 
-          t = translations.find_by_locale(locale)
-          translations.build :locale => locale.to_s unless t
-        end
-      end   
-      
-      protected
-      
-      def current_locale
-        defined?(@locale).nil? ? I18n.locale.to_s : @locale
-      end
-      
-      def translation_by_locale(locale)
-        t = translations.find { |t| t.locale == locale.to_s }
-        t ? t : translations.find_by_locale(locale)
-      end
-      
-    end
-  end
-end