desertcart 1.0.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96786e0639aedbd1ea6b5385a9e8365233c130e03d42e5a71c0c9f36e5cf788f
-  data.tar.gz: 33e199b3fd1ddc4ec40727165de105473a995bb6c6c97a45e11daf3dd2bfe41c
+  metadata.gz: 922d201ef27df956f41a02feaaccca3fff4ce8c490ac7e3011da1714f0a8e8c2
+  data.tar.gz: aaf81ab26675c020442deed5de7dfb308e1f928279d4869a2995c4081cc851ad
 SHA512:
-  metadata.gz: 7982f5aa663b627b53c3b69c9e1f391bd397ed65f15b001929bd277cbc34ca28d69faef378eaa34a8e355344384d2ee06be1e71253793dfd48734b64fbacffb5
-  data.tar.gz: aef6ebc66f95aacae392da90c7e180f5c550344fae01f32684131733a201e6b5345332308f16003dde81fcf6217ed543af321aa56aa5e5609288ccd4adba221e
+  metadata.gz: 2e43364dd0012f3e2d3f7e92db686ee7a8d2131eb97b919b896bffd1df2e45df039e0a1a4fcc3622b51d37dcdc6062150c99804ca812b3c2910e0b6a60a92b57
+  data.tar.gz: c0871c79a3cc8d60c7461399e5077270475a1e82f24328841a54cc847a48f21ee1674732304a113d818e4aa339d7bb79ef09c2dea2d1133740209663dabb5d2d

data/.github/workflows/ruby.yml

@@ -0,0 +1,36 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.7", "3.0"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+        # change this to (see https://github.com/ruby/setup-ruby#versioning):
+        # uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Rspec
+        run: bundle exec rspec
+      - name: Rubocop
+        run: bundle exec rubocop

data/.rubocop.yml

@@ -0,0 +1,25 @@
+inherit_mode:
+  merge:
+    - Exclude
+
+AllCops:
+  TargetRubyVersion: 2.7
+  Exclude:
+  - "Gemfile"
+  - "Rakefile"
+  - "bin/**/*"
+  - "spec/**/*"
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: single_quotes
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: single_quotes
+
+Layout/LineLength:
+  Max: 100
+
+Style/Documentation:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.7.2

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [1.1.2] - 2021-11-22
+
+- Fix: Add final purchase details to OrderItemAcceptance resource
+
+## [1.1.2] - 2021-11-22
+
+- Feature: Add final purchase details to OrderItemAcceptance
+
+## [1.1.0] - 2021-09-26
+
+- Feature: Support Ruby 2.7 and newer
+- Feature: Expose `Marketplace::Movement::Operations::Update` operation to update `estimated_arrival_at`
+
 ## [1.0.0] - 2021-09-01
 
 - Initial release of first stable version.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    desertcart (1.0.0)
+    desertcart (1.1.3)
       ledger_sync (~> 2.2.0)
 
 GEM
@@ -15,15 +15,17 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
+    ast (2.4.2)
     colorize (0.8.1)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    dry-configurable (0.12.1)
+    dotenv (2.7.6)
+    dry-configurable (0.13.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.8.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
+      dry-configurable (~> 0.13, >= 0.13.0)
     dry-core (0.7.1)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
@@ -53,7 +55,7 @@ GEM
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
       dry-schema (~> 1.5, >= 1.5.2)
-    faraday (1.7.1)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -64,8 +66,8 @@ GEM
       faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
-    faraday-detailed_logger (2.3.0)
-      faraday (>= 0.8, < 2)
+    faraday-detailed_logger (2.4.2)
+      faraday (>= 0.16, < 2)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
@@ -74,15 +76,15 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fingerprintable (1.2.1)
       colorize
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    ledger_sync (2.2.0)
+    ipaddr (1.2.3)
+    ledger_sync (2.2.3)
       activemodel
-      colorize
       dry-schema (~> 1.5.4)
       dry-validation (~> 1.5.6)
       faraday
@@ -93,19 +95,27 @@ GEM
       openssl (~> 2.2.0)
       pd_ruby
       rack (~> 2.2.3)
+      rainbow (~> 3.0)
       resonad
       simply_serializable (>= 1.5.1)
     minitest (5.14.4)
     multipart-post (2.1.1)
-    nokogiri (1.12.4-x86_64-linux)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
-    openssl (2.2.0)
+    openssl (2.2.1)
+      ipaddr
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
     pd_ruby (0.2.3)
       colorize
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
+    rainbow (3.0.0)
     rake (13.0.6)
+    regexp_parser (2.1.1)
     resonad (1.4.0)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -119,20 +129,35 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
+    rubocop (1.21.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.9.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     simply_serializable (1.5.1)
       fingerprintable (>= 1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
   desertcart!
+  dotenv
   rake (~> 13.0)
   rspec (~> 3.0)
+  rubocop
 
 BUNDLED WITH
-   2.2.15
+   2.2.26

data/desertcart.gemspec

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-# require_relative 'lib/desertcart/version'
+require_relative 'lib/desertcart/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'desertcart'
-  # spec.version       = Desertcart::VERSION
-  spec.version       = '1.0.0'
+  spec.version       = Desertcart::VERSION
   spec.authors       = ['Jozef Vaclavik']
   spec.email         = ['jozef@desertcart.com']
 
@@ -15,7 +14,7 @@ Gem::Specification.new do |spec|
                        'and retrieve informations about your orders.'
   spec.homepage      = 'https://developer.desertcart.com'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/desertcart/desertcart-ruby'
@@ -31,4 +30,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'ledger_sync', '~> 2.2.0'
+  spec.add_development_dependency 'dotenv'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/desertcart/marketplace/movement/operations/update.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Desertcart
+  module Marketplace
+    class Movement
+      module Operations
+        class Update < Desertcart::Operation::Update
+          class Contract < LedgerSync::Ledgers::Contract
+            params do
+              required(:ledger_id).filled(:string)
+              required(:estimated_arrival_at).filled(:integer)
+            end
+          end
+
+          def ledger_namespace_path
+            'marketplace'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/desertcart/marketplace/order_item/deserializer.rb

@@ -15,6 +15,8 @@ module Desertcart
         attribute :merchant_id
         attribute :currency_code
         attribute :price
+        attribute :final_purchase_currency_code
+        attribute :final_purchase_price
         attribute :title
         attribute :state
         attribute :marketplace_shipping_state

data/lib/desertcart/marketplace/order_item/operations/find.rb

@@ -6,7 +6,7 @@ module Desertcart
       module Operations
         class Find < Desertcart::Operation::Find
           class Contract < LedgerSync::Ledgers::Contract
-            params do
+            params do # rubocop:disable Metrics/BlockLength
               required(:ledger_id).filled(:string)
               optional(:name).maybe(:string)
               optional(:store_uid).maybe(:string)
@@ -16,6 +16,8 @@ module Desertcart
               optional(:merchant_id).maybe(:string)
               optional(:currency_code).maybe(:string)
               optional(:price).maybe(:integer)
+              optional(:final_purchase_currency_code).maybe(:string)
+              optional(:final_pruchase_price).maybe(:integer)
               optional(:title).maybe(:string)
               optional(:state).maybe(:string)
               optional(:marketplace_shipping_state).maybe(:string)

data/lib/desertcart/marketplace/order_item/operations/update.rb

@@ -6,7 +6,7 @@ module Desertcart
       module Operations
         class Update < Desertcart::Operation::Update
           class Contract < LedgerSync::Ledgers::Contract
-            params do
+            params do # rubocop:disable Metrics/BlockLength
               required(:ledger_id).filled(:string)
               optional(:name).maybe(:string)
               optional(:store_uid).maybe(:string)
@@ -16,6 +16,8 @@ module Desertcart
               optional(:merchant_id).maybe(:string)
               optional(:currency_code).maybe(:string)
               optional(:price).maybe(:integer)
+              optional(:final_purchase_currency_code).maybe(:string)
+              optional(:final_pruchase_price).maybe(:integer)
               optional(:title).maybe(:string)
               optional(:state).maybe(:string)
               optional(:marketplace_shipping_state).maybe(:string)

data/lib/desertcart/marketplace/order_item/serializer.rb

@@ -13,6 +13,8 @@ module Desertcart
         attribute :merchant_id
         attribute :currency_code
         attribute :price
+        attribute :final_purchase_currency_code
+        attribute :final_purchase_price
         attribute :title
         attribute :state
         attribute :marketplace_shipping_state

data/lib/desertcart/marketplace/order_item_acceptance/operations/create.rb

@@ -11,6 +11,8 @@ module Desertcart
             params do
               required(:order_item).maybe(:hash, Types::Reference)
               optional(:seller_reference_number).maybe(:string)
+              optional(:final_purchase_price).maybe(:string)
+              optional(:final_purchase_currency_code).maybe(:string)
             end
           end
 

data/lib/desertcart/marketplace/order_item_acceptance/serializer.rb

@@ -9,6 +9,8 @@ module Desertcart
           resource.order_item.ledger_id
         end
         attribute :seller_reference_number
+        attribute :final_purchase_price
+        attribute :final_purchase_currency_code
       end
     end
   end

data/lib/desertcart/resources/marketplace/authorization.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'store'
+
 module Desertcart
   module Marketplace
     class Authorization < Desertcart::Resource

data/lib/desertcart/resources/marketplace/order_item.rb

@@ -13,6 +13,8 @@ module Desertcart
       attribute :merchant_id, type: LedgerSync::Type::String
       attribute :currency_code, type: LedgerSync::Type::String
       attribute :price, type: LedgerSync::Type::Integer
+      attribute :final_purchase_currency_code, type: LedgerSync::Type::String
+      attribute :final_purchase_price, type: LedgerSync::Type::Integer
       attribute :title, type: LedgerSync::Type::String
       attribute :state, type: LedgerSync::Type::String
       attribute :marketplace_shipping_state, type: LedgerSync::Type::String

data/lib/desertcart/resources/marketplace/order_item_acceptance.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
+require_relative 'order_item'
+
 module Desertcart
   module Marketplace
     class OrderItemAcceptance < Desertcart::Resource
       references_one :order_item, to: Desertcart::Marketplace::OrderItem
       attribute :seller_reference_number, type: LedgerSync::Type::String
+      attribute :final_purchase_price, type: LedgerSync::Type::String
+      attribute :final_purchase_currency_code, type: LedgerSync::Type::String
     end
   end
 end

data/lib/desertcart/resources/marketplace/order_item_rejection.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'order_item'
+
 module Desertcart
   module Marketplace
     class OrderItemRejection < Desertcart::Resource

data/lib/desertcart/version.rb

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

data/lib/desertcart.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'ledger_sync'
 require 'desertcart/config'
 require 'desertcart/version'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desertcart
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Jozef Vaclavik
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ledger_sync
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client library to talk to Desertcart API. Get products details, proceed
   with checkout and retrieve informations about your orders.
 email:
@@ -32,9 +60,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/main.yml"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -55,6 +85,7 @@ files:
 - lib/desertcart/marketplace/authorizations/serializer.rb
 - lib/desertcart/marketplace/movement/deserializer.rb
 - lib/desertcart/marketplace/movement/operations/create.rb
+- lib/desertcart/marketplace/movement/operations/update.rb
 - lib/desertcart/marketplace/movement/serializer.rb
 - lib/desertcart/marketplace/order_item/deserializer.rb
 - lib/desertcart/marketplace/order_item/operations/find.rb
@@ -103,7 +134,7 @@ metadata:
   homepage_uri: https://developer.desertcart.com
   source_code_uri: https://github.com/desertcart/desertcart-ruby
   changelog_uri: https://github.com/desertcart/desertcart-ruby/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -111,15 +142,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.2.9
+signing_key: 
 specification_version: 4
 summary: Communicate with Desertcart API
 test_files: []

data/.github/workflows/main.yml

@@ -1,18 +0,0 @@
-name: Ruby
-
-on: [push,pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 3.0.0
-    - name: Run the default task
-      run: |
-        gem install bundler -v 2.2.15
-        bundle install
-        bundle exec rake