melissa 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 625ef678d1c9036881ab0e7b91ebef31bcb1e035
-  data.tar.gz: f7d15d546fa2f2bb82ac905d661751ed379ac400
+  metadata.gz: 38aa1440526f55f5a85a72c7f8474cffeedc34f9
+  data.tar.gz: 8f618410d0d128f51273b1b7f8a7e19d3070698b
 SHA512:
-  metadata.gz: f1427c544d18ff571008eff0bd169d2da64ba3d883d8c9082efe71ab2e1438e8df626c69d193e3e96c3904a837c231f1257024d67cff08155cd7f20882507850
-  data.tar.gz: 09730130a065c514854b6fff3ea91d4fccc4d526df0a86dd95178585379a3c36cd14fb39a91754c9e915b329c922916ea46f2445ca3283486d637781f93e3800
+  metadata.gz: a9437c18332658936df21a8c11ca0a05e1d92ce49c4cc928fbfabf6eb76d98f97318eb36dab36718524e71717643fcedba6ad2146179ac60081677e203a35eb1
+  data.tar.gz: 9b6b1801c36d49882e1e481715c59167f7ab50501674ea5af1285e985d9cb791ab0fd5c5999707326b31050727da02d9efa7031d925151500dc8e4eb71dfdd0d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    melissa (0.0.2)
+    melissa (0.0.3)
       activesupport
       ffi
       minitest

data/lib/melissa/addr_obj.rb

@@ -57,7 +57,10 @@ module Melissa
     end
 
     def time_zone_offset
-      GeoPoint.time_zone_offset(self.time_zone_code, self.state)
+      time_zone = TIME_ZONES[self.time_zone_code]
+      return nil unless time_zone
+      time_zone = 'US/Arizona' if self.state == 'AZ'
+      return Time.now.in_time_zone(time_zone).utc_offset / -60
     end
 
     def address_struct

data/lib/melissa/addr_obj_mock.rb

@@ -18,6 +18,7 @@ module Melissa
       #@urbanization        = opts[:urbanization] || ''
       @resultcodes = ['AS01']
       @address_type_string = 'Street'
+      @time_zone_code = '05'
     end
 
     #Mock

data/lib/melissa/config.rb

@@ -4,6 +4,20 @@ module Melissa
 
   MODES = [:mock, :live]
 
+  TIME_ZONES = {
+      '04' => 'Atlantic/Bermuda',
+      '05' => 'US/Eastern',
+      '06' => 'US/Central',
+      '07' => 'US/Mountain',
+      '08' => 'US/Pacific',
+      '09' => 'US/Alaska',
+      '10' => 'US/Hawaii',
+      '11' => 'US/Samoa',
+      '13' => 'Pacific/Majuro',
+      '14' => 'Pacific/Guam',
+      '15' => 'Pacific/Palau'
+  }
+
   class Config
 
     attr_accessor :mode, :license, :data_path, :addr_obj_lib, :geo_point_lib

data/lib/melissa/geo_point.rb

@@ -39,20 +39,6 @@ module Melissa
     #@@bad_codes   = ['GE01', 'GE02']
     @@fatal_codes = ['GE03', 'GE04', 'GE05']
 
-    @@time_zones = {
-        '04' => 'Atlantic/Bermuda',
-        '05' => 'US/Eastern',
-        '06' => 'US/Central',
-        '07' => 'US/Mountain',
-        '08' => 'US/Pacific',
-        '09' => 'US/Alaska',
-        '10' => 'US/Hawaii',
-        '11' => 'US/Samoa',
-        '13' => 'Pacific/Majuro',
-        '14' => 'Pacific/Guam',
-        '15' => 'Pacific/Palau'
-    }
-
     def valid?
       # Make sure there is at least 1 good code
       @is_valid
@@ -68,13 +54,8 @@ module Melissa
       @longitude
     end
 
-    def time_zone_offset
-      GeoPoint.time_zone_offset(self.time_zone_code, @addr_obj.state)
-    end
-
-    # Hack for AddrObj to share code
-    def self.time_zone_offset(time_zone_code, state=nil)
-      time_zone = @@time_zones[time_zone_code]
+    def time_zone_offset(state=nil)
+      time_zone = TIME_ZONES[self.time_zone_code]
       return nil unless time_zone
       time_zone = 'US/Arizona' if state == 'AZ'
       return Time.now.in_time_zone(time_zone).utc_offset / -60

data/lib/melissa/geo_point_mock.rb

@@ -10,13 +10,10 @@ module Melissa
       EOS
     end
 
-    def initialize(addr_obj)
+    def initialize(opts)
       @is_valid = false
-
-      if addr_obj.kind_of?(AddrObj)
-        @addr_obj = addr_obj
-      else
-        raise "Invalid call to GeoPoint, unknown object #{addr_obj.inspect}"
+      unless opts.kind_of?(AddrObj) || opts.kind_of?(Hash)
+        raise "Invalid call to GeoPoint, unknown object #{opts.inspect}"
       end
       @latitude = 27.850397
       @longitude = -82.659555

data/lib/melissa/version.rb

@@ -1,3 +1,3 @@
 module Melissa
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/addr_obj_test.rb

@@ -21,6 +21,8 @@ class AddrObjTest < Minitest::Test
           assert_equal '2517 Surfwood Dr', valid_address.address
           assert_equal 'Las Vegas', valid_address.city
           assert_equal '89128718217', valid_address.delivery_point
+          offset = Time.now.in_time_zone('US/Pacific').dst? ? 420 : 480
+          assert_equal offset, valid_address.time_zone_offset
         end
 
         it 'flags invalid data' do

data/test/geo_point_test.rb

@@ -21,11 +21,8 @@ class GeoPointTest < Minitest::Test
         assert geo_point_obj.valid?
         assert_includes 36.2..36.3, geo_point_obj.latitude
         assert_includes -115.3..-115.2, geo_point_obj.longitude
-        # offset = Time.now.in_time_zone('US/Eastern').dst? ? 240 : 300
-        # assert_equal offset, geo_point.time_zone_offset
-        #For the address above:
-        #g.time_zone_offset
-        #=> 480
+        offset = Time.now.in_time_zone('US/Pacific').dst? ? 420 : 480
+        assert_equal offset, geo_point_obj.time_zone_offset(valid_addr_obj.state)
       end
       it 'creates valid GeoPoint object from the Hash' do
         skip "Not run, Melissa library not loaded" unless Melissa::GeoPointLive.lib_loaded?
@@ -38,11 +35,8 @@ class GeoPointTest < Minitest::Test
         assert geo_point_obj.valid?
         assert_includes 36.2..36.3, geo_point_obj.latitude
         assert_includes -115.3..-115.2, geo_point_obj.longitude
-        # offset = Time.now.in_time_zone('US/Eastern').dst? ? 240 : 300
-        # assert_equal offset, geo_point.time_zone_offset
-        #For the address above:
-        #g.time_zone_offset
-        #=> 480
+        offset = Time.now.in_time_zone('US/Pacific').dst? ? 420 : 480
+        assert_equal offset, geo_point_obj.time_zone_offset
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: melissa
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Brad Pardee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport