tamara 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edbc1e81e1dfb04e02c29172d32de538b96b94d60e4fdd804b949264f673d2a2
-  data.tar.gz: 0c61bb924be56b120664eea9de485230455fb939e614196c598aab55937623b0
+  metadata.gz: 98690a89dd1b5601ff9c7c2da0643a0f8e0eb8da5da99b595cf72078f50cf220
+  data.tar.gz: 7ae0059eaf3df407a9a3461b96282007d074ffc2c8e20de4d547aee0d17d674d
 SHA512:
-  metadata.gz: c10cf6d155ecf1c9fff7319146939c4cb0983f02d016e6137590cfdbc65e874a3ea48ae494421cef342b3ec437f1833c86f8878777e5c2d2bec7d3b02ceb5eb8
-  data.tar.gz: 224597005ae038a91d1eff545bcd2f994848f4f1052635582a4ee63f01155d449401614ffde12ff20fcd0267b421309845c66273bf3b2e6b385e13cce2488f5d
+  metadata.gz: c9f878121556e2b74a5a8e23951010db0419bb52213cc60bf9be85f0845845ada4e0f6729ce01c8e1a0a0f88eef9c2cf5c59fbaa7a2639c5c87b9d6917cb3c62
+  data.tar.gz: e12f3367f44da07961cca5ec2672fefb630ad9ad76272f9f2544c9a5820fff51db723b31ec73cb3a4a48fd995ca171e3d87e146217a1b1a63cafd9fb93c0e6bb

data/.env.example

@@ -0,0 +1 @@
+TAMARA_API_TOKEN=

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## [Unreleased]
 
-## [0.1.0] - 2023-06-01
+## [0.1.0] - 2025-03-12
+## [0.1.1] - 2025-03-18
+## [0.1.2] - 2025-03-26
 
 - Initial release

data/Gemfile

@@ -5,13 +5,18 @@ gemspec
 
 group :development, :test do
   gem "dotenv-rails"
+  gem "bundler-audit"
   gem "fuubar", "~> 2.5.1"
   gem "guard-rspec"
   gem "rake", "~> 13.2"
   gem "rspec", "~> 3.13"
+  gem "rspec_junit_formatter"
   gem "rubocop", "~> 1.50.2"
   gem "rubocop-performance", "~> 1.17.1"
   gem "rubocop-rails", "~> 2.19.1"
+  gem "rubocop-rake"
+  gem "rubocop-rspec"
+  gem "ruby_audit"
 end
 
 group :test do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tamara (0.1.0)
+    tamara (0.1.2)
       activesupport (>= 5.2, < 7.0)
       concurrent-ruby (~> 1.2.2)
       faraday (~> 1.10.3)
@@ -35,6 +35,9 @@ GEM
     ast (2.4.2)
     bigdecimal (3.1.9)
     builder (3.3.0)
+    bundler-audit (0.9.2)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
     coderay (1.1.3)
     concurrent-ruby (1.2.3)
     crack (1.0.0)
@@ -118,6 +121,8 @@ GEM
     nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    nokogiri (1.13.10-x86_64-linux)
+      racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -166,6 +171,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
+    rspec_junit_formatter (0.6.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
@@ -178,6 +185,8 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
     rubocop-performance (1.17.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
@@ -185,8 +194,15 @@ GEM
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.20.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    ruby_audit (2.3.1)
+      bundler-audit (~> 0.9.0)
     shellany (0.0.1)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -207,17 +223,23 @@ GEM
 
 PLATFORMS
   -darwin-22
+  x86_64-linux
 
 DEPENDENCIES
+  bundler-audit
   dotenv-rails
   fuubar (~> 2.5.1)
   generator_spec
   guard-rspec
   rake (~> 13.2)
   rspec (~> 3.13)
+  rspec_junit_formatter
   rubocop (~> 1.50.2)
   rubocop-performance (~> 1.17.1)
   rubocop-rails (~> 2.19.1)
+  rubocop-rake
+  rubocop-rspec
+  ruby_audit
   simplecov (~> 0.22.0)
   tamara!
   vcr

data/lib/generators/tamara/templates/tamara.rb

@@ -5,4 +5,5 @@ Tamara.configure do |config|
   # config.notification_token = ""
   # config.public_key = ""
   config.checkout_optional_keys = {}
+  config.capture_optional_keys = {}
 end

data/lib/tamara/api/payments.rb

@@ -1,6 +1,6 @@
 module Tamara
   module Payments
-    def self.capture(order_id:, total_amount:, shipping_info:, items: [], shipping_amount: nil, tax_amount: nil, discount_amount: nil, opts: {})
+    def self.capture(order_id:, total_amount:, shipping_info: nil, items: [], shipping_amount: nil, tax_amount: nil, discount_amount: nil, opts: {})
       Tamara::Payments::Capture.call(
         order_id: order_id,
         total_amount: total_amount,

data/lib/tamara/configuration.rb

@@ -1,5 +1,5 @@
 module Tamara
   class Configuration
-    attr_accessor :api_token, :notification_token, :public_key, :checkout_optional_keys
+    attr_accessor :api_token, :notification_token, :public_key, :checkout_optional_keys, :capture_optional_keys
   end
 end

data/lib/tamara/json_schemas/amount.rb

@@ -3,12 +3,12 @@ module Tamara
     module Amount
       CURRENCIES = %w[SAR AED BHD KWD OMR].freeze
 
-      def self.schema(allows_null: false)
+      def self.schema(allows_null: false, min: 0.1)
         {
           "$schema": "http://json-schema.org/draft-06/schema",
           type: ["object", (allows_null ? "null" : nil)].compact,
           properties: {
-            amount: Types::Float.schema(min: 0.1),
+            amount: Types::Float.schema(min: min),
             currency: Types::Enum.schema(values: CURRENCIES, default: "SAR")
           },
           required: %w[amount currency]

data/lib/tamara/json_schemas/capture_optional_keys.rb

@@ -0,0 +1,11 @@
+module Tamara
+  module JsonSchemas
+    module CaptureOptionalKeys
+      def capture_optional_keys
+        @params ||= {}
+        capture_optional_keys = @params.dig(:opts, :capture_optional_keys) || Tamara.configuration.capture_optional_keys
+        capture_optional_keys.is_a?(Hash) ? capture_optional_keys : {}
+      end
+    end
+  end
+end

data/lib/tamara/json_schemas/item.rb

@@ -20,7 +20,7 @@ module Tamara
             item_url: Types::Url.schema(allows_null: filtered_keys.exclude?("item_url")),
             image_url: Types::Url.schema(allows_null: filtered_keys.exclude?("image_url")),
             unit_price: Amount.schema(allows_null: filtered_keys.exclude?("unit_price")),
-            tax_amount: Amount.schema(allows_null: filtered_keys.exclude?("tax_amount")),
+            tax_amount: Amount.schema(allows_null: filtered_keys.exclude?("tax_amount"), min: 0.0),
             discount_amount: Amount.schema(allows_null: filtered_keys.exclude?("discount_amount")),
             total_amount: Amount.schema(allows_null: filtered_keys.exclude?("total_amount"))
           },

data/lib/tamara/json_schemas/orders/create.rb

@@ -23,8 +23,8 @@ module Tamara
               country_code: Types::Enum.schema(values: COUNTRY_CODES, default: "SA"),
               description: Types::String.schema(max_length: 256, allows_null: filtered_keys.exclude?("description")),
               total_amount: Amount.schema(allows_null: filtered_keys.exclude?("total_amount")),
-              shipping_amount: Amount.schema(allows_null: filtered_keys.exclude?("shipping_amount")),
-              tax_amount: Amount.schema(allows_null: filtered_keys.exclude?("tax_amount")),
+              shipping_amount: Amount.schema(allows_null: filtered_keys.exclude?("shipping_amount"), min: 0.0),
+              tax_amount: Amount.schema(allows_null: filtered_keys.exclude?("tax_amount"), min: 0.0),
               consumer: Consumer.schema(allows_null: filtered_keys.exclude?("consumer")),
               items: {
                 type: "array",

data/lib/tamara/json_schemas/payments/capture.rb

@@ -2,8 +2,11 @@ module Tamara
   module JsonSchemas
     module Payments
       module Capture
+        include CaptureOptionalKeys
         include Validator
 
+        REQUIRED_KEYS = %w[order_id total_amount shipping_info].freeze
+
         private
 
         def schema
@@ -13,14 +16,7 @@ module Tamara
             properties: {
               order_id: Types::Uuid.schema,
               total_amount: Amount.schema,
-              shipping_info: {
-                type: "object",
-                properties: {
-                  shipped_at: Types::String.schema,
-                  shipping_company: Types::String.schema
-                },
-                required: %w[shipped_at shipping_company]
-              },
+              shipping_info: ShippingInfo.schema(allows_null: filtered_keys.exclude?("shipping_info")),
               items: {
                 type: "array",
                 items: Item.schema
@@ -29,9 +25,16 @@ module Tamara
               tax_amount: Amount.schema(allows_null: true),
               discount_amount: Amount.schema(allows_null: true)
             },
-            required: %w[order_id total_amount shipping_info]
+            required: REQUIRED_KEYS
           }
         end
+
+        def filtered_keys
+          @filtered_keys ||= begin
+            optional_keys = capture_optional_keys.select { |_k, v| v.empty? }.keys.map(&:to_s)
+            REQUIRED_KEYS - optional_keys
+          end
+        end
       end
     end
   end

data/lib/tamara/json_schemas/shipping_info.rb

@@ -0,0 +1,17 @@
+module Tamara
+  module JsonSchemas
+    module ShippingInfo
+      def self.schema(allows_null: false)
+        {
+          "$schema": "http://json-schema.org/draft-06/schema",
+          type: ["object", (allows_null ? "null" : nil)].compact,
+          properties: {
+            shipped_at: Types::String.schema,
+            shipping_company: Types::String.schema
+          },
+          required: %w[shipped_at shipping_company]
+        }
+      end
+    end
+  end
+end

data/lib/tamara/version.rb

@@ -1,3 +1,3 @@
 module Tamara
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.2".freeze
 end

data/lib/tamara.rb

@@ -11,6 +11,7 @@ require "tamara/errors"
 require "tamara/configuration"
 
 # JSON schemas
+require "tamara/json_schemas/capture_optional_keys"
 require "tamara/json_schemas/checkout_optional_keys"
 require "tamara/json_schemas/validator"
 
@@ -36,6 +37,7 @@ require "tamara/json_schemas/payments/capture"
 require "tamara/json_schemas/payment_options/check"
 require "tamara/json_schemas/payment_types"
 require "tamara/json_schemas/risk_assessment"
+require "tamara/json_schemas/shipping_info"
 require "tamara/json_schemas/webhook"
 require "tamara/json_schemas/webhook_event"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tamara
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Youssef Ossama
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-12 00:00:00.000000000 Z
+date: 2025-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,6 +93,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env.example"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
@@ -124,9 +125,9 @@ files:
 - lib/tamara/api/webhooks.rb
 - lib/tamara/configuration.rb
 - lib/tamara/errors.rb
-- lib/tamara/hmac.rb
 - lib/tamara/json_schemas/address.rb
 - lib/tamara/json_schemas/amount.rb
+- lib/tamara/json_schemas/capture_optional_keys.rb
 - lib/tamara/json_schemas/checkout_optional_keys.rb
 - lib/tamara/json_schemas/consumer.rb
 - lib/tamara/json_schemas/discount.rb
@@ -138,6 +139,7 @@ files:
 - lib/tamara/json_schemas/payment_types.rb
 - lib/tamara/json_schemas/payments/capture.rb
 - lib/tamara/json_schemas/risk_assessment.rb
+- lib/tamara/json_schemas/shipping_info.rb
 - lib/tamara/json_schemas/types/boolean.rb
 - lib/tamara/json_schemas/types/date.rb
 - lib/tamara/json_schemas/types/enum.rb
@@ -151,13 +153,13 @@ files:
 - lib/tamara/json_schemas/webhook_event.rb
 - lib/tamara/version.rb
 - sig/tamara.rbs
-homepage: https://github.com/autocloud/tamara-rails
+homepage: https://gitlab.com/autocloud/tamara-rails
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://github.com/autocloud/tamara-rails
-  source_code_uri: https://github.com/autocloud/tamara-rails
+  homepage_uri: https://gitlab.com/autocloud/tamara-rails
+  source_code_uri: https://gitlab.com/autocloud/tamara-rails
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []

data/lib/tamara/hmac.rb

@@ -1,20 +0,0 @@
-module Tamara
-  module Hmac
-    FILTERED_TRANSACTION_KEYS = %w[amount_cents created_at currency error_occured has_parent_transaction id
-                                   integration_id is_3d_secure is_auth is_capture is_refunded is_standalone_payment
-                                   is_voided order.id owner pending
-                                   source_data.pansource_data.sub_type source_data.type success].freeze
-
-    class << self
-      def valid_signature?(tamara_response)
-        digest = ::OpenSSL::Digest.new("sha512")
-
-        concatenated_str = FILTERED_TRANSACTION_KEYS.map do |element|
-          tamara_response.dig("obj", *element.split("."))
-        end.join
-        secure_hash = ::OpenSSL::HMAC.hexdigest(digest, Tamara.hmac_key, concatenated_str)
-        secure_hash == tamara_response["hmac"]
-      end
-    end
-  end
-end