locality 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 251fe2d5eeff7fd2bec5c9645a1c29158aa06475
-  data.tar.gz: 4546e8b4eb59c63d5988b8be4666515c31b482d4
+  metadata.gz: 87a063187c95946e77731cd381e1e196949c0d35
+  data.tar.gz: d74e6d3a5e2b944300e0b544fcac90c545be590d
 SHA512:
-  metadata.gz: fef7271ed467a49d229b06ca462ce365dc781a92bfa10507da721d54193083a8c0440dc0e4c70bf66d547f185f37b15191fac7594e8f3a7c76c6f906ea958e95
-  data.tar.gz: 6d1d3e869708adf6a6221f7fe535a7ca4478bafb49b54c0c8a88ff8139e3147b7b305a878e69c1247769f55618cb840e68ce9a52ad55b2761cbaed6e3b978547
+  metadata.gz: fe91e20cf92950d82ea82692d0ed76aa89c44f368ae74ebf404ca5e0945f8ebd6dd9c8e4aa15eb4dfb2172a98044ef8f4dec3d54d6ecc58778a2bc61c5999b15
+  data.tar.gz: d02ca7ca25fd003eb0419c3d745e2674096bb3516e8f4a938139dfb60ae3f281aa6809a4c26866039ea2fea4c84ac7d0baae1e5b0fcccef1b15754ddec796983

data/README.md

@@ -62,11 +62,13 @@ end
 ```
 
 ### Usage
+
+```ruby
 # If you want to make sure on application
 # bootup that everything works, call this method:
 Locality::IP.check!
 
-```ruby
+# Lookup an IP
 lookup = Locality::IP.new '198.51.100.55'
 
 # All these attributes return either a String or nil.

data/lib/locality/aregion.rb

@@ -1,21 +1,23 @@
 require 'locality/postnummerservice'
+require 'locality/postnummerservice/collection'
 
 module Locality
   # See https://sv.wikipedia.org/wiki/A-region
   class Aregion
+    include Postnummerservice::Collection
 
-    def initialize(raw_code)
-      @raw_code = raw_code
+    def code
+      raw_code.to_i
     end
 
-    def zip_codes
-      @zip_codes ||= backend.aregions[1].map(&:zip_code)
+    def state_name
+      state_names.first
     end
 
     private
 
     def backend
-      Locality::Postnummerservice
+      Locality::Postnummerservice.aregions
     end
 
   end

data/lib/locality/ip.rb

@@ -34,7 +34,7 @@ module Locality
     end
 
     def ip
-      @ip ||= ::IPAddr.new(raw_ip)
+      @ip ||= ::IPAddr.new(raw_ip.to_s)
     rescue => exception
       nil
     end

data/lib/locality/postnummerservice/collection.rb

@@ -0,0 +1,59 @@
+require 'active_support/concern'
+
+module Locality
+  module Postnummerservice
+    module Collection
+      extend ActiveSupport::Concern
+
+      def initialize(raw_code)
+        @raw_code = raw_code
+      end
+
+      # Convert raw_code to code
+      def code
+        fail NotImplementedError
+      end
+
+      def zip_codes
+        @zip_codes ||= entities.map(&:zip_code).uniq.sort
+      end
+
+      def city_names
+        @city_names ||= entities.map(&:city_name).uniq.sort
+      end
+
+      def state_codes
+        @state_codes ||= entities.map(&:state_code).uniq.sort
+      end
+
+      def state_names
+        @state_namess ||= entities.map(&:state_name).uniq.sort
+      end
+
+      def province_names
+        @province_names ||= entities.map(&:province_name).uniq.sort
+      end
+
+      def province_codes
+        @province_codes ||= entities.map(&:province_code).uniq.sort
+      end
+
+      def aregions
+        @aregions ||= entities.map(&:aregion).uniq.sort
+      end
+
+      private
+
+      attr_reader :raw_code
+
+      def entities
+        backend[code]
+      end
+
+      def backend
+        fail NotImplementedError
+      end
+
+    end
+  end
+end

data/lib/locality/postnummerservice/entry.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string'
+
 module Locality
   module Postnummerservice
     class Entry < Array
@@ -11,11 +13,11 @@ module Locality
       end
 
       def state_code
-        self[2]
+        self[2].to_i
       end
 
       def state_name
-        self[3]
+        self[3].humanize
       end
 
       def province_name

data/lib/locality/postnummerservice.rb

@@ -22,9 +22,7 @@ module Locality
     def self.load!
       @aregions = {}
 
-      ::CSV.foreach(::Locality.config.postnummerfilen_path, encoding: encoding) do |row|
-        next if row.blank?
-        entry = Entry.new(row)
+      entries do |entry|
         @aregions[entry.aregion] ||= []
         @aregions[entry.aregion] << entry
       end
@@ -32,6 +30,13 @@ module Locality
       @loaded = true
     end
 
+    def self.entries(&block)
+      ::CSV.foreach(::Locality.config.postnummerfilen_path, encoding: encoding) do |row|
+        next if row.blank?
+        yield Entry.new(row)
+      end
+    end
+
     def self.encoding
       'ISO-8859-1:UTF-8'  # from:to
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locality
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - bukowskis
@@ -177,6 +177,7 @@ files:
 - lib/locality/configuration.rb
 - lib/locality/ip.rb
 - lib/locality/postnummerservice.rb
+- lib/locality/postnummerservice/collection.rb
 - lib/locality/postnummerservice/entry.rb
 homepage: https://github.com/bukowskis/locality
 licenses: []