spree_core 0.60.6 → 0.70.RC1

data/lib/spree_core.rb

@@ -26,19 +26,19 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #--
-require "rails/all"
-
+require 'rails/all'
+require 'rails/generators'
 require 'state_machine'
 require 'paperclip'
 require 'stringex'
-require 'will_paginate'
-#require 'less' #TODO RAILS3: consider making this optional
+require 'kaminari'
 require 'nested_set'
 require 'acts_as_list'
 require 'resource_controller'
 require 'active_merchant'
-require "meta_search"
-require "find_by_param"
+require 'meta_search'
+require 'find_by_param'
+require 'jquery-rails'
 
 require 'spree_core/ext/active_record'
 require 'spree_core/ext/hash'
@@ -76,6 +76,9 @@ end
 require 'spree_core/version'
 
 require 'spree_core/railtie'
+require 'generators/spree/site/site_generator'
+require 'generators/spree/dummy/dummy_generator'
+require 'generators/spree/sandbox/sandbox_generator'
 
 ActiveRecord::Base.class_eval do
   include Spree::CalculatedAdjustments

data/lib/spree_core/ext/active_record.rb

@@ -2,7 +2,7 @@ module ActiveRecord::Persistence
 
   # Update attributes of a record in the database without callbacks, validations etc.
   def update_attributes_without_callbacks(attributes)
-    self.send(:attributes=, attributes, false)
+    self.assign_attributes(attributes, :without_protection => true)
     self.class.update_all(attributes, { :id => id })
   end
 

data/lib/spree_core/preferences/model_hooks.rb

@@ -96,10 +96,10 @@ module Spree
         #   user.save!  # => true
         def preference(name, *args)
           unless included_modules.include?(InstanceMethods)
-            class_inheritable_hash :preference_definitions
+            class_attribute :preference_definitions
             self.preference_definitions = {}
 
-            class_inheritable_hash :default_preferences
+            class_attribute :default_preferences
             self.default_preferences = {}
 
             has_many  :stored_preferences, :as => :owner, :class_name => 'Preference'
@@ -108,7 +108,11 @@ module Spree
 
             include Spree::Preferences::ModelHooks::InstanceMethods
           end
-
+          
+          # Reset definitions so that other subclass definitions aren't inherited
+          self.preference_definitions = self.preference_definitions.dup
+          self.default_preferences = self.default_preferences.dup
+          
           # Create the definition
           name = name.to_s
           definition = PreferenceDefinition.new(name, *args)

data/lib/spree_core/railtie.rb

@@ -1,14 +1,14 @@
 module SpreeCore
   class Engine < Rails::Engine
+    engine_name 'spree_core'
 
     config.autoload_paths += %W(#{config.root}/lib)
     # TODO - register state monitor observer?
 
+
+    # TODO: Is there a better way to make sure something within 'self.activate' only runs once in development?
     def self.activate
 
-      Spree::ThemeSupport::HookListener.subclasses.each do |hook_class|
-        Spree::ThemeSupport::Hook.add_listener(hook_class)
-      end
 
       #register all payment methods (unless we're in middle of rake task since migrations cannot be run for this first time without this check)
       if File.basename( $0 ) != "rake"
@@ -54,10 +54,26 @@ module SpreeCore
 
     config.to_prepare &method(:activate).to_proc
 
+    config.after_initialize do
+      ActiveSupport::Notifications.subscribe(/^spree\./) do |*args|
+        event_name, start_time, end_time, id, payload = args
+        Activator.active.event_name_starts_with(event_name).each do |activator|
+          activator.activate(payload)
+        end
+      end
+    end
+
     # filter sensitive information during logging
     initializer "spree.params.filter" do |app|
       app.config.filter_parameters += [:password, :password_confirmation, :number]
     end
 
+    # sets the manifests / assets to be precompiled
+    initializer "spree.assets.precompile" do |app|
+      app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/spree_dash.*', 'admin/orders/edit_form.js', '*.png', '*.jpg', '*.jpeg', '*.gif']
+      app.config.assets.debug = false
+    end
+
+
   end
 end

data/lib/spree_core/testing_support/common_rake.rb

@@ -0,0 +1,12 @@
+desc "Generates a dummy app for testing"
+namespace :common do
+  task :test_app do
+    require "#{ENV['LIB_NAME']}"
+
+    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--database=#{ENV['DB_NAME']}"]
+    Spree::SiteGenerator.start ["--lib_name=#{ENV['LIB_NAME']}"]
+
+    cmd = "bundle exec rake db:drop db:create db:migrate db:seed RAILS_ENV=test AUTO_ACCEPT=true"
+    puts cmd; system cmd
+  end
+end

data/lib/spree_core/testing_support/factories/activator_factory.rb

@@ -0,0 +1,6 @@
+Factory.define :activator do |f|
+  f.name 'Activator name'
+  f.event_name 'spree.order.contents_changed'
+  f.starts_at 2.weeks.ago
+  f.expires_at 2.weeks.from_now
+end

data/lib/spree_core/testing_support/factories/adjustment_factory.rb

@@ -3,4 +3,5 @@ Factory.define :adjustment do  |f|
   f.amount "100.0"
   f.label 'Shipping'
   f.source { Factory(:shipment) }
+  f.eligible true
 end

data/lib/spree_core/testing_support/factories/calculator_factory.rb

@@ -3,3 +3,9 @@ Factory.define :calculator, :class => Calculator::FlatRate do |f|
     c.set_preference(:amount, 10.0)
   end
 end
+
+Factory.define :no_amount_calculator, :class => Calculator::FlatRate do |f|
+  f.after_create do |c|
+    c.set_preference(:amount, 0)
+  end
+end

data/lib/spree_core/testing_support/factories/order_factory.rb

@@ -1,10 +1,11 @@
-Factory.define(:order) do |record|
+Factory.define(:order) do |f|
   # associations:
-  record.association(:user, :factory => :user)
-  record.association(:bill_address, :factory => :address)
-  record.completed_at nil
-  record.bill_address_id nil
-  record.ship_address_id nil
+  f.association(:user, :factory => :user)
+  f.association(:bill_address, :factory => :address)
+  f.completed_at nil
+  f.bill_address_id nil
+  f.ship_address_id nil
+  f.email 'foo@example.com'
 end
 
 Factory.define :order_with_totals, :parent => :order do |f|

data/lib/spree_core/testing_support/factories/product_factory.rb

@@ -14,3 +14,9 @@ Factory.define :product do |f|
   f.available_on { 1.year.ago }
   f.deleted_at nil
 end
+
+Factory.define :product_with_option_types, :parent => :product do |f|
+  f.after_create do |product|
+    Factory(:product_option_type, :product => product)
+  end
+end

data/lib/spree_core/testing_support/factories/user_factory.rb

@@ -1,15 +1,19 @@
-unless Factory.factories.keys.include?(:user)
-  Factory.define(:user) do |f|
-    f.email { Faker::Internet.email }
-    f.password "spree123"
-    f.password_confirmation "spree123"
-  end
+Factory.sequence :login do |n|
+  Faker::Internet.user_name + n.to_s
 end
 
-Factory.define(:admin_user, :parent => :user) do |u|
-  u.roles { [Role.find_by_name("admin") || Factory(:role, :name => "admin")]}
+Factory.sequence :user_authentication_token do |n|
+  "xxxx#{Time.now.to_i}#{rand(1000)}#{n}xxxxxxxxxxxxx"
 end
 
-Factory.sequence :login do |n|
-  Faker::Internet.user_name + n.to_s
+Factory.define :user do |f|
+  f.email { Faker::Internet.email }
+  f.login { |u| u.email }
+  f.password "secret"
+  f.password_confirmation "secret"
+  f.authentication_token { Factory.next(:user_authentication_token) } if User.attribute_method? :authentication_token
+end
+
+Factory.define(:admin_user, :parent => :user) do |u|
+  u.roles { [Role.find_by_name("admin") || Factory(:role, :name => "admin")]}
 end

data/lib/spree_core/testing_support/factories/zone_factory.rb

@@ -10,7 +10,7 @@ Factory.define(:global_zone, :class => Zone) do |record|
 end
 
 Factory.define(:zone) do |f|
-  f.name { Faker::Lorem.words }
+  f.name { Faker::Lorem.words.join(' ') }
   f.description { Faker::Lorem.sentence }
   f.zone_members do |member|
     [ZoneMember.create(:zoneable => Factory(:country) )]

data/lib/spree_core/theme_support.rb

@@ -1,4 +1 @@
-require 'spree_core/theme_support/hook'
 require 'spree_core/theme_support/hook_listener'
-require 'spree_core/theme_support/hook_modifier'
-#require 'spree/theme_support/more_patches'

data/lib/spree_core/theme_support/hook_listener.rb

@@ -1,67 +1,144 @@
+require 'deface'
+
 module Spree
   module ThemeSupport
 
-    # Listener class used for views hooks.
+    # This class is all deprecated and will be removed, currently being used as bridge
+    # between old style hooks and new Deface methods.
     class HookListener
       include Singleton
 
-      attr_accessor :hook_modifiers
-
-      def initialize
-        @hook_modifiers = []
+      def self.replace(hook_name, options = {}, &block)
+        create_deface_override(:replace, hook_name, options, &block)
       end
 
-      def modifiers_for_hook(hook_name)
-        hook_modifiers.select{|hm| hm.hook_name == hook_name}
+      def self.insert_before(hook_name, options = {}, &block)
+        create_deface_override(:insert_before, hook_name, options, &block)
       end
 
-
-      # Replace contents of hook_name using supplied render args or string returned from block
-      def self.replace(hook_name, options = {}, &block)
-        add_hook_modifier(hook_name, :replace, options, &block)
+      def self.insert_after(hook_name, options = {}, &block)
+        create_deface_override(:insert_after, hook_name, options, &block)
       end
 
-      # Insert before existing contents of hook_name using supplied render args or string returned from block
-      def self.insert_before(hook_name, options = {}, &block)
-        add_hook_modifier(hook_name, :insert_before, options, &block)
+      def self.insert_top(hook_name, options = {}, &block)
+        create_deface_override(:insert_top, hook_name, options, &block)
       end
 
-      # Insert after existing contents of hook_name using supplied render args or string returned from block
-      def self.insert_after(hook_name, options = {}, &block)
-        add_hook_modifier(hook_name, :insert_after, options, &block)
+      def self.insert_bottom(hook_name, options = {}, &block)
+        create_deface_override(:insert_bottom, hook_name, options, &block)
       end
 
-      # Clear contents of hook_name
       def self.remove(hook_name)
         add_hook_modifier(hook_name, :replace)
       end
 
-
       private
+        def self.create_deface_override(target, hook_name, options, &block)
+          virtual_path = migratable_hooks.detect{|path, hooks| hooks.include? hook_name.to_sym }.try(:first)
+          return if virtual_path.nil?
 
-        def self.add_hook_modifier(hook_name, action, options = {}, &block)
-          if block
-            renderer = lambda do |template, locals|
-              template.controller.render_to_string(:inline => yield, :locals => locals)
-            end
+          if block_given?
+            action = "text"
+            content = yield
+            content.gsub!(/["]/, '\\\"')
           else
-            if options.empty?
-              renderer = nil
+            if options.is_a? String
+              action = "partial"
+              content = options
             else
-              renderer = lambda do |template, locals|
-                render_args = [options]
-                if options.is_a?(Hash)
-                  options[:locals] = locals
-                else
-                  render_args << locals
-                end
-                template.render(*render_args)
+              if options.key? :partial
+                action = "partial"
+                content = options[:partial]
+              elsif options.key? :text
+                action = "text"
+                content = options[:text]
+              elsif options.key? :template
+                action = "template"
+                content = options[:template]
               end
             end
           end
-          instance.hook_modifiers << HookModifier.new(hook_name, action, renderer)
+          content ||= ""
+
+          override = %Q{Deface::Override.new(:virtual_path => "#{virtual_path}",
+                     :name => "converted_#{hook_name}_#{rand(1000000000)}",
+                     :#{target} => "[data-hook='#{hook_name}'], ##{hook_name}[data-hook]",
+                     :#{action} => "#{content}",
+                     :disabled => false)}
+
+          warn "[DEPRECATION] `#{target}` hook method is deprecated, replace hook call with: \n#{override}\n"
+          eval override
         end
 
+        def self.migratable_hooks
+          {
+            'shared/_user_form' => [:signup_below_password_fields],
+            'user_registrations/new' => [:signup, :signup_inside_form, :login_extras],
+            'user_sessions/new' => [:login, :login_extras],
+            'users/show' => [:account_summary, :account_my_orders],
+            'admin/overview/index' => [:admin_dashboard, :admin_dashboard_left, :admin_dashboard_center, :admin_dashboard_right, :admin_dashboard_welcome ],
+            'admin/configurations/index' => [:admin_configurations_menu],
+            'admin/mail_methods/index' => [:admin_mail_methods_index_headers, :admin_mail_methods_index_header_actions,
+                                           :admin_mail_methods_index_rows, :admin_mail_methods_index_row_actions],
+            'admin/orders/_form' => [:admin_order_form_line_items_headers, :admin_order_form_line_items_header_actions,
+                                    :admin_order_form_subtotal, :admin_order_form_adjustments, :admin_order_form_total, :admin_order_form_buttons],
+            'admin/orders/_line_item' => [:admin_order_form_line_item_row, :admin_order_form_line_item_actions],
+            'admin/orders/edit' => [:admin_order_edit_buttons, :admin_order_edit_header, :admin_order_edit_form],
+            'admin/orders/index' => [:admin_orders_index_headers, :admin_orders_index_header_actions, :admin_orders_index_rows, :admin_orders_index_row_actions,
+                                     :admin_orders_index_search, :admin_orders_index_search_buttons],
+            'admin/orders/new' => [:admin_order_new_header, :admin_order_new_form],
+            'admin/orders/show' => [:admin_order_show_buttons, :admin_order_show_addresses, :admin_order_show_details],
+            'admin/payment_methods/index' => [:admin_payment_methods_index_headers, :admin_payment_methods_index_header_actions,
+                                              :admin_payment_methods_index_rows, :admin_payment_methods_index_row_actions],
+            'admin/product_scopes/_form' => [:admin_product_form_left, :admin_product_form_right, :admin_product_form_meta, :admin_product_form_additional_fields],
+            'admin/products/_form' => [:admin_product_form_left, :admin_product_form_right, :admin_product_form_meta, :admin_product_form_additional_fields],
+            'admin/products/index' => [:admin_products_index_headers, :admin_products_index_header_actions, :admin_products_index_rows, :admin_products_index_search,
+                                       :admin_products_index_row_actions, :admin_products_sidebar, :admin_products_index_search_buttons],
+            'admin/shared/_configuration_menu' => [:admin_configurations_sidebar_menu],
+            'admin/shared/_order_tabs' => [:admin_order_tabs],
+            'admin/shared/_product_sub_menu' => [:admin_product_sub_tabs],
+            'admin/shared/_product_tabs' => [:admin_product_tabs],
+            'admin/shipments/_form' => [:admin_shipment_form_inventory_units, :admin_shipment_form_address, :admin_shipment_form_details],
+            'admin/shipments/edit' => [:admin_shipment_edit_buttons, :admin_shipment_edit_header, :admin_shipment_edit_form, :admin_shipment_edit_form_buttons],
+            'admin/shipments/index' => [:admin_shipments_index_headers, :admin_shipments_index_header_actions, :admin_shipments_index_rows,
+                                        :admin_shipments_index_row_actions],
+            'admin/shipments/new' => [:admin_shipment_new_header, :admin_shipment_new_form, :admin_shipment_new_form_buttons],
+            'admin/shipping_methods/_form' => [:admin_shipping_method_form_fields, :admin_shipping_method_form_calculator_fields],
+            'admin/shipping_methods/edit' => [:admin_shipping_method_edit_form_header, :admin_shipping_method_edit_form, :admin_shipping_method_edit_form_buttons],
+            'admin/shipping_methods/index' => [:admin_shipping_methods_index_headers, :admin_shipping_methods_index_header_actions,
+                                               :admin_shipping_methods_index_rows, :admin_shipping_methods_index_row_actions],
+            'admin/shipping_methods/new' => [:admin_shipping_method_new_form_header, :admin_shipping_method_new_form, :admin_shipping_method_new_form_buttons],
+            'admin/taxonomies/_form' => [:admin_inside_taxonomy_form],
+            'admin/taxons/_form' => [:admin_inside_taxon_form],
+            'admin/trackers/_form' => [:additional_tracker_fields],
+            'admin/trackers/index' => [:admin_trackers_index_headers, :admin_trackers_index_rows],
+            'admin/users/_form' => [:admin_user_form_fields, :admin_user_form_roles],
+            'admin/users/edit' => [:admin_user_edit_form_header, :admin_user_edit_form, :admin_user_edit_form_button],
+            'admin/users/index' => [:admin_users_index_headers, :admin_users_index_header_actions, :admin_users_index_rows, :admin_users_index_row_actions,
+                                    :admin_users_index_search, :admin_users_index_search_buttons],
+            'admin/users/new' => [:admin_user_new_form_header, :admin_user_new_form, :admin_user_new_form_buttons],
+            'admin/variants/edit' => [:admin_variant_edit_form],
+            'admin/variants/new' => [:admin_variant_new_form],
+            'checkout/_payment' => [:checkout_payment_step, :coupon_code_field],
+            'checkout/edit' => [:checkout_summary_box],
+            'layouts/admin' => [:admin_inside_head, :admin_login_navigation_bar, :admin_tabs, :admin_footer_scripts],
+            'layouts/spree_application' => [:inside_head, :sidebar],
+            'orders/_form' => [:cart_items_headers],
+            'orders/_line_item' => [:cart_item_image, :cart_item_description, :cart_item_price, :cart_item_quantity, :cart_item_total, :cart_item_delete],
+            'orders/edit' => [:empty_cart, :outside_cart_form, :inside_cart_form, :cart_items],
+            'products/_cart_form' => [:inside_product_cart_form, :product_price],
+            'products/_taxons' => [:product_taxons],
+            'products/index' => [:homepage_sidebar_navigation, :search_results, :homepage_products],
+            'products/show' => [:product_images, :product_description, :product_properties, :cart_form],
+            'shared/_basic_layout' => [:sidebar],
+            'shared/_products' => [:products_list_item],
+            'shared/_footer' => [:footer_left, :footer_right],
+            'shared/_nav_bar' => [:shared_login_bar],
+            'shared/_order_details' => [:order_details_line_items_headers, :order_details_line_item_row, :order_details_subtotal, :order_details_adjustments,
+                                       :order_details_total],
+            'taxons/show' => [:taxon_sidebar_navigation, :taxon_products, :taxon_children]
+          }
+        end
     end
 
   end

data/lib/spree_core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "0.60.6"
+    "0.70.RC1"
   end
 end

data/lib/subclass_registration.rb

@@ -0,0 +1,21 @@
+module SubclassRegistration
+  extend ActiveSupport::Concern
+
+  included do
+    cattr_accessor :registered_classes
+    self.registered_classes = []
+  end
+
+  module ClassMethods
+
+    def register
+      registered_classes << self
+    end
+
+    def registered_class_names
+      registered_classes.map(&:name)
+    end
+
+  end
+
+end