sendle_api 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a80399749f497c0cfb91bbf482a96ad8a41b74c7c759014ea6cfc755b7f2127b
-  data.tar.gz: 790d234ef4b3f8dda30f789e8a92f99663df66fd3e2a8693c02502346811494c
+  metadata.gz: 3a6d36701b1b8fa5816f7e19a6e4e19da3d169c2b1e3001310e7480a6f1c87a0
+  data.tar.gz: 0fd6ab34c7f2d65ef57b6c0a6a2b12d329055a3b2601d39247f2c825741d4a2e
 SHA512:
-  metadata.gz: e596d9496665068ac763770b8d99f6bd40e302b1055235fce94372020af86e311adcc200f967da4579dba9f4afd7f8b847feffa239eb5e9d609865e29c32cf58
-  data.tar.gz: f4073cfbfe00bb060522da79de8d680ebd68fbc3892678fed7612738369787281902a942c0d345b1e02aa3c1a544ec1d678616f7fd7a1f309598b8d1fa1ed05d
+  metadata.gz: 1e27eaf700d38a76b4db7437109013328bbeaa0c3d1dbb44aff6eaa4cece40e12b83c9c5af87f9538e4bd4d4695a65cfc2b66be70c9f126639beb80230f6f555
+  data.tar.gz: 8a0de62d7bf13843cf38e55549bf2858711dcf9275a1be9a46d8416928c7b09443856d9c9e761079abe9cc5391a098c93bea46a912ee3f7fd1cdf0ed069b211a

data/lib/dev/config.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require "dotenv/load"
 
 def set_config
   SendleAPI.configure do |config|
-    config.sendle_id = ENV["SENDLE_ID"] 
+    config.sendle_id = ENV["SENDLE_ID"]
     config.api_key = ENV["SENDLE_API_KEY"]
     config.testing = true
   end
-end 
+end

data/lib/dev/zeitwerk_loader.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require "zeitwerk"
 require_relative "config"
 
 loader = Zeitwerk::Loader.for_gem
 loader.inflector.inflect(
-  "sendle_api" => "SendleAPI"
+  "sendle_api" => "SendleAPI",
 )
 loader.push_dir("./lib")
 loader.collapse("./lib/sendle_api/resources")

data/lib/sendle_api/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SendleAPI
   class Configuration
     attr_accessor :sendle_id, :api_key, :testing

data/lib/sendle_api/errors.rb

@@ -1,71 +1,26 @@
-
 require "active_support/core_ext/array/wrap"
 require "active_support/core_ext/object/blank"
 
 module SendleAPI
-  class Errors < ActiveModel::Errors
-    # Grabs errors from an array of messages (like ActiveRecord::Validations).
-    # The second parameter directs the errors cache to be cleared (default)
-    # or not (by passing true).
-    def from_array(messages, save_cache = false)
-      clear unless save_cache
-      humanized_attributes = Hash[@base.known_attributes.map { |attr_name| [attr_name.humanize, attr_name] }]
-      messages.each do |message|
-        attr_message = humanized_attributes.keys.sort_by { |a| -a.length }.detect do |attr_name|
-          if message[0, attr_name.size + 1] == "#{attr_name} "
-            add humanized_attributes[attr_name], message[(attr_name.size + 1)..-1]
-          end
-        end
-        self[:base] << message if attr_message.nil?
-      end
-    end
-
-    # Grabs errors from a hash of attribute => array of errors elements
-    # The second parameter directs the errors cache to be cleared (default)
-    # or not (by passing true)
-    #
-    # Unrecognized attribute names will be humanized and added to the record's
-    # base errors.
+  class Errors < ActiveResource::Errors
     def from_hash(messages, save_cache = false)
       clear unless save_cache
 
-      # delete top level not-needed keys
-      messages.delete("error")
-      messages.delete("error_description")
- 
-      messages.each do |(key, errors)|
+      add(:base, messages["error_description"]) if messages["error_description"]
+
+      messages["messages"].each do |(key, errors)|
         errors.each do |error|
           if @base.known_attributes.include?(key)
-            add key, error
+            add(key, error)
           elsif key == "base"
-            self[:base] << error
+            add(:base, error)
           else
             # reporting an error on an attribute not in attributes
             # format and add them to base
-            self[:base] << "#{key.humanize} #{error}"
+            add(:base, "#{key.humanize} #{error}")
           end
         end
       end
     end
-
-    # Grabs errors from a json response.
-    def from_json(json, save_cache = false)
-      decoded = ActiveSupport::JSON.decode(json) || {} rescue {}
-      if decoded.kind_of?(Hash) && (decoded.has_key?("errors") || decoded.empty?)
-        errors = decoded["errors"] || {}
-        if errors.kind_of?(Array)
-          # 3.2.1-style with array of strings
-          ActiveSupport::Deprecation.warn("Returning errors as an array of strings is deprecated.")
-          from_array errors, save_cache
-        else
-          # 3.2.2+ style
-          from_hash errors, save_cache
-        end
-      else
-        # <3.2-style respond_with - lacks 'errors' key
-        ActiveSupport::Deprecation.warn('Returning errors as a hash without a root "errors" key is deprecated.')
-        from_hash decoded, save_cache
-      end
-    end
   end
-end
+end

data/lib/sendle_api/resources/address.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SendleAPI
   class Address < Base
     include NotSaveable
@@ -7,9 +9,9 @@ module SendleAPI
       suburb: nil,
       state_name: nil,
       postcode: nil,
-      country: nil
+      country: nil,
     }
 
     validates :address_line1, :suburb, :state_name, :postcode, :country, presence: true
   end
-end
+end

data/lib/sendle_api/resources/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module SendleAPI
   class Base < ::ActiveResource::Base
     validate :child_object_validations

data/lib/sendle_api/resources/contact.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SendleAPI
   class Contact < Base
     include NotSaveable
@@ -12,4 +14,4 @@ module SendleAPI
 
     FIELDS = [:name, :phone, :company]
   end
-end
+end

data/lib/sendle_api/resources/order.rb

@@ -1,4 +1,6 @@
-require 'digest/sha1'
+# frozen_string_literal: true
+
+require "digest/sha1"
 
 module SendleAPI
   class Order < Base
@@ -8,7 +10,7 @@ module SendleAPI
     has_one :receiver, class_name: Receiver
 
     validates :description, :weight, :sender, :receiver, presence: true
-    validates :first_mile_option, inclusion: { in: ["pickup", "drop off"]}
+    validates :first_mile_option, inclusion: { in: ["pickup", "drop off"] }
 
     DEFAULT_ATTRS = {
       pickup_date: nil,
@@ -20,7 +22,7 @@ module SendleAPI
       weight: Weight.new,
       volume: Volume.new,
       sender: Sender.new,
-      receiver: Receiver.new
+      receiver: Receiver.new,
     }
 
     CHILD_OBJECT_KEYS_FOR_VALIDATION = [:weight, :volume, :sender, :receiver]
@@ -47,8 +49,7 @@ module SendleAPI
     end
 
     def set_idempotency_key_header
-      self.class.headers.merge!("Idempotency-Key": Digest::SHA1.hexdigest(self.encode))
+      self.class.headers.merge!("Idempotency-Key": Digest::SHA1.hexdigest(encode))
     end
-
   end
 end

data/lib/sendle_api/resources/receiver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SendleAPI
   class Receiver < Base
     include NotSaveable
@@ -10,7 +12,7 @@ module SendleAPI
     DEFAULT_ATTRS = {
       contact: Contact.new,
       address: Address.new,
-      instructions: ""
+      instructions: "",
     }
 
     CHILD_OBJECT_KEYS_FOR_VALIDATION = [:contact, :address]

data/lib/sendle_api/resources/sender.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SendleAPI
   class Sender < Base
     include NotSaveable
@@ -7,11 +9,11 @@ module SendleAPI
 
     validates :contact, :address, presence: true
     validate :address_country_valid
-    
+
     DEFAULT_ATTRS = {
       contact: Contact.new,
       address: Address.new,
-      instructions: ""
+      instructions: "",
     }
 
     CHILD_OBJECT_KEYS_FOR_VALIDATION = [:contact, :address]
@@ -20,9 +22,9 @@ module SendleAPI
 
     def address_country_valid
       return unless address
-      
-      valid_sender_countries = ['AU', 'US', 'Australia', 'United States']
-      unless valid_sender_countries.include? address.country
+
+      valid_sender_countries = ["AU", "US", "Australia", "United States"]
+      unless valid_sender_countries.include?(address.country)
         errors.add(:sender_address_country, "Must be from #{valid_sender_countries}")
       end
     end

data/lib/sendle_api/resources/tracking.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SendleAPI
   class Tracking < Base
     self.prefix = "/api/tracking"

data/lib/sendle_api/resources/volume.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module SendleAPI
   class Volume < Base
     include NotSaveable
 
     DEFAULT_ATTRS = {
       value: nil,
-      units: nil
+      units: nil,
     }
-    validates :units, inclusion: { in: %w(m3 in3) }, if: -> {value.present?}
+    validates :units, inclusion: { in: ["m3", "in3"] }, if: -> { value.present? }
   end
-end
+end

data/lib/sendle_api/resources/weight.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module SendleAPI
   class Weight < Base
@@ -5,10 +6,10 @@ module SendleAPI
 
     DEFAULT_ATTRS = {
       value: nil,
-      units: nil
+      units: nil,
     }
 
     validates :value, presence: true
-    validates :units, inclusion: { in: %w(lb kg)   }
+    validates :units, inclusion: { in: ["lb", "kg"] }
   end
-end
+end

data/lib/sendle_api/version.rb

@@ -1,3 +1,3 @@
 module SendleAPI
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/sendle_api.rb

@@ -1,10 +1,9 @@
+# frozen_string_literal: true
+
 require "sendle_api/version"
 require "active_resource"
 
 module SendleAPI
-  require "phonelib"
-  require "countries"
-
   require "sendle_api/configuration"
   require "sendle_api/not_saveable"
   require "sendle_api/errors"

data/sendle_api.gemspec

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "lib/sendle_api/version"
 
 Gem::Specification.new do |spec|
@@ -20,23 +21,23 @@ Gem::Specification.new do |spec|
 
   # 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.
-  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
-    %x(git ls-files -z).split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
+  spec.files =
+    Dir.chdir(File.expand_path("..", __FILE__)) do
+      `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    end
   spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency("activeresource", ">= 4.1.0")
-  spec.add_dependency("countries", "~> 3.0")
-  spec.add_dependency("phonelib", "~> 0.6")
+  spec.add_dependency("activeresource", ">= 6.1.0")
 
-  spec.add_development_dependency("rspec", "~> 3.2")
   spec.add_development_dependency("dotenv")
-  spec.add_development_dependency("pry-byebug")
-  spec.add_development_dependency("pry")
   spec.add_development_dependency("guard-rspec")
+  spec.add_development_dependency("pry")
+  spec.add_development_dependency("pry-byebug")
+  spec.add_development_dependency("rspec", "~> 3.2")
   spec.add_development_dependency("rubocop")
   spec.add_development_dependency("rubocop-shopify")
+  spec.add_development_dependency("zeitwerk", "~> 2.1", ">= 2.1.8")
   spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sendle_api
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Andy Chong
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -16,58 +16,44 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
-  name: countries
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: phonelib
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-shopify
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,19 +123,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-shopify
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.8
 description:
 email:
 - andygg1996personal@gmail.com
@@ -211,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Ruby object based Sendle API wrapper.