nulogy-gettext_i18n_rails 0.4.6.2 → 0.5.0.1

data/.gitignore

@@ -0,0 +1,2 @@
+.idea
+pkg/*.gem

data/Gemfile

@@ -1,16 +1,12 @@
 source :rubygems
+gemspec
 
-gem 'fast_gettext'
-
-group :dev do
-  gem 'haml'
-  gem 'slim'
-  gem 'hamlet'
-  gem 'ruby_parser'
-  gem 'gettext'
-  gem 'sqlite3', '~>1.3.4'
-  gem 'rails', ENV['RAILS'] || '~>3'
-  gem 'rake'
-  gem 'rspec', '~>2'
-  gem 'jeweler'
-end
+gem 'haml'
+gem 'slim'
+gem 'hamlet'
+gem 'ruby_parser'
+gem 'gettext'
+gem 'sqlite3', '~>1.3.4'
+gem 'rails', ENV['RAILS'] || '~>3'
+gem 'rake'
+gem 'rspec', '~>2'

data/Gemfile.lock

@@ -1,3 +1,9 @@
+PATH
+  remote: .
+  specs:
+    gettext_i18n_rails (0.5.0)
+      fast_gettext
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -38,16 +44,11 @@ GEM
     fast_gettext (0.5.13)
     gettext (2.1.0)
       locale (>= 2.0.5)
-    git (1.2.5)
     haml (3.1.4)
     hamlet (0.1)
       slim (~> 1.0)
     hike (1.2.1)
     i18n (0.6.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
     locale (2.0.5)
     mail (2.3.0)
       i18n (>= 0.4.0)
@@ -113,11 +114,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fast_gettext
   gettext
+  gettext_i18n_rails!
   haml
   hamlet
-  jeweler
   rails (~> 3)
   rake
   rspec (~> 2)

data/Rakefile

@@ -1,3 +1,5 @@
+require 'bundler/gem_tasks'
+
 task :spec do
   sh "rspec spec"
 end
@@ -8,17 +10,20 @@ task :default do
   sh "RAILS=3.1.0 && (bundle || bundle install) && bundle exec rake spec"
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'gettext_i18n_rails'
-    gem.summary = "Simple FastGettext Rails integration."
-    gem.email = "grosser.michael@gmail.com"
-    gem.homepage = "http://github.com/grosser/#{gem.name}"
-    gem.authors = ["Michael Grosser"]
-  end
+# extracted from https://github.com/grosser/project_template
+rule /^version:bump:.*/ do |t|
+  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
+  index = ['major', 'minor','patch'].index(t.name.split(':').last)
+  file = 'lib/gettext_i18n_rails/version.rb'
+
+  version_file = File.read(file)
+  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
+  version_parts[index] = version_parts[index].to_i + 1
+  version_parts[2] = 0 if index < 2 # remove patch for minor
+  version_parts[1] = 0 if index < 1 # remove minor for major
+  new_version = version_parts * '.'
+  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
 
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
+  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
 end
+

data/Readme.md

@@ -220,6 +220,7 @@ lib/tasks/gettext.rake:
  - [Lucas Hills](https://github.com/2potatocakes)
  - [Ladislav Slezák](https://github.com/lslezak)
  - [Greg Weber](https://github.com/gregwebs)
+ - [Sean Kirby](https://github.com/sskirby)
 
 [Michael Grosser](http://grosser.it)<br/>
 grosser.michael@gmail.com<br/>

data/gettext_i18n_rails.gemspec

@@ -1,65 +1,13 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+name = "gettext_i18n_rails"
+require "#{name}/version"
 
-Gem::Specification.new do |s|
-  s.name = "gettext_i18n_rails"
-  s.version = "0.4.6"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Michael Grosser"]
-  s.date = "2012-04-05"
-  s.email = "grosser.michael@gmail.com"
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "Rakefile",
-    "Readme.md",
-    "VERSION",
-    "gettext_i18n_rails.gemspec",
-    "init.rb",
-    "lib/gettext_i18n_rails.rb",
-    "lib/gettext_i18n_rails/action_controller.rb",
-    "lib/gettext_i18n_rails/active_record.rb",
-    "lib/gettext_i18n_rails/backend.rb",
-    "lib/gettext_i18n_rails/base_parser.rb",
-    "lib/gettext_i18n_rails/haml_parser.rb",
-    "lib/gettext_i18n_rails/hamlet_parser.rb",
-    "lib/gettext_i18n_rails/html_safe_translations.rb",
-    "lib/gettext_i18n_rails/i18n_hacks.rb",
-    "lib/gettext_i18n_rails/model_attributes_finder.rb",
-    "lib/gettext_i18n_rails/railtie.rb",
-    "lib/gettext_i18n_rails/ruby_gettext_extractor.rb",
-    "lib/gettext_i18n_rails/slim_parser.rb",
-    "lib/gettext_i18n_rails/string_interpolate_fix.rb",
-    "lib/gettext_i18n_rails/tasks.rb",
-    "lib/tasks/gettext_rails_i18n.rake",
-    "spec/gettext_i18n_rails/action_controller_spec.rb",
-    "spec/gettext_i18n_rails/active_record_spec.rb",
-    "spec/gettext_i18n_rails/backend_spec.rb",
-    "spec/gettext_i18n_rails/haml_parser_spec.rb",
-    "spec/gettext_i18n_rails/hamlet_parser_spec.rb",
-    "spec/gettext_i18n_rails/slim_parser_spec.rb",
-    "spec/gettext_i18n_rails/string_interpolate_fix_spec.rb",
-    "spec/gettext_i18n_rails_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/grosser/gettext_i18n_rails"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+Gem::Specification.new name, GettextI18nRails::VERSION do |s|
   s.summary = "Simple FastGettext Rails integration."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fast_gettext>, [">= 0"])
-    else
-      s.add_dependency(%q<fast_gettext>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<fast_gettext>, [">= 0"])
-  end
+  s.authors = ["Michael Grosser"]
+  s.email = "michael@grosser.it"
+  s.homepage = "http://github.com/grosser/#{name}"
+  s.files = `git ls-files`.split("\n")
+  s.license = "MIT"
+  s.add_runtime_dependency "fast_gettext"
 end
-

data/lib/gettext_i18n_rails.rb

@@ -1,6 +1,6 @@
+require 'gettext_i18n_rails/version'
+
 module GettextI18nRails
-  VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
-  
   extend self
 end
 
@@ -29,5 +29,9 @@ if not defined?(Rails::Railtie) and defined?(ActiveRecord)
   ActiveRecord::Base.extend GettextI18nRails::ActiveRecord
 end
 
+if not defined?(Rails::Railtie) and defined?(ActiveModel)
+  require 'gettext_i18n_rails/active_model'
+end
+
 require 'gettext_i18n_rails/action_controller' if defined?(ActionController) # so that bundle console can work in a rails project
 require 'gettext_i18n_rails/railtie'

data/lib/gettext_i18n_rails/active_model.rb

@@ -0,0 +1,7 @@
+module ActiveModel
+  class Name < String
+    def human(options={})
+      _(@klass.humanize_class_name(self))
+    end
+  end
+end

data/lib/gettext_i18n_rails/active_record.rb

@@ -5,15 +5,20 @@ module GettextI18nRails::ActiveRecord
   end
 
   # CarDealer -> _('car dealer')
+  # method deprecated in Rails 3.1
   def human_name(*args)
-    _(self.human_name_without_translation)
+    _(self.humanize_class_name(self.to_s))
   end
 
-  def human_name_without_translation
-    self.to_s.underscore.gsub('_',' ')
+  def humanize_class_name(name)
+    name.underscore.humanize
   end
 
   def gettext_translation_for_attribute_name(attribute)
-    "#{self}|#{attribute.to_s.split('.').map! {|a| a.humanize }.join('|')}"
+    if attribute.to_s.ends_with?('_id')
+      humanize_class_name(attribute)
+    else
+      "#{self}|#{attribute.to_s.split('.').map! {|a| a.humanize }.join('|')}"
+    end
   end
 end

data/lib/gettext_i18n_rails/model_attributes_finder.rb

@@ -1,3 +1,6 @@
+require 'rails/version'
+require 'rails' if Rails::VERSION::MAJOR > 2
+
 module GettextI18nRails
   #write all found models/columns to a file where GetTexts ruby parser can find them
   def store_model_attributes(options)
@@ -45,7 +48,7 @@ module GettextI18nRails
     end
 
     def models
-      if Rails.respond_to?(:application)
+      if Rails::VERSION::MAJOR > 2
         Rails.application.eager_load! # make sure that all models are loaded so that direct_descendants works
         ::ActiveRecord::Base.direct_descendants
       else

data/lib/gettext_i18n_rails/railtie.rb

@@ -14,6 +14,7 @@ if defined?(Rails::Railtie)
         if app.config.gettext_i18n_rails.use_for_active_record_attributes
           ActiveSupport.on_load :active_record do
             extend GettextI18nRails::ActiveRecord
+            require 'gettext_i18n_rails/active_model.rb'
           end
         end
       end

data/lib/gettext_i18n_rails/tasks.rb

@@ -79,7 +79,7 @@ namespace :gettext do
     ignore_tables = [/^sitemap_/, /_versions$/, 'schema_migrations', 'sessions', 'delayed_jobs']
     GettextI18nRails.store_model_attributes(
       :to => storage_file,
-      :ignore_columns => ['id', 'type', 'created_at', 'updated_at'],
+      :ignore_columns => [/_id$/, 'id', 'type', 'created_at', 'updated_at'],
       :ignore_tables => ignore_tables
     )
   end

data/lib/gettext_i18n_rails/version.rb

@@ -0,0 +1,3 @@
+module GettextI18nRails
+  Version = VERSION = '0.5.0.1'
+end

data/spec/gettext_i18n_rails/active_model_spec.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe ActiveModel::Name do
+  before do
+    FastGettext.current_cache = {}
+  end
+
+  describe 'human' do
+    it "is translated through FastGettext" do
+      name = ActiveModel::Name.new(CarSeat)
+      name.should_receive(:_).with('Car seat').and_return('Autositz')
+      name.human.should == 'Autositz'
+    end
+  end
+end

data/spec/gettext_i18n_rails/active_record_spec.rb

@@ -1,36 +1,6 @@
 # coding: utf-8
 require "spec_helper"
 
-FastGettext.silence_errors
-
-ActiveRecord::Base.establish_connection({
-  :adapter => "sqlite3",
-  :database => ":memory:",
-})
-
-ActiveRecord::Schema.define(:version => 1) do
-  create_table :car_seats, :force=>true do |t|
-    t.string :seat_color
-  end
-
-  create_table :parts, :force=>true do |t|
-    t.string :name
-    t.references :car_seat
-  end
-end
-
-ActiveRecord::Base.extend GettextI18nRails::ActiveRecord
-
-class CarSeat < ActiveRecord::Base
-  validates_presence_of :seat_color, :message=>"translate me"
-  has_many :parts
-  accepts_nested_attributes_for :parts
-end
-
-class Part < ActiveRecord::Base
-  belongs_to :car_seat
-end
-
 describe ActiveRecord::Base do
   before do
     FastGettext.current_cache = {}
@@ -38,7 +8,7 @@ describe ActiveRecord::Base do
 
   describe :human_name do
     it "is translated through FastGettext" do
-      CarSeat.should_receive(:_).with('car seat').and_return('Autositz')
+      CarSeat.should_receive(:_).with('Car seat').and_return('Autositz')
       CarSeat.human_name.should == 'Autositz'
     end
   end
@@ -55,6 +25,12 @@ describe ActiveRecord::Base do
     end
   end
 
+  describe :gettext_translation_for_attribute_name do
+    it "translates foreign keys to model name keys" do
+      Part.gettext_translation_for_attribute_name('car_seat_id').should == 'Car seat'
+    end
+  end
+
   describe 'error messages' do
     let(:model){
       c = CarSeat.new

data/spec/gettext_i18n_rails/model_attributes_finder_spec.rb

@@ -0,0 +1,36 @@
+# coding: utf-8
+require "spec_helper"
+require "gettext_i18n_rails/model_attributes_finder"
+
+if Rails::VERSION::MAJOR > 2
+  module Test
+    class Application < Rails::Application
+    end
+  end
+end
+
+describe GettextI18nRails::ModelAttributesFinder do
+  let(:finder) { GettextI18nRails::ModelAttributesFinder.new }
+
+  before do
+    Rails.application
+  end
+
+  describe :find do
+    it "returns all AR models" do
+      keys = finder.find({}).keys
+      if Rails::VERSION::MAJOR > 2
+        keys.should == [CarSeat, NotConventional, Part]
+      else
+        keys.should == [CarSeat, Part]
+      end
+    end
+
+    it "returns all columns for each model" do
+      attributes = finder.find({})
+      attributes[CarSeat].should == ['id', 'seat_color']
+      attributes[NotConventional].should == ['id', 'name'] if Rails::VERSION::MAJOR > 2
+      attributes[Part].should == ['car_seat_id', 'id', 'name']
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -36,4 +36,40 @@ def with_file(content)
     f.close
     yield f.path
   end
-end
+end
+
+ActiveRecord::Base.establish_connection(
+  :adapter => "sqlite3",
+  :database => ":memory:"
+)
+
+ActiveRecord::Schema.define(:version => 1) do
+  create_table :car_seats, :force=>true do |t|
+    t.string :seat_color
+  end
+
+  create_table :parts, :force=>true do |t|
+    t.string :name
+    t.references :car_seat
+  end
+
+  create_table :not_at_all_conventionals, :force=>true do |t|
+    t.string :name
+  end
+end
+
+class CarSeat < ActiveRecord::Base
+  validates_presence_of :seat_color, :message=>"translate me"
+  has_many :parts
+  accepts_nested_attributes_for :parts
+end
+
+class Part < ActiveRecord::Base
+  belongs_to :car_seat
+end
+
+class NotConventional < ActiveRecord::Base
+  set_table_name :not_at_all_conventionals
+end
+
+ActiveRecord::Base.extend GettextI18nRails::ActiveRecord

metadata

@@ -1,55 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nulogy-gettext_i18n_rails
-version: !ruby/object:Gem::Version 
-  hash: 115
+version: !ruby/object:Gem::Version
+  version: 0.5.0.1
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 6
-  - 2
-  version: 0.4.6.2
 platform: ruby
-authors: 
+authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fast_gettext
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: grosser.michael@gmail.com
+email: michael@grosser.it
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - Rakefile
 - Readme.md
-- VERSION
 - gettext_i18n_rails.gemspec
 - init.rb
 - lib/gettext_i18n_rails.rb
 - lib/gettext_i18n_rails/action_controller.rb
+- lib/gettext_i18n_rails/active_model.rb
 - lib/gettext_i18n_rails/active_record.rb
 - lib/gettext_i18n_rails/backend.rb
 - lib/gettext_i18n_rails/base_parser.rb
@@ -63,48 +56,42 @@ files:
 - lib/gettext_i18n_rails/slim_parser.rb
 - lib/gettext_i18n_rails/string_interpolate_fix.rb
 - lib/gettext_i18n_rails/tasks.rb
+- lib/gettext_i18n_rails/version.rb
 - lib/tasks/gettext_rails_i18n.rake
 - spec/gettext_i18n_rails/action_controller_spec.rb
+- spec/gettext_i18n_rails/active_model_spec.rb
 - spec/gettext_i18n_rails/active_record_spec.rb
 - spec/gettext_i18n_rails/backend_spec.rb
 - spec/gettext_i18n_rails/haml_parser_spec.rb
 - spec/gettext_i18n_rails/hamlet_parser_spec.rb
+- spec/gettext_i18n_rails/model_attributes_finder_spec.rb
 - spec/gettext_i18n_rails/slim_parser_spec.rb
 - spec/gettext_i18n_rails/string_interpolate_fix_spec.rb
 - spec/gettext_i18n_rails_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/grosser/gettext_i18n_rails
-licenses: []
-
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Simple FastGettext Rails integration.
 test_files: []
-

data/VERSION

@@ -1 +0,0 @@
-0.4.6