faker-russian 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 555645ea6b04286daa9446b352fe7f1566a560c3
-  data.tar.gz: e1c06a0eacb4de35f7257b99cd722c0c81eb7ee8
+  metadata.gz: 1bd6b02cf4fb74d25527c82848ab0be7cdb3163d
+  data.tar.gz: 15260a247c047573f436ed18b9cc2b9e5d3ccc8b
 SHA512:
-  metadata.gz: 931aa64d63425363848cc0600e5315fc6e029991ada16bb681e805272697079b8a2f14f38dc50db089ecf57523632df5269ebe4778102100f7d3af61d2e81e35
-  data.tar.gz: e5f0ec94da0ff210f8d5cb5098004c69d87321b4a7f98f28ccd60959d2b21c05bd8730c949324bc707f580cc37c8ce3147e5d68db15c5a098ad8b001d3c087cd
+  metadata.gz: 2e0bcd450e84d772ffdad90cc91f01cabe1880d37558773e367ec2f08e39be659ca7c578cf21e6f839436c4519ed008314a8923c1a83e877556e8101e4ea8cda
+  data.tar.gz: d5fcd5308a1107a679ffc6790379c66b0f719a99aeb598cd4619a469b56986637f58b4b5fbf760b255b7c6e93219bb04ed8504e208bb9c205d424fd783baa6e2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.3
+
+* Okpo faker added
+
 # 0.0.2
 
 * Kpp faker added

data/CONTRIBUTING.md

@@ -0,0 +1,31 @@
+# Инструкции разработчикам
+
+Модуль `Faker::Russian` делает extend других модулей, в которых и находится функционал библиотеки.
+
+Например:
+
+``` ruby
+module Faker
+  module Russian
+    extend SharedConstants
+    extend Version
+
+    extend Inn # функционал ИНН
+    # other modules
+  end
+end
+```
+
+``` ruby
+module Faker
+  module Russian
+    module Inn
+      def inn(options = {})
+        # code
+```
+
+Константы (номера регионов, классификация госучреждений и т.д.) и методы работы с ними размещать в `Faker::Russian::Constants`
+
+Для каждого модуля предусмотреть последовательности(`Faker::Russian::Sequence`), а также возможность подстановки значений констант (напр., см. опцию `region_number` в `#inn`)
+
+Также надо предусмотреть вывод ошибки, если в Faker подставляется несуществующий параметр

data/README.md

@@ -1,6 +1,7 @@
 # Faker::Russian
 
 [[english_doc](doc/english_readme.md)]
+[[Инструкции разработчикам](CONTRIBUTING.md)]
 [![Gem Version](https://badge.fury.io/rb/faker-russian.svg)](http://badge.fury.io/rb/faker-russian)
 [![Build Status](https://travis-ci.org/asiniy/faker-russian.svg?branch=master)](https://travis-ci.org/asiniy/faker-russian)
 [![Code Climate](https://codeclimate.com/github/asiniy/faker-russian.png)](https://codeclimate.com/github/asiniy/faker-russian)
@@ -8,7 +9,7 @@
 Генерация русских значений: ИНН, ОКПО, КПП и т.д.
 
 * [ИНН](http://ru.wikipedia.org/wiki/Идентификационный_номер_налогоплательщика) (Faker::Russian.inn)
-* (TODO) [ОКПО](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_предприятий_и_организаций) (Faker::Russian.okpo)
+* [ОКПО](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_предприятий_и_организаций) (Faker::Russian.okpo)
 * [КПП](http://ru.wikipedia.org/wiki/Код_причины_постановки_на_учёт) (Faker::Russian.kpp)
 * (TODO) [ОГРН](http://ru.wikipedia.org/wiki/Основной_государственный_регистрационный_номер) (Faker::Russian.ogrn)
 * (TODO) [Корреспондентский счёт] (http://ru.wikipedia.org/wiki/Корреспондентский_счёт) (Faker::Russian.ks)
@@ -50,6 +51,20 @@
   Faker::Russian.inn(sequence_number: 1) # => '0956860593'
 ```
 
+### ОКПО
+
+``` ruby
+  Faker::Russian.okpo # => '57972160'
+```
+
+Также доступны последовательности:
+
+``` ruby
+  Faker::Russian.okpo(sequence_number: 1) # => '13410254'
+  Faker::Russian.okpo(sequence_number: 1) # => '13410254'
+```
+
+
 ### КПП
 
 Генерирует КПП со случайным номером региона
@@ -71,10 +86,6 @@
   Faker::Russian.inn(sequence_number: 1) # => '381201001'
 ```
 
-## Contributing
+## Инструкции разработчикам
 
-1. Fork it ( https://github.com/[my-github-username]/faker-russian/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+Читай [CONTRIBUTING.md](CONTRIBUTING.md)

data/doc/english_readme.md

@@ -1,6 +1,7 @@
 # Faker::Russian
 
 [[по-русски](../README.md)]
+[[developer instructions](../CONTRIBUTING.md)]
 [![Gem Version](https://badge.fury.io/rb/faker-russian.svg)](http://badge.fury.io/rb/faker-russian)
 [![Build Status](https://travis-ci.org/asiniy/faker-russian.svg?branch=master)](https://travis-ci.org/asiniy/faker-russian)
 [![Code Climate](https://codeclimate.com/github/asiniy/faker-russian.png)](https://codeclimate.com/github/asiniy/faker-russian)
@@ -8,7 +9,7 @@
 Generation of specific russian values
 
 * [INN](http://ru.wikipedia.org/wiki/Идентификационный_номер_налогоплательщика) (Faker::Russian.inn) Russian analogue of VAT identification number
-* (TODO) [OKPO](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_предприятий_и_организаций) (Faker::Russian.okpo) Legal code
+* [OKPO](http://ru.wikipedia.org/wiki/Общероссийский_классификатор_предприятий_и_организаций) (Faker::Russian.okpo) Legal code
 * [KPP](http://ru.wikipedia.org/wiki/Код_причины_постановки_на_учёт) (Faker::Russian.kpp) Code of reason for registration
 * (TODO) [OGRN](http://ru.wikipedia.org/wiki/Основной_государственный_регистрационный_номер) (Faker::Russian.ogrn) Main state registration number
 * (TODO) [Correspondent Account Value] (http://ru.wikipedia.org/wiki/Корреспондентский_счёт) (Faker::Russian.ks)
@@ -50,6 +51,19 @@ Also you can use sequences
   Faker::Russian.inn(sequence_number: 1) # => '0956860593'
 ```
 
+### OKPO
+
+``` ruby
+  Faker::Russian.okpo # => '57972160'
+```
+
+Also pseudo-random sequences available
+
+``` ruby
+  Faker::Russian.okpo(sequence_number: 1) # => '13410254'
+  Faker::Russian.okpo(sequence_number: 1) # => '13410254'
+```
+
 ### KPP
 
 Generate KPP with random region_number
@@ -73,8 +87,4 @@ Also, you can use pseudo random sequence numbers (not much 1000, there is limite
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/faker-russian/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
+Please read [CONTRIBUTING.md](../CONTRIBUTING.md) in Russian

data/faker-russian.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10'
   spec.add_development_dependency 'rspec', '~> 3'
   spec.add_development_dependency 'faker', '~> 1.3'
-  spec.add_development_dependency 'validates_russian', '0.0.6'
+  spec.add_development_dependency 'validates_russian', '0.0.7'
 end

data/lib/faker/russian/constants.rb

@@ -1,7 +1,18 @@
 module Faker
   module Russian
-    module SharedConstants
+    module Constants
       REGION_NUMBERS = %w{01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 83 86 87 89}
+
+      def find_region_number(number = nil, sequence)
+        region_numbers = Faker::Russian::Constants::REGION_NUMBERS
+
+        if number.present?
+          raise('there is no region with that number!') unless region_numbers.include?(number.to_s)
+          number.to_s
+        else
+          region_numbers[sequence.rand(region_numbers.size)]
+        end
+      end
     end
   end
 end

data/lib/faker/russian/inn.rb

@@ -17,22 +17,6 @@ module Faker
 
     private
 
-      def find_sequence(number)
-        sequence = number || Random.rand(1_000_000_000)
-        Random.new(sequence)
-      end
-
-      def find_region_number(number = nil, sequence)
-        region_numbers = Faker::Russian::SharedConstants::REGION_NUMBERS
-
-        if number.present?
-          raise('there is no region with that number!') unless region_numbers.include?(number.to_s)
-          number.to_s
-        else
-          region_numbers[sequence.rand(region_numbers.size)]
-        end
-      end
-
       def find_kind(kind, sequence)
         case kind
         when :individual, :legal then kind

data/lib/faker/russian/kpp.rb

@@ -14,22 +14,6 @@ module Faker
 
     private
 
-      def find_sequence(number)
-        sequence = number || Random.rand(1_000_000_000)
-        Random.new(sequence)
-      end
-
-      def find_region_number(number = nil, sequence)
-        region_numbers = Faker::Russian::SharedConstants::REGION_NUMBERS
-
-        if number.present?
-          raise('there is no region with that number!') unless region_numbers.include?(number.to_s)
-          number.to_s
-        else
-          region_numbers[sequence.rand(region_numbers.size)]
-        end
-      end
-
       def two_region_numbers(sequence)
         sprintf '%02d', sequence.rand(100)
       end

data/lib/faker/russian/okpo.rb

@@ -0,0 +1,30 @@
+module Faker
+  module Russian
+    module Okpo
+      def okpo(options = {})
+        if (options.keys - [:sequence_number]).any?
+          raise 'wrong options. just :sequence_number'
+        end
+
+        sequence = find_sequence(options[:sequence_number])
+        okpo_digits = okpo_region_numbers(sequence)
+        okpo_digits + okpo_calc(okpo_digits)
+      end
+
+    private
+
+      def okpo_region_numbers(sequence)
+        if [true, false][sequence.rand(2)]
+          sprintf '%07d', sequence.rand(10_000_000)
+        else
+          sprintf '%09d', sequence.rand(1_000_000_000)
+        end
+      end
+
+      def okpo_calc(okpo_digits)
+        (okpo_digits.split(//).map(&:to_i).each_with_index.inject(0) { |s, (p, i)| s + p * (i + 1) } % 11 % 10).to_s
+      end
+
+    end
+  end
+end

data/lib/faker/russian/sequence.rb

@@ -0,0 +1,10 @@
+module Faker
+  module Russian
+    module Sequence
+      def find_sequence(number)
+        sequence = number || Random.rand(1_000_000_000)
+        Random.new(sequence)
+      end
+    end
+  end
+end

data/lib/faker/russian/version.rb

@@ -1,7 +1,7 @@
 module Faker
   module Russian
     module Version
-      VERSION = '0.0.2'
+      VERSION = '0.0.3'
 
       def version
         VERSION

data/lib/faker/russian.rb

@@ -2,10 +2,12 @@ Dir[File.dirname(__FILE__) + '/russian/**/*.rb'].each{ |f| require f }
 
 module Faker
   module Russian
-    extend SharedConstants
+    extend Constants
+    extend Sequence
     extend Version
 
     extend Inn
     extend Kpp
+    extend Okpo
   end
 end

data/spec/faker/russian/okpo_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Faker::Russian do
+  describe '#okpo' do
+    before(:all) do
+      DummyModel.reset_callbacks(:validate)
+      DummyModel.validates(:field, okpo_format: true)
+    end
+
+    it 'generate valid okpo without arguments' do
+      100.times do
+        expect(DummyModel.new(field: Faker::Russian.okpo)).to be_valid
+      end
+    end
+
+    it 'generate difference okpos with sequence' do
+      sequenced_okpos = 10000.times.map{ |n| Faker::Russian.okpo(sequence_number: n) }
+      expect(sequenced_okpos.size).to eq(sequenced_okpos.uniq.size)
+    end
+
+    it 'generate same okpos for sequence' do
+      array1 = 10000.times.map{ |n| Faker::Russian.okpo(sequence_number: n) }
+      array2 = 10000.times.map{ |n| Faker::Russian.okpo(sequence_number: n) }
+      expect(array1).to eq(array2)
+    end
+
+    it 'permit just a few options' do
+      expect{ Faker::Russian.okpo(shit: 'shit') }.to raise_error
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faker-russian
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alex
 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: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 description: Faker russian specific values. INN, OKPO, OGRN et.c.
 email:
 - kaburbundokel11g@inbox.ru
@@ -90,6 +90,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,9 +101,12 @@ files:
 - lib/faker/russian/constants.rb
 - lib/faker/russian/inn.rb
 - lib/faker/russian/kpp.rb
+- lib/faker/russian/okpo.rb
+- lib/faker/russian/sequence.rb
 - lib/faker/russian/version.rb
 - spec/faker/russian/inn_spec.rb
 - spec/faker/russian/kpp_spec.rb
+- spec/faker/russian/okpo_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_model.rb
 homepage: http://github.com/asiniy/faker-russian
@@ -132,5 +136,6 @@ summary: Faker russian specific values. INN, OGRN, et.c.
 test_files:
 - spec/faker/russian/inn_spec.rb
 - spec/faker/russian/kpp_spec.rb
+- spec/faker/russian/okpo_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy_model.rb