l10n 0.0.1 → 0.0.2

data/README.md

@@ -6,6 +6,21 @@ Installation
 ------------
 
 
+Setting up your app
+-------------------
+
+In your language.yml, make sure to have definitions for 
+
+number:
+  precision:
+    format:
+      separator: ","
+      delimiter: "."
+      precision: 2
+      
+As there is currently a bug in Rails: https://github.com/rails/rails/issues/4420
+
+
 Features
 --------
 

data/Rakefile

@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rdoc/task'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Run all tests'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.test_files = FileList['test/cases/*_test.rb']
+  t.verbose = true
+end
+
+desc 'Generate documentation'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'L10n'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

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

data/lib/l10n.rb

@@ -1,9 +1,12 @@
 require 'i18n'
-require 'active_record'
 require 'action_view'
+require 'active_support'
 
 require 'l10n/core_extensions'
+require 'l10n/i18n_extensions'
 require 'l10n/numeric_column_conversions'
+require 'l10n/column_translation'
+require 'l10n/forms'
 
 
 module L10n
@@ -31,19 +34,15 @@ module L10n
       i18n_available_locales.map { |i18n_locale| normalize_language_code(i18n_locale) }.uniq
     end
     
-
-    # TODO: remove, deprecated
-    # def localize(value, options = {})
-    #  case value
-    #  when Numeric then @number_helper.number_with_precision(value, options)
-    #  end
-    #end
-    #alias :l :localize
-    
-    def number_with_precision(*args)
-      @number_helper.number_with_precision(*args)
+    def number_with_precision(number, options = {})
+      #options.symbolize_keys!
+      #defaults = { :separator => I18n.t('number.format.separator'),
+      #             :delimiter => I18n.t('number.format.delimiter'),
+      #             :precision => I18n.t('number.format.precision') }
+      #options.reverse_merge!(defaults)
+      @number_helper.number_with_precision(number, options)
     end
-    
+        
     private
     
     def normalize_language_code(code)

data/lib/l10n/column_translation.rb

@@ -0,0 +1,74 @@
+module L10n
+  module ColumnTranslation
+    
+    def self.included(base)
+      base.extend ClassMethods
+      base.class_attribute :translated_attributes, :translation_options
+      base.translated_attributes = []
+      base.translation_options = {}
+    end
+    
+    module ClassMethods
+      def translates(*attrs)
+        self.translation_options = attrs.last.is_a?(Hash) ? attrs.pop : {}
+        self.translated_attributes = attrs
+        
+        definition_context = Proc.new do |attr_name|
+          define_method "#{attr_name}_t" do
+            read_attribute("#{attr_name}#{I18n.translation_suffix}")
+          end
+          define_method "#{attr_name}_t_with_fallback" do
+            default_value = read_attribute(attr_name)
+            if I18n.default?
+              localized_value = default_value
+            else
+              localized_value = read_attribute("#{attr_name}_#{I18n.language_code}")
+              localized_value = default_value if localized_value.blank?
+            end
+            localized_value
+          end
+          define_method "#{attr_name}_t=" do |value|
+            write_attribute "#{attr_name}#{I18n.translation_suffix}", value
+          end
+          define_method "#{attr_name}_#{I18n.default_language_code}" do
+            read_attribute attr_name
+          end
+          define_method "#{attr_name}_#{I18n.default_language_code}=" do |attr_value|
+            write_attribute attr_name, attr_value
+          end
+          define_method "#{attr_name}_translations" do
+            translations = { I18n.default_language_code => read_attribute(attr_name) }
+            (I18n.supported_language_codes - [I18n.default_language_code]).each do |language_code|
+              translations[language_code] = read_attribute("#{attr_name}_#{language_code}")
+            end
+            translations
+          end
+          define_method "#{attr_name}_translations=" do |translations|
+            translations.each do |language_code, value|
+              method_name = "#{attr_name}_#{language_code}="
+              send("#{attr_name}_#{language_code}=", value) if respond_to?(method_name)
+            end
+          end
+        end
+        self.translated_attributes.each { |attr_name| definition_context.call attr_name }
+      end
+      
+      def translates?(attr_name)
+        translated_attributes.map(&:to_s).include?(attr_name.to_s)
+      end
+      
+      def translate_column_name(column_name_t)
+        column_name_t = column_name_t.to_s
+        if column_name_t.ends_with?('_t') and translates?(column_name_t[0..-3])
+          "#{column_name_t[0..-3]}#{I18n.translation_suffix}"
+        else
+          column_name_t
+        end
+      end
+
+    end
+
+  end
+end
+
+ActiveRecord::Base.class_eval { include L10n::ColumnTranslation }

data/lib/l10n/core_extensions.rb

@@ -1,82 +1,12 @@
-module L10n
-  module CoreExtensions
-    
-    module ObjectExt
-      def to_localized_s
-        to_s
-      end
-    end
+require 'l10n/core_extensions/object_ext'
+require 'l10n/core_extensions/string_ext'
+require 'l10n/core_extensions/symbol_ext'
+require 'l10n/core_extensions/date_ext'
+require 'l10n/core_extensions/numeric_ext'
+require 'l10n/core_extensions/big_decimal_ext'
 
-    module StringExt
-      def translate(*args)
-        I18n.t(self, *args)
-      end
-      alias :t :translate
-    end
-    
-    module SymbolExt
-      def translate(*args)
-        to_s.translate(*args)
-      end
-      alias :t :translate
-    end
 
-    module DateExt
-      def localize(*args)
-        I18n.l(self, *args)
-      end
-      alias :l :localize
-    end
-    
-    module NumericExt
 
-      def self.included(base)
-        base.extend ClassMethods
-      end
 
-      module ClassMethods
-        def delocalize(value)
-          return value unless value.is_a?(String)
-          separator = I18n.t(:'number.format.separator')
-          delimiter = I18n.t(:'number.format.delimiter')
-          value.gsub(delimiter, '').gsub(separator, '.')
-        end
-        
-        def localize(value)
-          return value unless value.is_a?(Numeric) or value.is_a?(String)
-          separator = I18n.t(:'number.format.separator')
-          delimiter = I18n.t(:'number.format.delimiter')
-          value.to_s.gsub('.', 's').gsub(',', delimiter).gsub('s', separator)
-        end
-      end       
 
-      def to_localized_s
-        Numeric.localize(self)
-      end
-      
-      def to_formatted_s
-        L10n.number_with_precision(self)
-      end
-    end
-    
-    module BigDecimalExt
-      def to_formatted_s
-        L10n.number_with_precision(self)
-      end
-    end
-    
-  end
-end
 
-L10n::CoreExtensions.constants.each do |mod|
-  extension = L10n::CoreExtensions.const_get(mod)
-  klass = mod.to_s.sub(/Ext\z/, '').constantize
-  klass.class_eval { include extension }
-end
-
-#Object.class_eval { include Localite::CoreExtensions::ObjectExt }
-#String.class_ :include, Localite::CoreExtensions::StringExt
-#Symbol.send :include, Localite::CoreExtensions::SymbolExt
-#Numeric.send :include, Localite::CoreExtensions::NumericExt
-#BigDecimal.send :include, Localite::CoreExtensions::BigDecimalExt
-#Date.send :include, Localite::CoreExtensions::DateExt

data/lib/l10n/core_extensions/big_decimal_ext.rb

@@ -0,0 +1,24 @@
+require 'bigdecimal'
+require 'active_support'
+
+module L10n
+  module CoreExtensions
+    module BigDecimalExt
+      
+      def self.included(base)
+        base.class_eval do
+          alias_method :_active_support_to_formatted_s, :to_formatted_s
+          alias_method :to_s, :_active_support_to_formatted_s
+          alias_method :to_formatted_s, :_l10n_to_formatted_s
+        end
+      end
+      
+      def _l10n_to_formatted_s(*args)
+        L10n.number_with_precision(self)
+      end
+      #
+    end
+  end
+end
+
+BigDecimal.send :include, L10n::CoreExtensions::BigDecimalExt

data/lib/l10n/core_extensions/date_ext.rb

@@ -0,0 +1,12 @@
+module L10n
+  module CoreExtensions
+    module DateExt
+      def localize(*args)
+        I18n.l(self, *args)
+      end
+      alias :l :localize
+    end
+  end
+end
+
+Date.send :include, L10n::CoreExtensions::DateExt

data/lib/l10n/core_extensions/numeric_ext.rb

@@ -0,0 +1,37 @@
+module L10n
+  module CoreExtensions
+    module NumericExt
+
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        def delocalize(value)
+          return value unless value.is_a?(String)
+          separator = I18n.t(:'number.format.separator')
+          delimiter = I18n.t(:'number.format.delimiter')
+          value.gsub(delimiter, '').gsub(separator, '.')
+        end
+        
+        def localize(value)
+          return value unless value.is_a?(Numeric) or value.is_a?(String)
+          separator = I18n.t(:'number.format.separator')
+          delimiter = I18n.t(:'number.format.delimiter')
+          value.to_s.gsub('.', 's').gsub(',', delimiter).gsub('s', separator)
+        end
+      end       
+
+      def to_localized_s
+        Numeric.localize(self)
+      end
+      
+      def to_formatted_s(*args)
+        L10n.number_with_precision(self)
+      end
+      
+    end
+  end
+end
+
+Numeric.send :include, L10n::CoreExtensions::NumericExt

data/lib/l10n/core_extensions/object_ext.rb

@@ -0,0 +1,11 @@
+module L10n
+  module CoreExtensions
+    module ObjectExt
+      def to_localized_s
+        to_s
+      end
+    end 
+  end
+end
+
+Object.send :include, L10n::CoreExtensions::ObjectExt

data/lib/l10n/core_extensions/string_ext.rb

@@ -0,0 +1,12 @@
+module L10n
+  module CoreExtensions
+    module StringExt
+      def translate(*args)
+        I18n.t(self, *args)
+      end
+      alias :t :translate
+    end
+  end
+end
+
+String.send :include, L10n::CoreExtensions::StringExt

data/lib/l10n/core_extensions/symbol_ext.rb

@@ -0,0 +1,12 @@
+module L10n
+  module CoreExtensions
+    module SymbolExt
+      def translate(*args)
+        I18n.t(self, *args)
+      end
+      alias :t :translate
+    end
+  end
+end
+
+Symbol.send :include, L10n::CoreExtensions::SymbolExt

data/lib/l10n/forms.rb

@@ -0,0 +1,19 @@
+module L10n
+  module Forms
+    module FormBuilder
+      
+      def amount_field(field, options = {})
+        value = L10n.number_with_precision(object.send(field))
+        options[:value] = value
+        options[:class] = "#{options[:class]} amount_field"
+        text_field(field, options)
+      end
+      
+    end
+  end
+end
+
+
+ActionView::Helpers::FormBuilder.class_eval do
+  include L10n::Forms::FormBuilder
+end

data/lib/l10n/i18n_extensions.rb

@@ -0,0 +1,83 @@
+module L10n
+  module I18nExtensions
+   
+    def self.included(base)
+      base.extend ClassMethods
+    end
+   
+    module ClassMethods
+     
+      def default?
+        language_code == default_language_code
+      end
+     
+      def language_code
+        normalize_language_code(locale) if locale
+      end
+      
+      def country_code
+        if locale.to_s.match(/\w\w-\w\w/)
+          locale.to_s[-2..-1]
+        else
+          normalize_locale_code(locale)[-2..-1]
+        end
+      end
+     
+      def default_language_code
+        normalize_language_code(default_locale) if default_locale
+      end
+     
+      def available_language_codes
+        available_locales.map { |locale| normalize_language_code(locale) }.uniq
+      end
+
+      def supported_language_codes
+        [:en, :de]
+      end
+    
+      def preferred_locale
+        :de
+      end
+     
+      def as(tmp_locale)
+        if normalized_code = normalize_locale_code(tmp_locale)
+          previous_locale = self.locale
+          self.locale = normalized_code
+        end
+        yield
+      ensure
+        self.locale = previous_locale if normalized_code
+      end
+      
+      def as_default
+        I18n.as(I18n.default_locale) { yield }
+      end
+      
+      def as_each
+        supported_language_codes.inject({}) { |hash, code| hash[code] = I18n.as(code) { yield(code) }; hash }
+      end
+      
+      def translations(key)
+        supported_language_codes.inject({}) { |hash, code| hash[code] = I18n.as(code) { I18n.t(key) }; hash }
+      end
+      
+      def translation_suffix
+        default? ? '' : "_#{I18n.language_code}"
+      end
+     
+      private
+     
+      def normalize_language_code(code)
+        code.to_s[0..1].downcase.to_sym
+      end
+      
+      def normalize_locale_code(code)
+        normalize_language_code(code)
+      end
+      
+    end
+    
+  end
+end
+
+I18n.extend L10n::I18nExtensions::ClassMethods

data/lib/l10n/numeric_column_conversions.rb

@@ -1,3 +1,5 @@
+require 'active_record'
+
 module L10n
   module NumericColumnConversions
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: l10n
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &3582520 !ruby/object:Gem::Requirement
+  requirement: &3672640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *3582520
+  version_requirements: *3672640
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &3582280 !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: &3672400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,19 +32,84 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *3582280
-description: Extensions for Rails I18n
+  version_requirements: *3672400
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &3672170 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *3672170
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &3671940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *3671940
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &3671750 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *3671750
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &3671520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *3671520
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &3671270 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *3671270
+description: I18n that roarrrs
 email: mtgrosser@gmx.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/l10n/column_translation.rb
+- lib/l10n/core_extensions/big_decimal_ext.rb
+- lib/l10n/core_extensions/date_ext.rb
+- lib/l10n/core_extensions/numeric_ext.rb
+- lib/l10n/core_extensions/object_ext.rb
+- lib/l10n/core_extensions/string_ext.rb
+- lib/l10n/core_extensions/symbol_ext.rb
 - lib/l10n/core_extensions.rb
+- lib/l10n/forms.rb
+- lib/l10n/i18n_extensions.rb
 - lib/l10n/numeric_column_conversions.rb
 - lib/l10n.rb
 - MIT-LICENSE
 - VERSION
 - README.md
+- Rakefile
 homepage: http://rubygems.org/gems/l10n
 licenses: []
 post_install_message: 
@@ -70,3 +135,4 @@ signing_key:
 specification_version: 3
 summary: Extensions for Rails I18n
 test_files: []
+has_rdoc: