e_plat 0.6.0 → 0.7.0

data/lib/e_plat/resource/product/variant.rb

@@ -2,12 +2,12 @@ module EPlat
 	class Product
 		class Variant < Base
 			belongs_to :product, class_name: "EPlat::Product"
-
+			
 			class << self; end
 
 			schema do
 				integer :id
-				integer :product_id
+				integer :product_id # nil-able as Shopify graphql doesn't use it
 				string :title
 				string :price
 				string :sku
@@ -15,29 +15,23 @@ module EPlat
 				string :inventory_policy
 				string :compare_at_price
 				string :fulfillment_service
-				string :inventory_management
-				string :option1
-				string :option2
-				string :option3
+				boolean :inventory_management
 				datetime :created_at
 				datetime :updated_at
 				boolean :taxable
 				string :barcode
 				integer :grams
-				integer :image_id
 				float :weight
 				string :weight_unit
 				integer :inventory_item_id
 				integer :inventory_quantity
-				integer :old_inventory_quantity
-				array :presentment_prices 
 				string :tax_code
 				boolean :requires_shipping
 				string :admin_graphql_api_id
 			end
 
 			def save
-				prefix_options[:product] ||= product.id
+				prefix_options[:product] ||= try(:product)&.id
 				super
 			end
 		end

data/lib/e_plat/resource/product.rb

@@ -2,16 +2,7 @@ module EPlat
 	class Product < Base
 		has_many :variants, class_name: "EPlat::Product::Variant"
 		has_many :images,   class_name: "EPlat::Product::Image"
-
-		# graphql :shopify, :product do
-		# 	variants do
-		# 		edges { node as: :variant }
-		# 	end
-		# 	images do
-		# 		edges { node as: :image }
-		# 	end
-		# end
-
+		has_many :options,  class_name: "EPlat::Product::Option"
 
 		include Concerns::Metafieldable
 		
@@ -24,7 +15,6 @@ module EPlat
 			array 		:options
 			string 		:product_type
 			datetime 	:published_at
-			string 		:published_scope
 			string 		:status
 			string 		:tags
 			string 		:admin_graphql_api_id
@@ -46,6 +36,28 @@ module EPlat
 		def find_variant(id)
 			variants.find { |v| v.id && v.id.to_i == id.to_i }
 		end
+
+		def variants_collection
+			@variants_collection ||= EPlat::Product::Variant.find(:all, params: {product_id: id, limit: 200})
+		end
+
+		def load_all_variants # slow method, run async
+			return EPlat::Collection.new(variants) unless client.shopify? && client.uses_graphql_for_products?
+
+			@variants_collection = variants_collection
+			@saved_variants 	 = @variants_collection.to_a
+			cycle = 0
+
+			while @variants_collection.next_page?
+				@variants_collection = @variants_collection.fetch_next_page
+				@saved_variants 	 += @variants_collection.to_a
+
+				cycle += 1
+				break if cycle > 10
+			end
+			
+			self.variants = EPlat::Collection.new(@saved_variants)
+		end
 		
 	end
 end

data/lib/e_plat/session.rb

@@ -3,12 +3,13 @@ module EPlat
 	class Session
 		#the session is an instance of EPlat::Client made available via Rails EPlat::Current::Attributes
 
-		def initialize(platform:, store_url:, api_token:, store_hash: nil)
+		def initialize(platform:, store_url:, api_token:, store_hash: nil, api_version: nil)
 			EPlat::Current.e_plat_session = EPlat::Client.new(
 				platform: platform,
 				store_url: store_url,
 				api_token: api_token,
-				store_hash: store_hash
+				store_hash: store_hash,
+				api_version: api_version
 			).freeze
 		end
 

data/lib/e_plat/type_coercer.rb

@@ -33,7 +33,7 @@ module EPlat
 			else
 				value.send to_type_method(type)
 			end
-		rescue
+		rescue 
 			value
 		end
 
@@ -48,6 +48,8 @@ module EPlat
 					"to_h"
 				when "string"
 					"to_s"
+				when "float"
+					"to_f"
 				when "datetime"
 					"to_datetime"
 				end

data/lib/e_plat/version.rb

@@ -1,3 +1,3 @@
 module EPlat
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/e_plat.rb

@@ -7,6 +7,7 @@ require "activeresource"
 require "activeresource-response"
 require 'dry-types'
 require 'active_resource/connection_error'
+require_relative "hash"
 # require "e_plat/railtie" if defined?(Rails::Railtie)
 
 Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
@@ -21,7 +22,7 @@ loader.setup
 
 module EPlat
     extend Dry::Configurable
-    SUPPORTED_SHOPIFY_API_VERSIONS = ['2024_01']
+    SUPPORTED_SHOPIFY_API_VERSIONS = ['2024_01', '2024_07']
     SUPPORTED_BIGCOMMERCE_API_VERSIONS = ['3']
 
     SUPPORTED_PLATFORMS = ["shopify", "bigcommerce"]
@@ -41,17 +42,19 @@ module EPlat
         "metafield"
     ]
     
-    setting(:shopify_api_version, default: "2024_01", constructor: ->(value) do 
+    setting(:shopify_api_version, default: ENV['EPLAT_SHOPIFY_API_VERSION'] || "2024_07", constructor: ->(value) do 
         SUPPORTED_SHOPIFY_API_VERSIONS.include?(value.underscore) ? value.underscore : raise(ArgumentError, "Shopify API version #{value} is not supported")
     end)
 
-    setting(:bigcommerce_api_version, default: "v3", constructor: ->(value) do 
+    setting(:bigcommerce_api_version, default: ENV['EPLAT_BIGCOMMERCE_API_VERSION'] ||  "v3", constructor: ->(value) do 
         v = value.downcase.gsub("v", "")
         SUPPORTED_BIGCOMMERCE_API_VERSIONS.include?(v) ? v : raise(ArgumentError, "Bigcommerce API version #{value} is not supported")
     end)
     
     setting(:woocommerce_api_version, default: "v3", constructor: ->(value) { value.downcase.gsub("v", "") })
 
+    setting(:print_graphql_requests, default:ENV['EPLAT_PRINT_GRAPHQL_REQUESTS'] || false)
+
     def self.api_display_name
         apis = Struct.new(:shopify, :bigcommerce, :woocommerce)
         apis.new(
@@ -61,7 +64,13 @@ module EPlat
         )
     end
 
+    def self.shopify_graphql_version
+        # "V#{ EPlat.config.shopify_api_version.underscore }"
+        "V202407"
+    end
+
     class Error < StandardError; end
+    class GraphqlError < Error; end
 end
 
 EPlat::Initializer.check_required_classes!

data/lib/hash.rb

@@ -0,0 +1,39 @@
+class Hash
+    def to_graphql_args
+        map do |key, value|
+            formatted_value = 
+                case value
+                when String
+                    "\"#{value}\""
+                when Hash
+                    value.to_graphql_args
+                else
+                    value
+                end
+
+            "#{key}: #{formatted_value}"
+        end.join(", ")
+    end
+
+    def to_camelized_graphql_args
+        map do |key, value|
+            formatted_value = 
+                case value
+                when String
+                    "\"#{value}\""
+                when Hash
+                    value.to_graphql_args
+                else
+                    value
+                end
+
+            "#{key.to_s.camelize(:lower)}: #{formatted_value}"
+        end.join(", ")
+    end
+
+    def to_shopify_graphql_query_string
+        map do |key, value|
+            "#{key}:#{value.is_a?(String) ? "\'#{value}\'" : value}"
+        end.join(" ")
+    end
+end

metadata

@@ -1,183 +1,255 @@
 --- !ruby/object:Gem::Specification
 name: e_plat
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - oliwoodsuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-29 00:00:00.000000000 Z
+date: 2024-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 7.0.4
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 7.0.4
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-logic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: dotenv-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: ruby-lsp
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 description:
 email:
 - 55204545+oliwoodsuk@users.noreply.github.com
@@ -213,7 +285,9 @@ files:
 - lib/e_plat/mapping/bigcommerce/v_3/order/shipping_address.rb
 - lib/e_plat/mapping/bigcommerce/v_3/product.rb
 - lib/e_plat/mapping/bigcommerce/v_3/product/image.rb
+- lib/e_plat/mapping/bigcommerce/v_3/product/option.rb
 - lib/e_plat/mapping/bigcommerce/v_3/product/variant.rb
+- lib/e_plat/mapping/bigcommerce/v_3/product/variant/option_value.rb
 - lib/e_plat/mapping/bigcommerce/v_3/script_tag.rb
 - lib/e_plat/mapping/bigcommerce/v_3/shop.rb
 - lib/e_plat/mapping/bigcommerce/v_3/webhook.rb
@@ -228,14 +302,28 @@ files:
 - lib/e_plat/mapping/shopify/v_2024_01/script_tag.rb
 - lib/e_plat/mapping/shopify/v_2024_01/shop.rb
 - lib/e_plat/mapping/shopify/v_2024_01/webhook.rb
+- lib/e_plat/mapping/shopify/v_2024_07/metafield.rb
+- lib/e_plat/mapping/shopify/v_2024_07/order.rb
+- lib/e_plat/mapping/shopify/v_2024_07/order/billing_address.rb
+- lib/e_plat/mapping/shopify/v_2024_07/order/shipping_address.rb
+- lib/e_plat/mapping/shopify/v_2024_07/product.rb
+- lib/e_plat/mapping/shopify/v_2024_07/product/image.rb
+- lib/e_plat/mapping/shopify/v_2024_07/product/option.rb
+- lib/e_plat/mapping/shopify/v_2024_07/product/variant.rb
+- lib/e_plat/mapping/shopify/v_2024_07/product/variant/option_value.rb
+- lib/e_plat/mapping/shopify/v_2024_07/script_tag.rb
+- lib/e_plat/mapping/shopify/v_2024_07/shop.rb
+- lib/e_plat/mapping/shopify/v_2024_07/webhook.rb
 - lib/e_plat/mapping/virtual_collection/base.rb
 - lib/e_plat/mapping/virtual_collection/bigcommerce/order_line_items.rb
+- lib/e_plat/mapping/virtual_collection/shopify/product/variant/option_value.rb
 - lib/e_plat/resource/attribute_interface.rb
 - lib/e_plat/resource/base.rb
 - lib/e_plat/resource/collection.rb
 - lib/e_plat/resource/concerns/aliases.rb
 - lib/e_plat/resource/concerns/dirty.rb
 - lib/e_plat/resource/concerns/full_json.rb
+- lib/e_plat/resource/concerns/graph_q_lable.rb
 - lib/e_plat/resource/concerns/metafieldable.rb
 - lib/e_plat/resource/concerns/overwrite_instance_methods.rb
 - lib/e_plat/resource/concerns/overwrite_request_methods.rb
@@ -262,9 +350,20 @@ files:
 - lib/e_plat/resource/platform_specific/bigcommerce/product/image.rb
 - lib/e_plat/resource/platform_specific/bigcommerce/product/option.rb
 - lib/e_plat/resource/platform_specific/bigcommerce/product/variant.rb
+- lib/e_plat/resource/platform_specific/bigcommerce/product/variant/option_value.rb
 - lib/e_plat/resource/platform_specific/bigcommerce/script_tag.rb
 - lib/e_plat/resource/platform_specific/bigcommerce/shop.rb
 - lib/e_plat/resource/platform_specific/bigcommerce/webhook.rb
+- lib/e_plat/resource/platform_specific/shopify/graph_q_l/v_2024_07/input.rb
+- lib/e_plat/resource/platform_specific/shopify/graph_q_l/v_2024_07/input/product.rb
+- lib/e_plat/resource/platform_specific/shopify/graph_q_l/v_2024_07/input/product/variant.rb
+- lib/e_plat/resource/platform_specific/shopify/graph_q_l/v_2024_07/input/product/variants_bulk.rb
+- lib/e_plat/resource/platform_specific/shopify/graph_q_l/v_2024_07/mutation.rb
+- lib/e_plat/resource/platform_specific/shopify/graph_q_l/v_2024_07/mutation/product.rb
+- lib/e_plat/resource/platform_specific/shopify/graph_q_l/v_2024_07/mutation/product/variant.rb
+- lib/e_plat/resource/platform_specific/shopify/graph_q_l/v_2024_07/query.rb
+- lib/e_plat/resource/platform_specific/shopify/graph_q_l/v_2024_07/query/product.rb
+- lib/e_plat/resource/platform_specific/shopify/graph_q_l/v_2024_07/query/product/variant.rb
 - lib/e_plat/resource/platform_specific/shopify/metafield.rb
 - lib/e_plat/resource/platform_specific/shopify/order.rb
 - lib/e_plat/resource/platform_specific/shopify/order/Consignment.rb
@@ -277,6 +376,7 @@ files:
 - lib/e_plat/resource/platform_specific/shopify/product/image.rb
 - lib/e_plat/resource/platform_specific/shopify/product/option.rb
 - lib/e_plat/resource/platform_specific/shopify/product/variant.rb
+- lib/e_plat/resource/platform_specific/shopify/product/variant/option_value.rb
 - lib/e_plat/resource/platform_specific/shopify/recurring_application_charge.rb
 - lib/e_plat/resource/platform_specific/shopify/recurring_application_charge/usage_charge.rb
 - lib/e_plat/resource/platform_specific/shopify/script_tag.rb
@@ -286,6 +386,7 @@ files:
 - lib/e_plat/resource/product/image.rb
 - lib/e_plat/resource/product/option.rb
 - lib/e_plat/resource/product/variant.rb
+- lib/e_plat/resource/product/variant/option_value.rb
 - lib/e_plat/resource/script_tag.rb
 - lib/e_plat/resource/shop.rb
 - lib/e_plat/resource/shopify_only/recurring_application_charge.rb
@@ -295,9 +396,11 @@ files:
 - lib/e_plat/type_coercer.rb
 - lib/e_plat/types.rb
 - lib/e_plat/version.rb
+- lib/hash.rb
 - lib/tasks/e_plat_tasks.rake
 homepage: https://rubygems.org/gems/e_plat
-licenses: []
+licenses:
+- MIT
 metadata:
   homepage_uri: https://rubygems.org/gems/e_plat
 post_install_message: