spree 0.8.5 → 0.9.0

data/db/sample/shipping_methods.yml

@@ -1,16 +1,9 @@
 ups_ground:
   name: UPS Ground
-  zone: available_shipping
-  shipping_calculator: Spree::FlatRateShipping::Calculator
+  zone_id: 2
 ups_two_day:
   name: UPS Two Day
-  zone: available_shipping
-  shipping_calculator: Spree::FlatRateShipping::Calculator
+  zone_id: 2
 ups_one_day:
   name: UPS One Day
-  zone: available_shipping
-  shipping_calculator: Spree::FlatRateShipping::Calculator
-one_option:
-  name: Only one option
-  zone: one_ship_option
-  shipping_calculator: Spree::FlatRateShipping::Calculator
+  zone_id: 2

data/db/sample/variants.yml

@@ -48,35 +48,48 @@ xlarge-green-baseball:
   option_values: xl, red
   sku: ROR-00010
   price: 21.99
+ror_baseball_jersey:
+  product: ror_baseball_jersey
+  sku: ROR-001
+  price: 19.99
+  is_master: true
 ror_tote_v:
   product: ror_tote
   sku: ROR-00011
   price: 15.99
+  is_master: true
 ror_bag_v:
   product: ror_bag
   sku: ROR-00012
   price: 22.99
+  is_master: true
 ror_jr_spaghetti_v:
   product: ror_jr_spaghetti
   sku: ROR-00013
   price: 19.99  
+  is_master: true
 ror_mug_v:
   product: ror_mug  
   sku: ROR-00014
   price: 13.99
+  is_master: true
 ror_ringer_v:
   product: ror_ringer  
   sku: ROR-00015
   price: 17.99
+  is_master: true
 ror_stein_v:
   product: ror_stein  
   sku: ROR-00016
   price: 16.99
+  is_master: true
 apache_baseball_v:
   product: apache_baseball_jersey
   sku: APC-00001
   price: 19.99
+  is_master: true
 ruby_baseball_v:
   product: ruby_baseball_jersey
   sku: RUB-00001
   price: 19.99
+  is_master: true

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20090427000000) do
+ActiveRecord::Schema.define(:version => 20090908141056) do
 
   create_table "addresses", :force => true do |t|
     t.string   "firstname"
@@ -24,6 +24,20 @@ ActiveRecord::Schema.define(:version => 20090427000000) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "state_name"
+    t.string   "alternative_phone"
+  end
+
+  create_table "adjustments", :force => true do |t|
+    t.integer  "order_id"
+    t.string   "type"
+    t.decimal  "amount",                 :precision => 8, :scale => 2, :default => 0.0, :null => false
+    t.string   "description"
+    t.integer  "position"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "adjustment_source_id"
+    t.string   "adjustment_source_type"
+    t.string   "secondary_type"
   end
 
   create_table "assets", :force => true do |t|
@@ -35,6 +49,27 @@ ActiveRecord::Schema.define(:version => 20090427000000) do
     t.integer  "position"
     t.string   "type"
     t.datetime "attachment_updated_at"
+    t.integer  "attachment_width"
+    t.integer  "attachment_height"
+  end
+
+  create_table "calculators", :force => true do |t|
+    t.string   "type"
+    t.integer  "calculable_id",                   :null => false
+    t.string   "calculable_type", :default => "", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "checkouts", :force => true do |t|
+    t.integer  "order_id"
+    t.string   "email"
+    t.string   "ip_address"
+    t.text     "special_instructions"
+    t.integer  "bill_address_id"
+    t.datetime "completed_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "configurations", :force => true do |t|
@@ -54,10 +89,21 @@ ActiveRecord::Schema.define(:version => 20090427000000) do
     t.integer "numcode"
   end
 
+  create_table "coupons", :force => true do |t|
+    t.string   "code"
+    t.string   "description"
+    t.integer  "usage_limit"
+    t.boolean  "combine"
+    t.datetime "expires_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.datetime "starts_at"
+  end
+
   create_table "creditcard_txns", :force => true do |t|
     t.integer  "creditcard_payment_id"
     t.decimal  "amount",                :precision => 8, :scale => 2, :default => 0.0, :null => false
-    t.string   "txn_type"
+    t.integer  "txn_type"
     t.string   "response_code"
     t.text     "avs_response"
     t.text     "cvv_response"
@@ -66,7 +112,6 @@ ActiveRecord::Schema.define(:version => 20090427000000) do
   end
 
   create_table "creditcards", :force => true do |t|
-    t.integer  "order_id"
     t.text     "number"
     t.string   "month"
     t.string   "year"
@@ -77,11 +122,13 @@ ActiveRecord::Schema.define(:version => 20090427000000) do
     t.string   "last_name"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "start_month"
+    t.string   "start_year"
+    t.string   "issue_number"
     t.integer  "address_id"
+    t.integer  "checkout_id"
   end
 
-  add_index "creditcards", ["order_id"], :name => "index_creditcards_on_order_id"
-
   create_table "gateway_configurations", :force => true do |t|
     t.integer  "gateway_id"
     t.datetime "created_at"
@@ -165,24 +212,17 @@ ActiveRecord::Schema.define(:version => 20090427000000) do
 
   create_table "orders", :force => true do |t|
     t.integer  "user_id"
-    t.string   "number",               :limit => 15
-    t.decimal  "ship_amount",                        :precision => 8, :scale => 2, :default => 0.0, :null => false
-    t.decimal  "tax_amount",                         :precision => 8, :scale => 2, :default => 0.0, :null => false
-    t.decimal  "item_total",                         :precision => 8, :scale => 2, :default => 0.0, :null => false
-    t.decimal  "total",                              :precision => 8, :scale => 2, :default => 0.0, :null => false
-    t.string   "ip_address"
-    t.text     "special_instructions"
+    t.string   "number",           :limit => 15
+    t.decimal  "item_total",                     :precision => 8, :scale => 2, :default => 0.0, :null => false
+    t.decimal  "total",                          :precision => 8, :scale => 2, :default => 0.0, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "state"
-    t.boolean  "checkout_complete"
     t.string   "token"
-    t.string   "email"
-    t.integer  "bill_address_id"
-    t.integer  "ship_address_id"
+    t.decimal  "adjustment_total",               :precision => 8, :scale => 2, :default => 0.0, :null => false
+    t.decimal  "credit_total",                   :precision => 8, :scale => 2, :default => 0.0, :null => false
   end
 
-  add_index "orders", ["checkout_complete"], :name => "index_orders_on_checkout_complete"
   add_index "orders", ["number"], :name => "index_orders_on_number"
 
   create_table "payments", :force => true do |t|
@@ -224,9 +264,8 @@ ActiveRecord::Schema.define(:version => 20090427000000) do
   end
 
   create_table "products", :force => true do |t|
-    t.string   "name",                                               :default => "", :null => false
+    t.string   "name",                 :default => "", :null => false
     t.text     "description"
-    t.decimal  "master_price",         :precision => 8, :scale => 2
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "permalink"
@@ -269,6 +308,11 @@ ActiveRecord::Schema.define(:version => 20090427000000) do
     t.datetime "updated_at"
   end
 
+  create_table "queued_mails", :force => true do |t|
+    t.text   "object"
+    t.string "mailer"
+  end
+
   create_table "roles", :force => true do |t|
     t.string "name"
   end
@@ -301,12 +345,16 @@ ActiveRecord::Schema.define(:version => 20090427000000) do
 
   create_table "shipping_methods", :force => true do |t|
     t.integer  "zone_id"
-    t.string   "shipping_calculator"
     t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  create_table "shipping_rates", :force => true do |t|
+    t.integer "shipping_category_id"
+    t.integer "shipping_method_id"
+  end
+
   create_table "state_events", :force => true do |t|
     t.integer  "order_id"
     t.integer  "user_id"
@@ -334,7 +382,6 @@ ActiveRecord::Schema.define(:version => 20090427000000) do
     t.decimal  "amount",          :precision => 8, :scale => 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "tax_type"
     t.integer  "tax_category_id"
   end
 
@@ -373,17 +420,20 @@ ActiveRecord::Schema.define(:version => 20090427000000) do
     t.string   "current_login_ip"
     t.string   "last_login_ip"
     t.string   "login"
+    t.integer  "ship_address_id"
+    t.integer  "bill_address_id"
   end
 
   create_table "variants", :force => true do |t|
     t.integer  "product_id"
-    t.string   "sku",                                      :default => "", :null => false
-    t.decimal  "price",      :precision => 8, :scale => 2,                 :null => false
+    t.string   "sku",                                      :default => "",    :null => false
+    t.decimal  "price",      :precision => 8, :scale => 2,                    :null => false
     t.decimal  "weight",     :precision => 8, :scale => 2
     t.decimal  "height",     :precision => 8, :scale => 2
     t.decimal  "width",      :precision => 8, :scale => 2
     t.decimal  "depth",      :precision => 8, :scale => 2
     t.datetime "deleted_at"
+    t.boolean  "is_master",                                :default => false
   end
 
   add_index "variants", ["product_id"], :name => "index_variants_on_product_id"

data/db/seeds.rb

@@ -1,10 +1,15 @@
+require 'active_record/fixtures'
+  
 def yaml_to_database(fixture, path)
-  require 'active_record/fixtures'
   ActiveRecord::Base.establish_connection(RAILS_ENV)
-  tables = Dir.new(path).entries.select{|e| e =~ /(.+)?\.yml/}.collect{|c| c.split('.').first} 
+  tables = Dir.new(path).entries.select{|e| e =~ /(.+)?\.yml/}.collect{|c| c.split('.').first}
   Fixtures.create_fixtures(path, tables)
 end
 
 # load setup data from seeds
 fixture = "default"
-yaml_to_database(fixture, "#{SPREE_ROOT}/db/#{fixture}")
+directory = "#{SPREE_ROOT}/db/#{fixture}"
+
+puts "loading fixtures from #{directory}"
+yaml_to_database(fixture, directory)
+puts "done."

data/generate

@@ -0,0 +1,4 @@
+Script started on Wed Jul 15 13:22:29 2009
+script: resource: No such file or directory
+
+Script done on Wed Jul 15 13:22:29 2009

data/lib/generators/extension/extension_generator.rb

@@ -18,7 +18,7 @@ class ExtensionGenerator < Rails::Generator::NamedBase
       m.directory "#{extension_path}/db/migrate"
       m.directory "#{extension_path}/db/sample"
       m.directory "#{extension_path}/lib/tasks"
-      m.directory "#{extension_path}/config"
+      m.directory "#{extension_path}/config/initializers"
       m.directory "#{extension_path}/public"
 
       m.template 'README.markdown',              "#{extension_path}/README.markdown"

data/lib/generators/extension/templates/Rakefile

@@ -22,4 +22,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
 end
 
 # Load any custom rakefiles for extension
-Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }
+Dir[File.dirname(__FILE__) + '/lib/tasks/*.rake'].sort.each { |f| require f }

data/lib/generators/extension/templates/extension.rb

@@ -13,6 +13,26 @@ class <%= class_name %> < Spree::Extension
   # end
   
   def activate
-    # admin.tabs.add "<%= extension_name %>", "/admin/<%= file_name %>", :after => "Layouts", :visibility => [:all]
+
+    # Add your extension tab to the admin.
+    # Requires that you have defined an admin controller:
+    # app/controllers/admin/yourextension_controller
+    # and that you mapped your admin in config/routes
+
+    #Admin::BaseController.class_eval do
+    #  before_filter :add_yourextension_tab
+    #
+    #  def add_yourextension_tab
+    #    # add_extension_admin_tab takes an array containing the same arguments expected
+    #    # by the tab helper method:
+    #    #   [ :extension_name, { :label => "Your Extension", :route => "/some/non/standard/route" } ]
+    #    add_extension_admin_tab [ :yourextension ]
+    #  end
+    #end
+
+    # make your helper avaliable in all views
+    # Spree::BaseController.class_eval do
+    #   helper YourHelper
+    # end
   end
-end
+end

data/lib/generators/extension_migration/extension_migration_generator.rb

@@ -16,9 +16,9 @@ class ExtensionMigrationGenerator < Rails::Generator::NamedBase
     []
   end
 
-  #def banner
-  #  "Usage: #{$0} extension_migration ExtensionName MigrationName"
-  #end
+  def banner
+    "Usage: #{$0} extension_migration ExtensionName MigrationName [options]"
+  end
 
   def manifest    
     record do |m|

data/lib/generators/instance/instance_generator.rb

@@ -1,4 +1,4 @@
-#######################################################################################################
+######################################################################################################
 # Substantial portions of this code were adapted from the Radiant CMS project (http://radiantcms.org) #
 #######################################################################################################
 
@@ -102,10 +102,11 @@ class InstanceGenerator < Rails::Generator::Base
 
       # Instance Configurations
       m.file "instance_routes.rb", "config/routes.rb"
+      m.file "../../../../db/seeds.rb", "db/seeds.rb"
       m.template "../../../../config/environment.rb", "config/environment.rb", :assigns => { :app_name => @app_name, :app_secret_key_to_be_replaced_in_real_app_by_generator => secret }
       m.file "../../../../config/boot.rb", "config/boot.rb"
       m.template "session_store.rb", "config/initializers/session_store.rb", :assigns => { :app_name => @app_name, :app_secret_key_to_be_replaced_in_real_app_by_generator => secret }
-      %w{backtrace_silencers inflections locales mime_types new_rails_defaults searchlogic spree compass}.each do |initializer|
+      %w{backtrace_silencers inflections locales mime_types new_rails_defaults paperclip spree compass}.each do |initializer|
         m.file "../../../../config/initializers/#{initializer}.rb", "config/initializers/#{initializer}.rb" 
       end
       m.file "../../../../config/spree_permissions.yml", "config/spree_permissions.yml"
@@ -120,6 +121,7 @@ class InstanceGenerator < Rails::Generator::Base
   
   def after_generate
     Rails::Generator::Scripts::Generate.new.run(%w{extension site}, :destination => "#{@destination_root}/")
+    File.rename("#{@destination_root}/config/initializers/session_store.rb", "#{@destination_root}/vendor/extensions/site/config/initializers/session_store.rb")
     puts File.read("#{@destination_root}/INSTALL") unless options[:pretend]
   end  
 

data/lib/plugins/extension_patches/lib/asset_copy.rb

@@ -1,51 +1,3 @@
-require 'fileutils'
-require 'spree/extension'
-
-module Spree
-  class FileUtilz            
-    # A general purpose method to mirror a directory (+source+) into a destination
-    # directory, including all files and subdirectories. Files will not be mirrored
-    # if they are identical already (checked via FileUtils#identical?).
-    #
-    # Copyright (c) 2008 James Adam (The MIT License)
-    def self.mirror_files(source, destination)
-      return unless File.directory?(source)
-    
-      # TODO: use Rake::FileList#pathmap?    
-      source_files = Dir[source + "/**/*"]
-      source_dirs = source_files.select { |d| File.directory?(d) }
-      source_files -= source_dirs
-    
-      unless source_files.empty?
-        base_target_dir = File.join(destination)
-        FileUtils.mkdir_p(base_target_dir)
-      end
-    
-      source_dirs.each do |dir|
-        # strip down these paths so we have simple, relative paths we can
-        # add to the destination
-        target_dir = File.join(destination, dir.gsub(source, ''))
-        begin        
-          FileUtils.mkdir_p(target_dir)
-        rescue Exception => e
-          raise "Could not create directory #{target_dir}: \n" + e
-        end
-      end
-    
-      source_files.each do |file|
-        begin
-          target = File.join(destination, file.gsub(source, ''))
-          unless File.exist?(target) && FileUtils.identical?(file, target)
-            FileUtils.cp(file, target)
-          end 
-        rescue Exception => e
-          raise "Could not copy #{file} to #{target}: \n" + e 
-        end
-      end  
-    end   
-  end
-end
-
 # copy the assets from extensions public dir into #{RAILS_ROOT}/public
 destination = "#{RAILS_ROOT}/public"
 paths_to_mirror = Spree::ExtensionLoader.instance.load_extension_roots
@@ -61,5 +13,4 @@ paths_to_mirror.each do |extension_path|
       nil
     end
   end
-end  
-
+end

data/lib/plugins/monkey_patches/lib/monkey_patches.rb

@@ -39,8 +39,8 @@ end
 #
 class ActionView::Helpers::FormBuilder
   
-  def label(method, text = nil)
-    @template.label(@object_name,method,text)
+  def label(method, text = nil, options={})
+    @template.label(@object_name,method,text,options)
   end
 
   def field_container(method, options = {}, &block)