translatable 0.3.0 → 0.3.1

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
-bundler_args: --without=debug
+bundler_args: --without=debug development

data/Gemfile

@@ -5,22 +5,31 @@ gem "activesupport", :require => false
 gem "i18n"
 
 group :debug do
-  gem "simplecov", ">= 0.6.0", :platform => :ruby_19
-  gem "debugger", "~> 1.1.3", :platform => :ruby_19
+  gem "debugger", "~> 1.2.2", :platform => :ruby_19
   gem "ruby-debug", :platform => :ruby_18
 end
 
 group :development do
-  gem "yard"
-  gem "jeweler", ">= 1.6.0"
-  gem "bundler", ">= 1.2.0"
+  gem "jeweler", "~> 1.8.0"
+end
+
+group :debug, :test do
+  gem "yard"  
+  gem "redcarpet"
+
+  gem "simplecov", "~> 0.7.1", :require => false, :platform => :ruby_19
+  gem "rcov", "~> 1.0.0", :require => false, :platform => :ruby_18
 end
 
 group :test do
+  gem "sqlite3"
+  gem "database_cleaner"
+
   gem "rails"
+
+  gem 'minitest'
   gem "test-unit"
   gem "shoulda"
 
-  gem "database_cleaner"
-  gem "sqlite3"
-end
+  gem "turn"
+end

data/Gemfile.lock

@@ -29,25 +29,27 @@ GEM
       activesupport (= 3.1.8)
     activesupport (3.1.8)
       multi_json (>= 1.0, < 1.3)
+    ansi (1.4.3)
     arel (2.2.3)
     builder (3.0.0)
     columnize (0.3.6)
     database_cleaner (0.7.2)
-    debugger (1.1.4)
+    debugger (1.2.4)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
+      debugger-ruby_core_source (~> 1.1.7)
     debugger-linecache (1.1.2)
       debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
+    debugger-ruby_core_source (1.1.9)
     erubis (2.7.0)
     git (1.2.5)
     hike (1.2.1)
     i18n (0.6.0)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
     json (1.7.5)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
@@ -56,6 +58,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
+    minitest (4.6.2)
     multi_json (1.2.0)
     polyglot (0.3.3)
     rack (1.3.6)
@@ -84,8 +87,10 @@ GEM
       thor (~> 0.14.6)
     rake (0.9.2.2)
     rbx-require-relative (0.0.9)
+    rcov (1.0.0)
     rdoc (3.12)
       json (~> 1.4)
+    redcarpet (2.2.2)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -97,10 +102,10 @@ GEM
     shoulda-context (1.0.1)
     shoulda-matchers (1.4.1)
       activesupport (>= 3.0.0)
-    simplecov (0.6.4)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
     sprockets (2.0.4)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -112,6 +117,8 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
+    turn (0.9.6)
+      ansi
     tzinfo (0.3.33)
     yard (0.6.8)
 
@@ -121,15 +128,18 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   activesupport
-  bundler (>= 1.2.0)
   database_cleaner
-  debugger (~> 1.1.3)
+  debugger (~> 1.2.2)
   i18n
-  jeweler (>= 1.6.0)
+  jeweler (~> 1.8.0)
+  minitest
   rails
+  rcov (~> 1.0.0)
+  redcarpet
   ruby-debug
   shoulda
-  simplecov (>= 0.6.0)
+  simplecov (~> 0.7.1)
   sqlite3
   test-unit
+  turn
   yard

data/README.rdoc

@@ -167,6 +167,10 @@ An example of application:
     news.content
     # => "That is where the text goes"
 
+== Testing
+
+Run the tests with `VERBOSE=true` to see SQL queries
+
 == Contributing to translatable
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/Rakefile

@@ -2,6 +2,9 @@
 
 require 'rubygems'
 require 'bundler'
+require 'rake'
+require 'rake/testtask'
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -9,25 +12,27 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "translatable"
-  gem.homepage = "http://github.com/kot-begemot/translatable"
-  gem.license = "MIT"
-  gem.summary = %Q{An esay way to manage the translations for datamapper}
-  gem.description = %Q{This game was build to make whole proccess of working with translation for DM to be almost invisble. That was THE AIM.}
-  gem.email = "max@studentify.nl"
-  gem.authors = ["E-Max"]
-  # dependencies defined in Gemfile
+begin 
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+    gem.name = "translatable"
+    gem.homepage = "http://github.com/kot-begemot/translatable"
+    gem.license = "MIT"
+    gem.summary = %Q{An esay way to manage the translations for datamapper}
+    gem.description = %Q{This game was build to make whole proccess of working with translation for DM to be almost invisble. That was THE AIM.}
+    gem.email = "max@studentify.nl"
+    gem.authors = ["E-Max"]
+    # dependencies defined in Gemfile
+  end
+  Jeweler::RubygemsDotOrgTasks.new
+rescue LoadError
+  $stderr.puts "Skip jeweler loading..."
 end
-Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs += ['lib', 'test']
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/generators/translatable/translation_generator.rb

@@ -5,7 +5,7 @@ module Translatable
     class TranslationGenerator < Rails::Generators::NamedBase
       include Translatable::GeneratorHelper
 
-      desc "Creates ActiveRecord for translation dealer"
+      desc "Creates ActiveRecord for translation"
 
       class_option :prefix, :type => :string, :default => "translatable", :desc => "Specifies the prefix to used tof translation dealer (Default: translatable)"
       class_option :origin, :type => :string, :default => "origin",       :desc => "Specifies the association name to be use for origin (Default: origin)"
@@ -30,9 +30,9 @@ module Translatable
   # should be avoided.
   # In later gem version its existance might not be necessary.
 CONTENT
-        unless attributes.empty?
-          block << "  attr_accessible :#{attributes.map(&:name).join(", :")}\n"
-        end
+        # unless attributes.empty?
+        #   block << "  attr_accessible :#{attributes.map(&:name).join(", :")}\n"
+        # end
         block << "  #attr_protected :#{options[:origin]}_id, :#{options[:locale]}\n"
         block
       end

data/lib/translatable.rb

@@ -4,13 +4,15 @@ if defined?(Rails)
   require 'translatable/engine'
 
   ActiveSupport.on_load(:active_record) do
-    ActiveSupport.on_load(:i18n) do
-      ActiveRecord::Base.extend Translatable::ActiveRecord
-    end
+    ActiveRecord::Base.extend Translatable::ActiveRecord if defined?(I18n)
   end
 else
-  require 'active_record'
-  require 'i18n'
-  
-  ActiveRecord::Base.extend Translatable::ActiveRecord
+  begin 
+    require 'active_record'
+    require 'i18n'
+      
+    ActiveRecord::Base.extend Translatable::ActiveRecord
+  rescue LoadError
+    $stderr.puts "Warning: Translatable is not loaded"
+  end
 end

data/lib/translatable/active_record.rb

@@ -200,7 +200,7 @@ module Translatable
 
         self.module_eval <<-RUBY, __FILE__, __LINE__ + 1
           def translatable_set_current(locale = ::I18n.locale)
-            locale = locale.to_s
+            locale = @translatable_locale = locale.to_s
             @current_translation = if translations.loaded?
               translations.select { |t| t.send(:"#{@translatable[:locale]}") == locale }
             else

data/test/cases/translatable_test.rb

@@ -5,6 +5,10 @@ require 'support/models/posts'
 require 'support/models/messages'
 
 class TranslatableTest < Test::Unit::TestCase
+    teardown do
+      ::I18n.locale = ::I18n.default_locale
+    end
+
   context "Translatable hash" do
     should "Define default" do
       th = News.instance_variable_get :@translatable
@@ -54,9 +58,10 @@ class TranslatableTest < Test::Unit::TestCase
 
       t_news = TranslatableNews.last
       assert_equal [t_news], news.other_translations
-      ::I18n.locale = :ru
+      
+      news.set_current_translation :ru
+
       assert_equal [], news.other_translations
-      ::I18n.locale = ::I18n.default_locale
     end
 
     should "Provide errors on creation" do
@@ -154,9 +159,9 @@ class TranslatableTest < Test::Unit::TestCase
       assert news.persisted?
 
       ::I18n.locale = :ru
+
       assert_equal "Заголовок", news.title
       assert_equal "Содержание", news.content
-      ::I18n.locale = ::I18n.default_locale
     end
     
     should "Not been set if unavailable" do
@@ -164,13 +169,13 @@ class TranslatableTest < Test::Unit::TestCase
         {:title => "Resent News", :content => "That is where the text goes", :locale => "en"}]
 
       assert news.persisted?
+      news.set_current_translation :de
 
-      ::I18n.locale = :de
       assert_nil news.title
       assert_nil news.content
     end
 
-    should "Be be switched on locale switching" do
+    should "Be switched on locale switching" do
       news = News.create :translations_attributes => [{:title => "Resent News", :content => "That is where the text goes", :locale => "en"}]
 
       assert news.persisted?
@@ -183,7 +188,7 @@ class TranslatableTest < Test::Unit::TestCase
       assert_equal "Resent News", news.title
       assert_equal "That is where the text goes", news.content
 
-      ::I18n.locale = :ru
+      news.set_current_translation :ru
 
       assert_equal "Заголовок", news.title
       assert_equal "Содержание", news.content
@@ -240,9 +245,9 @@ class TranslatableTest < Test::Unit::TestCase
 
     assert_equal "Resent Post", post.translated_title
 
-    ::I18n.locale = :ru
+    post.set_current_translation :ru
+
     assert_equal "Заголовок", post.translated_title
-    ::I18n.locale = ::I18n.default_locale
   end
 
   context "Mass assigment" do

data/test/generators/translation_generator_test.rb

@@ -16,7 +16,6 @@ class TranslatableArticle < ActiveRecord::Base
   # This class deals purely with translations themselves. Hence, any edition of
   # should be avoided.
   # In later gem version its existance might not be necessary.
-  attr_accessible :title, :content
   #attr_protected :origin_id, :locale
 end
 CONTENT
@@ -43,7 +42,6 @@ class TranslationArticle < ActiveRecord::Base
   # This class deals purely with translations themselves. Hence, any edition of
   # should be avoided.
   # In later gem version its existance might not be necessary.
-  attr_accessible :title, :content
   #attr_protected :post_id, :language
 end
 CONTENT

data/test/support/active_record.rb

@@ -5,6 +5,8 @@ ActiveRecord::Base.establish_connection(
   :database => ':memory:'
 )
 
+$VERBOSE ||= ENV['VERBOSE'] == 'true'
+
 ActiveRecord::Migration.verbose = $VERBOSE
 if $VERBOSE
   ActiveRecord::Base.logger = Logger.new(STDOUT)

data/test/test_helper.rb

@@ -5,7 +5,10 @@ require "i18n"
 
 begin
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.start do
+    add_filter "/test/"
+    add_filter "/vendor/"
+  end
 rescue LoadError
   $stderr.puts "Simplecov is skipped"
 end
@@ -18,13 +21,19 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'translatable'
 
 require File.expand_path("support/active_record", File.dirname(__FILE__))
 require File.expand_path("support/database_cleaner", File.dirname(__FILE__))
 
+# Test output styling
+# Turn do not want to play nicelly =(, skip it then....
+require 'turn/autorun'
+Turn.config do |c|
+  c.format  = :pretty
+  c.natural = true
+end
+
 class Test::Unit::TestCase
   include OrmSetup
 

data/translatable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "translatable"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["E-Max"]
-  s.date = "2013-03-06"
+  s.date = "2013-03-16"
   s.description = "This game was build to make whole proccess of working with translation for DM to be almost invisble. That was THE AIM."
   s.email = "max@studentify.nl"
   s.extra_rdoc_files = [
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
-    ".rvmrc",
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
@@ -56,24 +55,18 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activerecord>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.6.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.2.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.0"])
     else
       s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 1.6.0"])
-      s.add_dependency(%q<bundler>, [">= 1.2.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 1.6.0"])
-    s.add_dependency(%q<bundler>, [">= 1.2.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: translatable
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &76461280 !ruby/object:Gem::Requirement
+  requirement: &70443110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76461280
+  version_requirements: *70443110
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &76460820 !ruby/object:Gem::Requirement
+  requirement: &70441740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76460820
+  version_requirements: *70441740
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &76460440 !ruby/object:Gem::Requirement
+  requirement: &70440960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,40 +43,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76460440
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &76460090 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *76460090
+  version_requirements: *70440960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &76459550 !ruby/object:Gem::Requirement
+  requirement: &70598430 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *76459550
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &76459150 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *76459150
+  version_requirements: *70598430
 description: This game was build to make whole proccess of working with translation
   for DM to be almost invisble. That was THE AIM.
 email: max@studentify.nl
@@ -87,7 +65,6 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
-- .rvmrc
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -126,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -331493043
+      hash: -740240291
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create 1.9.2@translatable