simple_localizer 0.0.4 → 0.0.5

data/Gemfile

@@ -8,4 +8,6 @@ group :development do
   gem "jeweler", "~> 1.8.4"
   gem 'database_cleaner'
   gem 'sqlite3'
+  gem 'rails', '3.2.10'
+  gem 'rack', '1.4.1'
 end

data/Gemfile.lock

@@ -1,31 +1,78 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.7)
-      activesupport (= 3.2.7)
+    actionmailer (3.2.10)
+      actionpack (= 3.2.10)
+      mail (~> 2.4.4)
+    actionpack (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
       builder (~> 3.0.0)
-    activerecord (3.2.7)
-      activemodel (= 3.2.7)
-      activesupport (= 3.2.7)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.10)
+      activesupport (= 3.2.10)
+      builder (~> 3.0.0)
+    activerecord (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.7)
+    activeresource (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+    activesupport (3.2.10)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
-    database_cleaner (0.8.0)
+    builder (3.0.4)
+    database_cleaner (0.9.1)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     git (1.2.5)
-    i18n (0.6.0)
+    hike (1.2.1)
+    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.4)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
+    journey (1.0.4)
+    json (1.7.6)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    multi_json (1.5.0)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.10)
+      actionmailer (= 3.2.10)
+      actionpack (= 3.2.10)
+      activerecord (= 3.2.10)
+      activeresource (= 3.2.10)
+      activesupport (= 3.2.10)
+      bundler (~> 1.0)
+      railties (= 3.2.10)
+    railties (3.2.10)
+      actionpack (= 3.2.10)
+      activesupport (= 3.2.10)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     rspec (2.8.0)
@@ -36,8 +83,18 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    sqlite3 (1.3.6)
-    tzinfo (0.3.33)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.7)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -47,5 +104,7 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   database_cleaner
   jeweler (~> 1.8.4)
+  rack (= 1.4.1)
+  rails (= 3.2.10)
   rspec (~> 2.8.0)
   sqlite3

data/Rakefile

@@ -10,6 +10,11 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'rake'
+require 'rspec/core/rake_task'
+require File.expand_path('spec/dummy/config/application', File.dirname(__FILE__))
+
+Dummy::Application.load_tasks
+
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
@@ -23,36 +28,71 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
+RSpec::Core::RakeTask.new(:spec)
+
 task :default => :spec
 
-namespace :db do
-  require 'active_record'
-
-  config = YAML.load_file File.expand_path(File.join(File.dirname(__FILE__), 'spec', 'database.yml'))
-  ActiveRecord::Base.establish_connection(config.merge('schema_search_path' => 'public'))
-
-  desc 'Run migrations'
-  task :migrate do
-    ActiveRecord::Migration.create_table :admin_catalogs do |t|
-      t.timestamps
-    end
-
-    ActiveRecord::Migration.create_table :admin_catalog_translations do |t|
-      t.string :locale
-      t.string :name
-      t.integer :admin_catalog_id
-      t.timestamps
-    end
-
-    ActiveRecord::Migration.create_table :products do |t|
-      t.timestamps
-    end
-
-    ActiveRecord::Migration.create_table :product_translations do |t|
-      t.string :locale
-      t.string :name
-      t.integer :product_id
-      t.timestamps
-    end
-  end
-end
+# namespace :db do
+#   require 'active_record'
+
+#   config = YAML.load_file File.expand_path(File.join(File.dirname(__FILE__), 'spec', 'database.yml'))
+#   ActiveRecord::Base.establish_connection(config.merge('schema_search_path' => 'public'))
+
+#   desc 'Drop database'
+#   task :drop do
+#     system('rm spec/db/test.sqlite3')
+#   end
+
+#   desc 'Drop database and run migrations'
+#   task :setup do
+#     Rake::Task["db:drop"].invoke
+#     Rake::Task["db:migrate"].invoke
+#   end
+
+#   desc 'Run migrations'
+#   task :migrate do
+#     ActiveRecord::Migration.create_table :admin_catalogs do |t|
+#       t.timestamps
+#     end
+
+#     ActiveRecord::Migration.create_table :admin_catalog_translations do |t|
+#       t.string :locale
+#       t.string :name
+#       t.integer :admin_catalog_id
+#       t.timestamps
+#     end
+
+#     ActiveRecord::Migration.create_table :restaurants do |t|
+#       t.timestamps
+#     end
+
+#     ActiveRecord::Migration.create_table :food_restaurant_translations do |t|
+#       t.string :locale
+#       t.string :name
+#       t.integer :food_restaurant_id
+#       t.timestamps
+#     end
+
+#     ActiveRecord::Migration.create_table :qweqweqwe do |t|
+#       t.timestamps
+#     end
+
+#     ActiveRecord::Migration.create_table :legacy_service_translations do |t|
+#       t.string :locale
+#       t.string :name
+#       t.integer :legacy_service_id
+#       t.timestamps
+#     end
+
+#     ActiveRecord::Migration.create_table :products do |t|
+#       t.timestamps
+#     end
+
+#     ActiveRecord::Migration.create_table :product_translations do |t|
+#       t.string :locale
+#       t.string :name
+#       t.integer :product_id
+#       t.timestamps
+#     end
+#   end
+# end

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/generators/simple_localizer/create_migration_generator.rb

@@ -24,7 +24,7 @@ module SimpleLocalizer
       def create_migration
         migration_template(
           "create_translations.rb",
-          "db/migrate/create_#{model_name.underscore}_translations",
+          "db/migrate/create_#{model_name.underscore.gsub("/", "_")}_translations",
         )
       end
     end

data/lib/generators/simple_localizer/templates/create_translations.rb

@@ -1,10 +1,11 @@
-<% table_name = ":#{model_name.underscore}_translations" -%>
-<% owner_id   = ":#{model_name.underscore}_id" -%>
-class Create<%= model_name.camelcase -%>Translations < ActiveRecord::Migration
+<% underscore_name = model_name.underscore.gsub("/", "_") -%>
+<% table_name      = ":#{underscore_name}_translations" -%>
+<% foreign_key     = ":#{underscore_name}_id" -%>
+class Create<%= underscore_name.camelize -%>Translations < ActiveRecord::Migration
   def change
     create_table <%= table_name -%> do |t|
       t.string :locale, :null => false
-      t.integer <%=  owner_id -%>
+      t.integer <%=  foreign_key -%>
       <% fields.each_pair do |column, type| %>
       t.<%= type %> <%= ":#{column}" -%>
       <% end %>
@@ -12,8 +13,12 @@ class Create<%= model_name.camelcase -%>Translations < ActiveRecord::Migration
       t.timestamps
     end
 
-    add_index <%= table_name -%>, <%= owner_id %>
-    add_index <%= table_name -%>, :locale
-    add_index <%= table_name -%>, [:locale, <%= owner_id -%>], :unique => true
+    <%- random_string = proc { (0...20).map{ ('a'..'z').to_a[rand(26)] }.join } -%>
+    <%- options = ActiveRecord::Migration.index_name(table_name, foreign_key).size > 64 ? { :name => random_string.call } : {} -%>
+    add_index <%= table_name -%>, <%= foreign_key %>, <%= p(options) %>
+    <%- options = ActiveRecord::Migration.index_name(table_name, :locale).size > 64 ? { :name => random_string.call } : {} -%>
+    add_index <%= table_name -%>, :locale, <%= p(options) %>
+    <%- options = ActiveRecord::Migration.index_name(table_name, [:locale, foreign_key]).size > 64 ? { :name => random_string.call } : {} -%>
+    add_index <%= table_name -%>, [:locale, <%= foreign_key -%>], <%= p(options.merge(:unique => true)) %>
   end
-end
+end

data/lib/simple_localizer.rb

@@ -24,19 +24,27 @@ module SimpleLocalizer
 
   module ClassMethods
     def translates *columns
-      underscore_name = name.underscore.gsub("/", "_")
+      underscore_name = name.underscore.gsub("/", "_").to_sym
+      foreign_key     = "#{underscore_name}_id".to_sym
+
       translation_class = const_set(:Translation, Class.new(ActiveRecord::Base))
       translated_attribute_names = columns.map &:to_s
 
       translation_class.table_name = "#{underscore_name}_translations"
-      translation_class.belongs_to underscore_name.to_sym # WORKAROUND Rails prefers association name to be symbol
+      translation_class.belongs_to(underscore_name, # WORKAROUND Rails prefers association name to be symbol
+        :class_name  => self.name,
+        :foreign_key => foreign_key
+      )
       translation_class.validates :locale, :presence => true
-      translation_class.validates :locale, :uniqueness => { :scope => ["#{underscore_name}_id"] }
+      translation_class.validates underscore_name, :presence => true
+      translation_class.validates :locale, :uniqueness => { :scope => foreign_key }
 
       has_many(:translations,
-        :class_name => translation_class.name,
-        :dependent  => :destroy,
-        :autosave   => true
+        :dependent   => :destroy,
+        :autosave    => true,
+        :class_name  => translation_class.name,
+        :inverse_of  => underscore_name,
+        :foreign_key => foreign_key
       )
 
       translated_attribute_names.each do |attr|
@@ -62,7 +70,7 @@ module SimpleLocalizer
             if I18n.respond_to?(:fallbacks) && translation.try(attr).nil?
               fallbacks_locales = I18n.fallbacks[locale.to_sym]
               translation = translations.detect { |translation|
-                fallbacks_locales.include? translation.locale.to_sym
+                fallbacks_locales.include?(translation.locale.to_sym) && translation.send(attr).present?
               }
             end
 

data/simple_localizer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "simple_localizer"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["vad4msiu"]
-  s.date = "2013-01-17"
+  s.date = "2013-01-23"
   s.description = "Simple localization your ActiveRecord fields without magic"
   s.email = "vad4msiu@gmail.com"
   s.extra_rdoc_files = [
@@ -27,8 +27,78 @@ Gem::Specification.new do |s|
     "lib/generators/simple_localizer/templates/create_translations.rb",
     "lib/simple_localizer.rb",
     "simple_localizer.gemspec",
-    "spec/database.yml",
-    "spec/db/test.sqlite3",
+    "spec/dummy/.gitignore",
+    "spec/dummy/Gemfile",
+    "spec/dummy/Gemfile.lock",
+    "spec/dummy/README.rdoc",
+    "spec/dummy/Rakefile",
+    "spec/dummy/app/assets/images/rails.png",
+    "spec/dummy/app/assets/javascripts/application.js",
+    "spec/dummy/app/assets/stylesheets/application.css",
+    "spec/dummy/app/controllers/application_controller.rb",
+    "spec/dummy/app/helpers/application_helper.rb",
+    "spec/dummy/app/mailers/.gitkeep",
+    "spec/dummy/app/models/admin.rb",
+    "spec/dummy/app/models/admin/catalog.rb",
+    "spec/dummy/app/models/food.rb",
+    "spec/dummy/app/models/food/restaurant.rb",
+    "spec/dummy/app/models/legacy.rb",
+    "spec/dummy/app/models/legacy/service.rb",
+    "spec/dummy/app/models/product.rb",
+    "spec/dummy/app/views/layouts/application.html.erb",
+    "spec/dummy/config.ru",
+    "spec/dummy/config/application.rb",
+    "spec/dummy/config/boot.rb",
+    "spec/dummy/config/database.yml",
+    "spec/dummy/config/environment.rb",
+    "spec/dummy/config/environments/development.rb",
+    "spec/dummy/config/environments/production.rb",
+    "spec/dummy/config/environments/test.rb",
+    "spec/dummy/config/initializers/backtrace_silencers.rb",
+    "spec/dummy/config/initializers/inflections.rb",
+    "spec/dummy/config/initializers/mime_types.rb",
+    "spec/dummy/config/initializers/secret_token.rb",
+    "spec/dummy/config/initializers/session_store.rb",
+    "spec/dummy/config/initializers/wrap_parameters.rb",
+    "spec/dummy/config/locales/en.yml",
+    "spec/dummy/config/routes.rb",
+    "spec/dummy/db/migrate/20130123145651_create_admin_catalogs.rb",
+    "spec/dummy/db/migrate/20130123151746_create_food_restaurants.rb",
+    "spec/dummy/db/migrate/20130123151803_create_legacy_services.rb",
+    "spec/dummy/db/migrate/20130123151814_create_products.rb",
+    "spec/dummy/db/migrate/20130123200420_create_admin_catalog_translations.rb",
+    "spec/dummy/db/migrate/20130123200525_create_food_restaurant_translations.rb",
+    "spec/dummy/db/migrate/20130123200536_create_legacy_service_translations.rb",
+    "spec/dummy/db/migrate/20130123200543_create_product_translations.rb",
+    "spec/dummy/db/schema.rb",
+    "spec/dummy/db/seeds.rb",
+    "spec/dummy/lib/assets/.gitkeep",
+    "spec/dummy/lib/tasks/.gitkeep",
+    "spec/dummy/log/.gitkeep",
+    "spec/dummy/public/404.html",
+    "spec/dummy/public/422.html",
+    "spec/dummy/public/500.html",
+    "spec/dummy/public/favicon.ico",
+    "spec/dummy/public/index.html",
+    "spec/dummy/public/robots.txt",
+    "spec/dummy/script/rails",
+    "spec/dummy/test/fixtures/.gitkeep",
+    "spec/dummy/test/fixtures/admin/catalogs.yml",
+    "spec/dummy/test/fixtures/food/restaurants.yml",
+    "spec/dummy/test/fixtures/legacy/services.yml",
+    "spec/dummy/test/fixtures/products.yml",
+    "spec/dummy/test/functional/.gitkeep",
+    "spec/dummy/test/integration/.gitkeep",
+    "spec/dummy/test/performance/browsing_test.rb",
+    "spec/dummy/test/test_helper.rb",
+    "spec/dummy/test/unit/.gitkeep",
+    "spec/dummy/test/unit/admin/catalog_test.rb",
+    "spec/dummy/test/unit/food/restaurant_test.rb",
+    "spec/dummy/test/unit/legacy/service_test.rb",
+    "spec/dummy/test/unit/product_test.rb",
+    "spec/dummy/vendor/assets/javascripts/.gitkeep",
+    "spec/dummy/vendor/assets/stylesheets/.gitkeep",
+    "spec/dummy/vendor/plugins/.gitkeep",
     "spec/simple_localizer_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -48,6 +118,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<rails>, ["= 3.2.10"])
+      s.add_development_dependency(%q<rack>, ["= 1.4.1"])
     else
       s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
@@ -55,6 +127,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<rails>, ["= 3.2.10"])
+      s.add_dependency(%q<rack>, ["= 1.4.1"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 0"])
@@ -63,6 +137,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<rails>, ["= 3.2.10"])
+    s.add_dependency(%q<rack>, ["= 1.4.1"])
   end
 end
 

data/spec/dummy/.gitignore

@@ -0,0 +1,15 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp

data/spec/dummy/Gemfile

@@ -0,0 +1,40 @@
+source 'https://rubygems.org'
+
+gem 'rails', '3.2.10'
+gem 'rack', '1.4.1'
+
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'sqlite3'
+
+gem 'simple_localizer', :path => File.expand_path("../../../", __FILE__)
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  # gem 'therubyracer', :platforms => :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'debugger'

data/spec/dummy/Gemfile.lock

@@ -0,0 +1,120 @@
+PATH
+  remote: /Users/vad4msiu/projects/github/simple_localizer
+  specs:
+    simple_localizer (0.0.4)
+      activerecord
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.10)
+      actionpack (= 3.2.10)
+      mail (~> 2.4.4)
+    actionpack (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.10)
+      activesupport (= 3.2.10)
+      builder (~> 3.0.0)
+    activerecord (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.10)
+      activemodel (= 3.2.10)
+      activesupport (= 3.2.10)
+    activesupport (3.2.10)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    builder (3.0.4)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.4.0)
+    erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    hike (1.2.1)
+    i18n (0.6.1)
+    journey (1.0.4)
+    jquery-rails (2.2.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    json (1.7.6)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.19)
+    multi_json (1.5.0)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.10)
+      actionmailer (= 3.2.10)
+      actionpack (= 3.2.10)
+      activerecord (= 3.2.10)
+      activeresource (= 3.2.10)
+      activesupport (= 3.2.10)
+      bundler (~> 1.0)
+      railties (= 3.2.10)
+    railties (3.2.10)
+      actionpack (= 3.2.10)
+      activesupport (= 3.2.10)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
+    rdoc (3.12)
+      json (~> 1.4)
+    sass (3.2.5)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.7)
+    thor (0.16.0)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.35)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coffee-rails (~> 3.2.1)
+  jquery-rails
+  rack (= 1.4.1)
+  rails (= 3.2.10)
+  sass-rails (~> 3.2.3)
+  simple_localizer!
+  sqlite3
+  uglifier (>= 1.0.3)