translatable_records 1.0.7 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05af5734e652d0b785cd48ba53f395430fc4e248
-  data.tar.gz: 467134ed6c5695932738185040c0cb504a5f0944
+  metadata.gz: 853fe418c0b123941ce33d64f67872df5045cc6b
+  data.tar.gz: a2cc5c10f08c42a2eb29eebaafbabd035fad64eb
 SHA512:
-  metadata.gz: ed349d8c6bc19c14b1df8cdcb15127ff26ac8cb7a3f8eedfa7ecda32cb1c21e54b9eeef17d762a425333b16724a781f9528a7f41186f4746cedb627f1c1f077d
-  data.tar.gz: f010ff700fe1d44cb3a1703f8223850fc2b65a4652180cd08c59b05ac32f7050ca9702491a4a0db2b82f7ffd7763d06233a16f555f60e02a6dbdd0d2b9f771ca
+  metadata.gz: 166139b74c3c6bde0cfb6a34efc762c230914338b303ce5252a43ffa46d87f3ccd1dbe2112785295da21aa3c7fe38e4eba1d27343a5924650e380b6e3ab45238
+  data.tar.gz: ed33fe2d31a05cff0ec299e2ad1d11fcd052a7e92036ec381da566053f8287c1141ae0294a106525cc12ddfb52fa54192799f29aa416eef7e74d4446dfb86b9d

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 Museways
+Copyright 2014 Museways
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -17,26 +17,26 @@ Then bundle:
 First define the model and set the name of the fields you want to translate with the attr_translatable method:
   attr_translatable :attr
 
+(If you are using rails 3 you should add attr_accessible :attr to pass the atrr to create, update, etc)
+
 Generate the translation model and migration for that model:
   rails g translation Model
-  
+ 
 Update the translation migration with the column for that field and remove the column from the original table:
   t.string :attr
-  
+ 
 Update your db:
   rake db:migrate
-  
-(Now you can use that field of the model as usual and any change would be saved using the current I18n.locale) 
-
+ 
 If you want to change the locale to something different than I18n.locale:
-  model_instance.with_locale :es
+  record.with_locale :es
 
 If you want to build a translation for each available locale:
-  model_instance.build_translations
+  record.build_translations
  
 If you want to save multiple translations:
   <%= f.fields_for 'translations_attributes[]', t do |ff| %>
-    <%= field_set_tag t("languages.#{t.locale}") do %>
+    <%= field_set_tag t("locales.#{t.locale}") do %>
       <% unless t.new_record? %>
         <%= ff.hidden_field :id %>
       <% end %>

data/lib/generators/templates/model.rb

@@ -0,0 +1,8 @@
+class <%= "#{class_name}Translation" %> < ActiveRecord::Base
+ 
+  belongs_to <%= ":#{table_name}" %>
+ 
+  validates :locale, presence: true
+  validates <%= ":#{singular_table_name}_id" %>, uniqueness: { scope: :locale }
+ 
+end

data/lib/generators/translation_generator.rb

@@ -5,13 +5,13 @@ class TranslationGenerator < Rails::Generators::NamedBase
 
   source_root File.expand_path('../templates', __FILE__)
   
-  def create_model
+  def create_translation_model
     @model = Object.const_get(class_name)
-    template 'model.rb.erb', "app/models/#{file_name}_translation.rb"
+    template 'model.rb', "app/models/#{file_name}_translation.rb"
   end
   
-  def create_migration
-    migration_template 'migration.rb.erb', "db/migrate/create_#{singular_table_name}_translations.rb"
+  def create_translation_migration
+    migration_template 'migration.rb', "db/migrate/create_#{singular_table_name}_translations.rb"
   end
   
   def self.next_migration_number(path)

data/lib/translatable_records/active_record/base.rb

@@ -8,18 +8,18 @@ module TranslatableRecords
         def translatable?
           translatable_attrs.any?
         end
-     
+ 
         def translatable_attrs
           @translatable_attrs ||= []
         end
 
         def attr_translatable(*args)
           make_translatable unless translatable?
-          args.each do |name| 
+          args.each do |name|
             define_translatable_attribute_methods name
             translatable_attrs << name
           end
-        end 
+        end
 
         protected
 
@@ -27,29 +27,28 @@ module TranslatableRecords
           include TranslatableRecords::ActiveRecord::Translatable
           default_scope -> { includes(:translations) }
           attr_accessible :translations_attributes if Rails::VERSION::MAJOR < 4
-          has_many :translations, class_name: "#{name}Translation", autosave: true, dependent: :destroy    
-          accepts_nested_attributes_for :translations                                        
+          has_many :translations, class_name: "#{name}Translation", autosave: true, dependent: :destroy
+          accepts_nested_attributes_for :translations
         end
 
         def define_translatable_attribute_methods(attr)
-          ['setter', 'getter'].each { |method| send "define_translatable_attribute_#{method}", attr }
+          %w(setter getter).each { |method| send "define_translatable_attribute_#{method}", attr }
         end
 
         def define_translatable_attribute_setter(attr)
           name = :"#{attr}="
-          define_method name do |value|  
+          define_method name do |value|
             t = translation_by_locale(current_locale)
             t ? t.send(name, value) : translations.build(locale: current_locale.to_s, attr.to_sym => value)
-          end        
+          end
         end
 
         def define_translatable_attribute_getter(attr)
-          ['', '_was', '_changed?'].each do |suffix|
+          %w(_was _changed?).unshift('').each do |suffix|
             name = :"#{attr}#{suffix}"
             define_method name do
-              t = translation_by_locale(current_locale)
-              t ? t.send(name) : nil
-            end           
+              translation_by_locale(current_locale).try(name)
+            end
           end
         end
 

data/lib/translatable_records/active_record/translatable.rb

@@ -4,7 +4,7 @@ module TranslatableRecords
       extend ActiveSupport::Concern
  
       def with_locale(locale)
-        @locale = locale.to_sym
+        @current_locale = locale.to_sym
       end
  
       def build_translations
@@ -14,11 +14,11 @@ module TranslatableRecords
       protected
  
       def current_locale
-        @locale || I18n.locale
+        @current_locale || I18n.locale
       end
  
       def translation_by_locale(locale)
-        translations.find { |t| t.locale == locale.to_s } || translations.find_by_locale(locale)
+        translations.to_a.find { |t| t.locale == locale.to_s } || translations.find_by_locale(locale)
       end
  
     end

data/lib/translatable_records/version.rb

@@ -1,5 +1,5 @@
 module TranslatableRecords
 
-  VERSION = '1.0.7'
+  VERSION = '1.1.1'
 
 end

data/test/dummy/app/models/model.rb

@@ -1,3 +1,4 @@
 class Model < ActiveRecord::Base
+  attr_accessible :name if Rails::VERSION::MAJOR < 4
   attr_translatable :name
 end

data/test/dummy/app/models/model_translation.rb

@@ -1,9 +1,8 @@
 class ModelTranslation < ActiveRecord::Base
-  
+ 
   belongs_to :models
-  
-  validates :locale, presence: true    
-  validates :locale, inclusion: { in: I18n.available_locales.map(&:to_s) }
-  validates :model_id, uniqueness: { scope: :locale }  
-  
+ 
+  validates :locale, presence: true
+  validates :model_id, uniqueness: { scope: :locale }
+ 
 end

data/test/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require "translatable_records"
+require 'translatable_records'
 
 module Dummy
   class Application < Rails::Application
@@ -18,6 +18,5 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-    I18n.enforce_available_locales = false
   end
 end

data/test/dummy/config/initializers/secret_token.rb

@@ -9,4 +9,5 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
+Dummy::Application.config.secret_token = '7df7e2131e8049bf1397fd7586bd3dfa812f69914f258ee99734a62b8cc16896147a9276e35b6349629341cf1a9b62025e277ea721be144377dbc3979e90a629'
 Dummy::Application.config.secret_key_base = '7df7e2131e8049bf1397fd7586bd3dfa812f69914f258ee99734a62b8cc16896147a9276e35b6349629341cf1a9b62025e277ea721be144377dbc3979e90a629'

data/test/dummy/db/migrate/20130819155126_create_models.rb

@@ -1,7 +1,6 @@
 class CreateModels < ActiveRecord::Migration
   def change
     create_table :models do |t|
-      t.string :name
 
       t.timestamps
     end

data/test/dummy/db/schema.rb

@@ -9,11 +9,11 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended that you check this file into your version control system.
+# It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130819165249) do
+ActiveRecord::Schema.define(:version => 20130819165249) do
 
-  create_table "model_translations", force: true do |t|
+  create_table "model_translations", :force => true do |t|
     t.integer  "model_id"
     t.string   "locale"
     t.string   "name"
@@ -21,11 +21,10 @@ ActiveRecord::Schema.define(version: 20130819165249) do
     t.datetime "updated_at"
   end
 
-  add_index "model_translations", ["locale"], name: "index_model_translations_on_locale"
-  add_index "model_translations", ["model_id"], name: "index_model_translations_on_model_id"
+  add_index "model_translations", ["locale"], :name => "index_model_translations_on_locale"
+  add_index "model_translations", ["model_id"], :name => "index_model_translations_on_model_id"
 
-  create_table "models", force: true do |t|
-    t.string   "name"
+  create_table "models", :force => true do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
   end