numbers_and_words 0.7.1 → 0.8.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjY4MzliZjgxMWZjZTcyM2FhNDYxZWY0NTU1MmUzYWNhZWI4MWYxOQ==
-  data.tar.gz: !binary |-
-    MDNiNGE0ODQ4NjEzMDliZmJkNWQxMTI1MWU4YTI1ZTRhMzFlODE2Zg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MGI3NjJkY2E1OWM2OTFhNzZmZmY4NjFhNGNhY2QwZGZhN2RmZjE0YjJlNzUw
-    MTAzNmZiMDY0MzJiOWFjZGY0N2JlZjVlYTVlZTNjZGQzNGNiZTU3YjJlMTFm
-    ZDM5YTQ2NjYzZjAxZDkyYzI2Y2EzZGRkMzU5NGZkYWMxMjMyNzk=
-  data.tar.gz: !binary |-
-    NjAwODNmZDFkMjE0ODc5ZGI0Y2M3YWYwNmU1M2ZlOTY1YTdiM2IxMmM2MWMx
-    ZDM4MDIzNmJlNWFmMjY3Y2M3ODMxMWU1ZmE1ZmU3NDUxZTc0MTYxMTk5Y2Ew
-    ZTY2YmFkYzQzMDM4NzEzYjg0NjE0ODI1ZGQ2YjJiZTFmMmFjNjU=
+SHA1:
+  metadata.gz: 14b6c2ee5f7c2b5803ea7a19d4a3ca3441db4435
+  data.tar.gz: 459a289fa37ac62d3434560976b7a59f50c94c95
+SHA512:
+  metadata.gz: cfb6bebd6a761b1b74e0596fc0ea4090f19f673c6e6f32374d99075ea945038adfe52707c00d845888112838a29c33b2606c444265c712408136bf87fa29d198
+  data.tar.gz: e74db64eb655bd469aba22ea94d8ef5f1ac00d973b5378e4283ea40c913ad84276d50f0d9903dc2a2562a6b6e6c6158e68ac95b43189e145e94f6c35dc6962fc

data/README.rdoc

@@ -16,20 +16,27 @@ Számok betűvel írva az I18n könyvtár segítségével.
 
 == Supported Languages / Языки / Langues Supportées
 
-* English
-* Spanish
-* Русский
-* Français
-* Українська
-* Magyar
-* Türkçe**
-* Italiano**
-* Nederlands**
-* Swedish**
-* English (British)**
+* English [en]
+* Spanish [es]
+* Русский [ru]
+* Français [fr]
+* Українська [ua]
+* Magyar [hu]
+* Türkçe** [tr]
+* Italiano** [it]
+* Nederlands** [nl]
+* Swedish** [se]
+* English (British)** [en-GB]
 
 ** Experimental
 
+* {[en-AU], [en-CA], [en-IN], [en-US]}*** => [en]
+* {[es-419], [es-AR], [es-CL], [es-CO], [es-MX], [es-PE], [es-VE]}*** => [es]
+* {[fr-CA], [fr-CH]}*** => [fr]
+* {[it-CH]}*** => [it]
+
+*** Aliases
+
 == Examples / Примеры / Exemples
 
     I18n.with_locale(:en) { 42.to_words }

data/lib/numbers_and_words/helper_classes/figures_array.rb

@@ -8,11 +8,15 @@ module NumbersAndWords
 
     def to_words options = {}
       validate_figure_array!
-      Strategies.figures_converter.new(self, options).run
+      local_language { Strategies.figures_converter.new(self, options).run }
     end
 
     def reverse
       super.to_figures
     end
+
+    def local_language
+      ::I18n.with_locale(I18n.local_language) { yield }
+    end
   end
 end

data/lib/numbers_and_words/helper_classes/words_array.rb

@@ -5,7 +5,11 @@ module NumbersAndWords
   class WordsArray < Array
 
     def join options = {}
-      Strategies.array_joiner.new(self.to_a, options).run
+      local_language { Strategies.array_joiner.new(self.to_a, options).run }
+    end
+
+    def local_language
+      ::I18n.with_locale(I18n.local_language) { yield }
     end
   end
 end

data/lib/numbers_and_words/i18n.rb

@@ -5,6 +5,27 @@ module NumbersAndWords
   module I18n
     extend self
 
+    def languages
+      @languages ||= (locale_files.map { |path| path.split(/[\/.]/)[-2].to_sym })
+    end
+
+    def local_language locale = ::I18n.locale
+      if languages.include?(locale)
+        locale
+      else
+        locale = locale.to_s.scan(/\w+/).first.to_sym
+        languages.include?(locale) ? locale : raise('Language not supported')
+      end
+    end
+
+    def language_class_name
+      ::I18n.locale.to_s.titleize.gsub ' ', ''
+    end
+
+    def locale_files
+      files 'locales', '*.*'
+    end
+
     def files directory, ext
       Dir[File.join File.dirname(__FILE__), "i18n/#{directory}", "**/#{ext}"]
     end

data/lib/numbers_and_words/i18n/initialization.rb

@@ -3,22 +3,10 @@ module NumbersAndWords
     module Initialization
       extend self
 
-      attr_accessor :languages
-
       def init
-        locale_files.each { |locale_file| ::I18n.load_path << locale_file}
+        I18n.locale_files.each { |locale_file| ::I18n.load_path << locale_file}
         NumbersAndWords::I18n::Pluralization.init
       end
-
-      def languages
-        @languages ||= (locale_files.map{|path| path.split(/[\/.]/)[-2]})
-      end
-
-      private
-
-      def locale_files
-        I18n.files 'locales', '*.*'
-      end
     end
   end
 end

data/lib/numbers_and_words/strategies/array_joiner/languages.rb

@@ -14,11 +14,7 @@ module NumbersAndWords
       module Languages
         class << self
           def factory strategy
-            "#{name}::#{language_class_name}".constantize.new strategy
-          end
-
-          def language_class_name
-            ::I18n.locale.to_s.titleize.gsub ' ', ''
+            "#{name}::#{I18n.language_class_name}".constantize.new strategy
           end
         end
       end

data/lib/numbers_and_words/strategies/figures_converter/decorators.rb

@@ -27,11 +27,7 @@ module NumbersAndWords
           end
 
           def decorator_class_name method_name
-            "#{name}::#{language_class_name}::#{method_name.to_s.camelcase}"
-          end
-
-          def language_class_name
-            ::I18n.locale.to_s.titleize.gsub ' ', ''
+            "#{name}::#{I18n.language_class_name}::#{method_name.to_s.camelcase}"
           end
         end
       end

data/lib/numbers_and_words/strategies/figures_converter/languages.rb

@@ -27,11 +27,7 @@ module NumbersAndWords
       module Languages
         class << self
           def factory strategy
-            "#{name}::#{language_class_name}".constantize.new strategy
-          end
-
-          def language_class_name
-            ::I18n.locale.to_s.titleize.gsub ' ', ''
+            "#{name}::#{I18n.language_class_name}".constantize.new strategy
           end
         end
       end

data/lib/numbers_and_words/strategies/figures_converter/languages/families/cyrillic.rb

@@ -7,7 +7,9 @@ module NumbersAndWords
             include Base
 
             def gender
-              case @current_capacity.to_i
+              @current_capacity ||= 0
+
+              case @current_capacity
               when 1
                 :female
               when 0

data/lib/numbers_and_words/strategies/figures_converter/options.rb

@@ -25,11 +25,7 @@ module NumbersAndWords
           private
 
           def proxy_class_name method_name
-            "#{module_name}::#{language_class_name}::#{method_name.to_s.camelcase}"
-          end
-
-          def language_class_name
-            ::I18n.locale.to_s.titleize.gsub ' ', ''
+            "#{module_name}::#{I18n.language_class_name}::#{method_name.to_s.camelcase}"
           end
 
           def module_name

data/lib/numbers_and_words/translations.rb

@@ -19,11 +19,7 @@ module NumbersAndWords
   module Translations
     class << self
       def factory
-        "#{name}::#{language_class_name}".constantize.new
-      end
-
-      def language_class_name
-        ::I18n.locale.to_s.titleize.gsub ' ', ''
+        "#{name}::#{I18n.language_class_name}".constantize.new
       end
     end
   end

data/lib/numbers_and_words/version.rb

@@ -1,3 +1,3 @@
 module NumbersAndWords
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: numbers_and_words
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Kirill Lazarev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Convert numbers to words using I18N.
@@ -203,12 +203,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []