melissa 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb291d59288648da0db3f3c32dd53dc59fe4fb51
-  data.tar.gz: c3108433ae2a69e654267e172b77cbee2e546258
+  metadata.gz: 625ef678d1c9036881ab0e7b91ebef31bcb1e035
+  data.tar.gz: f7d15d546fa2f2bb82ac905d661751ed379ac400
 SHA512:
-  metadata.gz: 7adf1de091986fe471e96f2b090feeab46d88bff99ba672b464319e469ea905b2d3965eb9ceffa314b7bdaff95431b09161c501df5f732e1e04b9641d9098c3c
-  data.tar.gz: 6f02f3f05fb70f0d4d9eb13e3ccded9465e6c603c70a6f10597d3370a2a3a648c983625de481291ed0fead33566dc561a6df4ec8b40eed797d913d4a5ba3615a
+  metadata.gz: f1427c544d18ff571008eff0bd169d2da64ba3d883d8c9082efe71ab2e1438e8df626c69d193e3e96c3904a837c231f1257024d67cff08155cd7f20882507850
+  data.tar.gz: 09730130a065c514854b6fff3ea91d4fccc4d526df0a86dd95178585379a3c36cd14fb39a91754c9e915b329c922916ea46f2445ca3283486d637781f93e3800

data/.jruby-version

@@ -1 +1 @@
-jruby-1.7.9
+jruby-1.7.19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    melissa (0.0.1)
+    melissa (0.0.2)
       activesupport
       ffi
       minitest
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.0)
+    activesupport (4.2.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -17,11 +17,9 @@ GEM
       tzinfo (~> 1.1)
     ansi (1.5.0)
     builder (3.2.2)
-    ffi (1.9.6)
-    ffi (1.9.6-java)
+    ffi (1.9.8)
     i18n (0.7.0)
     json (1.8.2)
-    json (1.8.2-java)
     minitest (5.4.0)
     minitest-reporters (1.0.8)
       ansi
@@ -32,8 +30,7 @@ GEM
     rake (10.4.2)
     ruby-progressbar (1.7.1)
     shoulda-context (1.2.1)
-    thread_safe (0.3.4)
-    thread_safe (0.3.4-java)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 

data/README.md

@@ -79,10 +79,10 @@ the values to validate each other.
   ```ruby
   #create AddrObj
    valid_addr_obj = ::Melissa.addr_obj(
-              :address => '9802 Brompton Dr',
-              :city => 'Tampa',
-              :state => 'Fl',
-              :zip => '33626'
+              address: '9802 Brompton Dr',
+              city: 'Tampa',
+              state: 'Fl',
+              zip: '33626'
           )
    #use it to get deliverypoint
    deliverypoint = valid_addr_obj.delivery_point
@@ -97,8 +97,14 @@ the values to validate each other.
 
   ```
 
-The calls to Melissa Data library will be attempted only if Melissa Data library is loaded.
-Otherwise mock objects will be used. This way there is no need to install Melissa Data library on development machine.
+The calls to Melissa Data library will be attempted only if melissa gem config mode is set to live, and Melissa Data
+ library is loaded. This is the default mode for the gem.
+
+```
+Melissa.config.mode = :live
+```
+
+Otherwise mock objects can be used. This way there is no need to install Melissa Data library on development machine.
 The following rules are used in mocking AddrObj Library:
 1. if zip_code is present, addres object is valid.
 2. to mock delivery point: "#{zip_code}1234#{last 2 digits of zip code}".
@@ -107,13 +113,34 @@ The following rules are used in mocking AddrObj Library:
 Mocked GeoPoint object will return following values:
 
     ```ruby
-        @latitude = 36.20687
-        @longitude = -115.27857
-        @time_zone_code = '08'
-        @resultcodes = ['AS01']
+        @latitude = 27.850397
+        @longitude = -82.659555
+        @time_zone_code = '05'
+        @resultcodes = ['GS05']
         @is_valid = true
     ```
 
+To use melissa gem from rails application, see railtie.rb, and create melissa.yml in the application, based
+on the example below:
+
+```
+default:  &defaults
+ config_path: /etc/melissa
+ mode:        live
+
+production:
+  <<:       *defaults
+
+release:
+  <<:       *defaults
+
+hotfix:
+  <<:       *defaults
+```
+
+By using this set up the attempt to call Melissa data library will be made in production, release and hotfix environments,
+and mock objects will be used in test and development.
+
 ## Meta
 
 * Code: `git clone git://github.com/smarinskaya/melissa.git`

data/lib/melissa.rb

@@ -1,3 +1,13 @@
+require "melissa/config"
+require "melissa/version"
+require 'melissa/addr_obj'
+require 'melissa/geo_point'
+require 'melissa/addr_obj_live'
+require 'melissa/geo_point_live'
+require 'melissa/addr_obj_mock'
+require 'melissa/geo_point_mock'
+require 'melissa/railtie' if defined?(Rails)
+
 module Melissa
 
   class << self
@@ -6,7 +16,6 @@ module Melissa
 
   def self.addr_obj(attrs)
     if config.mode == :live
-      raise LoadError, "Melissa AddrObj was not loaded!" unless config.addr_obj_lib_loaded
       AddrObjLive.new(attrs)
     else
       AddrObjMock.new(attrs)
@@ -15,7 +24,6 @@ module Melissa
 
   def self.geo_point(attrs)
     if config.mode == :live
-      raise LoadError, "Melissa GeoPoint object was not loaded!" unless config.geo_point_lib_loaded
       GeoPointLive.new(attrs)
     else
       GeoPointMock.new(attrs)
@@ -35,23 +43,11 @@ module Melissa
   end
 end
 
-require 'melissa/railtie' if defined?(Rails)
-
-require "melissa/version"
-require "melissa/config"
-require 'melissa/addr_obj'
-require 'melissa/geo_point'
-require 'melissa/addr_obj_live'
-require 'melissa/geo_point_live'
-require 'melissa/addr_obj_mock'
-require 'melissa/geo_point_mock'
-
-
-#valid_address_obj = ::Melissa.adrr_obj(:address => 'valid street', :city => 'Tampa', :state => 'FL', :zip => '33626')
+#valid_address_obj = ::Melissa.addr_obj(address: 'valid street', city: 'Tampa', state: 'FL', zip: '33626')
 #puts "addr=#{valid_address_obj.address}"
 #puts "deliverypoint=#{valid_address_obj.delivery_point}"
 
 #g = ::Melissa.geo_point(valid_address_obj)
 #puts "lat,long=#{g.latitude},#{g.longitude}"
 #or
-#g = ::Melissa.geo_point(:zip => 'zip', :plus4 => 'plus4', :delivery_point_code => 'delivery_point_code')
+#g = ::Melissa.geo_point(zip: 'zip', plus4: 'plus4', delivery_point_code:  'delivery_point_code')

data/lib/melissa/addr_obj_live.rb

@@ -2,10 +2,12 @@ require 'ffi'
 
 module Melissa
   class AddrObjLive < AddrObj
-    begin
+
+    def self.lib_loaded?
+      return @lib_loaded if defined?(@lib_loaded)
       extend FFI::Library
 
-      ffi_lib Melissa.config.addr_obj_lib if defined?(FFI)
+      ffi_lib Melissa.config.addr_obj_lib
       attr_functions = @@melissa_attributes.map { |name| ["mdAddrGet#{name}".to_sym, [:pointer], :string] }
 
       functions = attr_functions + [
@@ -43,75 +45,81 @@ module Melissa
 
       # Get all the attributes out up-front so we can destroy the h_addr_lib object
       class_eval <<-EOS
-      define_method(:fill_attributes) do |h_addr_lib|
-        #{@@melissa_attributes.map { |name| "@#{name.underscore} = mdAddrGet#{name}(h_addr_lib)" }.join("\n")}
-      end
+        define_method(:fill_attributes) do |h_addr_lib|
+          #{@@melissa_attributes.map { |name| "@#{name.underscore} = mdAddrGet#{name}(h_addr_lib)" }.join("\n")}
+        end
       EOS
+    rescue LoadError => e
+      puts "WARNING: #{Melissa.config.addr_obj_lib} could not be loaded"
+      return @lib_loaded = false
+    else
+      return @lib_loaded = true
+    end
 
-      def self.with_mdaddr
+    def self.with_mdaddr
+      raise "Unable to load melissa library #{Melissa.config.addr_obj_lib}" unless self.lib_loaded?
+      raise "Unable to find the license for Melissa Data library #{Melissa.config.license}" unless Melissa.config.license.present?
+      raise "Unable to find data files for Melissa Data library #{Melissa.config.data_path}" unless Melissa.config.data_path.present?
+      begin
         h_addr_lib = mdAddrCreate
         mdAddrSetLicenseString(h_addr_lib, Melissa.config.license)
         mdAddrSetPathToUSFiles(h_addr_lib, Melissa.config.data_path)
         mdAddrInitializeDataFiles(h_addr_lib)
         yield h_addr_lib
       ensure
-        mdAddrDestroy(h_addr_lib)
+        mdAddrDestroy(h_addr_lib) if h_addr_lib
       end
+    end
 
-      #This function returns a date value corresponding to the date when the current license
-      #string expires.
+    #This function returns a date value corresponding to the date when the current license
+    #string expires.
 
-      def self.license_expiration_date
-        Date.parse(with_mdaddr { |h_addr_lib| mdAddrGetLicenseExpirationDate(h_addr_lib) })
-      end
+    def self.license_expiration_date
+      Date.parse(with_mdaddr { |h_addr_lib| mdAddrGetLicenseExpirationDate(h_addr_lib) })
+    end
 
-      def self.days_until_license_expiration
-        #I compare Date objects. I think it is more accurate.
-        #self.license_expiration_date returns string in format: "YYYY-MM-DD"
-        (self.license_expiration_date - Date.today).to_i
-      end
+    def self.days_until_license_expiration
+      #I compare Date objects. I think it is more accurate.
+      #self.license_expiration_date returns string in format: "YYYY-MM-DD"
+      (self.license_expiration_date - Date.today).to_i
+    end
 
-     # U.S. Only — This function returns a date value representing the
-     # date when the current U.S. data files expire. This date enables you to confirm that the
-     # data files you are using are the latest available.
+   # U.S. Only — This function returns a date value representing the
+   # date when the current U.S. data files expire. This date enables you to confirm that the
+   # data files you are using are the latest available.
 
-      def self.data_expiration_date
-        Date.strptime(with_mdaddr { |h_addr_lib| mdAddrGetExpirationDate(h_addr_lib) }, '%m-%d-%Y')
-      end
+    def self.data_expiration_date
+      Date.strptime(with_mdaddr { |h_addr_lib| mdAddrGetExpirationDate(h_addr_lib) }, '%m-%d-%Y')
+    end
 
-      def self.days_until_data_expiration
-        (self.data_expiration_date - Date.today).to_i
-      end
+    def self.days_until_data_expiration
+      (self.data_expiration_date - Date.today).to_i
+    end
 
-      def initialize(opts)
-        self.class.with_mdaddr do |h_addr_lib|
-          # clear any properties from a previous call
-          mdAddrClearProperties(h_addr_lib)
-
-          mdAddrSetCompany(h_addr_lib, opts[:company] || '');
-          mdAddrSetAddress(h_addr_lib, opts[:address] || '');
-          mdAddrSetAddress2(h_addr_lib, opts[:address2] || '');
-          mdAddrSetSuite(h_addr_lib, opts[:suite] || '');
-          mdAddrSetCity(h_addr_lib, opts[:city] || '');
-          mdAddrSetState(h_addr_lib, opts[:state] || '');
-          mdAddrSetZip(h_addr_lib, opts[:zip] || '');
-          mdAddrSetUrbanization(h_addr_lib, opts[:urbanization] || '');
-          mdAddrSetCountryCode(h_addr_lib, opts[:country_code] || '');
-          mdAddrVerifyAddress(h_addr_lib);
-
-          @resultcodes = mdAddrGetResults(h_addr_lib).split(',')
-          fill_attributes(h_addr_lib)
-        end
+    def initialize(opts)
+      self.class.with_mdaddr do |h_addr_lib|
+        # clear any properties from a previous call
+        mdAddrClearProperties(h_addr_lib)
+
+        mdAddrSetCompany(h_addr_lib, opts[:company] || '');
+        mdAddrSetAddress(h_addr_lib, opts[:address] || '');
+        mdAddrSetAddress2(h_addr_lib, opts[:address2] || '');
+        mdAddrSetSuite(h_addr_lib, opts[:suite] || '');
+        mdAddrSetCity(h_addr_lib, opts[:city] || '');
+        mdAddrSetState(h_addr_lib, opts[:state] || '');
+        mdAddrSetZip(h_addr_lib, opts[:zip] || '');
+        mdAddrSetUrbanization(h_addr_lib, opts[:urbanization] || '');
+        mdAddrSetCountryCode(h_addr_lib, opts[:country_code] || '');
+        mdAddrVerifyAddress(h_addr_lib);
+
+        @resultcodes = mdAddrGetResults(h_addr_lib).split(',')
+        fill_attributes(h_addr_lib)
       end
+    end
 
-      def valid?
-        # Make sure there is at least 1 good code and no bad codes
-        (@resultcodes & @@good_codes).present? && (@resultcodes & @@bad_codes).empty?
-      end
-    rescue LoadError => e
-      Melissa.config.addr_obj_lib_loaded = false
-    else
-      Melissa.config.addr_obj_lib_loaded = true
+    def valid?
+      # Make sure there is at least 1 good code and no bad codes
+      (@resultcodes & @@good_codes).present? && (@resultcodes & @@bad_codes).empty?
     end
   end
 end

data/lib/melissa/addr_obj_mock.rb

@@ -43,4 +43,4 @@ module Melissa
       return self.zip.present?
     end
   end
-end
+end

data/lib/melissa/config.rb

@@ -6,8 +6,7 @@ module Melissa
 
   class Config
 
-    attr_accessor :mode, :license, :data_path, :addr_obj_lib, :addr_obj_lib_loaded
-    attr_accessor :geo_point_lib, :geo_point_lib_loaded
+    attr_accessor :mode, :license, :data_path, :addr_obj_lib, :geo_point_lib
 
     def initialize
       #It is recommended to read the following config options from environment variables
@@ -15,9 +14,10 @@ module Melissa
       #The license string should be entered as an environment variable named
       #MD_LICENSE. This allows you to update your license string without editing
       #and recompiling your code
+      self.mode = :live
 
+      self.home = ENV['MELISSA_HOME'] || '/usr/local/dqs'
       self.config_path = ENV['MELISSA_CONFIG_PATH'] if ENV['MELISSA_CONFIG_PATH']
-      self.home = ENV['MELISSA_HOME'] if ENV['MELISSA_HOME']
       @data_path = ENV['MELISSA_DATA_PATH'] if ENV['MELISSA_DATA_PATH']
       @addr_obj_lib = ENV['MELISSA_ADDR_OBJ_LIB'] if ENV['MELISSA_ADDR_OBJ_LIB']
       @geo_point_lib = ENV['MELISSA_GEO_POINT_LIB'] if ENV['MELISSA_GEO_POINT_LIB']
@@ -48,16 +48,5 @@ module Melissa
       @geo_point_lib = "#{home}/GeoObj/libmdGeo.so"
       @data_path = "#{home}/data"
     end
-
-    def addr_obj_lib_loaded=(value)
-      @addr_obj_lib_loaded = value
-      @mode ||= :live if value
-    end
-
-    def geo_point_library_loaded=(value)
-      @geo_point_lib_loaded = value
-      @mode ||= :live if value
-    end
   end
 end
-

data/lib/melissa/geo_point.rb

@@ -58,6 +58,16 @@ module Melissa
       @is_valid
     end
 
+    #Added this method to have an ability to stub latitude if needed
+    def latitude
+      @latitude
+    end
+
+    #Added this method to have an ability to stub longitude if needed
+    def longitude
+      @longitude
+    end
+
     def time_zone_offset
       GeoPoint.time_zone_offset(self.time_zone_code, @addr_obj.state)
     end

data/lib/melissa/geo_point_live.rb

@@ -2,9 +2,11 @@ require 'ffi'
 
 module Melissa
   class GeoPointLive < GeoPoint
-    extend FFI::Library
 
-    begin
+    def self.lib_loaded?
+      return @lib_loaded if defined?(@lib_loaded)
+      extend FFI::Library
+
       ffi_lib Melissa.config.geo_point_lib
       attr_functions = @@melissa_attributes.map { |name| ["mdGeoGet#{name}".to_sym, [:pointer], :string] }
 
@@ -38,8 +40,18 @@ module Melissa
           #{@@melissa_attributes.map { |name| "@#{name.underscore} = mdGeoGet#{name}(mdGeo)" }.join("\n")}
         end
       EOS
+    rescue LoadError => e
+      puts "WARNING: #{Melissa.config.geo_point_lib} could not be loaded"
+      return @lib_loaded = false
+    else
+      return @lib_loaded = true
+    end
 
-      def self.with_mdgeo
+    def self.with_mdgeo
+      raise "Unable to load melissa library #{Melissa.config.addr_obj_lib}" unless self.lib_loaded?
+      raise "Unable to find the license for Melissa Data library #{Melissa.config.license}" unless Melissa.config.license.present?
+      raise "Unable to find data files for Melissa Data library #{Melissa.config.data_path}" unless Melissa.config.data_path.present?
+      begin
         mdGeo = mdGeoCreate
         mdGeoSetLicenseString(mdGeo, Melissa.config.license)
         mdGeoSetPathToGeoCodeDataFiles(mdGeo, Melissa.config.data_path)
@@ -52,75 +64,71 @@ module Melissa
       ensure
         mdGeoDestroy(mdGeo) if mdGeo
       end
+    end
 
-      #This function returns a date value corresponding to the date when the current license
-      #string expires.
-      def self.license_expiration_date
-        Date.parse(with_mdgeo { |mdGeo| mdGeoGetLicenseExpirationDate(mdGeo) })
-      end
+    #This function returns a date value corresponding to the date when the current license
+    #string expires.
+    def self.license_expiration_date
+      Date.parse(with_mdgeo { |mdGeo| mdGeoGetLicenseExpirationDate(mdGeo) })
+    end
 
-      def self.days_until_license_expiration
-        #I compare Date objects. I think it is more accurate.
-        #self.license_expiration_date returns string in format: "YYYY-MM-DD"
-        (self.license_expiration_date - Date.today).to_i
-      end
+    def self.days_until_license_expiration
+      #I compare Date objects. I think it is more accurate.
+      #self.license_expiration_date returns string in format: "YYYY-MM-DD"
+      (self.license_expiration_date - Date.today).to_i
+    end
 
-      # his function returns a date value representing the
-      # date when the current data files expire. This date enables you to confirm that the
-      # data files you are using are the latest available.
-      def self.expiration_date
-        Date.parse(with_mdgeo { |mdGeo| mdGeoGetExpirationDate(mdGeo)})
-      end
+    # his function returns a date value representing the
+    # date when the current data files expire. This date enables you to confirm that the
+    # data files you are using are the latest available.
+    def self.expiration_date
+      Date.parse(with_mdgeo { |mdGeo| mdGeoGetExpirationDate(mdGeo)})
+    end
 
-      def self.days_until_data_expiration
-        #I compare Date objects. I think it is more accurate.
-        #self.license_expiration_date returns string in format: "YYYY-MM-DD"
-        (self.expiration_date - Date.today).to_i
-      end
+    def self.days_until_data_expiration
+      #I compare Date objects. I think it is more accurate.
+      #self.license_expiration_date returns string in format: "YYYY-MM-DD"
+      (self.expiration_date - Date.today).to_i
+    end
 
-      def initialize(opts)
-        @is_valid = false
+    def initialize(opts)
+      @is_valid = false
 
-        self.class.with_mdgeo do |mdGeo|
-          if opts.kind_of?(AddrObj)
-            mdGeoGeoPoint(mdGeo, opts.zip || '', opts.plus4 || '', opts.delivery_point_code || '')
-          elsif opts.kind_of?(Hash)
-            mdGeoGeoPoint(mdGeo, opts[:zip] || '', opts[:plus4] || '', opts[:delivery_point_code] || '')
+      self.class.with_mdgeo do |mdGeo|
+        if opts.kind_of?(AddrObj)
+          mdGeoGeoPoint(mdGeo, opts.zip || '', opts.plus4 || '', opts.delivery_point_code || '')
+        elsif opts.kind_of?(Hash)
+          mdGeoGeoPoint(mdGeo, opts[:zip] || '', opts[:plus4] || '', opts[:delivery_point_code] || '')
+        else
+          raise "Invalid call to GeoPoint, unknown object #{opts.inspect}"
+        end
+        @resultcodes = mdGeoGetResults(mdGeo).split(',')
+        fatals = @resultcodes & @@fatal_codes
+        @is_valid = fatals.blank?
+        if @is_valid
+          fill_attributes(mdGeo)
+          # Convert from strings to actual types
+          if @latitude.blank?
+            @latitude = nil
           else
-            raise "Invalid call to GeoPoint, unknown object #{opts.inspect}"
+            @latitude = @latitude.to_f
           end
-          @resultcodes = mdGeoGetResults(mdGeo).split(',')
-          fatals = @resultcodes & @@fatal_codes
-          @is_valid = fatals.blank?
-          if @is_valid
-            fill_attributes(mdGeo)
-            # Convert from strings to actual types
-            if @latitude.blank?
-              @latitude = nil
-            else
-              @latitude = @latitude.to_f
-            end
-            if @longitude.blank?
-              @longitude = nil
-            else
-              @longitude = @longitude.to_f
-            end
-            if @latitude == 0.0 && @longitude == 0.0
-              @latitude = nil
-              @longitude = nil
-              @is_valid = false
-            end
+          if @longitude.blank?
+            @longitude = nil
           else
-            fatals.each do |fatal_code|
-              raise "FATAL ERROR Melissa GeoPoint returned #{fatal_code}-#{@@codes[fatal_code]}"
-            end
+            @longitude = @longitude.to_f
+          end
+          if @latitude == 0.0 && @longitude == 0.0
+            @latitude = nil
+            @longitude = nil
+            @is_valid = false
+          end
+        else
+          fatals.each do |fatal_code|
+            raise "FATAL ERROR Melissa GeoPoint returned #{fatal_code}-#{@@codes[fatal_code]}"
           end
         end
       end
-    rescue LoadError => e
-      Melissa.config.geo_point_library_loaded = false
-    else
-      Melissa.config.geo_point_library_loaded = true
     end
   end
 end

data/lib/melissa/geo_point_mock.rb

@@ -18,10 +18,10 @@ module Melissa
       else
         raise "Invalid call to GeoPoint, unknown object #{addr_obj.inspect}"
       end
-      @latitude = 36.20687
-      @longitude = -115.27857
-      @time_zone_code = '08'
-      @resultcodes = ['AS01']
+      @latitude = 27.850397
+      @longitude = -82.659555
+      @time_zone_code = '05'
+      @resultcodes = ['GS05']
       @is_valid = true
     end
   end

data/lib/melissa/railtie.rb

@@ -1,10 +1,24 @@
+require 'yaml'
+require 'erb'
+
 module Melissa
   class Railtie < Rails::Railtie #:nodoc:
     # Make the Melissa config available in the Rails application config
     config.before_configuration do
-      config_file = Rails.root.join('config', 'melissa.txt')
+      config_file = Rails.root.join('config', 'melissa.yml')
       if config_file.file?
-        Melissa.config.config_path = config_file
+        full_config = YAML.load(ERB.new(File.read(config_file)).result(binding))
+        config_hash      = full_config[ENV['MELISSA_ENV'] || Rails.env]
+        if config_hash
+          config_hash.each do |key, value|
+            value = value.to_sym if key == 'mode'
+            Melissa.config.send("#{key}=", value)
+          end
+        else
+          Melissa.config.mode = :mock
+        end
+      else
+        Melissa.config.mode = :mock
       end
     end
   end

data/lib/melissa/version.rb

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

data/test/addr_obj_test.rb

@@ -5,17 +5,17 @@ class AddrObjTest < Minitest::Test
 
     describe "live mode" do
       before do
-        Melissa.config.mode = :live if Melissa.config.addr_obj_lib_loaded
+        Melissa.config.mode = :live
       end
 
       describe "valid?" do
         it 'handles valid data' do
-          skip "Not run in mock mode" unless Melissa.config.mode == :live
+          skip "Not run, Melissa library not loaded" unless Melissa::AddrObjLive.lib_loaded?
           valid_address = Melissa.addr_obj(
-              :address => '2517 Surfwood Dr',
-              :city => 'Las Vegas',
-              :state => 'NV',
-              :zip => '89128'
+              address: '2517 Surfwood Dr',
+              city: 'Las Vegas',
+              state: 'NV',
+              zip: '89128'
           )
           assert valid_address.valid?
           assert_equal '2517 Surfwood Dr', valid_address.address
@@ -24,13 +24,13 @@ class AddrObjTest < Minitest::Test
         end
 
         it 'flags invalid data' do
-          skip "Not run in mock mode" unless Melissa.config.mode == :live
+          skip "Not run, Melissa library not loaded" unless Melissa::AddrObjLive.lib_loaded?
           # Zip points to Schenectady, NY
           invalid_address = Melissa.addr_obj(
-              :address => '123 Who Dr',
-              :city => 'WhoVille',
-              :state => 'IN',
-              :zip => '12345'
+              address: '123 Who Dr',
+              city: 'WhoVille',
+              state: 'IN',
+              zip: '12345'
           )
           assert !invalid_address.valid?
         end
@@ -38,12 +38,12 @@ class AddrObjTest < Minitest::Test
 
       describe "delivery_point" do
         it 'sets delivery point for valid data' do
-          skip "Not run in mock mode" unless Melissa.config.mode == :live
+          skip "Not run, Melissa library not loaded" unless Melissa::AddrObjLive.lib_loaded?
           valid_address = Melissa.addr_obj(
-              :address => '2517 Surfwood Dr',
-              :city => 'Las Vegas',
-              :state => 'NV',
-              :zip => '89128'
+              address: '2517 Surfwood Dr',
+              city: 'Las Vegas',
+              state: 'NV',
+              zip: '89128'
           )
           assert_equal '89128718217', valid_address.delivery_point
         end
@@ -51,7 +51,7 @@ class AddrObjTest < Minitest::Test
 
       describe 'number of days till licence expires' do
         it 'checks if we have more than 30 days till license expiration date' do
-          skip "Not run in mock mode" unless Melissa.config.mode == :live
+          skip "Not run, Melissa library not loaded" unless Melissa::AddrObjLive.lib_loaded?
           valid_address = Melissa.addr_obj(
               :address => '2517 Surfwood Dr',
               :city => 'Las Vegas',
@@ -70,10 +70,10 @@ class AddrObjTest < Minitest::Test
       describe "valid?" do
         it 'handles valid data' do
           valid_address = Melissa.addr_obj(
-              :address => '9802 Brompton Dr',
-              :city => 'Tampa',
-              :state => 'Fl',
-              :zip => '33626'
+              address: '9802 Brompton Dr',
+              city: 'Tampa',
+              state: 'Fl',
+              zip: '33626'
           )
           assert valid_address.valid?
           assert_equal '9802 Brompton Dr', valid_address.address
@@ -84,10 +84,10 @@ class AddrObjTest < Minitest::Test
         it 'flags invalid data' do
           # Zip points to Schenectady, NY
           invalid_address = Melissa.addr_obj(
-              :address => '123 Who Dr',
-              :city => 'WhoVille',
-              :state => 'IN',
-              :zip => ''
+              address: '123 Who Dr',
+              city: 'WhoVille',
+              state: 'IN',
+              zip: ''
           )
           assert !invalid_address.valid?
         end
@@ -96,10 +96,10 @@ class AddrObjTest < Minitest::Test
       describe "delivery_point" do
         it 'sets delivery point for valid data' do
           valid_address = Melissa.addr_obj(
-              :address => '9802 Brompton Dr',
-              :city => 'Tampa',
-              :state => 'Fl',
-              :zip => '33626'
+              address: '9802 Brompton Dr',
+              city: 'Tampa',
+              state: 'Fl',
+              zip: '33626'
           )
           assert_equal '33626123426', valid_address.delivery_point
         end

data/test/geo_point_test.rb

@@ -5,17 +5,17 @@ class GeoPointTest < Minitest::Test
 
   describe Melissa::GeoPoint do
     before do
-      Melissa.config.mode = :live  if  Melissa.config.addr_obj_lib_loaded
+      Melissa.config.mode = :live
     end
 
     describe 'valid?' do
       it 'creates valid GeoPoint object from valid Address Object' do
-        skip "Not run in mock mode" unless Melissa.config.mode == :live
+        skip "Not run, Melissa library not loaded" unless Melissa::GeoPointLive.lib_loaded?
         valid_addr_obj = Melissa.addr_obj(
-            :address => '2517 SURFWOOD DR',
-            :city => 'LAS VEGAS',
-            :state => 'NV',
-            :zip => '89128'
+            address: '2517 SURFWOOD DR',
+            city: 'LAS VEGAS',
+            state: 'NV',
+            zip: '89128'
         )
         geo_point_obj = Melissa.geo_point(valid_addr_obj)
         assert geo_point_obj.valid?
@@ -28,11 +28,11 @@ class GeoPointTest < Minitest::Test
         #=> 480
       end
       it 'creates valid GeoPoint object from the Hash' do
-        skip "Not run in mock mode" unless Melissa.config.mode == :live
+        skip "Not run, Melissa library not loaded" unless Melissa::GeoPointLive.lib_loaded?
         geo_point_obj= Melissa.geo_point(
-            :zip => '89128',
-            :plus4 =>  '7182',
-            :delivery_point_code => '17'
+            zip: '89128',
+            plus4: '7182',
+            delivery_point_code: '17'
         )
 
         assert geo_point_obj.valid?
@@ -48,12 +48,12 @@ class GeoPointTest < Minitest::Test
 
     describe 'number of days till licence expires' do
       it 'checks if we have more than 30 days till license expiration date' do
-        skip "Not run in mock mode" unless Melissa.config.mode == :live
+        skip "Not run, Melissa library not loaded" unless Melissa::GeoPointLive.lib_loaded?
         valid_addr_obj = Melissa.addr_obj(
-            :address => '2517 SURFWOOD DR',
-            :city => 'LAS VEGAS',
-            :state => 'NV',
-            :zip => '89128'
+            address: '2517 SURFWOOD DR',
+            city: 'LAS VEGAS',
+            state: 'NV',
+            zip: '89128'
         )
         geo_point = Melissa.geo_point(valid_addr_obj)
         assert_operator 30, :<, geo_point.class.days_until_license_expiration
@@ -61,5 +61,3 @@ class GeoPointTest < Minitest::Test
     end
   end
 end
-
-

data/test/melissa_test.rb

@@ -4,17 +4,17 @@ class MelissaTest < Minitest::Test
 
   describe 'Melissa.addr_obj' do
     before do
-      Melissa.config.mode = :live if  Melissa.config.addr_obj_lib_loaded
+      Melissa.config.mode = :live
     end
 
     describe "live mode" do
       it 'initializes AddrObjLive object' do
-        skip "Not run in mock mode" unless Melissa.config.mode == :live
+        skip "Not run, Melissa library not loaded" unless Melissa::AddrObjLive.lib_loaded?
         valid_address = Melissa.addr_obj(
-            :address => '9802 Brompton Dr',
-            :city => 'Tampa',
-            :state => 'Fl',
-            :zip => '33626'
+            address: '9802 Brompton Dr',
+            city: 'Tampa',
+            state: 'Fl',
+            zip: '33626'
         )
         assert_kind_of Melissa::AddrObjLive, valid_address
       end
@@ -27,10 +27,10 @@ class MelissaTest < Minitest::Test
 
       it 'initializes AddrObjMock object' do
         valid_address = Melissa.addr_obj(
-            :address => '9802 Brompton Dr',
-            :city => 'Tampa',
-            :state => 'Fl',
-            :zip => '33626'
+            address: '9802 Brompton Dr',
+            city: 'Tampa',
+            state: 'Fl',
+            zip: '33626'
         )
         assert_kind_of Melissa::AddrObjMock, valid_address
       end
@@ -39,17 +39,18 @@ class MelissaTest < Minitest::Test
 
   describe 'Melissa.geo_point' do
     before do
-      Melissa.config.mode = :live if  Melissa.config.addr_obj_lib_loaded
+      Melissa.config.mode = :live
     end
 
     describe "live mode" do
       it 'initializes GeoPointLive object' do
-        skip "Not run in mock mode" unless Melissa.config.mode == :live
+        skip "Not run, Melissa library not loaded" unless Melissa::AddrObjLive.lib_loaded?
+        skip "Not run, Melissa library not loaded" unless Melissa::GeoPointLive.lib_loaded?
         valid_addr_obj = Melissa.addr_obj(
-            :address => '9802 Brompton Dr',
-            :city => 'Tampa',
-            :state => 'Fl',
-            :zip => '33626'
+            address: '9802 Brompton Dr',
+            city: 'Tampa',
+            state: 'Fl',
+            zip: '33626'
         )
         geo_point_obj = Melissa.geo_point(valid_addr_obj)
         assert_kind_of Melissa::GeoPointLive, geo_point_obj
@@ -63,14 +64,14 @@ class MelissaTest < Minitest::Test
 
       it 'initializes GeoPointMock object' do
         valid_addr_obj = Melissa.addr_obj(
-            :address => '9802 Brompton Dr',
-            :city => 'Tampa',
-            :state => 'Fl',
-            :zip => '33626'
+            address: '9802 Brompton Dr',
+            city: 'Tampa',
+            state: 'Fl',
+            zip: '33626'
         )
         geo_point_obj = Melissa.geo_point(valid_addr_obj)
         assert_kind_of Melissa::GeoPointMock, geo_point_obj
       end
     end
   end
-end
+end

metadata

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