smartystreets_api 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b973ffd95180ed1525bf06779e749cb979bb10b4
-  data.tar.gz: 9bbcb1c2d13deb48c17335494114bc203b58f48d
+  metadata.gz: ed9642364a02745c73dc239d9a7245604c09aea7
+  data.tar.gz: d1ebcb4144482b870552070edc62f050110824e5
 SHA512:
-  metadata.gz: d84d3339812023dad016acac091b8929f034e312b9a4381a7a0734ab9dce0fa6299994fe1026a9dcca2d7bbd8a406c8fabd460e8c8b51792444d2d5334319ba4
-  data.tar.gz: a7acbbc26742bb3be1843ca8e8748abcf68f7d7d32f54d48863abca1e938f77e0b011f7620e7fb4faac965ef8f9221d86821d5d9442dac7538a97c3ce4930d27
+  metadata.gz: f69f91fde30409e819aad046be51ddc0a979a26e3d7d7e14706958aab19d925a942d54e0aa4f378d2b79b75df464dbb89cebd95642e2b805e85ff337f6d9156d
+  data.tar.gz: b1986b22485138581d582a2ef4b9c4295061fb1371d45eb94d160c78a2fa36542a64dbb4bcfec54515f1f6d7968f2862bebda42f5ebb99a488e71459bb088f6e

data/lib/smartystreets_api/decorators/base_decorator.rb

@@ -2,7 +2,7 @@ class SmartyStreetsApi::Decorators::BaseDecorator
   def call(address_object)
     return if !address_object || !address_object[:components]
 
-    self.class.private_instance_methods(false).inject({}) do |decorated_address, attribute|
+    decorated_components = self.class.private_instance_methods(false).inject({}) do |decorated_address, attribute|
       components = self.send(attribute.to_sym)
 
       array_values = components.map do |component_name|
@@ -17,5 +17,9 @@ class SmartyStreetsApi::Decorators::BaseDecorator
 
       decorated_address
     end
+
+    remove_empty_address_lines!(decorated_components)
+
+    decorated_components
   end
 end

data/lib/smartystreets_api/decorators/international_format.rb

@@ -4,6 +4,10 @@ class SmartyStreetsApi::Decorators::InternationalFormat < SmartyStreetsApi::Deco
 
     decorated_address[:organization] = address_object[:lines][:organization]
 
+    decorated_address
+  end
+
+  def remove_empty_address_lines!(decorated_address)
     unless decorated_address[:address2]
       decorated_address[:address2] = decorated_address[:address3]
       decorated_address[:address3] = nil
@@ -14,8 +18,6 @@ class SmartyStreetsApi::Decorators::InternationalFormat < SmartyStreetsApi::Deco
       decorated_address[:address2] = decorated_address[:address3]
       decorated_address[:address3] = nil
     end
-
-    decorated_address
   end
 
   private

data/lib/smartystreets_api/decorators/international_format_2_lines.rb

@@ -4,6 +4,10 @@ class SmartyStreetsApi::Decorators::InternationalFormat2Lines < SmartyStreetsApi
 
     decorated_address[:organization] = address_object[:lines][:organization]
 
+    decorated_address
+  end
+
+  def remove_empty_address_lines!(decorated_address)
     unless decorated_address[:address1]
       decorated_address[:address1] = decorated_address[:address_1_alternative]
       decorated_address[:address2] = decorated_address[:address_2_alternative]
@@ -12,7 +16,10 @@ class SmartyStreetsApi::Decorators::InternationalFormat2Lines < SmartyStreetsApi
     decorated_address.delete(:address_1_alternative)
     decorated_address.delete(:address_2_alternative)
 
-    decorated_address
+    unless decorated_address[:address1]
+      decorated_address[:address1] = decorated_address[:address2]
+      decorated_address[:address2] = nil
+    end
   end
 
   private

data/lib/smartystreets_api/decorators/us_format.rb

@@ -1,4 +1,11 @@
 class SmartyStreetsApi::Decorators::UsFormat < SmartyStreetsApi::Decorators::BaseDecorator
+  def remove_empty_address_lines!(decorated_address)
+    unless decorated_address[:street]
+      decorated_address[:street] = decorated_address[:secondary]
+      decorated_address[:secondary] = nil
+    end
+  end
+
   private
 
   def street

data/lib/smartystreets_api/version.rb

@@ -1,3 +1,3 @@
 module SmartyStreetsApi
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartystreets_api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - florrain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby API client for SmartyStreets