zipcoder 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74a116892f34cb6dbbbe40997c79d41f559068e62cf4d9635ddbc6979d6440b3
-  data.tar.gz: f0d60ba4dc4b20a54af43f71f047be8bc1c3301923ec4e4fc769e3121d640195
+  metadata.gz: eac9f2d3af269299c92366bff9bcecdf96bfec2c72b54d00ceb808e6008e0d53
+  data.tar.gz: 01d94a09280c77d36ca2b13078de68677064cbc6c427f5b75545b47e92411160
 SHA512:
-  metadata.gz: f9361df736ce201e9075e91d303960ff05011d08c4bfa33001fb0c1ba90724a1678064f4a6bf05a7668a70b606ca19ee83c3184f46fe052f508e67e2e3639cfd
-  data.tar.gz: b95eae0dad1956f385a24ed2580aed23e33e4d1749425fb236a20aa9c8415d51877378460365e721e79dcc31070f33fcc486cce79ae0e4f69549e5a886692921
+  metadata.gz: 7084550081121cf6ca274731d3917c3c395ac2b3fb24be2c24a9d5189e02eb02fc6c1d0f728f0efb53bd8a9db6ae74f572a948932635fce8f7bb45bceea26aef
+  data.tar.gz: dd5512b67ad72dbed6f4166246546357272f4f2e2001668338e1b8301b4030f75e0b3e9c9bc2145ed10646ee2be1b3423a2da99efb3ca42a550646290d70e6ba

data/README.md

@@ -7,6 +7,8 @@ Gem for performing zip code lookup operations
 
 ## Revision History
 
+ - v0.9.2:
+   - added config class
  - v0.9.1:
    - added ability to use a different data source
    - added support for data from unitestateszipcodes.org"
@@ -120,8 +122,11 @@ version.  I had to use v3.3.5 to test.*
 require 'zipcoder'
 require 'zipcoder/cacher/redis'
 
-cacher = Zipcoder::Cacher::Redis.new(**args)
-Zipcoder.load_cache(cacher)
+Zipcoder.config do |config|
+  config.cacher = Zipcoder::Cacher::Redis.new(**args)
+end
+
+Zipcoder.load_cache
 ```
 
 Please visit [Redis Github](https://github.com/redis/redis-rb) for the different options 
@@ -140,7 +145,11 @@ To override the default, you can create a new YAML file with the same format as
 ```ruby
 require 'zipcoder'
 
-Zipcoder.load_cache(data: "path_to_data/data.yml")
+Zipcoder.config do |config|
+  config.data = "path_to_data/data.yml"
+end
+
+Zipcoder.load_cache
 ```
 
 ##### unitestateszipcodes.org
@@ -333,7 +342,7 @@ puts "TX".state_cities names_only: true
 
 #### Method: Zipcoder.state_counties(state, **args)
 
-This will return the cities in a state
+This will return the counties in a state
 
 **variations:**
 

data/lib/zipcoder.rb

@@ -10,6 +10,17 @@ module Zipcoder
   class ZipcoderError < Exception
   end
 
+  class Config
+    attr_accessor :cacher
+    attr_accessor :data
+  end
+
+  CONFIG = Config.new
+
+  def self.config(&block)
+    block.call(CONFIG)
+  end
+
   @@cacher = nil
   def self.cacher
     if @@cacher == nil
@@ -19,9 +30,9 @@ module Zipcoder
   end
 
   # Loads the data into memory
-  def self.load_cache(cacher=nil, data:nil)
-    @@cacher = cacher || Cacher::Memory.new
-    self.cacher.load data:data
+  def self.load_cache
+    @@cacher = CONFIG.cacher || Cacher::Memory.new
+    self.cacher.load data: CONFIG.data
   end
 
   # Looks up zip code information

data/lib/zipcoder/cacher/base.rb

@@ -58,6 +58,7 @@ List of the states in the US
 module Zipcoder
   module Cacher
     class Base
+      attr_accessor :loaded
 
       KEY_BASE = "zipcoder"
       KEY_ZIP = "#{KEY_BASE}:zip"
@@ -92,9 +93,12 @@ module Zipcoder
 
       def initialize(**kwargs)
         self._init_cache **kwargs
+        self.loaded = false
       end
 
       def load(data: nil)
+        return if self.loaded
+
         start_time = Time.now
 
         # Load zip cache from file
@@ -166,6 +170,8 @@ module Zipcoder
 
         # Print the alpsed time
         puts "ZipCoder initialization time: #{Time.now-start_time}"
+
+        self.loaded = true
       end
 
       def read_zip_cache(zip)

data/lib/zipcoder/version.rb

@@ -1,3 +1,3 @@
 module Zipcoder
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/cacher_memory_spec.rb

@@ -3,12 +3,24 @@ require "zipcoder/cacher/memory"
 
 describe Zipcoder::Cacher::Memory do
 
-  it "allows the default data file to be overridden" do
-
-    # Load the new data
+  before(:all) {
     new_data = "#{File.dirname(__FILE__)}/fixtures/files/temp_data.yml"
-    Zipcoder.load_cache data: new_data
 
+    Zipcoder.config do |config|
+      config.data = new_data
+    end
+
+    Zipcoder.load_cache
+  }
+
+  after(:all) {
+    Zipcoder.config do |config|
+      config.data = nil
+      config.cacher = nil
+    end
+  }
+
+  it "allows the default data file to be overridden" do
     # Check that it was loaded
     expect(Zipcoder.states.count).to eq(1)
     expect("PR".state_cities.count).to eq(3)

data/spec/cacher_redis_spec.rb

@@ -10,12 +10,23 @@ describe Zipcoder::Cacher::Redis do
       allow(Zipcoder::Cacher::Redis).to receive(:_create_redis_client) do
         RedisStub.new
       end
-      Zipcoder.load_cache Zipcoder::Cacher::Redis.new
+      Zipcoder.config do |config|
+        config.cacher = Zipcoder::Cacher::Redis.new
+      end
+
+      Zipcoder.load_cache
     end
 
     stub_redis_once = true
   end
 
+  after(:each) {
+    Zipcoder.config do |config|
+      config.data = nil
+      config.cacher = nil
+    end
+  }
+
   describe "#zip_info" do
     it "match" do
       info = "78748".zip_info

data/spec/zipcoder_spec.rb

@@ -5,6 +5,13 @@ describe Zipcoder do
     Zipcoder.load_cache
   end
 
+  after(:all) {
+    Zipcoder.config do |config|
+      config.data = nil
+      config.cacher = nil
+    end
+  }
+
   it "has a version number" do
     expect(Zipcoder::VERSION).not_to be nil
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipcoder
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Eric Chapman