farsifu 0.5.0 → 0.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 77f2e7fa525f962740d9a65c8c32ac608a53f932
+  data.tar.gz: 936331335817d203a17e178768fa942627c0a768
+SHA512:
+  metadata.gz: 24403f36d3e7ea8b006bcab1555155dd2ae8980d1cb9b60e85d9aa0bcc472b9c660547ecaad757d2addc283f221264728a4ee61d4f8bc772ddc84d2d5ffa2bc4
+  data.tar.gz: 9c197a17b8ff8ffa3fa6f912f5a13df6557a2998c18a41dbb22c914ce0549d6836b2b10c276eac1f8921bfbd04a26f723d660751f7db0dd5d081e969eef2c488

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    farsifu (0.4.0)
+    farsifu (0.5.1)
 
 GEM
   remote: http://rubygems.org/
@@ -40,7 +40,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.2.0)
+  bundler (~> 1.10.0)
   farsifu!
   guard-rspec
   rspec (~> 2.12.0)
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -5,7 +5,7 @@ farsifu is a toolbox for developing ruby applications in Persian (Farsi) languag
 * Converting numbers to and from Persian numbers
 * Spelling numbers in Persian (supports ordinal spelling of numbers in Persian)
 * Converting Persian spelling of numbers back to normal numbers (see examples below)
-* List of Iran's provinces, cities, counties
+* List of Iran's provinces, cities and counties
 * List of countries in Persian
 
 ## Examples:

data/farsifu.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths             = ["lib"]
   s.extra_rdoc_files          = [ "LICENSE", "README.md"]
   s.rdoc_options              = ["--charset=UTF-8"]
-  s.add_development_dependency(%q<rspec>, ["~> 2.12.0"])
-  s.add_development_dependency(%q<bundler>, ["~> 1.2.0"])
-  s.add_development_dependency(%q<guard-rspec>)
+  s.add_development_dependency 'rspec', '~> 2.12.0'
+  s.add_development_dependency 'bundler', '~> 1.10.0'
+  s.add_development_dependency 'guard-rspec'
 end

data/lib/farsifu/constants.rb

@@ -4,7 +4,7 @@ module FarsiFu
   PERSIAN_CHARS = "۱۲۳۴۵۶۷۸۹۰،؛"
   ENGLISH_CHARS = "1234567890,;"
 
-  SIGNS ={
+  SIGNS = {
     "-" => "منفی ",
     "+" => "مثبت "
   }
@@ -54,7 +54,7 @@ module FarsiFu
   EXCEPTIONS_INVERT = EXCEPTIONS.invert
 
   POWER_OF_TEN = {
-    # based on: 
+    # based on:
     # https://fa.wikipedia.org/wiki/%D9%86%D8%A7%D9%85_%D8%A7%D8%B9%D8%AF%D8%A7%D8%AF_%D8%A8%D8%B2%D8%B1%DA%AF
     "ده"            => 1,
     "هزار"          => 3,
@@ -70,7 +70,7 @@ module FarsiFu
     "کوانتینیارد"   => 33,
     "سکستیلیون"     => 36,
     "سکستیلیارد"    => 39,
-    "دسیلیون"       => 42,
+    "سپتیلیون"      => 42,
     "سپتیلیارد"     => 45,
     "اکتیلیون"      => 48,
     "اکتیلیارد"     => 51,

data/lib/farsifu/convert.rb

@@ -10,9 +10,9 @@ module FarsiFu
     # Returns a string which is the equivalent English number of a Persian number (in String)
     #
     # Example:
-    #   "۱۲۳".to_english # => "123"
+    #   "۱۲۳".to_english  # => "123"
     def to_english
-      self.to_s.tr(PERSIAN_CHARS,ENGLISH_CHARS)
+      to_s.tr(PERSIAN_CHARS, ENGLISH_CHARS)
     end
 
     # Returns a string which is the equivalent Persian number of an English number (in String)
@@ -21,15 +21,15 @@ module FarsiFu
     # alias: to_persian
     #
     # Example:
-    #   "123".to_farsi # => "۱۲۳"
-    #   "456".to_persian # => "۴۵۶"
-    #   789.to_farsi # => "۷۸۹"
+    #   "123".to_farsi    # => "۱۲۳"
+    #   "456".to_persian  # => "۴۵۶"
+    #   789.to_farsi      # => "۷۸۹"
     def to_farsi
-      self.to_s.tr(ENGLISH_CHARS,PERSIAN_CHARS)
+      to_s.tr(ENGLISH_CHARS, PERSIAN_CHARS)
     end
 
     def to_s
       @number.to_s
     end
   end
-end
+end

data/lib/farsifu/num_to_word.rb

@@ -14,8 +14,8 @@ module FarsiFu
     # accpets english numbers (in float,fixnum or string)
     #
     # Example:
-    #   5678.spell_farsi # => "پنج هزار و ششصد و هفتاد و هشت"
-    #   3.22.spell_farsi # => "سه ممیز بیست و دو صدم"
+    #   5678.spell_farsi  # => "پنج هزار و ششصد و هفتاد و هشت"
+    #   3.22.spell_farsi  # => "سه ممیز بیست و دو صدم"
     def spell_farsi
       if @float
         parse_and_spell_float
@@ -27,23 +27,24 @@ module FarsiFu
     # Spells numbers in sequentional format. If pass `true`, it will use the second format
     #
     # Example:
-    #   1.spell_ordinal_farsi       # => "اول"
-    #   121.spell_ordinal_farsi     # => "صد و بیست و یکم"
-    #   2.spell_ordinal_farsi(true) # => "دومین"
-    #   2054.spell_ordinal_farsi(true) # => "دو هزار و پنجاه چهارمین"
+    #   1.spell_ordinal_farsi           # => "اول"
+    #   121.spell_ordinal_farsi         # => "صد و بیست و یکم"
+    #   2.spell_ordinal_farsi(true)     # => "دومین"
+    #   2054.spell_ordinal_farsi(true)  # => "دو هزار و پنجاه چهارمین"
     def spell_ordinal_farsi(second_type = false)
       if second_type
-        exceptions = {'0' => "صفر", '1' => "اولین", '3' => "سومین"}
-        suffix     = "مین"
+        exceptions = { '0' => 'صفر', '1' => 'اولین', '3' => 'سومین' }
+        suffix     = 'مین'
       else
-        exceptions = {'0' => "صفر", '1' => "اول", '3' => "سوم"}
-        suffix     = "م"
+        exceptions = { '0' => 'صفر', '1' => 'اول', '3' => 'سوم' }
+        suffix     = 'م'
       end
 
       make_ordinal_spell(exceptions, suffix)
     end
 
-  private
+    private
+
     def parse_and_spell_real_number
       answer = []
       group_by_power do |power, num|
@@ -52,23 +53,23 @@ module FarsiFu
       end
       spell = answer.compact.reverse.join(' و ').prepend("#{SIGNS[@sign]}")
       # verbose false?
-      spell.gsub!(/^(منفی\s|مثبت\s)*یک\sهزار/) {"#{$1}هزار"} unless @verbose
+      spell.gsub!(/^(منفی\s|مثبت\s)*یک\sهزار/) { "#{$1}هزار" } unless @verbose
       spell
     end
 
     def parse_and_spell_float
       # Seperate floating point
-      float_num         = @number.match(/\./)
-      pre_num, post_num = float_num.pre_match.prepend("#{@sign}"), float_num.post_match
+      float_num = @number.match(/\./)
+      pre_num   = float_num.pre_match.prepend("#{@sign}")
+      post_num  = float_num.post_match
       # To convert it to دهم, صدم...
-      floating_point_power       = 10 ** post_num.size
-
+      floating_point_power       = 10**post_num.size
       pre_num_spell              = NumToWord.new(pre_num).spell_farsi
-      pre_num_spell << 'صفر' if pre_num == '0' and @verbose
+      pre_num_spell << 'صفر' if pre_num == '0' && @verbose
       post_num_spell             = NumToWord.new(post_num).spell_farsi
       floating_point_power_spell = NumToWord.new(floating_point_power, false).spell_ordinal_farsi.gsub(/یک\s*/, '')
 
-      if pre_num != '0' or @verbose
+      if pre_num != '0' || @verbose
         "#{pre_num_spell} ممیز #{post_num_spell} #{floating_point_power_spell}"
       else
         "#{pre_num_spell if pre_num_spell.size > 0}#{post_num_spell} #{floating_point_power_spell}"
@@ -78,15 +79,14 @@ module FarsiFu
     # checks if the first char is `+` or `-` and returns the sign
     def check_for_sign
       sign = @number.slice(0).match(/(-|\+)/)
-      if sign
-        # remove the sign from number
-        @number.slice!(0)
-        sign[1]
-      end
+      return unless sign
+      # remove the sign from number
+      @number.slice!(0)
+      sign[1]
     end
 
     # '1234567' #=> {0=>["7", "6", "5"], 3=>["4", "3", "2"], 6=>["1"]}
-    def group_by_power &block
+    def group_by_power(&block)
       power = 0
       @number.split('').reverse.each_slice(3) do |digit|
         yield power, digit
@@ -101,7 +101,7 @@ module FarsiFu
       num.each_with_index do |n, i|
         # The 'n' is zero? no need to evaluate
         next if n == '0'
-        exception_index = n.to_i * (10 ** i)
+        exception_index = n.to_i * (10**i)
 
         case i
         when 0
@@ -131,4 +131,4 @@ module FarsiFu
       end
     end
   end
-end
+end

data/lib/farsifu/version.rb

@@ -1,3 +1,3 @@
 module FarsiFu
-  VERSION = "0.5.0"
-end
+  VERSION = "0.5.1"
+end

data/lib/farsifu/word_to_num.rb

@@ -11,7 +11,7 @@ module FarsiFu
     # Example:
     #   "صد و بیست و یک".to_number #=> 121
     def to_number
-      return @number_in_words if !(@number_in_words.is_a? String)
+      return @number_in_words unless @number_in_words.is_a?(String)
 
       numbers_array = make_integer_array(@number_in_words)
 
@@ -32,7 +32,8 @@ module FarsiFu
       answer += memory
     end
 
-  private
+    private
+
     # returns an array of corresponding numbers from string
     # [1, 1000000, 200, 30, 5, 1000, 400, 30, 3]
     def make_integer_array(number_in_words)
@@ -40,7 +41,7 @@ module FarsiFu
       numbers_array = []
       number_in_words.each do |number|
         if power_of_ten? number
-          numbers_array << 10 ** POWER_OF_TEN[number]
+          numbers_array << 10**POWER_OF_TEN[number]
         else
           numbers_array << EXCEPTIONS[number]
         end
@@ -57,10 +58,10 @@ module FarsiFu
     def divisible_by_thousand?(number)
       number % 1000 == 0
     end
-    
+
     # Checks if the number is power of ten
-    def power_of_ten? number
+    def power_of_ten?(number)
       POWER_OF_TEN.keys.include? number
     end
   end
-end
+end

data/lib/iran/iran.rb

@@ -308,7 +308,6 @@ module Iran
       { :iso2 => 'ZM', :fa => 'زامبیا', :en => 'Zambia' },
       { :iso2 => 'ZW', :fa => 'زیمبابوه', :en => 'Zimbabwe' },
       { :iso2 => 'ZZ', :fa => 'ناحیهٔ نامشخص یا نامعتبر', :en => 'Unknown or Invalid Region' }
-
   ]
   # :startdoc:
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: farsifu
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors:
 - Allen A. Bargi
@@ -10,54 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: a toolbox for developing ruby applications in Persian (Farsi) language,
@@ -69,7 +62,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -93,28 +86,27 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/aziz/farsifu
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: farsifu
-rubygems_version: 1.8.23
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: a toolbox for developing ruby applications in Persian (Farsi) language, see
   readme file for features
 test_files: