melissa 0.0.8 → 0.0.9b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59236d88782fb94987e5148e7be63d62ae1485f6
-  data.tar.gz: 5b903e0f90337b7c81393052f35ff795846797a8
+  metadata.gz: 4b691b75df37248404fcec6e5361070194f7a4b2
+  data.tar.gz: 2189c5a6e00cf89216f2b37b77747ee0af6571e3
 SHA512:
-  metadata.gz: d885a6be9192ece24fbfa12df7163530a7df86c8531394e21ca5d8c4c74f56e5b38b8682817e659c3fda716b62109be58cf19c148f4a44faad28e62336c6486b
-  data.tar.gz: 568d35113295907fb0decb371f06881e04c39d9daac1c5a46a4474107cfda68bb2ce7912b6281b6c57ae689fb17a935f3d6621086c401f6b32173ee7f2a092d1
+  metadata.gz: a900ac4abc2fd4daabf2df8b7f98b980179ae82afc2647b166fcb6f10edb74d5fba961525454f5fa6cce9d6ab7da625b9e5fae422f9b653dd9ef4043a95757ac
+  data.tar.gz: 923c8c2aba2639775fd703f0ba2a650fb893f2a0e2f67647b98ed7d63d35043861e2ccb733361fadf971950ba68d57510075e788328f6bc3ac7b5823e0c7de7b

data/.jruby-version

@@ -1 +1 @@
-jruby-1.7.19
+jruby-1.7.23

data/.ruby-version

@@ -1 +1 @@
-2.2.1
+2.3

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    melissa (0.0.8)
-      activesupport
+    melissa (0.0.9b)
+      activesupport (~> 4.2.1)
+      concurrent-ruby
       ffi
       minitest
-      thread_safe
+      sync_attr
 
 GEM
   remote: https://rubygems.org/
@@ -18,11 +19,10 @@ GEM
       tzinfo (~> 1.1)
     ansi (1.5.0)
     builder (3.2.2)
+    concurrent-ruby (1.0.2)
     ffi (1.9.8)
-    ffi (1.9.8-java)
     i18n (0.7.0)
     json (1.8.2)
-    json (1.8.2-java)
     minitest (5.4.0)
     minitest-reporters (1.0.8)
       ansi
@@ -33,8 +33,8 @@ GEM
     rake (10.4.2)
     ruby-progressbar (1.7.1)
     shoulda-context (1.2.1)
+    sync_attr (2.0.0)
     thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 

data/lib/melissa/addr_obj.rb

@@ -1,4 +1,5 @@
 require 'active_support/all' #TODO I can narrow down this
+require 'concurrent'
 
 module Melissa
   class AddrObj
@@ -53,7 +54,7 @@ module Melissa
     @@good_codes = ['AS01', 'AS02', 'AS03']
     @@bad_codes = ['AC02', 'AC03']
 
-    @@callbacks = ThreadSafe::Array.new
+    @@callbacks = Concurrent::Array.new
 
     # Allow callbacks to intercept response and perform whatever misc stuff (hint: victim_statements)
     def self.add_callback(&callback)

data/lib/melissa/addr_obj_live.rb

@@ -1,16 +1,17 @@
 require 'ffi'
+require 'sync_attr'
 
 module Melissa
   class AddrObjLive < AddrObj
 
-    def self.lib_loaded?
-      return @lib_loaded if defined?(@lib_loaded)
-      extend FFI::Library
+    sync_cattr_reader :lib_loaded do
+      begin
+        extend FFI::Library
 
-      ffi_lib Melissa.config.addr_obj_lib
-      attr_functions = @@melissa_attributes.map { |name| ["mdAddrGet#{name}".to_sym, [:pointer], :string] }
+        ffi_lib Melissa.config.addr_obj_lib
+        attr_functions = @@melissa_attributes.map { |name| ["mdAddrGet#{name}".to_sym, [:pointer], :string] }
 
-      functions = attr_functions + [
+        functions = attr_functions + [
           # method # parameters        # return
           [:mdAddrCreate, [], :pointer],
           [:mdAddrSetLicenseString, [:pointer, :string], :int],
@@ -31,33 +32,34 @@ module Melissa
           [:mdAddrDestroy, [:pointer], :void],
           [:mdAddrGetLicenseExpirationDate, [:pointer], :string],
           [:mdAddrGetExpirationDate, [:pointer], :string],
-      ]
-
-      functions.each do |func|
-        begin
-          attach_function(*func)
-        rescue Object => e
-          raise "Could not attach #{func}, #{e.message}"
+        ]
+
+        functions.each do |func|
+          begin
+            attach_function(*func)
+          rescue Object => e
+            raise "Could not attach #{func}, #{e.message}"
+          end
         end
-      end
 
-      attr_reader *@@melissa_attributes.map { |name| name.underscore.to_sym }
+        attr_reader *@@melissa_attributes.map { |name| name.underscore.to_sym }
 
-      # Get all the attributes out up-front so we can destroy the h_addr_lib object
-      class_eval <<-EOS
+        # 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
-      EOS
-    rescue LoadError => e
-      puts "WARNING: #{Melissa.config.addr_obj_lib} could not be loaded"
-      return @lib_loaded = false
-    else
-      return @lib_loaded = true
+        EOS
+      rescue LoadError => e
+        puts "WARNING: #{Melissa.config.addr_obj_lib} could not be loaded"
+        false
+      else
+        true
+      end
     end
 
     def self.with_mdaddr
-      raise "Unable to load melissa library #{Melissa.config.addr_obj_lib}" unless self.lib_loaded?
+      raise "Unable to load melissa library #{Melissa.config.addr_obj_lib}" unless 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
@@ -84,9 +86,9 @@ module Melissa
       (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')

data/lib/melissa/geo_point.rb

@@ -1,4 +1,5 @@
 require "melissa/config"
+require 'concurrent'
 
 module Melissa
   class GeoPoint
@@ -39,7 +40,7 @@ module Melissa
     #@@bad_codes   = ['GE01', 'GE02']
     @@fatal_codes = ['GE03', 'GE04', 'GE05']
 
-    @@callbacks = ThreadSafe::Array.new
+    @@callbacks = Concurrent::Array.new
 
     # Allow callbacks to intercept response and perform whatever misc stuff (hint: victim_statements)
     def self.add_callback(&callback)

data/lib/melissa/geo_point_live.rb

@@ -1,16 +1,17 @@
 require 'ffi'
+require 'sync_attr'
 
 module Melissa
   class GeoPointLive < GeoPoint
 
-    def self.lib_loaded?
-      return @lib_loaded if defined?(@lib_loaded)
-      extend FFI::Library
+    sync_cattr_reader :lib_loaded do
+      begin
+        extend FFI::Library
 
-      ffi_lib Melissa.config.geo_point_lib
-      attr_functions = @@melissa_attributes.map { |name| ["mdGeoGet#{name}".to_sym, [:pointer], :string] }
+        ffi_lib Melissa.config.geo_point_lib
+        attr_functions = @@melissa_attributes.map { |name| ["mdGeoGet#{name}".to_sym, [:pointer], :string] }
 
-      functions = attr_functions + [
+        functions = attr_functions + [
           # method # parameters        # return
           [:mdGeoCreate, [], :pointer],
           [:mdGeoSetLicenseString, [:pointer, :string], :int],
@@ -22,33 +23,34 @@ module Melissa
           [:mdGeoDestroy, [:pointer], :void],
           [:mdGeoGetLicenseExpirationDate, [:pointer], :string],
           [:mdGeoGetExpirationDate, [:pointer], :string],
-      ]
+        ]
 
-      functions.each do |func|
-        begin
-          attach_function(*func)
-        rescue Object => e
-          raise "Could not attach #{func}, #{e.message}"
+        functions.each do |func|
+          begin
+            attach_function(*func)
+          rescue Object => e
+            raise "Could not attach #{func}, #{e.message}"
+          end
         end
-      end
 
-      attr_reader *@@melissa_attributes.map { |name| name.underscore.to_sym }
+        attr_reader *@@melissa_attributes.map { |name| name.underscore.to_sym }
 
-      # Get all the attributes out up-front so we can destroy the mdGeo object
-      class_eval <<-EOS
+        # Get all the attributes out up-front so we can destroy the mdGeo object
+        class_eval <<-EOS
         define_method(:fill_attributes) do |mdGeo|
           #{@@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
+        EOS
+      rescue LoadError => e
+        puts "WARNING: #{Melissa.config.geo_point_lib} could not be loaded"
+        false
+      else
+        true
+      end
     end
 
     def self.with_mdgeo
-      raise "Unable to load melissa library #{Melissa.config.addr_obj_lib}" unless self.lib_loaded?
+      raise "Unable to load melissa library #{Melissa.config.addr_obj_lib}" unless 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
@@ -58,7 +60,7 @@ module Melissa
         mdGeoSetPathToGeoPointDataFiles(mdGeo, Melissa.config.data_path)
         result = mdGeoInitializeDataFiles(mdGeo)
         if result != 0
-          raise mdGeoGetInitializeErrorString(mdGeo)
+          raise "Unable to initialize data files for Melissa Data library #{Melissa.config.data_path}"
         end
         yield mdGeo
       ensure
@@ -82,7 +84,7 @@ module Melissa
     # 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)})
+      Date.parse(with_mdgeo { |mdGeo| mdGeoGetExpirationDate(mdGeo) })
     end
 
     def self.days_until_data_expiration
@@ -103,8 +105,8 @@ module Melissa
           raise "Invalid call to GeoPoint, unknown object #{opts.inspect}"
         end
         @resultcodes = mdGeoGetResults(mdGeo).split(',')
-        fatals = @resultcodes & @@fatal_codes
-        @is_valid = fatals.blank?
+        fatals       = @resultcodes & @@fatal_codes
+        @is_valid    = fatals.blank?
         if @is_valid
           fill_attributes(mdGeo)
           # Convert from strings to actual types
@@ -119,9 +121,9 @@ module Melissa
             @longitude = @longitude.to_f
           end
           if @latitude == 0.0 && @longitude == 0.0
-            @latitude = nil
+            @latitude  = nil
             @longitude = nil
-            @is_valid = false
+            @is_valid  = false
           end
         else
           fatals.each do |fatal_code|

data/lib/melissa/version.rb

@@ -1,3 +1,3 @@
 module Melissa
-  VERSION = "0.0.8"
+  VERSION = "0.0.9b"
 end

data/melissa.gemspec

@@ -2,21 +2,23 @@
 require File.expand_path('../lib/melissa/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ['Brad Pardee', 'Svetlana Marinskaya']
-  gem.email         = ['bradpardee@gmail.com', 'svetlana.marinskaya@gmail.com']
-  gem.description   = %q{Configurable interface to Melissa Data Address and GeoPoint objects}
-  gem.summary       = %q{Melissa allows you to use ruby wrappers for Melissa Data's AddrObj and GeoPoint objects or use the mock objects depending on configuration.}
-  gem.homepage      = "https://github.com/smarinskaya/Melissa"
+  gem.authors     = ['Brad Pardee', 'Svetlana Marinskaya']
+  gem.email       = ['bradpardee@gmail.com', 'svetlana.marinskaya@gmail.com']
+  gem.description = %q{Configurable interface to Melissa Data Address and GeoPoint objects}
+  gem.summary     = %q{Melissa allows you to use ruby wrappers for Melissa Data's AddrObj and GeoPoint objects or use the mock objects depending on configuration.}
+  gem.homepage    = "https://github.com/smarinskaya/Melissa"
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "melissa"
   gem.require_paths = ["lib"]
   gem.version       = Melissa::VERSION
 
-  gem.add_dependency 'activesupport' # added to support underscore method.
-  gem.add_dependency 'minitest'      # added as a dependency of activesupport and for testing.
-  gem.add_dependency 'ffi'           #used for converting c libraries to ruby
-  gem.add_dependency 'thread_safe'   # added to support callbacks
+  # Don't want to upgrade to '5.0.0' yet.
+  gem.add_dependency 'activesupport', '~> 4.2.1'  # added to support underscore method.
+  gem.add_dependency 'minitest'                   # added as a dependency of activesupport and for testing.
+  gem.add_dependency 'ffi'                        # used for converting c libraries to ruby
+  gem.add_dependency 'concurrent-ruby'            # added to support concurrent callbacks
+  gem.add_dependency 'sync_attr'                  # added to safely create lazy loaded class variables
 end

data/test/addr_obj_test.rb

@@ -9,7 +9,7 @@ class AddrObjTest < Minitest::Test
 
       describe 'valid?' do
         it 'handles valid data' do
-          skip 'Not run, Melissa library not loaded' unless Melissa::AddrObjLive.lib_loaded?
+          skip 'Not run, Melissa library not loaded' unless Melissa::AddrObjLive.lib_loaded
           valid_address = Melissa.addr_obj(
               address: '2517 Surfwood Dr',
               city: 'Las Vegas',
@@ -25,7 +25,7 @@ class AddrObjTest < Minitest::Test
         end
 
         it 'flags invalid data' do
-          skip 'Not run, Melissa library not loaded' unless Melissa::AddrObjLive.lib_loaded?
+          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',
@@ -39,7 +39,7 @@ class AddrObjTest < Minitest::Test
 
       describe 'delivery_point' do
         it 'sets delivery point for valid data' do
-          skip 'Not run, Melissa library not loaded' unless Melissa::AddrObjLive.lib_loaded?
+          skip 'Not run, Melissa library not loaded' unless Melissa::AddrObjLive.lib_loaded
           valid_address = Melissa.addr_obj(
               address: '2517 Surfwood Dr',
               city: 'Las Vegas',
@@ -52,7 +52,7 @@ class AddrObjTest < Minitest::Test
 
       describe 'address_key' do
         it 'sets address key for valid data' do
-          skip 'Not run, Melissa library not loaded' unless Melissa::AddrObjLive.lib_loaded?
+          skip 'Not run, Melissa library not loaded' unless Melissa::AddrObjLive.lib_loaded
           valid_address = Melissa.addr_obj(
             address: '9802 Brompton Dr',
             city: 'Tampa',
@@ -65,7 +65,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, Melissa library not loaded' unless Melissa::AddrObjLive.lib_loaded?
+          skip 'Not run, Melissa library not loaded' unless Melissa::AddrObjLive.lib_loaded
           valid_address = Melissa.addr_obj(
               :address => '2517 Surfwood Dr',
               :city => 'Las Vegas',
@@ -78,7 +78,7 @@ class AddrObjTest < Minitest::Test
 
       describe 'callback' do
         it 'executes added callback' do
-          skip 'Not run, Melissa library not loaded' unless Melissa::AddrObjLive.lib_loaded?
+          skip 'Not run, Melissa library not loaded' unless Melissa::AddrObjLive.lib_loaded
           callback_flag = false
           Melissa::AddrObj.add_callback do
             callback_flag = true

data/test/geo_point_test.rb

@@ -10,7 +10,7 @@ class GeoPointTest < Minitest::Test
 
       describe 'valid?' do
         it 'creates valid GeoPoint object from valid Address Object' do
-          skip 'Not run, Melissa library not loaded' unless Melissa::GeoPointLive.lib_loaded?
+          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',
@@ -25,7 +25,7 @@ class GeoPointTest < Minitest::Test
           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?
+          skip 'Not run, Melissa library not loaded' unless Melissa::GeoPointLive.lib_loaded
           geo_point_obj= Melissa.geo_point(
             zip:                 '89128',
             plus4:               '7182',
@@ -42,7 +42,7 @@ 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, Melissa library not loaded' unless Melissa::GeoPointLive.lib_loaded?
+          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',
@@ -56,7 +56,7 @@ class GeoPointTest < Minitest::Test
 
       describe 'callback' do
         it 'executes added callback' do
-          skip 'Not run, Melissa library not loaded' unless Melissa::GeoPointLive.lib_loaded?
+          skip 'Not run, Melissa library not loaded' unless Melissa::GeoPointLive.lib_loaded
           callback_flag = false
           Melissa::GeoPoint.add_callback do
             callback_flag = true

data/test/melissa_test.rb

@@ -9,7 +9,7 @@ class MelissaTest < Minitest::Test
 
     describe "live mode" do
       it 'initializes AddrObjLive object' do
-        skip "Not run, Melissa library not loaded" unless Melissa::AddrObjLive.lib_loaded?
+        skip "Not run, Melissa library not loaded" unless Melissa::AddrObjLive.lib_loaded
         valid_address = Melissa.addr_obj(
             address: '9802 Brompton Dr',
             city: 'Tampa',
@@ -44,8 +44,8 @@ class MelissaTest < Minitest::Test
 
     describe "live mode" do
       it 'initializes GeoPointLive object' do
-        skip "Not run, Melissa library not loaded" unless Melissa::AddrObjLive.lib_loaded?
-        skip "Not run, Melissa library not loaded" unless Melissa::GeoPointLive.lib_loaded?
+        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',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: melissa
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9b
 platform: ruby
 authors:
 - Brad Pardee
@@ -9,10 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+- !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thread_safe
+  name: sync_attr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,12 +129,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Melissa allows you to use ruby wrappers for Melissa Data's AddrObj and GeoPoint