spree 0.9.4 → 0.10.0.beta

data/lib/spree/theme_support/hook_listener.rb

@@ -0,0 +1,68 @@
+module Spree
+  module ThemeSupport
+
+    # Listener class used for views hooks.
+    class HookListener
+      include Singleton
+
+      attr_accessor :hook_modifiers
+
+      def initialize
+        @hook_modifiers = []
+      end
+
+      def modifiers_for_hook(hook_name)
+        hook_modifiers.select{|hm| hm.hook_name == hook_name}
+      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)
+      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)
+      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)
+      end
+
+      # Clear contents of hook_name
+      def self.remove(hook_name)
+        add_hook_modifier(hook_name, :replace)
+      end
+
+
+      private
+
+        def self.add_hook_modifier(hook_name, action, options = {}, &block)
+          if block
+            renderer = lambda do |template, locals|
+              template.render(:inline => yield, :locals => locals)
+            end
+          else
+            if options.empty?
+              renderer = nil
+            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)
+              end
+            end
+          end
+          instance.hook_modifiers << HookModifier.new(hook_name, action, renderer)
+        end
+
+    end
+
+  end
+end

data/lib/spree/theme_support/hook_modifier.rb

@@ -0,0 +1,35 @@
+module Spree
+  module ThemeSupport
+
+    # A hook modifier is created for each usage of 'insert_before','replace' etc.
+    # This stores how the original contents of the hook should be modified
+    # and does the work of altering the hooks content appropriately
+    class HookModifier
+      attr_accessor :hook_name
+      attr_accessor :action
+      attr_accessor :renderer
+
+      def initialize(hook_name, action, renderer = nil)
+        @hook_name = hook_name
+        @action = action
+        @renderer = renderer
+      end
+
+      def apply_to(content, context, locals = {})
+        return '' if renderer.nil?
+        case action
+        when :insert_before
+          "#{renderer.call(context, locals)}#{content}"
+        when :insert_after
+          "#{content}#{renderer.call(context, locals)}"
+        when :replace
+          renderer.call(context, locals).to_s
+        else
+          ''
+        end
+      end
+
+    end
+
+  end
+end

data/lib/spree/theme_support/more_patches.rb

@@ -0,0 +1,117 @@
+# Patches for the 'more' plugin which adds LessCSS Support to Rails
+# We need more to be able to load stylesheets from app/stylesheets in
+# each extension then write them to the same destination. Where stylesheets
+# of the same name exist in different extensions, the file in the last 
+# extension to be loaded takes precedence allowing them to be overriden
+# in the same manner as views
+
+class Less::More
+  
+  class << self
+
+    def source_paths
+      @source_paths || [source_path]
+    end
+    def source_paths=(paths_array)
+      @source_paths = paths_array.map{|p| Pathname.new(p.to_s)}
+    end
+
+    # Override because this method would only generate if .css file didnt exist for path_as_array
+    # and we want to force re-compilation of a less file, overwriting css
+    def generate(path_as_array)
+      source = pathname_from_array(path_as_array)
+      if source.extname == ".css"
+        css = File.read(source)
+      else
+        css = generate_css(source)
+      end
+      css
+    end
+    
+    def generate_css(source)
+      engine = File.open(source) {|f| Less::Engine.new(f) }
+      css = engine.to_css
+      css.delete!("\n") if self.compression?
+      css = (HEADER % [source.to_s]) << css if self.header?
+      css
+    end
+
+
+    # If .less file, compile CSS for same directory as a cache
+    def compile(path_as_array)
+      source = pathname_from_filename(path_as_array.to_s + '.less')
+      return if source.nil?
+      unless source.extname == ".css"
+        destination = Pathname.new(source.to_s.gsub(/.less$/, '.css'))
+
+        if !File.exists?(destination) || source.mtime > destination.mtime
+          css = Less::More.generate_css(source)
+          if page_cache?
+            File.open(destination, "w") {|f|
+              f.puts css
+            }
+          end
+        end
+      end
+    end
+    
+
+    # Array of Pathname instances for all the less source files.
+    def all_less_files
+      #Dir[Less::More.source_path.join("**", "*.{css,less,lss}")].map! {|f| Pathname.new(f) }
+      source_paths.map do |pathname|
+        all_less_files_in_path(pathname)
+      end.flatten
+    end
+    
+    def all_less_files_in_path(pathname)
+      Dir[pathname.join("**", "*.{css,less,lss}").to_s].map! {|f| Pathname.new(f) }
+    end
+
+
+    # Generates all the .css files.
+    # Override to iterate through all source paths
+    def parse
+      source_paths.reverse.each do |source_path|
+        Less::More.all_less_files_in_path(source_path).each do |path|
+          # Get path
+          relative_path = path.relative_path_from(source_path)
+          path_as_array = relative_path.to_s.split(File::SEPARATOR)
+          path_as_array[-1] = File.basename(path_as_array[-1], File.extname(path_as_array[-1]))
+
+          # Generate CSS
+          css = Less::More.generate(path_as_array)
+
+          # Store CSS
+          path_as_array[-1] = path_as_array[-1] + ".css"
+          destination = Pathname.new(File.join(Rails.root, "public", Less::More.destination_path)).join(*path_as_array)
+          destination.dirname.mkpath
+
+          File.open(destination, "w") {|f|
+            f.puts css
+          }
+        end
+      end
+    end
+
+    # Override to look in each of the source paths. Return pathname for first source path that contains this file
+    def pathname_from_array(array)
+      path_spec = array.dup
+      path_spec[-1] = path_spec[-1] + ".{css,less,lss}"
+      self.source_paths.map do |source_path|
+        Pathname.glob(File.join(source_path.to_s, *path_spec))[0]
+      end.compact.first
+    end
+
+    # Find pathname for specific filename in each of the source paths
+    def pathname_from_filename(filename)
+      self.source_paths.map do |source_path|
+        Pathname.glob(File.join(source_path.to_s, filename))[0]
+      end.compact.first
+    end  
+
+  end
+
+end
+
+$LESS_LOAD_PATH = Less::More.source_paths = Spree::ExtensionLoader.stylesheet_source_paths.reverse

data/lib/tasks/database.rake

@@ -1,4 +1,5 @@
 require 'active_record'              
+require 'custom_fixtures'
 
 namespace :db do
   desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
@@ -25,31 +26,66 @@ namespace :db do
     desc "Create admin username and password"
     task :create => :environment do
       require 'authlogic'     
-      Spree::Setup.create_admin_user      
+      require "#{SPREE_ROOT}/db/sample/users.rb" 
     end
   end
-  
-  desc 'Create the database, load the schema, and initialize with the seed data'  
-  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]         
 
-  desc 'Load the sample fixture data from db/sample'  
-  task :sample => :environment do  
-    require 'spree/setup'
-    Spree::Setup.load_sample_data
+  desc "Loading db/sample for spree and each extension"
+  task :sample => :environment do   # an invoke will not execute the task after defaults has already executed it
+    Rake::Task["db:load_dir"].execute( Rake::TaskArguments.new([:dir],  ["sample" ]) ) 
+    puts "Sample data has been loaded"
+  end
+
+  desc "Loading file for spree and each extension where you specify dir by rake db:load_file[filename.rb]"
+  task :load_file , [:file] => :environment do |t , args|
+    file = args.file
+    ext = File.extname file
+    if ext == ".csv" or ext == ".yml"
+      puts "loading fixture " + file
+      Fixtures.create_fixtures(File.dirname(file) , File.basename(file, '.*') )
+    else
+      if File.exists? file
+        puts "loading ruby    " + file 
+        require file
+      end
+    end
   end
+
+  desc "Dump a class to YML, give class name in square brackets, use rake -s for silent"
+  task :dump , [:clazz]  => :environment do  |t , args|
+    clazz = eval(args.clazz)
+    objects = {}
+    clazz.find( :all ).each do |obj|
+      attributes = obj.attributes
+      attributes.delete("created_at")   
+      attributes.delete("updated_at")   
+      name = attributes["name"] 
+      unless name
+        name = args.clazz 
+        name = name +   "_" + attributes["id"].to_s if attributes["id"]
+      end
+      name = name.gsub( " " , "_")
+      objects[name] = attributes
+    end
+    puts objects.to_yaml
+  end
+
+  desc 'Create the database, load the schema, and initialize with the seed data'  
+  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]         
     
-  desc "Bootstrap your database for Spree."
+  desc "Bootstrap is: migrating, loading defaults, sample data and seeding (for all extensions) invoking create_admin and load_products tasks"
   task :bootstrap  => :environment do
-    require 'highline/import'       
-    require 'authlogic'     
+    require 'highline/import' 
+    require 'authlogic'
 
     # remigrate unless production mode (as saftey check)
     if %w[demo development test].include? RAILS_ENV 
       if ENV['AUTO_ACCEPT'] or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
         ENV['SKIP_NAG'] = 'yes'
         Rake::Task["db:remigrate"].invoke
+        puts "remigrate"
       else
-        say "Task cancelled."
+        say "Task cancelled, exiting."
         exit
       end
     else 
@@ -57,16 +93,20 @@ namespace :db do
       Rake::Task["db:migrate"].invoke
     end
     
-    require 'spree/setup'
-    
-    attributes = {}
-    if ENV['AUTO_ACCEPT']
-      attributes = {
-        :admin_password => "spree",
-        :admin_email => "spree@example.com"          
-      }
+    load_defaults  = Country.count == 0
+    unless load_defaults    # ask if there are already Countries => default data hass been loaded
+      load_defaults = agree('Countries present, load sample data anyways? [y]: ')
     end
+    Rake::Task["db:seed"].invoke if load_defaults
     
-    Spree::Setup.bootstrap attributes
+    if RAILS_ENV == 'production' and Product.count > 0
+      load_sample = agree("WARNING: In Production and products exist in database, load sample data anyways? [y]:" )
+    else
+      load_sample = true if ENV['AUTO_ACCEPT'] 
+      load_sample = agree('Load Sample Data? [y]: ') unless load_sample    
+    end
+    Rake::Task["db:sample"].invoke if load_sample
+
+    puts "Bootstrap Complete.\n\n"
   end
 end

data/lib/tasks/extensions.rake

@@ -1,5 +1,6 @@
 require 'rake/testtask'
 require 'spree/extension'
+require 'custom_fixtures'
 
 namespace :db do
   desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
@@ -8,20 +9,56 @@ namespace :db do
     version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
     # spree 
     ActiveRecord::Migrator.migrate("#{SPREE_ROOT}/db/migrate/", version)
-    # extensions
+    # core extensions
     Spree::Extension.descendants.select{|ext| ext.root.starts_with?(SPREE_ROOT)}.each do |extension|
       ActiveRecord::Migrator.migrate("#{extension.root}/db/migrate/", version)
-    end    
-    Spree::Extension.descendants.select{|ext| !ext.root.starts_with?(SPREE_ROOT)}.each do |extension|
+    end
+    # rest of extensions (except site)    
+    Spree::Extension.descendants.select{|ext| !ext.root.starts_with?(SPREE_ROOT) and not ext.name == "SiteExtension" }.each do |extension|
       ActiveRecord::Migrator.migrate("#{extension.root}/db/migrate/", version)
     end    
-    
+    # everything else (basically the site extension if any)
     Spree::Extension.descendants.each do |extension|
       ActiveRecord::Migrator.migrate("#{extension.root}/db/migrate/", version)
     end    
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
+  desc "Loading db/loadfrom for spree and each extension where you specify dir by rake db:load_dir[loadfrom]"
+  task :load_dir , [:dir] => :environment do |t , args|
+    dir = args.dir
+    fixtures = ActiveSupport::OrderedHash.new  
+    ruby_files = ActiveSupport::OrderedHash.new
+    unless ENV['SKIP_CORE'] and dir == "sample"
+      Dir.glob(File.join(SPREE_ROOT, "db", dir , '*.{yml,csv,rb}')).each do |fixture_file|
+        ext = File.extname fixture_file
+        if ext == ".rb"
+          ruby_files[File.basename(fixture_file, '.*')]  = fixture_file
+        else
+          fixtures[File.basename(fixture_file, '.*')]  = fixture_file
+        end
+      end
+    end
+    Spree::ExtensionLoader.instance.db_paths(dir).each do |dir|
+      Dir.glob(File.join(dir, '*.{yml,csv,rb}')).each do |fixture_file|
+        ext = File.extname fixture_file
+        if ext == ".rb"
+          ruby_files[File.basename(fixture_file, '.*')]  = fixture_file
+        else
+          fixtures[File.basename(fixture_file, '.*')]  = fixture_file
+        end
+      end
+    end
+    fixtures.sort.each do |fixture , fixture_file|
+      # an invoke will only execute the task once
+      Rake::Task["db:load_file"].execute( Rake::TaskArguments.new([:file], [fixture_file]) )
+    end
+    ruby_files.sort.each do |fixture , ruby_file|
+      # an invoke will only execute the task once
+      Rake::Task["db:load_file"].execute( Rake::TaskArguments.new([:file], [ruby_file]) )
+    end
+  end
+
   namespace :migrate do
     desc  'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x'
     task :redo => [ 'db:rollback', 'db:migrate' ]
@@ -96,10 +133,7 @@ namespace :db do
 
 end
 
-namespace :spec do
-  desc "Runs specs on all available extensions in the current /vendor/extensions directory, pass EXT=extension_name to test a single extension"
-  task :extensions => "db:test:prepare" do
-    
+def find_extension_roots
     current_extensions_path = File.join(File.expand_path(Dir.pwd), 'vendor/extensions')
     all_extension_names = Spree::Extension.descendants
     all_extension_names.collect!{ |x| x.extension_name.tr(' ', '').underscore }
@@ -119,6 +153,14 @@ namespace :spec do
         puts "Sorry, that extension is not installed."
       end
     end
+    extension_roots
+end
+
+namespace :spec do
+  desc "Runs specs on all available extensions in the current /vendor/extensions directory, pass EXT=extension_name to test a single extension"
+  task :extensions => "db:test:prepare" do
+    result = 0
+    extension_roots = find_extension_roots
     extension_roots.each do |directory|
       if File.directory?(File.join(directory, 'spec'))
         chdir directory do
@@ -127,13 +169,67 @@ namespace :spec do
           else
             system "rake spec SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
           end
+          result += $?.exitstatus
+        end
+      end
+    end
+    raise "Extension specs failed" if result != 0
+  end
+end
+
+
+namespace :extensions do
+  namespace :test do
+    desc "Runs functional tests on all available extensions in the current /vendor/extensions directory, pass EXT=extension_name to test a single extension"
+    task :functionals => "db:test:prepare" do
+      result = 0
+      extension_roots = find_extension_roots
+      extension_roots.each do |directory|
+        if File.directory?(File.join(directory, 'test/functional'))
+          chdir directory do
+            system "rake test:functionals SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            result += $?.exitstatus
+          end
         end
       end
+      raise "Extension functional tests failed" if result != 0
     end
+
+    desc "Runs unit tests on all available extensions in the current /vendor/extensions directory, pass EXT=extension_name to test a single extension"    
+    task :units => "db:test:prepare" do
+      result = 0
+      extension_roots = find_extension_roots
+      extension_roots.each do |directory|
+        if File.directory?(File.join(directory, 'test/unit'))
+          chdir directory do
+            system "rake test:units SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            result += $?.exitstatus
+          end
+        end
+      end
+      raise "Extension unit tests failed" if result != 0
+    end 
+          
   end
+
+    desc "Runs all tests on all available extensions in the current /vendor/extensions directory, pass EXT=extension_name to test a single extension"   
+    task :test => "db:test:prepare" do
+      result = 0
+      extension_roots = find_extension_roots
+      extension_roots.each do |directory|
+        if File.directory?(File.join(directory, 'test'))
+          chdir directory do
+            system "rake test SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            result += $?.exitstatus
+          end
+        end
+      end
+      raise "Extension tests failed" if result != 0
+    end  
+  
 end
 
 # Load any custom rakefiles from extensions
 [RAILS_ROOT, SPREE_ROOT].uniq.each do |root|
   Dir[root + '/vendor/extensions/*/lib/tasks/*.rake'].sort.each { |ext| load ext }
-end
+end