faker 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced120390f0205e9fa10ec66d97c988b01a0ab19
-  data.tar.gz: fc059c6b0a2986f815b9420ff3cdc3c01c6954cf
+  metadata.gz: 388ce6e6400da23238b626370b32f0294421df15
+  data.tar.gz: 87d1240d2e49881fd848834b6541334dbc750bb1
 SHA512:
-  metadata.gz: bed9f65081c40bbf04890929acb89ba1cba7e0fa6ebd3936778e70bb67ca94f32d1ed653462e5161795aff15ea1f3a56f681731a420ae4692443e46d5aa9de35
-  data.tar.gz: e22e1878b5b92680fd6dd19803fdf191f32c133a2e32595bbf670edf7b837aded3c5b6522469b7547a12ae8adf67f1dad1700400590b875c1acb433b4f1e23a2
+  metadata.gz: fbad50f565fa058744b4bdad1ff92cf0cb741535b86dd3d0d56cc7ddd15b4acdf337ea67390dc89359d2f94225b586e6fce5c5411880020c917ffa33ad91096c
+  data.tar.gz: 1d7601d9c39cc6b981f1763f63069d8215f9e8666e16d7ee242bcc8ce5072bda0e1ae5ecea8d7ec74b37372a6d85b97a4031d7b92c116553331dc0a7a37c07bd

data/History.txt

@@ -1,3 +1,6 @@
+== 1.4.1 2014-07-04
+* Bugfix and cleanup
+
 == 1.4.0 2014-07-03
 * Many enhancements and bugfixes
 

data/README.md

@@ -349,12 +349,7 @@ rest.
 
 Contributing
 ------------
-If you'd like to contribute code or formats/data for another locale, fork
-the project at [github](https://github.com/stympy/faker), make your changes,
-then send a pull request.
-
-**note**
-Run `bundle install` and `rake test` to confirm tests are passing.
+See [CONTRIBUTING.md](https://github.com/stympy/faker/blob/master/CONTRIBUTING.md).
 
 Contact
 -------

data/lib/faker/address.rb

@@ -28,7 +28,7 @@ module Faker
       end
 
       def time_zone
-        bothify(fetch('address.time_zone'))
+        fetch('address.time_zone')
       end
 
       alias_method :zip, :zip_code

data/lib/faker/code.rb

@@ -41,18 +41,18 @@ module Faker
 
       def generate_base8_ean
         values = regexify(/\d{7}/)
-        check_digit = values.split(//).each_with_index.inject(0){ |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT8[i] } % 10
-        values << (10 - check_digit).to_s
+        check_digit = 10 - values.split(//).each_with_index.inject(0){ |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT8[i] } % 10
+        values << (check_digit == 10 ? 0 : check_digit).to_s
       end
 
       def generate_base13_ean
         values = regexify(/\d{12}/)
-        check_digit = values.split(//).each_with_index.inject(0){ |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT13[i] } % 10
-        values << (10 - check_digit).to_s
+        check_digit = 10 - values.split(//).each_with_index.inject(0){ |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT13[i] } % 10
+        values << (check_digit == 10 ? 0 : check_digit).to_s
       end
 
-      EAN_CHECK_DIGIT8 = [3, 1, 3, 1, 3, 1, 3, 1]
-      EAN_CHECK_DIGIT13 = [1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1]
+      EAN_CHECK_DIGIT8 = [3, 1, 3, 1, 3, 1, 3]
+      EAN_CHECK_DIGIT13 = [1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3]
 
       def rut_verificator_digit(rut)
         total = rut.to_s.rjust(8, '0').split(//).zip(%w(3 2 7 6 5 4 3 2)).collect{|a, b| a.to_i * b.to_i}.inject(:+)

data/lib/faker/lorem.rb

@@ -45,17 +45,17 @@ module Faker
           end
         end
       end
-    end
 
-  private
+    private
 
-    # If an array or range is passed, a random value will be selected.
-    # All other values are simply returned.
-    def self.resolve(value)
-      case value
-      when Array then value[rand(value.size)]
-      when Range then rand((value.last+1) - value.first) + value.first
-      else value
+      # If an array or range is passed, a random value will be selected.
+      # All other values are simply returned.
+      def resolve(value)
+        case value
+        when Array then value[rand(value.size)]
+        when Range then rand((value.last+1) - value.first) + value.first
+        else value
+        end
       end
     end
   end

data/lib/faker/version.rb

@@ -1,3 +1,3 @@
 module Faker #:nodoc:
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/lib/locales/en.yml

@@ -116,7 +116,9 @@ en:
         - "#{first_name} #{last_name}"
 
     phone_number:
-      formats: ['###-###-####', '(###)###-####', '1-###-###-####', '###.###.####', '###-###-####', '(###)###-####', '1-###-###-####', '###.###.####', '###-###-#### x###', '(###)###-#### x###', '1-###-###-#### x###', '###.###.#### x###', '###-###-#### x####', '(###)###-#### x####', '1-###-###-#### x####', '###.###.#### x####', '###-###-#### x#####', '(###)###-#### x#####', '1-###-###-#### x#####', '###.###.#### x#####']
+      formats: ['###-###-####', '(###) ###-####', '1-###-###-####', '###.###.####', '###-###-####', '(###) ###-####', '1-###-###-####', '###.###.####', '###-###-#### x###', '(###) ###-#### x###', '1-###-###-#### x###', '###.###.#### x###', '###-###-#### x####', '(###) ###-#### x####', '1-###-###-#### x####', '###.###.#### x####', '###-###-#### x#####', '(###) ###-#### x#####', '1-###-###-#### x#####', '###.###.#### x#####']
+    cell_phone:
+      formats: ['###-###-####', '(###) ###-####', '1-###-###-####', '###.###.####']
 
     business:
       credit_card_numbers: ['1234-2121-1221-1211', '1212-1221-1121-1234', '1211-1221-1234-2201', '1228-1221-1221-1431']

data/test/test_faker_company.rb

@@ -9,10 +9,7 @@ class TestFakerCompany < Test::Unit::TestCase
     assert @tester.duns_number.match(/\d\d-\d\d\d-\d\d\d\d/)
   end
 
-  require "open-uri"
   def test_logo
-    open("#{ @tester.logo }") do |f|
-	  assert f.readline.include?("GIF")
-	end
+	  assert @tester.logo.match(%r{http://www.biz-logo.com/examples/\d+\.gif})
   end
-end
+end

data/test/test_faker_street.rb

@@ -36,10 +36,10 @@ class TestFakerStreet < Test::Unit::TestCase
       assert_match(/Wide Cheerful Path \d \(Green Door\)/, Faker::Address.street_address(:include_secondary))
     end
   end
-  
+
   def test_street_address_with_locale_fallback
     I18n.with_locale('en-GB') do
-      assert_match(/^\d+ \w+ \w+/, Faker::Address.street_address)
+      assert_match(/^\d+ [\w']+ \w+/, Faker::Address.street_address)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faker
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Benjamin Curtis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n