squake 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 878657f24a04c4d4ea9ac849fbde8db18e2b7899fb4b277666ffadb3d9287807
-  data.tar.gz: b29ad578e8187896048ba9bb807be01f3b82308de8cba2bb5bc5d1edff4b49cf
+  metadata.gz: fbe25ba449a2b7838a20ae80a5bcd9106bfe21a2f2626185a9eb901dc9e2f58a
+  data.tar.gz: 18b8e92dabac3f0f0657a27b6adadd9616530421c640c4b6a584f1d454e16596
 SHA512:
-  metadata.gz: 6e8420f30d8cf7ef3afb890c0723da12727e785e84582725868321a18e108f6c715da6c33abc08d4a679df8375c6d2e63d9ff0448bf0354cb4edb149ebacbc2d
-  data.tar.gz: 418592b0bc53e33bf94661c20c572e196f7f94c70f15fa626f41dd385143204b13bc7eaa838e3940a41b734b34299738bf76c1d79e6a534ff084482aaa4f3890
+  metadata.gz: b302c402858193ee25d25ed3ed610362b1bb00ce477956c9c6f7e440b312e758b9eddd6861841f5fb8059eb0300728d85707b44964d2f10614a4f20429c3bf4c
+  data.tar.gz: ee363ceeb88006801dfcc7a6be2535ac82357e001cd3e71c6b4d86e722f71719b84fcc536897cb1505374cd7a2226f17764ddc2e7bff678c0cef62ac234473ae

data/lib/squake/calculation.rb

@@ -11,12 +11,17 @@ module Squake
     sig do
       params(
         client: Squake::Client,
-        items: T::Array[Squake::Model::Items::BaseType],
+        items: T::Array[T.any(Squake::Model::Items::BaseType, T::Hash[T.any(String, Symbol), T.untyped])],
         carbon_unit: String,
         expand: T::Array[String],
       ).returns(Squake::Model::Carbon)
     end
     def self.create(client:, items:, carbon_unit: 'gram', expand: [])
+      # @TODO: add typed objects for all possible items. Until then, we allow either a Hash or a T::Struct
+      items = items.map do |item|
+        item.is_a?(T::Struct) ? item.serialize : item
+      end
+
       result = client.call(
         path: ENDPOINT,
         method: :post,

data/lib/squake/calculation_with_pricing.rb

@@ -11,7 +11,7 @@ module Squake
     sig do
       params(
         client: Squake::Client,
-        items: T::Array[Squake::Model::Items::BaseType],
+        items: T::Array[T.any(Squake::Model::Items::BaseType, T::Hash[T.any(String, Symbol), T.untyped])],
         product: String,
         currency: String,
         carbon_unit: String,
@@ -19,11 +19,16 @@ module Squake
       ).returns(Squake::Model::Pricing)
     end
     def self.quote(client:, items:, product:, currency: 'EUR', carbon_unit: 'gram', expand: [])
+      # @TODO: add typed objects for all possible items. Until then, we allow either a Hash or a T::Struct
+      items = items.map do |item|
+        item.is_a?(T::Struct) ? item.serialize : item
+      end
+
       result = client.call(
         path: ENDPOINT,
         method: :post,
         params: {
-          items: items.map(&:serialize),
+          items: items,
           product: product,
           currency: currency,
           carbon_unit: carbon_unit,

data/lib/squake/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Squake
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end

data/lib/squake.rb

@@ -8,3 +8,8 @@ require 'net/http'
 Dir[File.join(__dir__, './**/*', '*.rb')].each { require(_1) }
 
 module Squake; end
+
+Oj.default_options = {
+  mode: :compat, # required to dump hashes with symbol-keys
+  symbol_keys: true,
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squake
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - SQUAKE