spree_core 2.1.12 → 2.2.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.2.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.1
+        version: 1.42.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.1
+        version: 1.42.3
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.0.3
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +178,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.0
-- !ruby/object:Gem::Dependency
-  name: monetize
-  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: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -212,26 +212,26 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.12
+        version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.12
+        version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
@@ -287,16 +287,12 @@ files:
 - app/assets/images/noimage/mini.png
 - app/assets/images/noimage/product.png
 - app/assets/images/noimage/small.png
-- app/assets/javascripts/admin/handlebar_extensions.js
 - app/assets/javascripts/spree.js.coffee
 - app/controllers/spree/base_controller.rb
-- app/helpers/spree/admin/adjustments_helper.rb
-- app/helpers/spree/admin/images_helper.rb
 - app/helpers/spree/base_helper.rb
 - app/helpers/spree/checkout_helper.rb
 - app/helpers/spree/orders_helper.rb
 - app/helpers/spree/products_helper.rb
-- app/helpers/spree/promotion_rules_helper.rb
 - app/helpers/spree/store_helper.rb
 - app/helpers/spree/taxons_helper.rb
 - app/mailers/spree/base_mailer.rb
@@ -304,7 +300,6 @@ files:
 - app/mailers/spree/shipment_mailer.rb
 - app/mailers/spree/test_mailer.rb
 - app/models/spree/ability.rb
-- app/models/spree/activator.rb
 - app/models/spree/address.rb
 - app/models/spree/adjustment.rb
 - app/models/spree/alert.rb
@@ -317,7 +312,7 @@ files:
 - app/models/spree/calculator/flat_rate.rb
 - app/models/spree/calculator/flexi_rate.rb
 - app/models/spree/calculator/free_shipping.rb
-- app/models/spree/calculator/per_item.rb
+- app/models/spree/calculator/percent_on_line_item.rb
 - app/models/spree/calculator/percent_per_item.rb
 - app/models/spree/calculator/price_sack.rb
 - app/models/spree/calculator/shipping/flat_percent_item_total.rb
@@ -334,6 +329,7 @@ files:
 - app/models/spree/gateway/bogus_simple.rb
 - app/models/spree/image.rb
 - app/models/spree/inventory_unit.rb
+- app/models/spree/item_adjustments.rb
 - app/models/spree/legacy_user.rb
 - app/models/spree/line_item.rb
 - app/models/spree/log_entry.rb
@@ -347,6 +343,7 @@ files:
 - app/models/spree/order_updater.rb
 - app/models/spree/payment.rb
 - app/models/spree/payment/processing.rb
+- app/models/spree/payment_capture_event.rb
 - app/models/spree/payment_method.rb
 - app/models/spree/payment_method/check.rb
 - app/models/spree/preference.rb
@@ -362,7 +359,9 @@ files:
 - app/models/spree/product_scope/scopes.rb
 - app/models/spree/promotion.rb
 - app/models/spree/promotion/actions/create_adjustment.rb
+- app/models/spree/promotion/actions/create_item_adjustments.rb
 - app/models/spree/promotion/actions/create_line_items.rb
+- app/models/spree/promotion/actions/free_shipping.rb
 - app/models/spree/promotion/rules/first_order.rb
 - app/models/spree/promotion/rules/item_total.rb
 - app/models/spree/promotion/rules/product.rb
@@ -370,6 +369,10 @@ files:
 - app/models/spree/promotion/rules/user_logged_in.rb
 - app/models/spree/promotion_action.rb
 - app/models/spree/promotion_action_line_item.rb
+- app/models/spree/promotion_handler/cart.rb
+- app/models/spree/promotion_handler/coupon.rb
+- app/models/spree/promotion_handler/free_shipping.rb
+- app/models/spree/promotion_handler/page.rb
 - app/models/spree/promotion_rule.rb
 - app/models/spree/property.rb
 - app/models/spree/prototype.rb
@@ -393,7 +396,6 @@ files:
 - app/models/spree/stock/packer.rb
 - app/models/spree/stock/prioritizer.rb
 - app/models/spree/stock/quantifier.rb
-- app/models/spree/stock/remaining_packer.rb
 - app/models/spree/stock/splitter/backordered.rb
 - app/models/spree/stock/splitter/base.rb
 - app/models/spree/stock/splitter/shipping_category.rb
@@ -415,7 +417,6 @@ files:
 - app/views/spree/admin/orders/customer_details/_autocomplete.js.erb
 - app/views/spree/order_mailer/cancel_email.text.erb
 - app/views/spree/order_mailer/confirm_email.text.erb
-- app/views/spree/payments/_payment.html.erb
 - app/views/spree/shared/_error_messages.html.erb
 - app/views/spree/shared/_routes.html.erb
 - app/views/spree/shipment_mailer/shipped_email.text.erb
@@ -481,6 +482,8 @@ files:
 - db/migrate/20130328130308_update_shipment_state_for_canceled_orders.rb
 - db/migrate/20130328195253_add_seo_metas_to_taxons.rb
 - db/migrate/20130329134939_remove_stock_item_and_variant_lock.rb
+- db/migrate/20130413230529_add_name_to_spree_credit_cards.rb
+- db/migrate/20130414000512_update_name_fields_on_spree_credit_cards.rb
 - db/migrate/20130417120034_add_index_to_source_columns_on_adjustments.rb
 - db/migrate/20130417120035_update_adjustment_states.rb
 - db/migrate/20130417123427_add_shipping_rates_to_shipments.rb
@@ -508,27 +511,51 @@ files:
 - db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb
 - db/migrate/20130806022521_drop_spree_mail_methods.rb
 - db/migrate/20130806145853_set_default_stock_location_on_shipments.rb
+- db/migrate/20130807024301_upgrade_adjustments.rb
+- db/migrate/20130807024302_rename_adjustment_fields.rb
 - db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb
 - db/migrate/20130809164330_add_admin_name_column_to_spree_stock_locations.rb
+- db/migrate/20130813004002_add_shipment_total_to_spree_orders.rb
 - db/migrate/20130813140619_expand_order_number_size.rb
+- db/migrate/20130813232134_rename_activators_to_promotions.rb
+- db/migrate/20130815000406_add_adjustment_total_to_line_items.rb
+- db/migrate/20130815024413_add_adjustment_total_to_shipments.rb
 - db/migrate/20130826062534_add_depth_to_spree_taxons.rb
+- db/migrate/20130828234942_add_tax_total_to_line_items_shipments_and_orders.rb
 - db/migrate/20130830001033_add_shipping_category_to_shipping_methods_and_products.rb
 - db/migrate/20130830001159_migrate_old_shipping_calculators.rb
+- db/migrate/20130903183026_add_code_to_spree_promotion_rules.rb
 - db/migrate/20130909115621_change_states_required_for_countries.rb
 - db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb
+- db/migrate/20130917024658_remove_promotions_event_name_field.rb
+- db/migrate/20130924040529_add_promo_total_to_line_items_and_shipments_and_orders.rb
 - db/migrate/20131001013410_remove_unused_credit_card_fields.rb
 - db/migrate/20131026154747_add_track_inventory_to_variant.rb
+- db/migrate/20131107132123_add_tax_category_to_variants.rb
 - db/migrate/20131113035136_add_channel_to_spree_orders.rb
-- db/migrate/20131118041203_add_tax_total_to_spree_orders.rb
-- db/migrate/20131118043021_add_order_id_to_spree_adjustments.rb
-- db/migrate/20131118074808_add_included_to_spree_adjustments.rb
+- db/migrate/20131118043959_add_included_to_adjustments.rb
+- db/migrate/20131118050234_rename_tax_total_fields.rb
+- db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb
 - db/migrate/20131120234456_add_updated_at_to_variants.rb
+- db/migrate/20131127001002_add_position_to_classifications.rb
+- db/migrate/20131211112807_create_spree_orders_promotions.rb
 - db/migrate/20131211192741_unique_shipping_method_categories.rb
+- db/migrate/20131218054603_add_item_count_to_spree_orders.rb
+- db/migrate/20140106224208_rename_permalink_to_slug_for_products.rb
 - db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb
+- db/migrate/20140124023232_rename_activator_id_in_rules_and_actions_to_promotion_id.rb
 - db/migrate/20140129024326_add_deleted_at_to_spree_prices.rb
+- db/migrate/20140203161722_add_approver_id_and_approved_at_to_orders.rb
+- db/migrate/20140204115338_add_confirmation_delivered_to_spree_orders.rb
 - db/migrate/20140204192230_add_auto_capture_to_payment_methods.rb
+- db/migrate/20140205120320_create_spree_payment_capture_events.rb
+- db/migrate/20140205144710_add_uncaptured_amount_to_payments.rb
 - db/migrate/20140205181631_default_variant_weight_to_zero.rb
-- db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb
+- db/migrate/20140207085910_add_tax_category_id_to_shipping_methods.rb
+- db/migrate/20140207093021_add_tax_rate_id_to_shipping_rates.rb
+- db/migrate/20140211040159_add_pre_tax_amount_to_line_items_and_shipments.rb
+- db/migrate/20140213184916_add_more_indexes.rb
+- db/migrate/20140219060952_add_considered_risky_to_orders.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -543,11 +570,11 @@ files:
 - lib/generators/spree/dummy/templates/rails/script/rails
 - lib/generators/spree/dummy/templates/rails/test.rb
 - lib/generators/spree/install/install_generator.rb
-- lib/generators/spree/install/templates/app/assets/javascripts/admin/all.js
-- lib/generators/spree/install/templates/app/assets/javascripts/store/all.js
-- lib/generators/spree/install/templates/app/assets/stylesheets/admin/all.css
-- lib/generators/spree/install/templates/app/assets/stylesheets/store/all.css
 - lib/generators/spree/install/templates/config/initializers/spree.rb
+- lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js
+- lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
+- lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
+- lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
 - lib/spree/core.rb
 - lib/spree/core/calculated_adjustments.rb
 - lib/spree/core/controller_helpers.rb
@@ -563,16 +590,13 @@ files:
 - lib/spree/core/environment.rb
 - lib/spree/core/environment/calculators.rb
 - lib/spree/core/environment_extension.rb
-- lib/spree/core/gateway_error.rb
 - lib/spree/core/mail_interceptor.rb
 - lib/spree/core/mail_method.rb
 - lib/spree/core/mail_settings.rb
 - lib/spree/core/permalinks.rb
-- lib/spree/core/preference_rescue.rb
 - lib/spree/core/product_duplicator.rb
 - lib/spree/core/product_filters.rb
 - lib/spree/core/routes.rb
-- lib/spree/core/s3_support.rb
 - lib/spree/core/search/base.rb
 - lib/spree/core/token_resource.rb
 - lib/spree/core/user_address.rb
@@ -584,18 +608,17 @@ files:
 - lib/spree/migrations.rb
 - lib/spree/money.rb
 - lib/spree/permitted_attributes.rb
-- lib/spree/promo/coupon_applicator.rb
 - lib/spree/promo/environment.rb
 - lib/spree/responder.rb
 - lib/spree/testing_support/ability_helpers.rb
 - lib/spree/testing_support/authorization_helpers.rb
 - lib/spree/testing_support/bar_ability.rb
+- lib/spree/testing_support/caching.rb
 - lib/spree/testing_support/capybara_ext.rb
 - lib/spree/testing_support/common_rake.rb
 - lib/spree/testing_support/controller_requests.rb
 - lib/spree/testing_support/extension_rake.rb
 - lib/spree/testing_support/factories.rb
-- lib/spree/testing_support/factories/activator_factory.rb
 - lib/spree/testing_support/factories/address_factory.rb
 - lib/spree/testing_support/factories/adjustment_factory.rb
 - lib/spree/testing_support/factories/calculator_factory.rb
@@ -640,6 +663,11 @@ files:
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree_core.rb
 - lib/tasks/core.rake
+- vendor/assets/fonts/FontAwesome.otf
+- vendor/assets/fonts/fontawesome-webfont.eot
+- vendor/assets/fonts/fontawesome-webfont.svg
+- vendor/assets/fonts/fontawesome-webfont.ttf
+- vendor/assets/fonts/fontawesome-webfont.woff
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_et.js
@@ -656,6 +684,7 @@ files:
 - vendor/assets/javascripts/jquery.validate/localization/messages_zh.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_zh_TW.js
 - vendor/assets/javascripts/jsuri.js
+- vendor/assets/stylesheets/font-awesome.scss
 - vendor/assets/stylesheets/normalize.css
 - vendor/assets/stylesheets/skeleton.css
 homepage: http://spreecommerce.com
@@ -678,7 +707,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.

data/app/assets/javascripts/admin/handlebar_extensions.js

@@ -1,9 +0,0 @@
-//= require handlebars
-Handlebars.registerHelper("t", function(key) {
-  if (Spree.translations[key]) {
-    return Spree.translations[key]
-  } else {
-    console.error("No translation found for " + key + ". Does it exist within spree/admin/shared/_translations.html.erb?")
-  }
-});
-

data/app/helpers/spree/admin/adjustments_helper.rb

@@ -1,26 +0,0 @@
-module Spree
-  module Admin
-    module AdjustmentsHelper
-      def link_to_toggle_adjustment_state(order, adjustment, options={})
-        return if adjustment.finalized?
-        icon = { closed: 'icon-unlock', open: 'icon-lock' }
-        alt_text = adjustment.immutable? ? Spree.t(:open) : Spree.t(:close)
-        link_to_with_icon(icon[adjustment.state.to_sym], alt_text, toggle_state_admin_order_adjustment_url(order, adjustment), options)
-      end
-
-      def adjustment_state(adjustment)
-        state = adjustment.state.to_sym
-        if adjustment.finalized?
-          Spree.t(state)
-        else
-          icon_for(state)
-        end
-      end
-
-      def icon_for(adjustment_state)
-        icon = { closed: 'icon-lock', open: 'icon-unlock' }
-        content_tag(:span, '', class: icon[adjustment_state])
-      end
-    end
-  end
-end

data/app/helpers/spree/admin/images_helper.rb

@@ -1,18 +0,0 @@
-module Spree
-  module Admin
-    module ImagesHelper
-      def options_text_for(image)
-        if image.viewable.is_a?(Spree::Variant)
-          if image.viewable.is_master?
-            Spree.t(:all)
-          else
-            image.viewable.sku_and_options_text
-          end
-        else
-          Spree.t(:all)
-        end
-      end
-    end
-  end
-end
-

data/app/helpers/spree/promotion_rules_helper.rb

@@ -1,13 +0,0 @@
-module Spree
-  module PromotionRulesHelper
-
-    def options_for_promotion_rule_types(promotion)
-      existing = promotion.rules.map { |rule| rule.class.name }
-      rule_names = Rails.application.config.spree.promotions.rules.map(&:name).reject{ |r| existing.include? r }
-      options = rule_names.map { |name| [ Spree.t("promotion_rule_types.#{name.demodulize.underscore}.name"), name] }
-      options_for_select(options)
-    end
-
-  end
-end
-

data/app/models/spree/activator.rb

@@ -1,29 +0,0 @@
-module Spree
-  class Activator < ActiveRecord::Base
-    cattr_accessor :event_names
-
-    self.event_names = [
-      'spree.cart.add',
-      'spree.order.contents_changed',
-      'spree.user.signup'
-    ]
-
-    def self.register_event_name(name)
-      self.event_names << name
-    end
-
-    scope :event_name_starts_with, ->(name) { where('event_name LIKE ?', "#{name}%") }
-
-    def self.active
-      where('starts_at IS NULL OR starts_at < ?', Time.now).
-        where('expires_at IS NULL OR expires_at > ?', Time.now)
-    end
-
-    def activate(payload)
-    end
-
-    def expired?
-      starts_at && Time.now < starts_at || expires_at && Time.now > expires_at
-    end
-  end
-end

data/app/models/spree/calculator/per_item.rb

@@ -1,41 +0,0 @@
-require_dependency 'spree/calculator'
-
-module Spree
-  class Calculator::PerItem < Calculator
-    preference :amount, :decimal, default: 0
-    preference :currency, :string, default: Spree::Config[:currency]
-
-    def self.description
-      Spree.t(:flat_rate_per_item)
-    end
-
-    def compute(object=nil)
-      return 0 if object.nil?
-      self.preferred_amount * object.line_items.reduce(0) do |sum, value|
-        if matching_products.blank? || matching_products.include?(value.product)
-          value_to_add = value.quantity
-        else
-          value_to_add = 0
-        end
-        sum + value_to_add
-      end
-    end
-
-    # Returns all products that match this calculator, but only if the calculator
-    # is attached to a promotion. If attached to a ShippingMethod, nil is returned.
-    def matching_products
-      # Regression check for #1596
-      # Calculator::PerItem can be used in two cases.
-      # The first is in a typical promotion, providing a discount per item of a particular item
-      # The second is a ShippingMethod, where it applies to an entire order
-      #
-      # Shipping methods do not have promotions attached, but promotions do
-      # Therefore we must check for promotions
-      if self.calculable.respond_to?(:promotion)
-        self.calculable.promotion.rules.map do |rule|
-          rule.respond_to?(:products) ? rule.products : []
-        end.flatten
-      end
-    end
-  end
-end