fast_gettext 0.6.10 → 0.6.11

data/Gemfile

@@ -1,10 +1,9 @@
 source :rubygems
 gemspec
 
-group :development do
-  gem 'rake'
-  gem 'sqlite3'
-  gem 'rspec', '~>2'
-  gem 'activerecord', ENV['AR']
-  gem 'i18n'
-end
+gem 'rake'
+gem 'sqlite3'
+gem 'rspec', '~>2'
+gem 'activerecord', ENV['AR']
+gem 'i18n'
+gem 'bump'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fast_gettext (0.6.10)
+    fast_gettext (0.6.11)
 
 GEM
   remote: http://rubygems.org/
@@ -19,6 +19,7 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.0)
+    bump (0.3.3)
     diff-lcs (1.1.3)
     i18n (0.6.0)
     multi_json (1.3.6)
@@ -39,6 +40,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord
+  bump
   fast_gettext!
   i18n
   rake

data/Rakefile

@@ -1,4 +1,5 @@
 require 'bundler/gem_tasks'
+require 'bump/tasks'
 
 task :default do
   ['~>2', '~>3'].each do |version|
@@ -8,9 +9,9 @@ task :default do
 end
 
 task :benchmark do
-  puts "Running on #{RUBY}"
+  puts "Running on #{RUBY_DESCRIPTION}"
   %w[baseline ideal fast_gettext original i18n_simple].each do |bench|
-    puts `ruby benchmark/#{bench}.rb`
+    puts `ruby -I. benchmark/#{bench}.rb`
     puts ""
   end
 end

data/Readme.md

@@ -222,6 +222,8 @@ Mo/Po-file parsing from Masao Mutoh, see vendor/README
  - [Dmitry Borodaenko](https://github.com/angdraug)
  - [Kouhei Sutou](https://github.com/kou)
  - [Hoang Nghiem](https://github.com/hoangnghiem)
+ - [Costa Shapiro](https://github.com/costa)
+ - [Jamie Dyer](https://github.com/kernow)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>

data/benchmark/base.rb

@@ -35,7 +35,11 @@ end
 
 def memory
   pid = Process.pid
-  map = `pmap -d #{pid}`
+  if RUBY_PLATFORM.downcase.include?("darwin")
+    map = `vmmap #{pid}`
+  else
+    map = `pmap -d #{pid}`
+  end
   map.split("\n").last.strip.squeeze(' ').split(' ')[3].to_i - DEFAULTS[:memory]
 end
 

data/benchmark/i18n_simple.rb

@@ -1,7 +1,8 @@
 require 'benchmark/base'
-require 'activesupport'
+require 'active_support'
+
 I18n.backend = I18n::Backend::Simple.new
 I18n.load_path = ['benchmark/locale/de.yml']
 I18n.locale = :de
 puts "ActiveSupport I18n::Backend::Simple :"
-results_test{I18n.translate('activerecord.models.car')=='Auto'}
+results_test{I18n.translate('activerecord.models.car')=='Auto'}

data/benchmark/locale/de.yml

@@ -1,4 +1,4 @@
-# German translations for Ruby on Rails 
+# German translations for Ruby on Rails
 # by Clemens Kofler (clemens@railway.at)
 
 de:
@@ -13,8 +13,7 @@ de:
     abbr_day_names: [So, Mo, Di, Mi, Do, Fr, Sa]
     month_names: [~, Januar, Februar, März, April, Mai, Juni, Juli, August, September, Oktober, November, Dezember]
     abbr_month_names: [~, Jan, Feb, Mär, Apr, Mai, Jun, Jul, Aug, Sep, Okt, Nov, Dez]
-    order: [ :day, :month, :year ]
-  
+
   time:
     formats:
       default: "%A, %e. %B %Y, %H:%M Uhr"
@@ -24,7 +23,7 @@ de:
 
     am: "vormittags"
     pm: "nachmittags"
-      
+
   datetime:
     distance_in_words:
       half_a_minute: 'eine halbe Minute'
@@ -60,7 +59,7 @@ de:
       over_x_years:
         one: 'mehr als 1 Jahr'
         other: 'mehr als {{count}} Jahre'
-      
+
   number:
     format:
       precision: 2
@@ -70,9 +69,9 @@ de:
       format:
         unit: '€'
         format: '%n%u'
-        separator: 
-        delimiter: 
-        precision: 
+        separator:
+        delimiter:
+        precision:
     percentage:
       format:
         delimiter: ""
@@ -88,7 +87,7 @@ de:
     array:
       sentence_connector: "und"
       skip_last_comma: true
-        
+
   activerecord:
     errors:
       template:

data/benchmark/original.rb

@@ -1,10 +1,13 @@
 require 'benchmark/base'
 
 begin
-gem 'gettext', '>=2.0.0'
+  gem 'gettext', '>=2.0.0'
 rescue LoadError
-  $LOAD_PATH.unshift 'lib'
+  puts 'To run this benchmark, please install the gettext gem'
+  exit 1
 end
+
+$LOAD_PATH.unshift 'lib'
 require 'gettext'
 include GetText
 

data/lib/fast_gettext/storage.rb

@@ -112,6 +112,10 @@ module FastGettext
       end
     end
 
+    def expire_cache_for(key)
+      current_cache.delete(key)
+    end
+
     def locale
       _locale || ( default_locale || (available_locales||[]).first || 'en' )
     end

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

@@ -3,4 +3,11 @@ class TranslationText < ActiveRecord::Base
   validates_presence_of :locale
   validates_uniqueness_of :locale, :scope=>:translation_key_id
   attr_accessible :text, :locale, :translation_key, :translation_key_id
+  after_update :expire_cache
+
+  protected
+
+  def expire_cache
+    FastGettext.expire_cache_for(translation_key.key)
+  end
 end

data/lib/fast_gettext/version.rb

@@ -1,3 +1,3 @@
 module FastGettext
-  VERSION = Version = '0.6.10'
+  VERSION = Version = '0.6.11'
 end

data/spec/fast_gettext/storage_spec.rb

@@ -327,6 +327,16 @@ describe 'Storage' do
     end
   end
 
+  describe :expire_cache_for do
+    it "expires the cached key" do
+      should_receive(:current_repository).and_return 'xxx' => 'new string'
+      current_cache['xxx'] = 'old string'
+      cached_find('xxx').should == 'old string'
+      expire_cache_for('xxx')
+      cached_find('xxx').should == 'new string'
+    end
+  end
+
   describe FastGettext::Storage::NoTextDomainConfigured do
     it "shows what to do" do
       FastGettext::Storage::NoTextDomainConfigured.new.to_s.should =~ /FastGettext\.add_text_domain/

data/spec/fast_gettext/translation_repository/db_spec.rb

@@ -105,4 +105,10 @@ describe FastGettext::TranslationRepository::Db do
     translation.should be_accessible(:translation_key_id)
     translation.should_not be_accessible(:created_at)
   end
+
+  it "expires the cache when updated" do
+    FastGettext.should_receive(:expire_cache_for).with('car')
+    translation_text = create_translation 'car', 'Auto'
+    translation_text.update_attributes :text => 'Autobot'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_gettext
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1278908847002659361
+      hash: -1129641372544859423
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1278908847002659361
+      hash: -1129641372544859423
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24