hstore_translate 0.0.8 → 0.0.9

data/lib/hstore_translate/translates.rb

@@ -35,12 +35,23 @@ module HstoreTranslate
 
       protected
 
+      def hstore_translate_fallback_locales(locale)
+        return if !!@disable_fallback || !I18n.respond_to?(:fallbacks)
+        I18n.fallbacks[locale]
+      end
+
       def read_hstore_translation(attr_name, locale = I18n.locale)
         translations = send("#{attr_name}_translations") || {}
         translation  = translations[locale.to_s]
 
-        if (@disable_fallback == nil || @disable_fallback == false) && translation.nil? && I18n.respond_to?(:fallbacks) && (fallbacks = I18n.fallbacks[locale])
-          fallbacks.find { |f| translation = translations[f.to_s] }
+        if fallback_locales = hstore_translate_fallback_locales(locale)
+          fallback_locales.each do |fallback_locale|
+            t = translations[fallback_locale.to_s]
+            if t && !t.empty? # differs from blank?
+              translation = t
+              break
+            end
+          end
         end
 
         translation

data/lib/hstore_translate/version.rb

@@ -1,3 +1,3 @@
 module HstoreTranslate
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/hstore_translate.rb

@@ -1,6 +1,6 @@
-require "active_record/connection_adapters/postgresql_adapter"
-require "hstore_translate/translates"
-require "hstore_translate/version"
+require 'active_record'
+require 'active_record/connection_adapters/postgresql_adapter'
+require 'hstore_translate/translates'
 
 module HstoreTranslate
   def self.native_hstore?

data/test/database.yml

@@ -0,0 +1,6 @@
+test:
+  adapter:  postgresql
+  host:     localhost
+  database: hstore_translate_test
+  username: postgres
+  min_messages: warning

data/test/gemfiles/Gemfile.rails-3.1.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => './../..'
+
+gem 'activerecord', '~> 3.1.0'

data/test/gemfiles/Gemfile.rails-3.2.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => './../..'
+
+gem 'activerecord', '~> 3.2.0'

data/test/gemfiles/Gemfile.rails-4.0.x

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec :path => './../..'
+
+gem 'activerecord', '~> 4.0.0'

data/test/test_helper.rb

@@ -0,0 +1,69 @@
+require 'minitest/autorun'
+require 'hstore_translate'
+
+require 'database_cleaner'
+DatabaseCleaner.strategy = :transaction
+
+class Post < ActiveRecord::Base
+  translates :title
+end
+
+class HstoreTranslate::Test < MiniTest::Unit::TestCase
+  class << self
+    def prepare_database
+      create_database
+      create_table
+    end
+
+    private
+
+    def db_config
+      @db_config ||= begin
+        filepath = File.join('test', 'database.yml')
+        YAML.load_file(filepath)['test']
+      end
+    end
+
+    def establish_connection(config)
+      ActiveRecord::Base.establish_connection(config)
+      ActiveRecord::Base.connection
+    end
+
+    def create_database
+      system_config = db_config.merge('database' => 'postgres', 'schema_search_path' => 'public')
+      connection = establish_connection(system_config)
+      connection.create_database(db_config['database']) rescue nil
+      enable_extension
+    end
+
+    def enable_extension
+      connection = establish_connection(db_config)
+      unless connection.select_value("SELECT proname FROM pg_proc WHERE proname = 'akeys'")
+        if connection.send(:postgresql_version) < 90100
+          pg_sharedir = `pg_config --sharedir`.strip
+          hstore_script_path = File.join(pg_sharedir, 'contrib', 'hstore.sql')
+          connection.execute(File.read(hstore_script_path))
+        else
+          connection.execute('CREATE EXTENSION IF NOT EXISTS hstore')
+        end
+      end
+    end
+
+    def create_table
+      connection = establish_connection(db_config)
+      connection.create_table(:posts, :force => true) do |t|
+        t.column :title_translations, 'hstore'
+      end
+    end
+  end
+
+  prepare_database
+
+  def setup
+    DatabaseCleaner.start
+  end
+
+  def teardown
+    DatabaseCleaner.clean
+  end
+end

data/test/translates_test.rb

@@ -0,0 +1,115 @@
+# -*- encoding : utf-8 -*-
+require 'test_helper'
+
+class TranslatesTest < HstoreTranslate::Test
+  def test_assigns_in_current_locale
+    I18n.with_locale(:en) do
+      p = Post.new(:title => "English Title")
+      assert_equal("English Title", p.title_translations['en'])
+    end
+  end
+
+  def test_retrieves_in_current_locale
+    p = Post.new(:title_translations => { "en" => "English Title", "fr" => "Titre français" })
+    I18n.with_locale(:fr) do
+      assert_equal("Titre français", p.title)
+    end
+  end
+
+  def test_retrieves_in_current_locale_with_fallbacks
+    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+    I18n.default_locale = :"en-US"
+
+    p = Post.new(:title_translations => {"en" => "English Title"})
+    I18n.with_locale(:fr) do
+      assert_equal("English Title", p.title)
+    end
+  end
+
+  def test_assigns_in_specified_locale
+    I18n.with_locale(:en) do
+      p = Post.new(:title_translations => { "en" => "English Title" })
+      p.title_fr = "Titre français"
+      assert_equal("Titre français", p.title_translations["fr"])
+    end
+  end
+
+  def test_persists_changes_in_specified_locale
+    I18n.with_locale(:en) do
+      p = Post.create!(:title_translations => { "en" => "Original Text" })
+      p.title_en = "Updated Text"
+      p.save!
+      assert_equal("Updated Text", Post.last.title_en)
+    end
+  end
+
+  def test_retrieves_in_specified_locale
+    I18n.with_locale(:en) do
+      p = Post.new(:title_translations => { "en" => "English Title", "fr" => "Titre français" })
+      assert_equal("Titre français", p.title_fr)
+    end
+  end
+
+  def test_retrieves_in_specified_locale_with_fallbacks
+    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+    I18n.default_locale = :"en-US"
+
+    p = Post.new(:title_translations => { "en" => "English Title" })
+    I18n.with_locale(:fr) do
+      assert_equal("English Title", p.title_fr)
+    end
+  end
+
+  def test_fallback_from_empty_string
+    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+    I18n.default_locale = :"en-US"
+
+    p = Post.new(:title_translations => { "en" => "English Title", "fr" => "" })
+    I18n.with_locale(:fr) do
+      assert_equal("English Title", p.title_fr)
+    end
+  end
+
+  def test_retrieves_in_specified_locale_with_fallback_disabled
+    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+    I18n.default_locale = :"en-US"
+
+    p = Post.new(:title_translations => { "en" => "English Title" })
+    p.disable_fallback
+    I18n.with_locale(:fr) do
+      assert_equal(nil, p.title_fr)
+    end
+  end
+
+  def test_retrieves_in_specified_locale_with_fallback_reenabled
+    I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
+    I18n.default_locale = :"en-US"
+
+    p = Post.new(:title_translations => { "en" => "English Title" })
+    p.disable_fallback
+    p.enable_fallback
+    I18n.with_locale(:fr) do
+      assert_equal("English Title", p.title_fr)
+    end
+  end
+
+  def test_method_missing_delegates
+    assert_raises(NoMethodError) { Post.new.nonexistant_method }
+  end
+
+  def test_method_missing_delegates_non_translated_attributes
+    assert_raises(NoMethodError) { Post.new.other_fr }
+  end
+
+  def test_persists_translations_assigned_as_hash
+    p = Post.create!(:title_translations => { "en" => "English Title", "fr" => "Titre français" })
+    p.reload
+    assert_equal({"en" => "English Title", "fr" => "Titre français"}, p.title_translations)
+  end
+
+  def test_persists_translations_assigned_to_localized_accessors
+    p = Post.create!(:title_en => "English Title", :title_fr => "Titre français")
+    p.reload
+    assert_equal({"en" => "English Title", "fr" => "Titre français"}, p.title_translations)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hstore_translate
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,15 +26,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord-postgres-hstore
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails I18n library for ActiveRecord model/data translation using PostgreSQL's
   hstore datatype. Translations are stored directly in the model table rather than
   shadow tables.
@@ -86,11 +118,14 @@ files:
 - lib/hstore_translate/translates.rb
 - lib/hstore_translate/version.rb
 - lib/hstore_translate.rb
-- Gemfile
-- Gemfile.lock
-- MIT-LICENSE
-- Rakefile
 - README.md
+- MIT-LICENSE
+- test/database.yml
+- test/gemfiles/Gemfile.rails-3.1.x
+- test/gemfiles/Gemfile.rails-3.2.x
+- test/gemfiles/Gemfile.rails-4.0.x
+- test/test_helper.rb
+- test/translates_test.rb
 homepage: https://github.com/robworley/hstore_translate
 licenses: []
 post_install_message: 
@@ -110,11 +145,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: ! '[none]'
+rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails I18n library for ActiveRecord model/data translation using PostgreSQL's
   hstore datatype.
-test_files: []
+test_files:
+- test/database.yml
+- test/gemfiles/Gemfile.rails-3.1.x
+- test/gemfiles/Gemfile.rails-3.2.x
+- test/gemfiles/Gemfile.rails-4.0.x
+- test/test_helper.rb
+- test/translates_test.rb
 has_rdoc: 

data/Gemfile

@@ -1,8 +0,0 @@
-source "http://rubygems.org"
-
-if ENV["EDGE_RAILS"]
-  gem 'pg'
-  gem 'rails', :git => 'git://github.com/rails/rails'
-else
-  gemspec
-end

data/Gemfile.lock

@@ -1,49 +0,0 @@
-PATH
-  remote: .
-  specs:
-    hstore_translate (0.0.8)
-      activerecord (= 4.0.0.rc2)
-      activerecord-postgres-hstore (~> 0.7.0)
-      pg
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (4.0.0.rc2)
-      activesupport (= 4.0.0.rc2)
-      builder (~> 3.1.0)
-    activerecord (4.0.0.rc2)
-      activemodel (= 4.0.0.rc2)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0.rc2)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.2)
-    activerecord-postgres-hstore (0.7.6)
-      activerecord (>= 3.1)
-      pg-hstore (>= 1.1.5)
-      rake
-    activesupport (4.0.0.rc2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.9)
-    builder (3.1.4)
-    i18n (0.6.4)
-    minitest (4.7.4)
-    multi_json (1.7.6)
-    pg (0.15.1)
-    pg-hstore (1.1.7)
-    rake (10.0.3)
-    thread_safe (0.1.0)
-      atomic
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  hstore_translate!
-  rake

data/Rakefile

@@ -1,12 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the ltree_hierarchy plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end