fast_gettext 0.6.8 → 0.6.9

data/.travis.yml

@@ -1,4 +1,4 @@
-script: "bundle exec rake"
+script: "rake"
 rvm:
   - ree
   - 1.9.2

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    fast_gettext (0.6.8)
+    fast_gettext (0.6.9)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.5)
-      activesupport (= 3.2.5)
+    activemodel (3.2.7)
+      activesupport (= 3.2.7)
       builder (~> 3.0.0)
-    activerecord (3.2.5)
-      activemodel (= 3.2.5)
-      activesupport (= 3.2.5)
+    activerecord (3.2.7)
+      activemodel (= 3.2.7)
+      activesupport (= 3.2.7)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.5)
+    activesupport (3.2.7)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)

data/Rakefile

@@ -2,7 +2,7 @@ require 'bundler/gem_tasks'
 
 task :default do
   ['~>2', '~>3'].each do |version|
-    sh "export AR='#{version}' && (bundle check || bundle) && bundle exec rspec spec"
+    sh "export AR='#{version}' && (bundle check || bundle install) && bundle exec rspec spec"
   end
   sh "git checkout Gemfile.lock"
 end

data/Readme.md

@@ -50,24 +50,24 @@ Setup
 
 From mo files (traditional/default)
 
-    FastGettext.add_text_domain('my_app',:path=>'locale')
+    FastGettext.add_text_domain('my_app',:path => 'locale')
 
 Or po files (less maintenance than mo)
 
-    FastGettext.add_text_domain('my_app',:path=>'locale', :type=>:po)
-    # :ignore_fuzzy => true to silence warnings about fuzzy translations
-    # :ignore_obsolete => true to silence warnings about obsolete translations
+    FastGettext.add_text_domain('my_app',:path => 'locale', :type => :po)
+    # :ignore_fuzzy => true to not use fuzzy translations
+    # :report_warning => false to hide warnings about obsolete/fuzzy translations
 
 Or yaml files (use I18n syntax/indentation)
 
-    FastGettext.add_text_domain('my_app',:path=>'config/locales', :type=>:yaml)
+    FastGettext.add_text_domain('my_app', :path => 'config/locales', :type => :yaml)
 
 Or database (scaleable, good for many locales/translators)
 
     # db access is cached <-> only first lookup hits the db
     require "fast_gettext/translation_repository/db"
     FastGettext::TranslationRepository::Db.require_models #load and include default models
-    FastGettext.add_text_domain('my_app', :type=>:db, :model=>TranslationKey)
+    FastGettext.add_text_domain('my_app', :type => :db, :model => TranslationKey)
 
 ### 3. Choose text domain and locale for translation
 Do this once in every Thread. (e.g. Rails -> ApplicationController)
@@ -221,6 +221,7 @@ Mo/Po-file parsing from Masao Mutoh, see vendor/README
  - [Rainux Luo](http://rainux.org)
  - [Dmitry Borodaenko](https://github.com/angdraug)
  - [Kouhei Sutou](https://github.com/kou)
+ - [Hoang Nghiem](https://github.com/hoangnghiem)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/lib/fast_gettext/po_file.rb

@@ -2,7 +2,6 @@ require 'fast_gettext/mo_file'
 module FastGettext
   # Responsibility:
   #  - abstract po files for Po Repository
-  # TODO refactor...
   class PoFile
     def self.to_mo_file(file, options={})
       require 'fast_gettext/vendor/poparser'

data/lib/fast_gettext/translation_repository/db_models/translation_key.rb

@@ -1,11 +1,13 @@
 class TranslationKey < ActiveRecord::Base
-  has_many :translations, :class_name => 'TranslationText'
+  has_many :translations, :class_name => 'TranslationText', :dependent => :destroy
 
   accepts_nested_attributes_for :translations, :allow_destroy => true
 
   validates_uniqueness_of :key
   validates_presence_of :key
 
+  attr_accessible :key, :translations, :translations_attributes
+
   def self.translation(key, locale)
     return unless translation_key = find_by_key(key)
     return unless translation_text = translation_key.translations.find_by_locale(locale)
@@ -15,4 +17,4 @@ class TranslationKey < ActiveRecord::Base
   def self.available_locales
     @@available_locales ||= TranslationText.count(:group=>:locale).keys.sort
   end
-end
+end

data/lib/fast_gettext/translation_repository/db_models/translation_text.rb

@@ -1,5 +1,6 @@
 class TranslationText < ActiveRecord::Base
-  belongs_to :key, :class_name=>'TranslationKey'
+  belongs_to :translation_key, :class_name => 'TranslationKey'
   validates_presence_of :locale
   validates_uniqueness_of :locale, :scope=>:translation_key_id
-end
+  attr_accessible :text, :locale, :translation_key, :translation_key_id
+end

data/lib/fast_gettext/version.rb

@@ -1,3 +1,3 @@
 module FastGettext
-  VERSION = Version = '0.6.8'
+  VERSION = Version = '0.6.9'
 end

data/spec/fast_gettext/translation_repository/db_spec.rb

@@ -1,23 +1,25 @@
-require "spec_helper"
-
+require 'spec_helper'
 require 'active_record'
 require 'fast_gettext/translation_repository/db'
+require 'support/be_accessible_matcher'
+
 FastGettext::TranslationRepository::Db.require_models
-describe FastGettext::TranslationRepository::Db do
 
+describe FastGettext::TranslationRepository::Db do
   before :all do
-    ActiveRecord::Base.establish_connection({
+    ActiveRecord::Base.establish_connection(
       :adapter => "sqlite3",
       :database => ":memory:"
-    })
+    )
 
     #create model table
-    #TODO surpress output ?
+    ActiveRecord::Migration.verbose = false
     ActiveRecord::Schema.define(:version => 1) do
       create_table :translation_keys do |t|
         t.string :key, :unique=>true, :null=>false
         t.timestamps
       end
+
       create_table :translation_texts do |t|
         t.string :text, :locale
         t.integer :translation_key_id, :null=>false
@@ -34,8 +36,8 @@ describe FastGettext::TranslationRepository::Db do
   end
 
   def create_translation(key, text)
-    translation_key = TranslationKey.create!(:key=>key)
-    TranslationText.create!(:translation_key_id=>translation_key.id, :text=>text, :locale=>'de')
+    translation_key = TranslationKey.create!(:key => key)
+    TranslationText.create!(:translation_key_id => translation_key.id, :text => text, :locale => "de")
   end
   
   it "reads locales from the db" do
@@ -67,4 +69,35 @@ describe FastGettext::TranslationRepository::Db do
     create_translation 'Axis||||Axis', 'Achse||||Achsen'
     @rep.plural('Axis','Axis').should == ['Achse','Achsen']
   end
+
+  it "removes texts when key is removed" do
+    t = create_translation("a", "b")
+    expect{
+      expect{
+        t.translation_key.destroy
+      }.to change{ TranslationText.count }.by(-1)
+    }.to change{ TranslationKey.count }.by(-1)
+  end
+
+  it "model attributes should be accessible" do
+    key = TranslationKey.new(:key => 'New Key', :translations_attributes => { '0' => {:text => 'New Key En', :locale => 'en'}})
+
+    key.key.should == 'New Key'
+
+    key.should be_accessible(:key)
+    key.should be_accessible(:translations)
+    key.should be_accessible(:translations_attributes)
+    key.should_not be_accessible(:created_at)
+
+    translation = key.translations.first
+
+    translation.text.should == 'New Key En'
+    translation.locale.should == 'en'
+
+    translation.should be_accessible(:locale)
+    translation.should be_accessible(:text)
+    translation.should be_accessible(:translation_key)
+    translation.should be_accessible(:translation_key_id)
+    translation.should_not be_accessible(:created_at)
+  end
 end

data/spec/fast_gettext/vendor/string_spec.rb

@@ -5,9 +5,7 @@ describe String do
     if RUBY_VERSION > '1.9'
       yield
     else
-      pending do
-        yield
-      end
+      pending "does not work on 1.8"
     end
   end
 

data/spec/support/be_accessible_matcher.rb

@@ -0,0 +1,8 @@
+RSpec::Matchers.define :be_accessible do |attribute|
+  match do |response|
+    response.class.accessible_attributes.include?(attribute.to_s)
+  end
+  description { "be accessible :#{attribute}" }
+  failure_message_for_should { ":#{attribute} should be accessible" }
+  failure_message_for_should_not { ":#{attribute} should not be accessible" }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_gettext
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -95,6 +95,7 @@ files:
 - spec/locale/yaml/notfound.yml
 - spec/obsolete_locale/de/test.po
 - spec/spec_helper.rb
+- spec/support/be_accessible_matcher.rb
 homepage: http://github.com/grosser/fast_gettext
 licenses:
 - MIT
@@ -110,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3956951288386353458
+      hash: 4402652659877715881
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3956951288386353458
+      hash: 4402652659877715881
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24