lolita-translation 0.2.18 → 0.3.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "lolita", "3.1.18"
+gem "lolita", ">=3.2.0.rc.3"
 group :development do
   gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
@@ -9,7 +9,7 @@ group :development do
 end
 
 group :test do
-  gem "rails", "~>3.0.0"
+  gem "rails", "~>3.1.0"
   gem "rspec","~>2.6.0"
   gem "rspec-rails", "~>2.6.0"
   gem "webmock", "~> 1.7.6"

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.3.0

data/lib/lolita-translation/configuration.rb

@@ -80,11 +80,7 @@ module Lolita
       # <tt>all_translations</tt> method that returns all possible translations in
       # ordered hash (useful when creating forms with nested attributes).
       def translations *attrs
-        @translations_config ||= Lolita::Translation::Configuration.new(self,*attrs)
-        if block_given?
-          yield @translations_config
-        end
-        @translations_config
+        @config ||= Lolita::Translation::Configuration.new(self,*attrs)
       end
     end
 
@@ -108,8 +104,8 @@ module Lolita
         config = self
         @klass.class_eval do
     
-          class_attribute :has_translations_options
-          self.has_translations_options = config.options
+          class_attribute :has_translation_options
+          self.has_translation_options = config.options
 
           class_attribute :columns_has_translations
           self.columns_has_translations = (columns rescue []).collect{|col| col if config.attrs.include?(col.name.to_sym)}.compact

data/lib/lolita-translation/model.rb

@@ -23,8 +23,8 @@ module Lolita
       # override validate to vaidate only translate fields from master Class
       def validate
         item = self.class.name.sub('Translation','').constantize.new(self.attributes.clone.delete_if{|k,_| !self.class.translate_attrs.include?(k.to_sym)})
-        item_adapter =  Lolita::DBI::Base.create(item.class)
-        self_adapter =  Lolita::DBI::Base.create(self.class)
+        item_adapter = Lolita::DBI::Adapter.add(item.class)
+        self_adapter = Lolita::DBI::Adapter.add(self)
         was_table_name = item_adapter.collection_name
         item_adapter.collection_name = self_adapter.collection_name
         item.valid? rescue
@@ -71,7 +71,7 @@ module Lolita
             end
             # set's real table name
             translation_adapter = Lolita::DBI::Base.create(self)
-            translation_adapter.collection_name = config.options[:table_name] || translation_model.adapter.collection_name.to_s + "_translations"
+            translation_adapter.collection_name = config.options[:table_name] || translation_model.adapter.collection_name.to_s.singularize + "_translation"
            
             cattr_accessor :translate_attrs, :master_id
 

data/lib/lolita-translation.rb

@@ -16,7 +16,6 @@ module Lolita
     end
 
     class << self
-      # Determine whether tab is translatable. When there is one or more fields in tab, that are defined with #translates.
       def translatable?(tab)
         fields = tab.fields.reject{|field|
           field.dbi!=tab.dbi
@@ -25,7 +24,6 @@ module Lolita
         tab.dbi.klass.respond_to?(:translations) && (fields.map(&:name) & tab.dbi.klass.translation_attrs).any?
       end
 
-      # Create nested form configuration for views.
       def create_translations_nested_form(resource,tab)
         resource.build_nested_translations 
         nested_form = Lolita::Configuration::NestedForm.new(tab,:translations) 

data/lolita-translation.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lolita-translation"
-  s.version = "0.2.18"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse", "Gatis Tomsons", "Arturs Meisters"]
-  s.date = "2011-12-13"
+  s.date = "2011-11-11"
   s.description = "Translates models in Lolita"
   s.email = "support@ithouse.lv"
   s.extra_rdoc_files = [
@@ -25,6 +25,9 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/assets/.gitkeep",
+    "app/assets/javascripts/.gitkeep",
+    "app/assets/javascripts/lolita/translation/application.js",
+    "app/assets/stylesheets/lolita/translation/application.css",
     "app/views/components/lolita/translation/_assets.html.erb",
     "app/views/components/lolita/translation/_language_wrap.html.erb",
     "app/views/components/lolita/translation/_switch.html.erb",
@@ -40,16 +43,13 @@ Gem::Specification.new do |s|
     "lib/lolita-translation/string.rb",
     "lib/tasks/has_translations_tasks.rake",
     "lolita-translation.gemspec",
-    "public/javascripts/.gitkeep",
-    "public/javascripts/lolita/translation/application.js",
-    "public/stylesheets/lolita/translation/application.css",
     "spec/has_translations_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/ithouse/lolita-translations"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.10"
   s.summary = "Lolita models translation plugin"
   s.test_files = [
     "spec/has_translations_spec.rb",
@@ -60,20 +60,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<lolita>, ["= 3.1.18"])
+      s.add_runtime_dependency(%q<lolita>, [">= 3.2.0.rc.3"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<lolita>, ["= 3.1.18"])
+      s.add_dependency(%q<lolita>, [">= 3.2.0.rc.3"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<lolita>, ["= 3.1.18"])
+    s.add_dependency(%q<lolita>, [">= 3.2.0.rc.3"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-translation
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-13 00:00:00.000000000Z
+date: 2011-11-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &16064780 !ruby/object:Gem::Requirement
+  requirement: &84276570 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.18
+        version: 3.2.0.rc.3
   type: :runtime
   prerelease: false
-  version_requirements: *16064780
+  version_requirements: *84276570
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &16063400 !ruby/object:Gem::Requirement
+  requirement: &84276210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16063400
+  version_requirements: *84276210
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16062360 !ruby/object:Gem::Requirement
+  requirement: &84275880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16062360
+  version_requirements: *84275880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16061500 !ruby/object:Gem::Requirement
+  requirement: &84275520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *16061500
+  version_requirements: *84275520
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &16060600 !ruby/object:Gem::Requirement
+  requirement: &84275140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16060600
+  version_requirements: *84275140
 description: Translates models in Lolita
 email: support@ithouse.lv
 executables: []
@@ -84,6 +84,9 @@ files:
 - Rakefile
 - VERSION
 - app/assets/.gitkeep
+- app/assets/javascripts/.gitkeep
+- app/assets/javascripts/lolita/translation/application.js
+- app/assets/stylesheets/lolita/translation/application.css
 - app/views/components/lolita/translation/_assets.html.erb
 - app/views/components/lolita/translation/_language_wrap.html.erb
 - app/views/components/lolita/translation/_switch.html.erb
@@ -99,9 +102,6 @@ files:
 - lib/lolita-translation/string.rb
 - lib/tasks/has_translations_tasks.rake
 - lolita-translation.gemspec
-- public/javascripts/.gitkeep
-- public/javascripts/lolita/translation/application.js
-- public/stylesheets/lolita/translation/application.css
 - spec/has_translations_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/ithouse/lolita-translations
@@ -117,6 +117,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -628896687
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -125,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Lolita models translation plugin