lolita-translation 0.6.3 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fc20174ac98f712d9ee2a4f45973cc8cca9e0286
+  data.tar.gz: cc14813d6a22f407017347e9e4cb467368e859c2
+SHA512:
+  metadata.gz: b90088d1f9c8cbc0b7ef7e296da256847a64c39ca0132dcad28e1198fc26cb5ba6282ec22cc9e8757e8b5a89765112261a90e5a77f7cbadbd5956e293170c4e2
+  data.tar.gz: b1bcdf5e21767e1fb38c6d476fa9570619be40c5e47bb8829b24061753e5b6793d918bd4b10a503faac03681ef36b6eadf411e7f3931cc0de3413b2d29ee2565

data/Gemfile

@@ -1,3 +1,15 @@
-source :rubygems
+source "http://rubygems.org"
+
 gemspec
 
+group :test do
+  gem 'rails', '~> 3.2.12'
+  gem 'rspec-rails', '~> 2.14'
+  gem 'ffaker', '~> 1.16.2'
+  gem 'capybara', '~> 2.1'
+  gem 'selenium-webdriver', '~> 2.33.0'
+  gem 'sqlite3', '~> 1.3.7'
+  gem 'byebug'
+  gem 'cover_me'
+  gem "coffee-rails"
+end

data/README.md

@@ -6,7 +6,7 @@
     gem "lolita-translation"
 
 ### Usage
-    
+
 1. Add `include Lolita::Translation` in your model.
 2. Call `translate :title, :body` in your model and pass column names to translate.
 3. Add `Article.sync_translation_table!` to your `db/seeds.rb` and run it.
@@ -20,7 +20,7 @@ Translations table holds only translations, but not the original data from defau
 
     I18n.default_locale = :en
     I18n.locale = :lv
-    
+
     a = Article.create :title => "Title in EN"
     a.title # returns blank, because current locale is LV and there is no translation in it
     #=> ""
@@ -29,7 +29,7 @@ Translations table holds only translations, but not the original data from defau
     #=> "Title in EN"
     a.translations.create :title => "Title in LV", :locale => 'lv'
     I18n.locale = :lv
-    a.title 
+    a.title
     #=> "Title in LV"
 
 When a "find" is executed and current language is not the same as default language then `:translations` are added to `:includes` to pre fetch all translations.
@@ -41,6 +41,6 @@ The `ModelNameTranslation` class is created for you automaticly with all validat
 
 Inspired by http://github.com/dmitry/has_translations
 
-### License 
+### License
 
 Copyright © 2011 ITHouse. See LICENSE.txt for further details.

data/Rakefile

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'bundler'
+require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
-
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/app/assets/javascripts/lolita/translation/application.js

@@ -1,7 +1,6 @@
 $(function(){
-  $(".tab-language-switch li").live("click",function(){
+  $(".tab-language-switch li").on("click",function(){
     $(this).parent().children("li").removeClass("active");
-    //$(".tab-language-switch li").removeClass("active");
     $(this).addClass("active");
     var locale = $(this).data("locale"),
         tab_name = $(this).data("tab"),

data/lib/lolita-translation/builder/abstract_builder.rb

@@ -43,13 +43,13 @@ module Lolita
         def override_klass_attributes method_names
           method_names.each do |method_name, attribute|
             validate_attribute_method_and_attribute(method_name, attribute)
-            base_klass.instance_eval do 
-              define_method(method_name) do 
+            base_klass.instance_eval do
+              define_method(method_name) do
                 translation_record.attribute(attribute)
               end
             end
           end
-        end 
+        end
 
         private
 
@@ -59,7 +59,7 @@ module Lolita
 
         def validate_attribute_method_and_attribute(method_name, attribute)
           raise ArgumentError.new("#{method_name} is not valid attribute reader name") unless method_name
-          raise ArgumentError.new("#{attribute} is not valid attribute name") unless attribute 
+          raise ArgumentError.new("#{attribute} is not valid attribute name") unless attribute
         end
 
         def implementation_warn
@@ -100,4 +100,4 @@ module Lolita
 
     end
   end
-end 
+end

data/lib/lolita-translation/builder/active_record_builder.rb

@@ -20,8 +20,8 @@ module Lolita
 
         def override_klass_attributes(attributes)
           add_ar_klass_attr_accessible(attributes + default_attributes)
-          expanded_attributes = attributes.inject({}){|hsh,attribute| 
-            hsh[attribute] = attribute 
+          expanded_attributes = attributes.inject({}){|hsh,attribute|
+            hsh[attribute] = attribute
             hsh
           }
           super(expanded_attributes)
@@ -34,14 +34,14 @@ module Lolita
         end
 
         def add_ar_klass_attr_accessible attributes
-          klass.class_eval do 
+          klass.class_eval do
             attr_accessible :locale, *attributes
           end
         end
 
         def add_ar_klass_associations
           if self.configuration
-            klass.belongs_to association_name, :inverse_of => translations_association_name
+            klass.belongs_to association_name
           end
         end
 
@@ -50,13 +50,13 @@ module Lolita
             ar_translation_builder = self
 
             klass.validates(:locale,{
-              :presence => true, 
+              :presence => true,
               :uniqueness => {:scope => association_key},
             })
             klass.validates(association_name, :presence => true, :on => :update)
             klass.validates_each(:locale) do |record, attr, value|
               original_record = record.send(ar_translation_builder.association_name)
-              if original_record && original_record.original_locale.to_s == value.to_s 
+              if original_record && original_record.original_locale.to_s == value.to_s
                 record.errors.add(attr, 'is used as default locale')
               end
             end
@@ -65,8 +65,8 @@ module Lolita
 
         def add_ar_klass_class_methods
           ar_translation_builder = self
-          klass.singleton_class.instance_eval do 
-            define_method(:table_name) do 
+          klass.singleton_class.instance_eval do
+            define_method(:table_name) do
               ar_translation_builder.table_name
             end
           end
@@ -75,10 +75,9 @@ module Lolita
         def call_base_klass_class_methods
           if self.configuration
             base_klass.has_many(translations_association_name, {
-              :class_name => class_name, 
-              :foreign_key => association_key, 
-              :dependent => :destroy,
-              :inverse_of => association_name
+              :class_name => class_name,
+              :foreign_key => association_key,
+              :dependent => :destroy
             })
             base_klass.accepts_nested_attributes_for translations_association_name, :allow_destroy => true, :reject_if => nested_attributes_rejection_proc
             base_klass.attr_accessible :translations_attributes,  locale_field_name
@@ -94,11 +93,11 @@ module Lolita
         def add_validations_to_base_klass
           if base_klass.column_names.include?(locale_field_name.to_s)
             base_klass.validates locale_field_name, :presence => true
-            base_klass.before_validation do 
+            base_klass.before_validation do
               def_locale = self.send(self.translations_configuration.locale_field_name)
               unless def_locale
                 self.send(:"#{self.translations_configuration.locale_field_name}=",self.translation_record.system_current_locale)
-              end 
+              end
             end
           end
         end

data/lib/lolita-translation/configuration.rb

@@ -4,7 +4,7 @@ module Lolita
 
     def self.included(base)
       base.extend(Lolita::Translation::ORM::ClassMethods)
-      base.class_eval do 
+      base.class_eval do
         include Lolita::Translation::ORM::InstanceMethods
       end
     end
@@ -30,7 +30,7 @@ module Lolita
       end
 
       def locales
-        if options[:locales] 
+        if options[:locales]
           Lolita::Translation::Locales.new(options[:locales])
         else
           Lolita::Translation.locales
@@ -54,7 +54,7 @@ module Lolita
       end
 
       private
-      
+
       def build_translation_class
         @builder            = Lolita::Translation::TranslationClassBuilder.new(self.klass, self)
         @translation_class  = @builder.build_class
@@ -64,4 +64,4 @@ module Lolita
     end
 
   end
-end 
+end

data/lib/lolita-translation/locales.rb

@@ -25,7 +25,7 @@ module Lolita
           else
             result.push(locale)
           end
-          result 
+          result
         end
       end
 
@@ -50,7 +50,7 @@ module Lolita
       end
 
       def populate_locales!
-        unless @locales 
+        unless @locales
           @locales = locale_names.map do |locale_name|
             Lolita::Translation::Locale.new(locale_name)
           end

data/lib/lolita-translation/lolita/component_hooks.rb

@@ -7,7 +7,7 @@ end
 
 Lolita::Hooks.component(:"/lolita/configuration/tab/fields").after do
   tab = self.component_locals[:tab]
-  if tab.translatable?  
+  if tab.translatable?
     self.render_component tab.build_translations_nested_form(self.resource)
   end
 end
@@ -16,12 +16,12 @@ Lolita::Hooks.component(:"/lolita/configuration/tab/fields").around do
   tab = self.component_locals[:tab]
   if tab.translatable?
     content = nil
-    resource.in(resource.original_locale) do 
+    resource.in(resource.original_locale) do
       content = let_content
     end
     self.send(:render_component,"lolita/translation",:language_wrap, {
-      :tab => tab, 
-      :content => content, 
+      :tab => tab,
+      :content => content,
       :active => true,
       :translation_locale => resource.original_locale
     })
@@ -34,8 +34,8 @@ Lolita::Hooks.component(:"/lolita/configuration/nested_form/fields").around do
   tab = self.component_locals[:nested_form].parent
   if tab.translatable? && current_form.object.respond_to?(:locale)
     self.send(:render_component,"lolita/translation",:language_wrap, {
-      :tab => tab, 
-      :content => let_content, 
+      :tab => tab,
+      :content => let_content,
       :active => false,
       :translation_locale => current_form.object.locale
     })

data/lib/lolita-translation/record.rb

@@ -41,7 +41,7 @@ module Lolita
         def has_translation_for?(locale)
           nil
         end
-    
+
         private
 
         def adapter
@@ -80,7 +80,7 @@ module Lolita
         end
 
         def locale
-          if has_locale_column? 
+          if has_locale_column?
             if value = orm_record.attributes[locale_field] and value.to_s.size > 0
               value
             else
@@ -88,7 +88,7 @@ module Lolita
             end
           else
             system_default_locale
-          end  
+          end
         end
 
         def attribute(name)
@@ -128,14 +128,14 @@ module Lolita
         end
 
         def find_translation_by_locale given_locale
-          translations.detect{|translation| 
+          translations.detect{|translation|
             translation.locale.to_s == given_locale.to_s
           }
         end
       end
 
       class MongoidRecord < AbstractRecord
-        
+
       end
 
       attr_reader :original_record, :default_locale, :orm_wrapper
@@ -158,7 +158,7 @@ module Lolita
 
       def build_nested_translations
         available_locales.each do |locale|
-          unless self.default_locale.to_s == locale.to_s 
+          unless self.default_locale.to_s == locale.to_s
             attributes = { :locale => locale.to_s }
             original_record.translations.build(attributes) unless orm_wrapper.has_translation_for?(locale)
           end
@@ -167,7 +167,7 @@ module Lolita
 
       def default_locale=(value)
         @orm_wrapper.default_locale = value
-      end 
+      end
 
       def in(locale)
         old_locale = @record_current_locale
@@ -181,7 +181,7 @@ module Lolita
       def system_current_locale
         ::I18n.locale
       end
-      
+
       private
 
       def available_locales
@@ -199,7 +199,7 @@ module Lolita
           MongoidRecord.new(original_record,@configuration)
         else
           AbstractRecord.new(original_record,@configuration)
-        end 
+        end
       end
 
       def is_mongoid_record?

data/lib/lolita-translation/version.rb

@@ -2,8 +2,8 @@ module Lolita
   module Translation
     module Version
       MAJOR = 0
-      MINOR = 6
-      PATCH = 3
+      MINOR = 7
+      PATCH = 0
       BUILD = nil
 
       STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lolita-translation.gemspec

@@ -18,19 +18,8 @@ Gem::Specification.new do |s|
   ]
   s.licenses = ["MIT"]
 
-  s.add_runtime_dependency(%q<lolita>, ["~> 3.2.0.rc.14"])
-
-  s.add_development_dependency(%q<rails>, ["~> 3.2.3"])
-  s.add_development_dependency(%q<rspec>, ["~> 2.9.0"])
-  s.add_development_dependency(%q<rspec-rails>, ["~> 2.9.0"])
-  s.add_development_dependency(%q<ffaker>, ["~> 1"])
-  s.add_development_dependency(%q<capybara>, ["~> 1.1.2"])
-  s.add_development_dependency(%q<capybara-webkit>, ["~> 0.11.0"])
-  s.add_development_dependency(%q<cover_me>, ["~> 1.2.0"])
-  s.add_development_dependency(%q<sqlite3>, ["~> 1.3.6"])
-  s.add_development_dependency(%q<debugger>,[">0"])
-
+  s.add_runtime_dependency(%q<lolita>, ["~> 3.2"])
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- {spec}/*`.split("\n")
   s.require_paths = ["lib"]
 end

data/spec/features/record_language_switch_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+feature "In order to translate resource As system user I want to switch from original resource to translations" do
+
+  scenario "As user in resource create form I see language switch and current language is active and I can switch to other languages" do
+    visit "/lolita/posts/new"
+    language_selector_text = page.find(".tab-language-switch").text
+    ::I18n.available_locales.each do |locale|
+      language_selector_text.should match(/#{locale.to_s.capitalize}/)
+    end
+  end
+
+end

data/spec/{requests → features}/record_saving_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe "In order to internationalize all content I can enter information in any language and translate to any other language" do 
-  
+feature "In order to internationalize all content I can enter information in any language and translate to any other language", js: true do
+
   def click_save_btn
     save_btn = page.find("button[data-type='save&close']")
     save_btn.click
@@ -12,7 +12,7 @@ describe "In order to internationalize all content I can enter information in an
     Category.create!(default_options.merge(options))
   end
 
-  it "As user I can enter information in same language as system uses and resource will be stored in that language" do 
+  scenario "As user I can enter information in same language as system uses and resource will be stored in that language" do
     visit "/lolita/posts/new"
     fill_in "post_title", :with => "lv-title"
     fill_in "post_body", :with => "lv-body"
@@ -21,7 +21,7 @@ describe "In order to internationalize all content I can enter information in an
     page.should have_content("lv-body")
   end
 
-  it "As user I can enter information in language that I am using currently and original resource will be save in that language" do 
+  scenario "As user I can enter information in language that I am using currently and original resource will be save in that language" do
     visit "/lolita/posts/new?locale=ru"
     fill_in "post_title", :with => "ru-title"
     fill_in "post_body", :with => "ru-body"
@@ -31,8 +31,8 @@ describe "In order to internationalize all content I can enter information in an
     page.should have_content("ru-body")
   end
 
-  it "As user I can open previously saved resource, in different language than mine, and resource will be shown in resource original language and I will see that" do 
-    I18n.locale = :ru 
+  scenario "As user I can open previously saved resource, in different language than mine, and resource will be shown in resource original language and I will see that" do
+    I18n.locale = :ru
     category = create_category(:name => "ru-name")
     visit("/lolita/categories/#{category.id}/edit?locale=lv")
     page.should have_selector(".tab-language-switch li.active", :text => "Ru")
@@ -40,8 +40,8 @@ describe "In order to internationalize all content I can enter information in an
     ru_content.should be_visible
   end
 
-  it "As user I can open previously saved resource, in different language than mine, and change original information and that information will be save in original resource" do 
-    I18n.locale = :ru 
+  scenario "As user I can open previously saved resource, in different language than mine, and change original information and that information will be save in original resource" do
+    I18n.locale = :ru
     category = create_category(:name => "ru-name")
     visit("/lolita/categories/#{category.id}/edit?locale=lv")
     page.fill_in "category_name", :with => "changed-ru-name"
@@ -51,9 +51,9 @@ describe "In order to internationalize all content I can enter information in an
     name_inp.value.should eq("changed-ru-name")
   end
 
-  it "As user I can open previously saved resource, in different language than mine, and change information for my language, and it will be saved as translation", :js => true do 
+  scenario "As user I can open previously saved resource, in different language than mine, and change information for my language, and it will be saved as translation", :js => true do
     pending "test gives time, should check why not error but timeout"
-    # I18n.locale = :ru 
+    # I18n.locale = :ru
     # category = create_category(:name => "ru-name")
     # visit("/lolita/categories/#{category.id}/edit?locale=lv")
     # page.execute_script(%Q{$(".tab-language-switch li[data-locale='lv']").click()})