zipcode-fr 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b951d8164fd96461f3b1c4549c231867c77d4bc
-  data.tar.gz: 27f411e06e2fefa64d9e84098c0d84cc0e23bd2e
+  metadata.gz: 25ae394ec05abe31e0c569e482c0921974d5eec9
+  data.tar.gz: 242efa64b48bb3fce200e47ece0251b40b1c9d70
 SHA512:
-  metadata.gz: fe56c6094a32e80322b04d4b0aaf6dc1dc91679ed14c49f9c6393d79290185f83dfa4cffdafa088d73843716b3dcf15a282f939e1fbff0c45486105798567532
-  data.tar.gz: 6a6705c55e4846bfadc5ba5f3e269e1e1917fbbcd23bfe771cc393a80f01e9696d42066dfb5f9955364c3c7433d127c117d4c0dd007d8cee74c98eff1481ff5d
+  metadata.gz: b866e37bc86951e3d35f8fe475d7d8bf5a0b639a14d1c58ca94739fff53e5c9aabc6813c39f5322173e7fa9e530cb68507ad3cb318609e977b059fa15ed5b171
+  data.tar.gz: 1c753016728b3f915660e1cea0ae94bb0943d8efbd170adcb27c9b48273a09792889a0a1999604be7ad135a49bc169226ed8938e2729d5beb70fb120f7da5abf

data/lib/zipcode-fr.rb

@@ -20,45 +20,52 @@ module ZipCode
       @loaded
     end
 
-    private def data_source
+    def data_source
       path = 'vendor/data/code_postaux_v201410.csv'
       File.expand_path(File.join(File.dirname(__FILE__), '..', path))
     end
+    private :data_source
 
-    private def reader_options
+    def reader_options
       {
         col_sep: ';',
         encoding: 'ISO-8859-1',
       }
     end
+    private :reader_options
 
-    private def open
+    def open
       CSV.open(data_source, 'rb', reader_options) do |csv|
         csv.take(1)  # skip header manually to preserve tell()
         yield csv
       end
     end
+    private :open
 
-    private def reader
-      Enumerator.new do |y|
-        open do |io|
-          pos = io.tell
-          io.each { |row| y << [pos, clean(row)]; pos = io.tell }
-        end
+    def reader
+      return enum_for(:reader) unless block_given?
+
+      open do |io|
+        pos = io.tell
+        io.each { |row| yield(pos, clean(row)); pos = io.tell }
       end
     end
+    private :reader
 
-    private def clean(row)
+    def clean(row)
       row_to_h(row_clean(row))
     end
+    private :clean
 
-    private def row_clean(row)
+    def row_clean(row)
       row.map { |e| e.strip.encode('UTF-8') }
     end
+    private :row_clean
 
-    private def row_to_h(row)
+    def row_to_h(row)
       [:insee, :name, :zip, :alt_name].zip(row).to_h
     end
+    private :row_to_h
 
     def index!(name, data, modes = nil, key: nil)
       key ||= name
@@ -78,7 +85,7 @@ module ZipCode
     # TODO: create an appender registry
     # rubocop:disable Metrics/AbcSize
     # rubocop:disable Metrics/MethodLength
-    private def appender(idx, key, mode)
+    def appender(idx, key, mode)
       case mode
       when :prefix
         -> (pos, record) { append_prefixes(idx, pos, record[key]) }
@@ -92,52 +99,62 @@ module ZipCode
         -> (pos, record) { append_match(idx, pos, record[key]) }
       end
     end
+    private :appender
 
-    private def append_match(idx, pos, val)
+    def append_match(idx, pos, val)
       idx[val.hash] << pos
     end
+    private :append_match
 
-    private def append_words(idx, pos, val)
+    def append_words(idx, pos, val)
       each_word(val) { |w| idx[w.hash] << pos }
     end
+    private :append_words
 
-    private def append_word_prefixes(idx, pos, val)
+    def append_word_prefixes(idx, pos, val)
       each_word(val) do |word|
         each_prefix(word) { |prefix| idx[prefix.hash] << pos }
       end
     end
+    private :append_word_prefixes
 
-    private def append_prefixes(idx, pos, val, min_size: 1)
+    def append_prefixes(idx, pos, val, min_size: 1)
       each_prefix(val, min_size: min_size) { |prefix| idx[prefix.hash] << pos }
     end
+    private :append_prefixes
 
-    private def each_word(val, &block)
+    def each_word(val, &block)
       val.split.each(&block)
     end
+    private :each_word
 
-    private def each_prefix(val, min_size: 1)
+    def each_prefix(val, min_size: 1)
       min_size.upto(val.length) { |i| yield val[0...i] }
     end
+    private :each_prefix
 
-    private def each_suffix(val, min_size: 1)
+    def each_suffix(val, min_size: 1)
       min_size.upto(val.length) { |i| yield val[-i..-1] }
     end
+    private :each_suffix
 
-    private def append_infixes(idx, pos, val, min_size: 1)
+    def append_infixes(idx, pos, val, min_size: 1)
       each_prefix(val, min_size: min_size) do |prefix|
         each_suffix(prefix, min_size: min_size) do |infix|
           idx[infix.hash] << pos
         end
       end
     end
+    private :append_infixes
 
-    private def index(name)
+    def index(name)
       if @indexes.key?(name)
         @indexes[name]
       else
         fail "no index named #{name.inspect}"
       end
     end
+    private :index
 
     def memsize_of_index(name)
       require 'objspace'
@@ -145,16 +162,17 @@ module ZipCode
         @indexes[name].reduce(0) { |a, (_, v)| a + ObjectSpace.memsize_of(v) }
     end
 
-    private def read_at(*positions, count: 1)
-      Enumerator.new do |y|
-        open do |io|
-          positions.each do |pos|
-            io.seek(pos)
-            io.take(count).each { |row| y << clean(row) }
-          end
+    def read_at(*positions, count: 1)
+      return enum_for(:read_at, *positions, count: count) unless block_given?
+
+      open do |io|
+        positions.each do |pos|
+          io.seek(pos)
+          io.take(count).each { |row| yield clean(row) }
         end
       end
     end
+    private :read_at
 
     def search(name, str, case_insensitive: true)
       str = str.upcase if case_insensitive

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipcode-fr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Loic Nageleisen
@@ -12,62 +12,62 @@ date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |2
-     Query city information by zip code and city name, indexed by word prefixes.
+description: "   Query city information by zip code and city name, indexed by word
+  prefixes.\n"
 email: loic.nageleisen@gmail.com
 executables: []
 extensions: []
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: French zip codes and cities