simple_model_translations 0.1.0 → 0.1.1

data/Gemfile

@@ -3,10 +3,12 @@ source :rubygems
 gem 'activerecord', '>= 3.0.0'
 
 group :test do
-  gem 'database_cleaner'
-  gem 'ruby-debug'
-  gem 'sqlite3-ruby'
-  gem 'shoulda'
-  gem 'factory_girl'
+  gem 'database_cleaner', '>= 0.5.2'
+  gem 'sqlite3-ruby', '>= 1.3.1'
+  gem 'shoulda', '>= 2.11.3'
   gem 'rspec', '>= 2.0.0'
 end
+
+group :console do
+  gem 'jeweler', '>= 1.5.0.pre5'
+end

data/Gemfile.lock

@@ -14,12 +14,15 @@ GEM
     arel (1.0.1)
       activesupport (~> 3.0.0)
     builder (2.1.2)
-    columnize (0.3.1)
     database_cleaner (0.5.2)
     diff-lcs (1.1.2)
-    factory_girl (1.3.2)
+    git (1.2.5)
     i18n (0.4.1)
-    linecache (0.43)
+    jeweler (1.5.0.pre5)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
     rspec (2.0.0)
       rspec-core (= 2.0.0)
       rspec-expectations (= 2.0.0)
@@ -30,11 +33,6 @@ GEM
     rspec-mocks (2.0.0)
       rspec-core (= 2.0.0)
       rspec-expectations (= 2.0.0)
-    ruby-debug (0.10.3)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
-      linecache (>= 0.3)
     shoulda (2.11.3)
     sqlite3-ruby (1.3.1)
     tzinfo (0.3.23)
@@ -44,9 +42,8 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (>= 3.0.0)
-  database_cleaner
-  factory_girl
+  database_cleaner (>= 0.5.2)
+  jeweler (>= 1.5.0.pre5)
   rspec (>= 2.0.0)
-  ruby-debug
-  shoulda
-  sqlite3-ruby
+  shoulda (>= 2.11.3)
+  sqlite3-ruby (>= 1.3.1)

data/README.rdoc

@@ -1,6 +1,7 @@
 = SimpleModelTranslations
 
-Yet another implementation of ActiveRecord translations. Created for zn.ua, because globalize3 was too unconfortable to use.
+Yet another implementation of ActiveRecord translations. Created for zn.ua, because globalize3 was too uncomfortable to use.
+It borrows some things from globalize3[http://github.com/svenfuchs/globalize3] and puret[http://github.com/jo/puret].
 
 == Basic Usage
 

data/Rakefile

@@ -10,18 +10,16 @@ begin
     gem.email = "fxposter@gmail.com"
     gem.homepage = "http://github.com/fxposter/simple_model_translations"
     gem.authors = ["Pavel Forkert"]
-    gem.add_dependency "activerecord", '>= 3.0.0'
     
-    gem.add_development_dependency 'database_cleaner'
-    gem.add_development_dependency 'ruby-debug'
-    gem.add_development_dependency 'sqlite3-ruby'
-    gem.add_development_dependency 'shoulda'
-    gem.add_development_dependency 'factory_girl'
+    gem.add_development_dependency 'database_cleaner', '>= 0.5.2'
+    gem.add_development_dependency 'sqlite3-ruby', '>= 1.3.1'
+    gem.add_development_dependency 'shoulda', '>= 2.11.3'
     gem.add_development_dependency 'rspec', '>= 2.0.0'
+    gem.add_development_dependency 'jeweler', '>= 1.5.0.pre5'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler --pre"
 end
 
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/simple_model_translations/base.rb

@@ -42,15 +42,19 @@ module SimpleModelTranslations
       def configure_translations(options)
         raise 'You can call #translates method only once per model!' if included_modules.include?(SimpleModelTranslations::InstanceMethods)
         
+        (class << self; self; end).send :define_method, :translation_options do
+          options
+        end
+        
         include SimpleModelTranslations::InstanceMethods
         include SimpleModelTranslations::Attributes
+        extend SimpleModelTranslations::ClassMethods
         
-        class_name = options[:class_name] || "#{self.name}Translation"
         # unless Kernel.const_get(class_name)
         #   klass = Kernel.const_set(class_name.to_sym, Class.new(ActiveRecord::Base))
         #   klass.translation_for(self.name.underscore.to_sym)
         # end
-        has_many :translations, :class_name => class_name, :dependent => :destroy, :order => "created_at DESC", :autosave => true
+        has_many :translations, :class_name => translation_class_name, :dependent => :destroy, :autosave => true
         
         if options[:accepts_nested_attributes]
           accepts_nested_attributes_for :translations, :allow_destroy => true

data/lib/simple_model_translations/class_methods.rb

@@ -1,2 +1,26 @@
 module SimpleModelTranslations
+  module ClassMethods
+    def with_translations
+      includes(:translations).where("#{translated_column_name(:id)} IS NOT NULL")
+    end
+    
+    def translation_class
+      Module.const_get(translation_class_name)
+    end
+    
+    def translation_class_name
+      class_name = translation_options[:class_name] || "#{self.name}Translation"
+    end
+    
+    def translated_column_name(name)
+      "#{translation_class.table_name}.#{name}".to_sym
+    end
+    
+    def with_translated_attribute(name, value, locales = nil)
+      with_translations.where(
+          translated_column_name(name)    => value,
+          translated_column_name(:locale) => Array(locales).map(&:to_s)
+        )
+    end
+  end
 end

data/simple_model_translations.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_model_translations}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pavel Forkert"]
@@ -14,43 +14,43 @@ Gem::Specification.new do |s|
   s.email = %q{fxposter@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/simple_model_translations.rb",
-     "lib/simple_model_translations/attributes.rb",
-     "lib/simple_model_translations/base.rb",
-     "lib/simple_model_translations/class_methods.rb",
-     "lib/simple_model_translations/instance_methods.rb",
-     "lib/simple_model_translations/validations.rb",
-     "simple_model_translations.gemspec",
-     "spec/attributes_spec.rb",
-     "spec/data/models.rb",
-     "spec/data/schema.rb",
-     "spec/simple_model_translations_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/validations_spec.rb"
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/simple_model_translations.rb",
+    "lib/simple_model_translations/attributes.rb",
+    "lib/simple_model_translations/base.rb",
+    "lib/simple_model_translations/class_methods.rb",
+    "lib/simple_model_translations/instance_methods.rb",
+    "lib/simple_model_translations/validations.rb",
+    "simple_model_translations.gemspec",
+    "spec/attributes_spec.rb",
+    "spec/class_methods_spec.rb",
+    "spec/data/models.rb",
+    "spec/data/schema.rb",
+    "spec/simple_model_translations_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/validations_spec.rb"
   ]
   s.homepage = %q{http://github.com/fxposter/simple_model_translations}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Simple ActiveRecord translations for Rails 3}
   s.test_files = [
     "spec/attributes_spec.rb",
-     "spec/data/models.rb",
-     "spec/data/schema.rb",
-     "spec/simple_model_translations_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/validations_spec.rb"
+    "spec/class_methods_spec.rb",
+    "spec/data/models.rb",
+    "spec/data/schema.rb",
+    "spec/simple_model_translations_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/validations_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -59,29 +59,26 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<factory_girl>, [">= 0"])
+      s.add_development_dependency(%q<database_cleaner>, [">= 0.5.2"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.11.3"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.0.pre5"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-      s.add_dependency(%q<database_cleaner>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<factory_girl>, [">= 0"])
+      s.add_dependency(%q<database_cleaner>, [">= 0.5.2"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
+      s.add_dependency(%q<shoulda>, [">= 2.11.3"])
       s.add_dependency(%q<rspec>, [">= 2.0.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.0.pre5"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.0.0"])
-    s.add_dependency(%q<database_cleaner>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<factory_girl>, [">= 0"])
+    s.add_dependency(%q<database_cleaner>, [">= 0.5.2"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.1"])
+    s.add_dependency(%q<shoulda>, [">= 2.11.3"])
     s.add_dependency(%q<rspec>, [">= 2.0.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.0.pre5"])
   end
 end
 

data/spec/class_methods_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Article do
+  it 'should be able to return only records which have translations' do
+    first_article = Article.create!(:slug => 'hello')
+    second_article = Article.create!(:slug => 'world', :name => 'WORLD')
+    Article.with_translations.to_a.should == [second_article]
+  end
+  
+  it 'should be able to return translation class' do
+    Article.translation_class.should == ArticleTranslation
+  end
+  
+  it 'should be able to return translated column name' do
+    Article.translated_column_name(:name).should == :'article_translations.name'
+  end
+  
+  it 'should be able to search by specific column names and locales' do
+    first_article = Article.create!(:slug => 'hello', :locale => :en, :name => 'hello')
+    second_article = Article.create!(:slug => 'world', :name => 'WORLD')
+    third_article = Article.create!(:slug => 'hello')
+    fourth_article = Article.create!(:slug => 'world', :name => 'WORLD', :locale => :en)
+    Article.with_translated_attribute(:name, ['hello'], :en).should == [first_article]
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_model_translations
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Pavel Forkert
@@ -19,9 +19,10 @@ date: 2010-10-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: activerecord
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,94 +33,88 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: database_cleaner
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  name: database_cleaner
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
+        - 5
+        - 2
+        version: 0.5.2
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  name: shoulda
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 37
         segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: factory_girl
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  name: rspec
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 2
         - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
+        - 0
+        version: 2.0.0
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  name: jeweler
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: -1876988220
         segments: 
-        - 2
-        - 0
+        - 1
+        - 5
         - 0
-        version: 2.0.0
-  type: :development
-  version_requirements: *id007
+        - pre5
+        version: 1.5.0.pre5
+  requirement: *id006
 description: Simple ActiveRecord translations for Rails 3
 email: fxposter@gmail.com
 executables: []
@@ -131,7 +126,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -146,6 +140,7 @@ files:
 - lib/simple_model_translations/validations.rb
 - simple_model_translations.gemspec
 - spec/attributes_spec.rb
+- spec/class_methods_spec.rb
 - spec/data/models.rb
 - spec/data/schema.rb
 - spec/simple_model_translations_spec.rb
@@ -156,8 +151,8 @@ homepage: http://github.com/fxposter/simple_model_translations
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -187,6 +182,7 @@ specification_version: 3
 summary: Simple ActiveRecord translations for Rails 3
 test_files: 
 - spec/attributes_spec.rb
+- spec/class_methods_spec.rb
 - spec/data/models.rb
 - spec/data/schema.rb
 - spec/simple_model_translations_spec.rb

data/.gitignore

@@ -1,24 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-.rspec
-.rvmrc
-.bundle