solidus_subscriptions-alpha 0.0.4 → 0.0.5

data/app/models/solidus_subscriptions/subscription_generator.rb

@@ -1,60 +1,60 @@
-# This module is responsible for taking SolidusSubscriptions::LineItem
-# objects and creating SolidusSubscriptions::Subscription Objects
-module SolidusSubscriptions
-  module SubscriptionGenerator
-    extend self
-
-    SubscriptionConfiguration = Struct.new(:interval_length, :interval_units, :end_date)
-
-    # Create and persist a subscription for a collection of subscription
-    #   line items
-    #
-    # @param subscription_line_items [Array<SolidusSubscriptions::LineItem>] The
-    #   subscription_line_items to be activated
-    #
-    # @return [SolidusSubscriptions::Subscription]
-    def activate(subscription_line_items)
-      return if subscription_line_items.empty?
-
-      order = subscription_line_items.first.order
-      configuration = subscription_configuration(subscription_line_items.first)
-
-      subscription_attributes = {
-        user: order.user,
-        line_items: subscription_line_items,
-        store: order.store,
-        shipping_address: order.ship_address,
-        **configuration.to_h
-      }
-
-      Subscription.create!(subscription_attributes) do |sub|
-        sub.actionable_date = sub.next_actionable_date
-      end
-    end
-
-    # Group a collection of line items by common subscription configuration
-    # options. Grouped subscription_line_items can belong to a single
-    # subscription.
-    #
-    # @param subscription_line_items [Array<SolidusSubscriptions::LineItem>] The
-    #   subscription_line_items to be grouped.
-    #
-    # @return [Array<Array<SolidusSubscriptions::LineItem>>]
-    def group(subscription_line_items)
-      subscription_line_items.group_by do |li|
-        subscription_configuration(li)
-      end.
-      values
-    end
-
-    private
-
-    def subscription_configuration(subscription_line_item)
-      SubscriptionConfiguration.new(
-        subscription_line_item.interval_length,
-        subscription_line_item.interval_units,
-        subscription_line_item.end_date
-      )
-    end
-  end
-end
+# This module is responsible for taking SolidusSubscriptions::LineItem
+# objects and creating SolidusSubscriptions::Subscription Objects
+module SolidusSubscriptions
+  module SubscriptionGenerator
+    extend self
+
+    SubscriptionConfiguration = Struct.new(:interval_length, :interval_units, :end_date)
+
+    # Create and persist a subscription for a collection of subscription
+    #   line items
+    #
+    # @param subscription_line_items [Array<SolidusSubscriptions::LineItem>] The
+    #   subscription_line_items to be activated
+    #
+    # @return [SolidusSubscriptions::Subscription]
+    def activate(subscription_line_items)
+      return if subscription_line_items.empty?
+
+      order = subscription_line_items.first.order
+      configuration = subscription_configuration(subscription_line_items.first)
+
+      subscription_attributes = {
+        user: order.user,
+        line_items: subscription_line_items,
+        store: order.store,
+        shipping_address: order.ship_address,
+        **configuration.to_h
+      }
+
+      Subscription.create!(subscription_attributes) do |sub|
+        sub.actionable_date = sub.next_actionable_date
+      end
+    end
+
+    # Group a collection of line items by common subscription configuration
+    # options. Grouped subscription_line_items can belong to a single
+    # subscription.
+    #
+    # @param subscription_line_items [Array<SolidusSubscriptions::LineItem>] The
+    #   subscription_line_items to be grouped.
+    #
+    # @return [Array<Array<SolidusSubscriptions::LineItem>>]
+    def group(subscription_line_items)
+      subscription_line_items.group_by do |li|
+        subscription_configuration(li)
+      end.
+      values
+    end
+
+    private
+
+    def subscription_configuration(subscription_line_item)
+      SubscriptionConfiguration.new(
+        subscription_line_item.interval_length,
+        subscription_line_item.interval_units,
+        subscription_line_item.end_date
+      )
+    end
+  end
+end

data/app/models/solidus_subscriptions/subscription_line_item_builder.rb

@@ -1,21 +1,21 @@
-module SolidusSubscriptions
-  module SubscriptionLineItemBuilder
-    private
-
-    def create_subscription_line_item(line_item)
-      SolidusSubscriptions::LineItem.create!(
-        subscription_params.merge(spree_line_item: line_item)
-      )
-
-      # Rerun the promotion handler to pickup subscription promotions
-      Spree::PromotionHandler::Cart.new(line_item.order).activate
-      line_item.order.update!
-    end
-
-    def subscription_params
-      params.require(:subscription_line_item).permit(
-        SolidusSubscriptions::Config.subscription_line_item_attributes
-      )
-    end
-  end
-end
+module SolidusSubscriptions
+  module SubscriptionLineItemBuilder
+    private
+
+    def create_subscription_line_item(line_item)
+      SolidusSubscriptions::LineItem.create!(
+        subscription_params.merge(spree_line_item: line_item)
+      )
+
+      # Rerun the promotion handler to pickup subscription promotions
+      Spree::PromotionHandler::Cart.new(line_item.order).activate
+      line_item.order.update!
+    end
+
+    def subscription_params
+      params.require(:subscription_line_item).permit(
+        SolidusSubscriptions::Config.subscription_line_item_attributes
+      )
+    end
+  end
+end

data/app/models/solidus_subscriptions/subscription_order_promotion_rule.rb

@@ -1,25 +1,25 @@
-module SolidusSubscriptions
-  class SubscriptionOrderPromotionRule < Spree::PromotionRule
-    # Promotion can be applied to an entire order. Will only be true
-    # for Spree::Order
-    #
-    # @param promotable [Object] Any object which could have this
-    #   promotion rule applied to it.
-    #
-    # @return [Boolean]
-    def applicable?(promotable)
-      promotable.is_a? Spree::Order
-    end
-
-    # An order is eligible if it fulfills a subscription Installment. Will only
-    # return true if the order fulfills one or more Installments
-    #
-    # @param order [Spree::Order] The order which could have this rule applied
-    #   to it.
-    #
-    # @return [Boolean]
-    def eligible?(order, **_options)
-      order.subscription_order?
-    end
-  end
-end
+module SolidusSubscriptions
+  class SubscriptionOrderPromotionRule < Spree::PromotionRule
+    # Promotion can be applied to an entire order. Will only be true
+    # for Spree::Order
+    #
+    # @param promotable [Object] Any object which could have this
+    #   promotion rule applied to it.
+    #
+    # @return [Boolean]
+    def applicable?(promotable)
+      promotable.is_a? Spree::Order
+    end
+
+    # An order is eligible if it fulfills a subscription Installment. Will only
+    # return true if the order fulfills one or more Installments
+    #
+    # @param order [Spree::Order] The order which could have this rule applied
+    #   to it.
+    #
+    # @return [Boolean]
+    def eligible?(order, **_options)
+      order.subscription_order?
+    end
+  end
+end

data/app/models/solidus_subscriptions/subscription_promotion_rule.rb

@@ -1,38 +1,38 @@
-module SolidusSubscriptions
-  class SubscriptionPromotionRule < Spree::PromotionRule
-    # Promotion can be applied to an entire order. Will only be true
-    # for Spree::Order
-    #
-    # @param promotable [Object] Any object which could have this
-    #   promotion rule applied to it.
-    #
-    # @return [Boolean]
-    def applicable?(promotable)
-      promotable.is_a? Spree::Order
-    end
-
-    # An order is eligible if it contains a line item with an associates
-    # subscription_line_item.  This rule applies to order and so its eligibility
-    # will always be considered against an order. Will only return true for
-    # orders containing Spree::Line item with associated subscription_line_items
-    #
-    # @param order [Spree::Order] The order which could have this rule applied
-    #   to it.
-    #
-    # @return [Boolean]
-    def eligible?(order, **_options)
-      order.subscription_line_items.any?
-    end
-
-    # Certain actions create adjustments on line items. In this case, only
-    # line items with associated subscription_line_itms are eligible to be
-    # adjusted. Will only return true # if :line_item has an associated
-    # subscription.
-    #
-    # @param line_item [Spree::LineItem] The line item which could be adjusted
-    #   by the promotion.
-    def actionable?(line_item)
-      line_item.subscription_line_items.present?
-    end
-  end
-end
+module SolidusSubscriptions
+  class SubscriptionPromotionRule < Spree::PromotionRule
+    # Promotion can be applied to an entire order. Will only be true
+    # for Spree::Order
+    #
+    # @param promotable [Object] Any object which could have this
+    #   promotion rule applied to it.
+    #
+    # @return [Boolean]
+    def applicable?(promotable)
+      promotable.is_a? Spree::Order
+    end
+
+    # An order is eligible if it contains a line item with an associates
+    # subscription_line_item.  This rule applies to order and so its eligibility
+    # will always be considered against an order. Will only return true for
+    # orders containing Spree::Line item with associated subscription_line_items
+    #
+    # @param order [Spree::Order] The order which could have this rule applied
+    #   to it.
+    #
+    # @return [Boolean]
+    def eligible?(order, **_options)
+      order.subscription_line_items.any?
+    end
+
+    # Certain actions create adjustments on line items. In this case, only
+    # line items with associated subscription_line_itms are eligible to be
+    # adjusted. Will only return true # if :line_item has an associated
+    # subscription.
+    #
+    # @param line_item [Spree::LineItem] The line item which could be adjusted
+    #   by the promotion.
+    def actionable?(line_item)
+      line_item.subscription_line_items.present?
+    end
+  end
+end

data/app/models/solidus_subscriptions/success_dispatcher.rb

@@ -1,16 +1,16 @@
-# This service class is intented to provide callback behaviour to handle
-# an installment successfully being processed
-module SolidusSubscriptions
-  class SuccessDispatcher < Dispatcher
-    def dispatch
-      installments.each { |i| i.success!(order) }
-      super
-    end
-
-    private
-
-    def message
-      "Successfully processed installments: #{installments.map(&:id).join(', ')}"
-    end
-  end
-end
+# This service class is intented to provide callback behaviour to handle
+# an installment successfully being processed
+module SolidusSubscriptions
+  class SuccessDispatcher < Dispatcher
+    def dispatch
+      installments.each { |i| i.success!(order) }
+      super
+    end
+
+    private
+
+    def message
+      "Successfully processed installments: #{installments.map(&:id).join(', ')}"
+    end
+  end
+end

data/app/models/solidus_subscriptions/unsubscribable_error.rb

@@ -1,17 +1,17 @@
-# This error should be raised if a user attempts to subscribe to a item which
-# is not subscribable
-module SolidusSubscriptions
-  class UnsubscribableError < StandardError
-    def initialize(subscribable)
-      @subscribable = subscribable
-      super
-    end
-
-    def to_s
-      <<-MSG.squish
-        #{@subscribable.class} with id: #{@subscribable.id} cannot be
-        subscribed to.
-      MSG
-    end
-  end
-end
+# This error should be raised if a user attempts to subscribe to a item which
+# is not subscribable
+module SolidusSubscriptions
+  class UnsubscribableError < StandardError
+    def initialize(subscribable)
+      @subscribable = subscribable
+      super
+    end
+
+    def to_s
+      <<-MSG.squish
+        #{@subscribable.class} with id: #{@subscribable.id} cannot be
+        subscribed to.
+      MSG
+    end
+  end
+end

data/app/models/solidus_subscriptions/user_mismatch_error.rb

@@ -1,15 +1,15 @@
-module SolidusSubscriptions
-  class UserMismatchError < StandardError
-    def initialize(installments)
-      @installments = installments
-    end
-
-    def to_s
-      <<-MSG.squish
-        Installments must have the same user to be processed as a consolidated
-        installment. Could not process installments:
-        #{@installments.map(&:id).join(', ')}
-      MSG
-    end
-  end
-end
+module SolidusSubscriptions
+  class UserMismatchError < StandardError
+    def initialize(installments)
+      @installments = installments
+    end
+
+    def to_s
+      <<-MSG.squish
+        Installments must have the same user to be processed as a consolidated
+        installment. Could not process installments:
+        #{@installments.map(&:id).join(', ')}
+      MSG
+    end
+  end
+end

data/app/overrides/views/admin_subscribable_checkbox.rb

@@ -1,13 +1,13 @@
-Deface::Override.new(
-  virtual_path: "spree/admin/variants/_form",
-  name: "solidus_subscriptions_subscribable_checkbox",
-  insert_after: "[data-hook='track_inventory']",
-  partial: "spree/admin/variants/subscribable_checkbox"
-)
-
-Deface::Override.new(
-  virtual_path: "spree/admin/products/_form",
-  name: "solidus_subscriptions_product_subscribable_checkbox",
-  insert_after: "[data-hook='admin_product_form_meta']",
-  partial: "spree/admin/products/subscribable_checkbox"
-)
+Deface::Override.new(
+  virtual_path: "spree/admin/variants/_form",
+  name: "solidus_subscriptions_subscribable_checkbox",
+  insert_after: "[data-hook='track_inventory']",
+  partial: "spree/admin/variants/subscribable_checkbox"
+)
+
+Deface::Override.new(
+  virtual_path: "spree/admin/products/_form",
+  name: "solidus_subscriptions_product_subscribable_checkbox",
+  insert_after: "[data-hook='admin_product_form_meta']",
+  partial: "spree/admin/products/subscribable_checkbox"
+)

data/app/overrides/views/admin_subscriptions_menu_link.rb

@@ -1,8 +1,8 @@
-if !Spree::Backend::Config.respond_to?(:menu_items)
-  Deface::Override.new(
-    virtual_path: 'spree/admin/shared/_menu',
-    name: :add_subcriptions_admin_link,
-    insert_bottom: "[data-hook='admin_tabs']",
-    partial: 'spree/admin/shared/subscription_tab'
-  )
-end
+if !Spree::Backend::Config.respond_to?(:menu_items)
+  Deface::Override.new(
+    virtual_path: 'spree/admin/shared/_menu',
+    name: :add_subcriptions_admin_link,
+    insert_bottom: "[data-hook='admin_tabs']",
+    partial: 'spree/admin/shared/subscription_tab'
+  )
+end

data/app/overrides/views/subscription_line_item_fields.rb

@@ -1,6 +1,6 @@
-Deface::Override.new(
-  virtual_path: "spree/products/_cart_form",
-  name: "subscription_line_item_fields",
-  insert_after: "[data-hook='inside_product_cart_form']",
-  partial: "spree/frontend/products/subscription_line_item_fields"
-)
+Deface::Override.new(
+  virtual_path: "spree/products/_cart_form",
+  name: "subscription_line_item_fields",
+  insert_after: "[data-hook='inside_product_cart_form']",
+  partial: "spree/frontend/products/subscription_line_item_fields"
+)