active_shopify_graphql 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 209f2565381c7c64385baecde798f09270b6b1e55df8adaadfaa436c5d0890f2
-  data.tar.gz: 3813282f284e46583305ff2afb3ff143a69b8051a60bbcd6f42a567e562685e2
+  metadata.gz: 2f8f9c57e3dd7f5371ace9fb8d3db79d796a0aa34890065d4727ae7a45a0723b
+  data.tar.gz: 16d8e5361a00e4aaa2b166ba8108496a8564e669fc16c76e68e4ed058df12a23
 SHA512:
-  metadata.gz: 338c590007e3510507cc197912db871979f77dc8a905cae118a29982a75fd8a74a178dde94ea25f7133857312e8b5d04820d99813c77efd803aadc51b8e49c37
-  data.tar.gz: 7f40d85c87be589b9c2df2461c035c43560e3c3ae6a343b2cac209c2c3974374acf7583b68261e1b1f259feb98e8c7310a3a6d11140e5c7314b34e98b9e6f385
+  metadata.gz: c30453eafcf98bc563f309e2a5762373615ad9a23c0b8d0c6e3c0919e5e8490088974d0d187582e6a55b0d012d4cc2e9c3abcc77cb2c638bd4acd8098be1b032
+  data.tar.gz: 1b190403f8fcdee4d69d35b534c168b63200a87aca06a6cbf465ea09dc873b3d723597e3f99201acbd8e0d4ed9618897af028dbcf73653be891391cc6d383d23

data/lib/active_shopify_graphql/loader_switchable.rb

@@ -80,9 +80,56 @@ module ActiveShopifyGraphQL
 
     # Simple proxy class to handle loader delegation
     class LoaderProxy
-      def initialize(model_class, loader)
+      def initialize(model_class, loader, included_connections: [], selected_attributes: nil)
         @model_class = model_class
         @loader = loader
+        @included_connections = included_connections
+        @selected_attributes = selected_attributes
+      end
+
+      def includes(*connection_names)
+        # Validate connections exist
+        @model_class.send(:validate_includes_connections!, connection_names) if @model_class.respond_to?(:validate_includes_connections!, true)
+
+        # Collect connections with eager_load: true
+        auto_included_connections = @model_class.connections.select { |_name, config| config[:eager_load] }.keys
+
+        # Merge manual and automatic connections
+        all_included_connections = (@included_connections + connection_names + auto_included_connections).uniq
+
+        # Create a new loader with the included connections
+        new_loader = @loader.class.new(
+          @model_class,
+          *loader_extra_args,
+          selected_attributes: @selected_attributes,
+          included_connections: all_included_connections
+        )
+
+        LoaderProxy.new(
+          @model_class,
+          new_loader,
+          included_connections: all_included_connections,
+          selected_attributes: @selected_attributes
+        )
+      end
+
+      def select(*attribute_names)
+        new_selected = attribute_names.map(&:to_sym)
+
+        # Create a new loader with the selected attributes
+        new_loader = @loader.class.new(
+          @model_class,
+          *loader_extra_args,
+          selected_attributes: new_selected,
+          included_connections: @included_connections
+        )
+
+        LoaderProxy.new(
+          @model_class,
+          new_loader,
+          included_connections: @included_connections,
+          selected_attributes: new_selected
+        )
       end
 
       def find(id = nil)
@@ -116,6 +163,18 @@ module ActiveShopifyGraphQL
         "#{@model_class.name}(with_#{@loader.class.name.demodulize})"
       end
       alias to_s inspect
+
+      private
+
+      # Returns extra arguments needed when creating a new loader of the same type
+      # For CustomerAccountApiLoader, this includes the token
+      def loader_extra_args
+        if @loader.is_a?(ActiveShopifyGraphQL::Loaders::CustomerAccountApiLoader)
+          [@loader.instance_variable_get(:@token)]
+        else
+          []
+        end
+      end
     end
   end
 end

data/lib/active_shopify_graphql/loaders/customer_account_api_loader.rb

@@ -12,7 +12,7 @@ module ActiveShopifyGraphQL
       def graphql_query(model_type = nil)
         type = model_type || graphql_type
         if type == 'Customer'
-          customer_only_query(type)
+          QueryTree.build_current_customer_query(context)
         else
           super(type)
         end
@@ -54,18 +54,6 @@ module ActiveShopifyGraphQL
         logger.info("ActiveShopifyGraphQL Query (Customer Account API):\n#{query}")
         logger.info("ActiveShopifyGraphQL Variables:\n#{variables}")
       end
-
-      def customer_only_query(model_type = nil)
-        type = model_type || graphql_type
-        compact = ActiveShopifyGraphQL.configuration.compact_queries
-        frag = fragment
-
-        if compact
-          "#{frag} query getCurrentCustomer { #{query_name(type)} { ...#{fragment_name(type)} } }"
-        else
-          "#{frag}\n\nquery getCurrentCustomer {\n  #{query_name(type)} {\n    ...#{fragment_name(type)}\n  }\n}\n"
-        end
-      end
     end
   end
 end

data/lib/active_shopify_graphql/query_tree.rb

@@ -27,6 +27,19 @@ module ActiveShopifyGraphQL
       end.to_s
     end
 
+    # Build a query that doesn't require an ID parameter (e.g., Customer Account API's current customer)
+    def self.build_current_customer_query(context, query_name: nil)
+      new(context).tap do |tree|
+        tree.add_fragment(FragmentBuilder.new(context).build)
+        tree.set_query_config(
+          type: :current_customer,
+          model_type: context.graphql_type,
+          query_name: query_name || context.query_name,
+          fragment_name: context.fragment_name
+        )
+      end.to_s
+    end
+
     def self.build_collection_query(context, query_name:, variables:, connection_type: :nodes_only)
       new(context).tap do |tree|
         tree.add_fragment(FragmentBuilder.new(context).build)
@@ -80,6 +93,7 @@ module ActiveShopifyGraphQL
     def to_s
       case @query_config[:type]
       when :single_record then render_single_record_query
+      when :current_customer then render_current_customer_query
       when :collection    then render_collection_query
       when :connection    then render_connection_query
       else ""
@@ -113,6 +127,18 @@ module ActiveShopifyGraphQL
       end
     end
 
+    def render_current_customer_query
+      type = @query_config[:model_type]
+      query_name = @query_config[:query_name]
+      fragment_name = @query_config[:fragment_name]
+
+      if compact?
+        "#{fragments_string} query getCurrent#{type} { #{query_name} { ...#{fragment_name} } }"
+      else
+        "#{fragments_string}\n\nquery getCurrent#{type} {\n  #{query_name} {\n    ...#{fragment_name}\n  }\n}\n"
+      end
+    end
+
     def render_collection_query
       type = @query_config[:model_type]
       query_name = @query_config[:query_name]

data/lib/active_shopify_graphql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveShopifyGraphQL
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shopify_graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nicolò Rebughini
@@ -14,28 +14,28 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !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'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !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'
 - !ruby/object:Gem::Dependency