gtm_on_rails 0.1.13 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2286c644421d286b191d0dcf4d13630a1eb68e64
-  data.tar.gz: '0595efe9d6e06b2ae8c722b791cbf738d3ee284f'
+SHA256:
+  metadata.gz: 11c48a3372589d7ee869e4b12c5772e8a590e5fed3c9827a0997b412afbcb03c
+  data.tar.gz: 7808e669d186c1ede37934594d18465e1e7eff525a2a15702b8041eddbc03d78
 SHA512:
-  metadata.gz: 49686ed7d4c9dbcf126474313987b491161f2a9f0c09c47f09e18ef8eb8b40f765943d6192f3bc19d16791a9779974c0b791a2292948b3e5a3eef84d8aef19b6
-  data.tar.gz: aea4782dab512cc8e90f783b243080118dc6bdc088c58c34db8e223de17958c69f7707a209a9c4a648b4f9f90f9e20a3ba783035df9655c5e3f52b663f751eab
+  metadata.gz: 7e0b3fc22cfdc33045f5a94ca788af6bfacd5a8a776176ea525391926641cdd295e905bb6cfc33e1b68e2ce706491dd6fa1c3d022d7e04382f2bc4b0a56031ff
+  data.tar.gz: 725975a753a98b4d866a679a94df17c6a88b4c1971cf55206e785335560df709af857a774001e7009a9c4309267900d98018e46905ec001467b84f12c2ca41eb

data/lib/gtm_on_rails/controllers/initialize_data_layer.rb

@@ -15,7 +15,7 @@ module GtmOnRails
       def data_layer
         @gtm_on_rails_data_layer
       end
-      
+
       private
         def initialize_data_layer
           @gtm_on_rails_data_layer = GtmOnRails::DataLayer.new
@@ -24,7 +24,7 @@ module GtmOnRails
             @gtm_on_rails_data_layer.push({
               rails_controller: controller_name,
               rails_action:     action_name
-            })
+            }, before_page_view: true)
           end
         end
     end

data/lib/gtm_on_rails/models/data_layer/ecommerce.rb

@@ -3,15 +3,10 @@ module GtmOnRails
   class DataLayer::Ecommerce < DataLayer::Object
     ACTIVITY_TYPES = [:product_impression, :product_click, :product_detail, :add_to_cart, :remove_from_cart, :promotion_impression, :promotion_click, :checkout, :purchase, :refund]
 
-    def initialize(activity_type, *args)
+    def initialize(activity_type, **args)
       raise ArgumentError.new("'#{activity_type}' is undefined activity type.") unless activity_type.in?(ACTIVITY_TYPES)
 
-      sanitize = true
-      if args.first.keys.count == 1 && args.first.keys.first.to_sym == :sanitize
-        sanitize = args.shift[:sanitize]
-      end
-
-      @data = send(:"generate_#{activity_type}_hash", *[sanitize, args.first]).with_indifferent_access
+      @data = send(:"generate_#{activity_type}_hash", args).with_indifferent_access
     end
 
     class << self
@@ -29,187 +24,214 @@ module GtmOnRails
     end
 
     private
+      def generate_product_impression_hash(args)
+        result = {}
 
-      def generate_product_impression_hash(sanitize, args)
-        result = get_default_data(args)
-
-        result[:event] = args.delete(:event) if args[:event].present?
+        result[:event] = args[:event] if args[:event].present?
 
-        result[:ecommerce][:impressions] = get_impression(args) if args[:impressions].present?
+        result[:ecommerce]                = {}
+        result[:ecommerce][:currencyCode] = args[:currency] || GtmOnRails.config.ecommerce_default_currency
 
-        result.merge!(args) unless sanitize
+        if args[:impressions].present?
+          result[:ecommerce][:impressions] = args[:impressions].map{|impression| impression.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Impression.new(impression) : impression}
+        end
 
         return result
       end
 
-      def generate_product_click_hash(sanitize, args)
-        result = get_default_data(args)
-
-        result[:event] = args.delete(:event) || 'productClick'
+      def generate_product_click_hash(args)
+        result = {}
 
-        result[:event_category] = args.delete(:event_category) || 'Enhanced Ecommerce'
-        result[:event_action]   = args.delete(:event_action)   || 'Product Click'
-        result[:event_label]    = args.delete(:event_label)    || 'Enhanced Ecommerce Product Click'
+        result[:event] = args[:event] || 'productClick'
 
-        result[:ecommerce][:click]               = {}
-        result[:ecommerce][:click][:actionField] = get_action(args)   if args[:action].present?
-        result[:ecommerce][:click][:products]    = get_products(args) if args[:products].present?
-
-        result.merge!(args) unless sanitize
-
-        return result
-      end
+        result[:event_category] = args[:event_category] || 'Enhanced Ecommerce'
+        result[:event_action]   = args[:event_action]   || 'Product Click'
+        result[:event_label]    = args[:event_label]    || 'Enhanced Ecommerce Product Click'
 
-      def generate_product_detail_hash(sanitize, args)
-        result = get_default_data(args)
+        result[:ecommerce]                = {}
+        result[:ecommerce][:currencyCode] = args[:currency] || GtmOnRails.config.ecommerce_default_currency
 
-        result[:event] = args.delete(:event) if args[:event].present?
+        result[:ecommerce][:click] = {}
 
-        result[:ecommerce][:detail]               = {}
-        result[:ecommerce][:detail][:actionField] = get_action(args)   if args[:action].present?
-        result[:ecommerce][:detail][:products]    = get_products(args) if args[:products].present?
+        if args[:action].present?
+          action = args[:action].is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Action.new(args[:action]) : args[:action]
+          result[:ecommerce][:click][:actionField] = action
+        end
 
-        result.merge!(args) unless sanitize
+        if args[:products].present?
+          result[:ecommerce][:click][:products] = args[:products].map{|product| product.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Product.new(product) : product}
+        end
 
         return result
       end
 
-      def generate_add_to_cart_hash(sanitize, args)
-        result = get_default_data(args)
+      def generate_product_detail_hash(args)
+        result = {}
 
-        result[:event] = args.delete(:event) || 'addToCart'
+        result[:event] = args[:event] if args[:event].present?
 
-        result[:event_category] = args.delete(:event_category) || 'Enhanced Ecommerce'
-        result[:event_action]   = args.delete(:event_action)   || 'Add to Cart'
-        result[:event_label]    = args.delete(:event_label)    || 'Enhanced Ecommerce Add to Cart'
+        result[:ecommerce]                = {}
+        result[:ecommerce][:currencyCode] = args[:currency] || GtmOnRails.config.ecommerce_default_currency
 
-        result[:ecommerce][:add]            = {}
-        result[:ecommerce][:add][:products] = get_products(args) if args[:products].present?
+        result[:ecommerce][:detail] = {}
 
-        result.merge!(args) unless sanitize
+        if args[:action].present?
+          action = args[:action].is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Action.new(args[:action]) : args[:action]
+          result[:ecommerce][:detail][:actionField] = action
+        end
+
+        if args[:products].present?
+          result[:ecommerce][:detail][:products] = args[:products].map{|product| product.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Product.new(product) : product}
+        end
 
         return result
       end
 
-      def generate_remove_from_cart_hash(sanitize, args)
-        result = get_default_data(args)
+      def generate_add_to_cart_hash(args)
+        result = {}
 
-        result[:event] = args.delete(:event) || 'removeFromCart'
+        result[:event] = args[:event] || 'addToCart'
 
-        result[:event_category] = args.delete(:event_category) || 'Enhanced Ecommerce'
-        result[:event_action]   = args.delete(:event_action)   || 'Remove from Cart'
-        result[:event_label]    = args.delete(:event_label)    || 'Enhanced Ecommerce Remove from Cart'
+        result[:event_category] = args[:event_category] || 'Enhanced Ecommerce'
+        result[:event_action]   = args[:event_action]   || 'Add to Cart'
+        result[:event_label]    = args[:event_label]    || 'Enhanced Ecommerce Add to Cart'
 
-        result[:ecommerce][:remove]            = {}
-        result[:ecommerce][:remove][:products] = get_products(args) if args[:products].present?
+        result[:ecommerce]                = {}
+        result[:ecommerce][:currencyCode] = args[:currency] || GtmOnRails.config.ecommerce_default_currency
 
-        result.merge!(args) unless sanitize
+        result[:ecommerce][:add] = {}
+        if args[:products].present?
+          result[:ecommerce][:add][:products] = args[:products].map{|product| product.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Product.new(product) : product}
+        end
 
         return result
       end
 
-      def generate_promotion_impression_hash(sanitize, args)
-        result = get_default_data(args)
+      def generate_remove_from_cart_hash(args)
+        result = {}
+
+        result[:event] = args[:event] || 'removeFromCart'
 
-        result[:event] = args.delete(:event) if args[:event].present?
+        result[:event_category] = args[:event_category] || 'Enhanced Ecommerce'
+        result[:event_action]   = args[:event_action]   || 'Remove from Cart'
+        result[:event_label]    = args[:event_label]    || 'Enhanced Ecommerce Remove from Cart'
 
-        result[:ecommerce][:promoView]              = {}
-        result[:ecommerce][:promoView][:promotions] = get_promotion(args) if args[:promotions].present?
+        result[:ecommerce]                = {}
+        result[:ecommerce][:currencyCode] = args[:currency] || GtmOnRails.config.ecommerce_default_currency
 
-        result.merge!(args) unless sanitize
+        result[:ecommerce][:remove] = {}
+        if args[:products].present?
+          result[:ecommerce][:remove][:products] = args[:products].map{|product| product.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Product.new(product) : product}
+        end
 
         return result
       end
 
-      def generate_promotion_click_hash(sanitize, args)
-        result = get_default_data(args)
+      def generate_promotion_impression_hash(args)
+        result = {}
 
-        result[:event] = args.delete(:event) || 'promotionClick'
+        result[:event] = args[:event] if args[:event].present?
 
-        result[:event_category] = args.delete(:event_category) || 'Enhanced Ecommerce'
-        result[:event_action]   = args.delete(:event_action)   || 'Promotion Click'
-        result[:event_label]    = args.delete(:event_label)    || 'Enhanced Ecommerce Promotion Click'
+        result[:ecommerce]                = {}
+        result[:ecommerce][:currencyCode] = args[:currency] || GtmOnRails.config.ecommerce_default_currency
 
-        result[:ecommerce][:promoClick]              = {}
-        result[:ecommerce][:promoClick][:promotions] = get_promotion(args) if args[:promotions].present?
+        result[:ecommerce][:promoView] = {}
 
-        result.merge!(args) unless sanitize
+        if args[:promotions].present?
+          result[:ecommerce][:promoView][:promotions] = args[:promotions].map{|promotion| promotion.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Promotion.new(promotion) : promotion}
+        end
 
         return result
       end
 
-      def generate_checkout_hash(sanitize, args)
-        result = get_default_data(args)
+      def generate_promotion_click_hash(args)
+        result = {}
 
-        result[:event] = args.delete(:event) || 'checkout'
+        result[:event] = args[:event] || 'promotionClick'
 
-        result[:event_category] = args.delete(:event_category) || 'Enhanced Ecommerce'
-        result[:event_action]   = args.delete(:event_action)   || 'Checkout'
-        result[:event_label]    = args.delete(:event_label)    || 'Enhanced Ecommerce Checkout'
+        result[:event_category] = args[:event_category] || 'Enhanced Ecommerce'
+        result[:event_action]   = args[:event_action]   || 'Promotion Click'
+        result[:event_label]    = args[:event_label]    || 'Enhanced Ecommerce Promotion Click'
 
-        result[:ecommerce][:checkout]               = {}
-        result[:ecommerce][:checkout][:actionField] = get_action(args)   if args[:action].present?
-        result[:ecommerce][:checkout][:products]    = get_products(args) if args[:products].present?
+        result[:ecommerce]                = {}
+        result[:ecommerce][:currencyCode] = args[:currency] || GtmOnRails.config.ecommerce_default_currency
 
-        result.merge!(args) unless sanitize
+        result[:ecommerce][:promoClick] = {}
+
+        if args[:promotions].present?
+          result[:ecommerce][:promoClick][:promotions] = args[:promotions].map{|promotion| promotion.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Promotion.new(promotion) : promotion}
+        end
 
         return result
       end
 
-      def generate_purchase_hash(sanitize, args)
-        result = get_default_data(args)
+      def generate_checkout_hash(args)
+        result = {}
+
+        result[:event] = args[:event] || 'checkout'
 
-        result[:event] = args.delete(:event) if args[:event].present?
+        result[:event_category] = args[:event_category] || 'Enhanced Ecommerce'
+        result[:event_action]   = args[:event_action]   || 'Checkout'
+        result[:event_label]    = args[:event_label]    || 'Enhanced Ecommerce Checkout'
 
-        result[:ecommerce][:purchase]               = {}
-        result[:ecommerce][:purchase][:actionField] = get_action(args)   if args[:action].present?
-        result[:ecommerce][:purchase][:products]    = get_products(args) if args[:products].present?
+        result[:ecommerce]                = {}
+        result[:ecommerce][:currencyCode] = args[:currency] || GtmOnRails.config.ecommerce_default_currency
 
-        result.merge!(args) unless sanitize
+        result[:ecommerce][:checkout] = {}
+
+        if args[:action].present?
+          action = args[:action].is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Action.new(args[:action]) : args[:action]
+          result[:ecommerce][:checkout][:actionField] = action
+        end
+
+        if args[:products].present?
+          result[:ecommerce][:checkout][:products] = args[:products].map{|product| product.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Product.new(product) : product}
+        end
 
         return result
       end
 
-      def generate_refund_hash(sanitize, args)
-        result = get_default_data(args)
+      def generate_purchase_hash(args)
+        result = {}
 
-        result[:event] = args.delete(:event) if args[:event].present?
+        result[:event] = args[:event] if args[:event].present?
 
-        result[:ecommerce][:refund]               = {}
-        result[:ecommerce][:refund][:actionField] = get_action(args)   if args[:action].present?
-        result[:ecommerce][:refund][:products]    = get_products(args) if args[:products].present?
+        result[:ecommerce]                = {}
+        result[:ecommerce][:currencyCode] = args[:currency] || GtmOnRails.config.ecommerce_default_currency
 
-        result.merge!(args) unless sanitize
+        result[:ecommerce][:purchase] = {}
+
+        action = args[:action] || {}
+        action = action.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Action.new(action) : action
+        result[:ecommerce][:purchase][:actionField] = action
+        
+        if args[:products].present?
+          result[:ecommerce][:purchase][:products] = args[:products].map{|product| product.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Product.new(product) : product}
+        end
 
         return result
       end
 
+      def generate_refund_hash(args)
+        result = {}
 
-      def get_default_data(args)
-        hash = {}
-        hash[:ecommerce]                = {}
-        hash[:ecommerce][:currencyCode] = get_currency(args)
-        hash
-      end
+        result[:event] = args[:event] if args[:event].present?
 
-      def get_currency(args)
-        args.delete(:currency) || GtmOnRails.config.ecommerce_default_currency
-      end
+        result[:ecommerce]                = {}
+        result[:ecommerce][:currencyCode] = args[:currency] || GtmOnRails.config.ecommerce_default_currency
 
-      def get_impression(args)
-        args.delete(:impressions).map{|impression| impression.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Impression.new(impression) : impression}
-      end
-
-      def get_promotion(args)
-        args.delete(:promotions).map{|promotion| promotion.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Promotion.new(promotion) : promotion}
-      end
+        result[:ecommerce][:refund] = {}
 
-      def get_products(args)
-        args.delete(:products).map{|product| product.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Product.new(product) : product}
-      end
+        if args[:action].present?
+          action = args[:action].is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Action.new(args[:action]) : args[:action]
+          result[:ecommerce][:refund][:actionField] = action
+        end
+        
+        if args[:products].present?
+          result[:ecommerce][:refund][:products] = args[:products].map{|product| product.is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Product.new(product) : product}
+        end
 
-      def get_action(args)
-        args[:action].is_a?(Hash) ? GtmOnRails::DataLayer::Ecommerce::Action.new(args.delete(:action)) : args.delete(:action)
+        return result
       end
   end
 end

data/lib/gtm_on_rails/models/data_layer.rb

@@ -17,7 +17,7 @@ module GtmOnRails
       args.each do |object|
         case object
         when Hash
-          obj = GtmOnRails::DataLayer::Object.new(object)
+          obj = GtmOnRails::DataLayer::Object.new(**object)
         when GtmOnRails::DataLayer::Object
           obj = object
         end

data/lib/gtm_on_rails/version.rb

@@ -1,3 +1,3 @@
 module GtmOnRails
-  VERSION = '0.1.13'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtm_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.1
 platform: ruby
 authors:
 - ykogure
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.22
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -88,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: An plugin that integrate Google Tag Manager easy with Rails