solidus_shipstation 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37cf9d9129cf565114ca4f4b83ffeea474d5d448e16400a93bc566b92f1344a2
-  data.tar.gz: 236d9df971bd47bac9c0bab46673f3c0e48dddf14f7110835609788554b42861
+  metadata.gz: a9158fe6f42218427d250e4a5283b0760d0dc486fa3f128861b03ace6f2fd5a5
+  data.tar.gz: 05f08c3a8854d31590ffd945c0096534ce689c94b544015733b46624b4c87d74
 SHA512:
-  metadata.gz: 8ca2d78aaaec9acbf0c28a38a85c73176613c131cae3888d5d63c285f0c94b04116a3a4a728e7639bf8e1b36540b8a87e8260dbd3ee33d081d355e308a3e27fe
-  data.tar.gz: c14094a306bf705b4289a7455a0818a34fe5b926e25fcb20a65f750891c3e554c5cfc468775cb6deaae2a550b68525a7ab533b1bae1164dd27c5fffa9ead0a11
+  metadata.gz: ddda2973c4dc3f11b7dc242f0fa5dcc4818dcdee6d9ec78c062e2a8a2295e0212e2bfb24de4199e6d6eef44401838041320ce81b71029c0ad177b652d0d63fba
+  data.tar.gz: a1ede00a82aedc12f3242857f1c159b8c2e935ad869131890d384b4e817ea2630e1b134792d26fb44a94b3d4d8e62cadc4258d6cbaebd6abf0096784a808395d

data/.rubocop.yml

@@ -5,6 +5,7 @@ require:
 
 AllCops:
   NewCops: disable
+  TargetRubyVersion: 2.5
 
 Layout/LineLength:
   Enabled: false

data/CHANGELOG.md

@@ -1,15 +1,22 @@
 # Changelog
 
-## [v1.0.0](https://github.com/solidusio-contrib/solidus_shipstation/tree/v1.0.0) (2021-05-26)
+## [v1.1.0](https://github.com/solidusio-contrib/solidus_shipstation/tree/v1.1.0) (2021-10-26)
 
-[Full Changelog](https://github.com/solidusio-contrib/solidus_shipstation/compare/v2.0.1...v1.0.0)
+[Full Changelog](https://github.com/solidusio-contrib/solidus_shipstation/compare/v1.0.0...v1.1.0)
 
-**Closed issues:**
+**Implemented enhancements:**
 
-- Prepare Solidus Shipstation for Solidus 3.0 [\#6](https://github.com/solidusio-contrib/solidus_shipstation/issues/6)
+- Add support to ruby 3 [\#21](https://github.com/solidusio-contrib/solidus_shipstation/pull/21) ([stefano-sarioli](https://github.com/stefano-sarioli))
+
+**Fixed bugs:**
+
+- Handle orders without a billing address [\#20](https://github.com/solidusio-contrib/solidus_shipstation/pull/20) ([aldesantis](https://github.com/aldesantis))
 
 **Merged pull requests:**
 
+- Fix Ruby version requirement [\#22](https://github.com/solidusio-contrib/solidus_shipstation/pull/22) ([stefano-sarioli](https://github.com/stefano-sarioli))
+- Allow ShipmentNotice class to be customized [\#17](https://github.com/solidusio-contrib/solidus_shipstation/pull/17) ([cesartalves](https://github.com/cesartalves))
+- Address: infer residential attribute from company [\#16](https://github.com/solidusio-contrib/solidus_shipstation/pull/16) ([nerfologist](https://github.com/nerfologist))
 - Fix pending API sync query returning synced shipments [\#15](https://github.com/solidusio-contrib/solidus_shipstation/pull/15) ([aldesantis](https://github.com/aldesantis))
 - Swallow errors in `Api::SyncShipmentsJob` [\#14](https://github.com/solidusio-contrib/solidus_shipstation/pull/14) ([aldesantis](https://github.com/aldesantis))
 - API sync improvements [\#13](https://github.com/solidusio-contrib/solidus_shipstation/pull/13) ([aldesantis](https://github.com/aldesantis))
@@ -23,13 +30,13 @@
 - Fix installer [\#2](https://github.com/solidusio-contrib/solidus_shipstation/pull/2) ([kennyadsl](https://github.com/kennyadsl))
 - Make extension compatible with latest Solidus [\#1](https://github.com/solidusio-contrib/solidus_shipstation/pull/1) ([aldesantis](https://github.com/aldesantis))
 
-## [v2.0.1](https://github.com/solidusio-contrib/solidus_shipstation/tree/v2.0.1) (2014-05-01)
+## [v1.0.0](https://github.com/solidusio-contrib/solidus_shipstation/tree/v1.0.0) (2021-05-26)
 
-[Full Changelog](https://github.com/solidusio-contrib/solidus_shipstation/compare/v1.3.2...v2.0.1)
+[Full Changelog](https://github.com/solidusio-contrib/solidus_shipstation/compare/077ee0bcdf9faf66121faa4387ec645122892c98...v1.0.0)
 
-## [v1.3.2](https://github.com/solidusio-contrib/solidus_shipstation/tree/v1.3.2) (2013-11-22)
+**Closed issues:**
 
-[Full Changelog](https://github.com/solidusio-contrib/solidus_shipstation/compare/077ee0bcdf9faf66121faa4387ec645122892c98...v1.3.2)
+- Prepare Solidus Shipstation for Solidus 3.0 [\#6](https://github.com/solidusio-contrib/solidus_shipstation/issues/6)
 
 
 

data/app/controllers/spree/shipstation_controller.rb

@@ -21,7 +21,8 @@ module Spree
     end
 
     def shipnotify
-      SolidusShipstation::ShipmentNotice.from_payload(params.to_unsafe_h).apply
+      shipment_notice_class = SolidusShipstation.configuration.shipment_notice_class.constantize
+      shipment_notice_class.from_payload(params.to_unsafe_h).apply
       head :ok
     rescue SolidusShipstation::Error => e
       head :bad_request

data/lib/generators/solidus_shipstation/install/templates/initializer.rb

@@ -21,6 +21,11 @@ SolidusShipstation.configure do |config|
   # Set this to `true` if you want canceled shipments included in the endpoint.
   # config.export_canceled_shipments = false
 
+  # You can customize the class used to receive notifications from the POST request
+  # Make sure it has a class method `from_payload` which receives the notification hash
+  # and an instance method `apply`
+  # config.shipment_notice_class = 'SolidusShipstation::ShipmentNotice'
+
   ####### API integration
   # Only uncomment these lines if you're going to use the API integration.
 

data/lib/solidus_shipstation/api/batch_syncer.rb

@@ -40,6 +40,8 @@ module SolidusShipstation
           raise e
         end
 
+        return unless response
+
         response['results'].each do |shipstation_order|
           shipment = shipment_matcher.call(shipstation_order, shipments)
 

data/lib/solidus_shipstation/api/shipment_serializer.rb

@@ -51,15 +51,16 @@ module SolidusShipstation
 
       def serialize_address(address)
         {
-          name: SolidusSupport.combined_first_and_last_name_in_address? ? address.name : address.full_name,
-          company: address.company,
-          street1: address.address1,
-          street2: address.address2,
-          city: address.city,
-          state: address.state&.abbr,
-          postalCode: address.zipcode,
-          country: address.country&.iso,
-          phone: address.phone,
+          name: (SolidusSupport.combined_first_and_last_name_in_address? ? address&.name : address&.full_name).to_s,
+          company: address&.company.to_s,
+          street1: address&.address1.to_s,
+          street2: address&.address2.to_s,
+          city: address&.city.to_s,
+          state: address&.state&.abbr.to_s,
+          postalCode: address&.zipcode.to_s,
+          country: address&.country&.iso.to_s,
+          phone: address&.phone.to_s,
+          residential: address&.company.blank?
         }
       end
 

data/lib/solidus_shipstation/configuration.rb

@@ -16,6 +16,7 @@ module SolidusShipstation
       :api_secret,
       :api_shipment_matcher,
       :error_handler,
+      :shipment_notice_class
     )
 
     def initialize
@@ -27,6 +28,8 @@ module SolidusShipstation
       @api_shipment_matcher = proc do |shipstation_order, shipments|
         shipments.find { |shipment| shipment.number == shipstation_order['orderNumber'] }
       end
+
+      @shipment_notice_class = 'SolidusShipstation::ShipmentNotice'
     end
   end
 

data/lib/solidus_shipstation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusShipstation
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/solidus_shipstation.gemspec

@@ -8,8 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors = ['Stephen Puiszis']
   spec.email = 'steve@tablexi.com'
 
-  spec.summary = 'Solidus/ShipStation Integration'
-  spec.description = 'Integrates ShipStation API with Solidus. Supports exporting shipments and importing tracking numbers'
+  spec.summary = 'A Solidus extension for integrating the ShipStation API.'
   spec.homepage = 'https://github.com/solidusio-contrib/solidus_shipstation'
   spec.license = 'BSD-3-Clause'
 
@@ -17,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_shipstation'
   spec.metadata['changelog_uri'] = 'https://github.com/solidusio-contrib/solidus_shipstation/blob/master/CHANGELOG.md'
 
-  spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5')
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/spec/lib/solidus_shipstation/api/client_spec.rb

@@ -95,7 +95,7 @@ RSpec.describe SolidusShipstation::Api::Client do
   private
 
   def build_client(options = {})
-    described_class.new({
+    described_class.new(**{
       request_runner: instance_spy('SolidusShipstation::Api::RequestRunner'),
       error_handler: instance_spy('Proc'),
       shipment_serializer: stub_shipment_serializer,

data/spec/lib/solidus_shipstation/api/shipment_serializer_spec.rb

@@ -8,5 +8,18 @@ RSpec.describe SolidusShipstation::Api::ShipmentSerializer do
 
       expect(result).to be_instance_of(Hash)
     end
+
+    it 'sets residential = false in address if company is given' do
+      order = create(:order_ready_to_ship,
+        bill_address: build(:address, company: 'ACME Co.'),
+        ship_address: build(:address, company: nil))
+      shipment = order.shipments.first
+
+      serializer = described_class.new(store_id: '12345678')
+      result = serializer.call(shipment)
+
+      expect(result[:billTo][:residential]).to be false
+      expect(result[:shipTo][:residential]).to be true
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_shipstation
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Stephen Puiszis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -114,8 +114,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Integrates ShipStation API with Solidus. Supports exporting shipments
-  and importing tracking numbers
+description:
 email: steve@tablexi.com
 executables: []
 extensions: []
@@ -210,7 +209,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -219,10 +218,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
-summary: Solidus/ShipStation Integration
+summary: A Solidus extension for integrating the ShipStation API.
 test_files:
 - spec/controllers/spree/shipstation_controller_spec.rb
 - spec/fixtures/shipstation_xml_schema.xsd