i18n_column 0.0.1 → 0.0.2

data/README.rdoc

@@ -4,12 +4,19 @@
 
 This extension provides the capabilities of storing and retrieving translations from a single database column. The translations are stored as a JSON object i.e. {"en":"Home","de":"Zuhause"}.
 
-The current and default language are stored within the class <tt>I18nColumn::Language</tt>. On each request the current language must be set via <tt>I18nColumn::Language.current_lang = 'en'</tt>. If not set the default language is taken. <tt>I18nColumn::Language.current_lang</tt> is used as the JSON key to store a translation i.e. "en":"Home".
+The current and default locale are retrieved from the {Rails Internationalization (I18n) API}[http://guides.rubyonrails.org/i18n.html]. Set the current locale on each request with i.e. <tt>I18n.locale = :de</tt>. If not set the default locale will be taken: <tt>I18n.default_locale</tt>. <tt>I18n.locale</tt> is used as the JSON key to store a translation i.e. <tt>"en":"Home"</tt>.
+
+<tt>i18n_column</tt> is tested with rails version 3.
 
 == Installation
 
-* Recently a gem version will be provided on gemcutter.
-* Run <tt>rails generate i18n_column:install</tt>. It will generate a i18n_column initializer file in order to set the default language.
+<b>Gem</b>
+
+ gem install i18n_column
+
+<b>Bundler</b>
+
+ gem('i18n_column')
 
 == Example
 
@@ -23,7 +30,7 @@ The current and default language are stored within the class <tt>I18nColumn::Lan
    end
 
    def self.down
-     drop_table :nodes
+     drop_table(:nodes)
    end
  end
 
@@ -36,21 +43,25 @@ The current and default language are stored within the class <tt>I18nColumn::Lan
 <b>Controller</b>
 
  class ApplicationController < ActionController::Base
-   before_filter(:set_i18n_column_lang)
+   before_filter(:set_locale)
 
    private
 
-   def set_i18n_column_lang
-     I18nColumn::Language.current_lang = params[:lang]
+   def set_locale
+     I18n.locale = params[:locale]
    end
  end
 
+<b>Set the default locale in config/application.rb file</b>
+
+ config.i18n.default_locale = :de
+
 <b>Console</b>
 
- I18nColumn::Language.current_lang = 'en'
+ I18n.locale = :en
  node = Node.create!(:name => 'Home') => {"en":"Home"}
  node.name => 'Home'
- I18nColumn::Language.current_lang = 'de'
+ I18n.locale = :de
  node.name = 'Zuhause'
  node.save! => {"en":"Home","de":"Zuhause"}
  node.name => 'Zuhause'

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/i18n_column.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{i18n_column}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philipp Ullmann"]
-  s.date = %q{2010-10-13}
+  s.date = %q{2010-10-14}
   s.description = %q{This extension provides the capabilities of storing and retrieving translations from a single database column. The translations are serialized using JSON.}
   s.email = %q{philipp.ullmann@create.at}
   s.extra_rdoc_files = [
@@ -24,11 +24,8 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "i18n_column.gemspec",
-     "lib/generators/i18n_column/install/install_generator.rb",
-     "lib/generators/i18n_column/install/templates/config/initializers/i18n_column.rb",
      "lib/i18n_column.rb",
      "lib/i18n_column/base.rb",
-     "lib/i18n_column/language.rb",
      "spec/.rspec",
      "spec/i18n_column_spec.rb",
      "spec/spec_helper.rb"

data/lib/i18n_column/base.rb

@@ -19,12 +19,12 @@ module I18nColumn
           class_eval <<-EOV
             def #{col_name}
               json = #{col_name}_to_json
-              json.nil? ? nil : json[::I18nColumn::Language.current_lang]
+              json.nil? ? nil : json[::I18n.locale.to_s]
             end
           
             def #{col_name}=(value)
               json = #{col_name}_to_json || {}
-              json[::I18nColumn::Language.current_lang] = value
+              json[::I18n.locale.to_s] = value
               self[:#{col_name}] = json.to_json
               value
             end

data/lib/i18n_column.rb

@@ -1,3 +1,2 @@
 require('active_record')
 require('i18n_column/base')
-require('i18n_column/language')

data/spec/i18n_column_spec.rb

@@ -2,6 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe(I18nColumn::Base) do
   before(:each) do
+    I18n.locale = :en
     setup_db
   end
   
@@ -11,7 +12,6 @@ describe(I18nColumn::Base) do
   
   context('with no translation') do
     before(:each) do
-      I18nColumn::Language.current_lang = 'en'
       @node = Node.new
     end
     
@@ -31,7 +31,6 @@ describe(I18nColumn::Base) do
   
   context('with an english name only') do
     before(:each) do
-      I18nColumn::Language.current_lang = 'en'
       @node = Node.create!(:name => 'Home')
     end
     
@@ -48,7 +47,7 @@ describe(I18nColumn::Base) do
       end
       
       it('translates the name into german') do
-        I18nColumn::Language.current_lang = 'de'
+        I18n.locale = :de
         @node.name = 'Zuhause'
         @node.name.should == 'Zuhause'
       end
@@ -57,38 +56,37 @@ describe(I18nColumn::Base) do
   
   context('with an english and german name') do
     before(:each) do
-      I18nColumn::Language.current_lang = 'en'
       @node = Node.create!(:name => 'Home')
-      I18nColumn::Language.current_lang = 'de'
+      I18n.locale = :de
       @node.update_attribute(:name, 'Zuhause')
     end
     
     describe('#name') do
       it('returns the english name') do
-        I18nColumn::Language.current_lang = 'en'
+        I18n.locale = :en
         @node.name.should == 'Home'
       end
       
       it('returns the german name') do
-        I18nColumn::Language.current_lang = 'de'
+        I18n.locale = :de
         @node.name.should == 'Zuhause'
       end
     end
     
     describe('#name=') do
       it('overrides the english name only') do
-        I18nColumn::Language.current_lang = 'en'
+        I18n.locale = :en
         @node.name = 'Home overridden'
         @node.name.should == 'Home overridden'
-        I18nColumn::Language.current_lang = 'de'
+        I18n.locale = :de
         @node.name.should == 'Zuhause'
       end
       
       it('overrides the german name only') do
-        I18nColumn::Language.current_lang = 'de'
+        I18n.locale = :de
         @node.name = 'Zuhause ueberschrieben'
         @node.name.should == 'Zuhause ueberschrieben'
-        I18nColumn::Language.current_lang = 'en'
+        I18n.locale = :en
         @node.name.should == 'Home'
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i18n_column
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Philipp Ullmann
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +02:00
+date: 2010-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,11 +83,8 @@ files:
 - Rakefile
 - VERSION
 - i18n_column.gemspec
-- lib/generators/i18n_column/install/install_generator.rb
-- lib/generators/i18n_column/install/templates/config/initializers/i18n_column.rb
 - lib/i18n_column.rb
 - lib/i18n_column/base.rb
-- lib/i18n_column/language.rb
 - spec/.rspec
 - spec/i18n_column_spec.rb
 - spec/spec_helper.rb

data/lib/generators/i18n_column/install/install_generator.rb

@@ -1,19 +0,0 @@
-module I18nColumn
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-
-      desc <<DESC
-Description:
-    Copy initialize file to your application.
-DESC
-
-      def self.source_root
-        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-      end
-      
-      def copy_initializer_file
-        template('config/initializers/i18n_column.rb')
-      end
-    end
-  end
-end

data/lib/generators/i18n_column/install/templates/config/initializers/i18n_column.rb

@@ -1,2 +0,0 @@
-# On each request the current language must be set via I18nColumn::Language.current_lang = 'de'. If not set the default language ('en') is returned by I18nColumn::Language.current_lang.
-I18nColumn::Language.default_lang = 'en'

data/lib/i18n_column/language.rb

@@ -1,21 +0,0 @@
-# Saves the current and default language.
-module I18nColumn
-  class Language
-    @@default_lang = 'en'
-    
-    # Sets the default language.
-    def self.default_lang=(lang)
-      @@default_lang = lang
-    end
-    
-    # Returns the current language.
-    def self.current_lang
-      ::Thread.current[:i18n_column_current_lang] || @@default_lang
-    end
-  
-    # Sets the current language. Must be set by each request.
-    def self.current_lang=(lang)
-      ::Thread.current[:i18n_column_current_lang] = lang
-    end
-  end
-end