spree 0.0.9 → 0.2.0

data/lib/tasks/database.rake

@@ -5,7 +5,9 @@ namespace :db do
   desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
   task :remigrate => :environment do
     require 'highline/import'
-    if ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+    if ENV['SKIP_NAG'] or ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+
+      ENV['SKIP_NAG'] = 'yes'
       
       # Migrate downward
       ActiveRecord::Migrator.migrate("#{SPREE_ROOT}/db/migrate/", 0)
@@ -22,14 +24,37 @@ namespace :db do
   end
   
   desc "Bootstrap your database for Spree."
-  task :bootstrap => :remigrate do
-    require 'spree/setup'
-    Spree::Setup.bootstrap(
-      :admin_name => ENV['ADMIN_NAME'],
-      :admin_username => ENV['ADMIN_USERNAME'],
-      :admin_password => ENV['ADMIN_PASSWORD'],
-      :admin_email => ENV['ADMIN_EMAIL'],
-      :database_template => ENV['DATABASE_TEMPLATE']
-    )
+  task :bootstrap  do
+    require 'highline/import'
+    if ENV['AUTO_ACCEPT'] or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
+      # Migrate downward
+      ENV['SKIP_NAG'] = 'yes'
+      Rake::Task["db:migrate:extensions:zero"].invoke
+      ActiveRecord::Migrator.migrate("#{SPREE_ROOT}/db/migrate/", 0)
+
+      # Migrate upward 
+      ActiveRecord::Migrator.migrate("#{SPREE_ROOT}/db/migrate/")
+      Rake::Task["db:migrate:extensions"].invoke    
+    
+      # Dump the schema
+      Rake::Task["db:schema:dump"].invoke
+
+      require 'spree/setup'
+      
+      attributes = {}
+      if ENV['AUTO_ACCEPT']
+        attributes = {
+          :admin_name => "Administrator", 
+          :admin_username => "admin",
+          :admin_password => "spree",
+          :admin_email => "admin@example.com"          
+        }
+      end
+      
+      Spree::Setup.bootstrap attributes
+    else
+      say "Task cancelled."
+      exit
+    end
   end
 end

data/lib/tasks/extensions.rake

@@ -0,0 +1,104 @@
+require 'rake/testtask'
+
+namespace :db do
+  namespace :migrate do
+    desc "Run all Spree extension migrations"
+    task :extensions => :environment do
+      require 'spree/extension_migrator'
+      Spree::ExtensionMigrator.migrate_extensions
+    end
+  end
+
+  namespace :remigrate do
+    desc "Migrate down and back up all Spree extension migrations"
+    task :extensions => :environment do
+      require 'highline/import'
+      # skip the prompt if we're here as the result of db:bootstrap
+      if ENV['SKIP_NAG'] or agree("This task will destroy any data stored by extensions in the database. Are you sure you want to \ncontinue? [yn] ")
+        ENV['SKIP_NAG'] = 'yes'
+        Rake::Task['db:migrate:extensions:zero'].invoke
+        Rake::Task['db:migrate:extensions'].invoke
+      end
+    end
+  end
+end
+
+namespace :db do
+  namespace :migrate do
+    namespace :extensions do
+      desc "Migrate all Spree extensions back down to VERSION=0."
+      task :zero => :environment do
+        begin 
+          problem = false
+          # this will cause an exception if there is no schema info 
+          ActiveRecord::Migrator.current_version
+        rescue
+          # ignore problems - presumably schema is just missing b/c this is the first time running bootstrap
+          problem = true
+        end
+        
+        unless problem
+          require 'highline/import'
+          # skip the prompt if we're here as the result of db:bootstrap
+          if ENV['SKIP_NAG'] or agree("This task will destroy any data stored by extensions in the database. Are you sure you want to \ncontinue? [yn] ")
+            require 'spree/extension_migrator'     
+            Spree::Extension.descendants.map(&:migrator).each {|m| m.migrate(0) }
+          end
+        end
+      end
+    end
+  end
+end
+
+namespace :test do
+  desc "Runs tests on all available Spree extensions, pass EXT=extension_name to test a single extension"
+  task :extensions => "db:test:prepare" do
+    extension_roots = Spree::Extension.descendants.map(&:root)
+    if ENV["EXT"]
+      extension_roots = extension_roots.select {|x| /\/(\d+_)?#{ENV["EXT"]}$/ === x }
+      if extension_roots.empty?
+        puts "Sorry, that extension is not installed."
+      end
+    end
+    extension_roots.each do |directory|
+      if File.directory?(File.join(directory, 'test'))
+        chdir directory do
+          if RUBY_PLATFORM =~ /win32/
+            system "rake.cmd test SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+          else
+            system "rake test SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+          end
+        end
+      end
+    end
+  end
+end
+
+namespace :spec do
+  desc "Runs specs on all available Spree extensions, pass EXT=extension_name to test a single extension"
+  task :extensions => "db:test:prepare" do
+    extension_roots = Spree::Extension.descendants.map(&:root)
+    if ENV["EXT"]
+      extension_roots = extension_roots.select {|x| /\/(\d+_)?#{ENV["EXT"]}$/ === x }
+      if extension_roots.empty?
+        puts "Sorry, that extension is not installed."
+      end
+    end
+    extension_roots.each do |directory|
+      if File.directory?(File.join(directory, 'spec'))
+        chdir directory do
+          if RUBY_PLATFORM =~ /win32/
+            system "rake.cmd spec SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+          else
+            system "rake spec SPREE_ENV_FILE=#{RAILS_ROOT}/config/environment"
+          end
+        end
+      end
+    end
+  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

data/lib/tasks/framework.rake

@@ -0,0 +1,41 @@
+# Only define freeze and unfreeze tasks in instance mode
+#unless File.directory? "#{RAILS_ROOT}/app"
+  namespace :spree do
+    namespace :freeze do
+      desc "Lock this application to the current gems (by unpacking them into vendor/spree)"
+      task :gems do
+        require 'rubygems'
+        require 'rubygems/gem_runner'
+        Gem.manage_gems
+
+        spree = (version = ENV['VERSION']) ?
+          Gem.cache.search('spreee', "= #{version}").first :
+          Gem.cache.search('spree').sort_by { |g| g.version }.last
+
+        version ||= spree.version
+
+        unless spree
+          puts "No Spree gem #{version} is installed.  Do 'gem list spree' to see what you have available."
+          exit
+        end
+
+        puts "Freezing to the gems for Spree #{spree.version}"
+        rm_rf   "vendor/spree"
+
+        chdir("vendor") do
+          Gem::GemRunner.new.run(["unpack", "spree", "--version", "=#{version}"])
+          FileUtils.mv(Dir.glob("spree*").first, "spree")
+        end
+      end
+    end
+
+    # TODO - Support freeze from "edge"
+
+    desc "Unlock this application from freeze of gems or edge and return to a fluid use of system gems"
+    task :unfreeze do
+      rm_rf "vendor/spree"
+    end
+    
+    # TODO - Deal with updating javascript, etc.
+  end
+#end

data/lib/tasks/release.rake

@@ -15,7 +15,7 @@ RUBY_FORGE_GROUPID = '5614'
 RUBY_FORGE_PACKAGEID = '7123'
 
 RDOC_TITLE = "Spree -- Complete Commerce Solution for Ruby on Rails"
-RDOC_EXTRAS = ["README", "CONTRIBUTORS", "CHANGELOG", "INSTALL", "LICENSE"]
+RDOC_EXTRAS = ["README.markdown", "CONTRIBUTORS", "CHANGELOG", "INSTALL", "LICENSE"]
 
 namespace 'spree' do
   spec = Gem::Specification.new do |s|
@@ -31,11 +31,8 @@ namespace 'spree' do
     s.bindir = 'bin'
     s.executables = (Dir['bin/*'] + Dir['scripts/*']).map { |file| File.basename(file) } 
     s.add_dependency 'rake', '>= 0.7.1'
-    s.add_dependency 'activemerchant', '>= 1.2.1'
     s.add_dependency 'has_many_polymorphs', '>= 2.12'
     s.add_dependency 'highline', '>=1.4.0'
-    s.add_dependency 'mini_magick', '>=1.2.3'
-    s.add_dependency 'rspec', '=1.1.3'    
     s.autorequire = 'spree'
     s.has_rdoc = true
     #s.rdoc_options << '--title' << RDOC_TITLE << '--line-numbers' << '--main' << 'README'
@@ -87,7 +84,7 @@ namespace 'spree' do
 
   desc "Publish the release files to RubyForge."
   task :release => [:gem, :package] do
-    files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
+    files = ["gem", "tgz"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
 
     system %{rubyforge login --username #{RUBY_FORGE_USER}}
   

data/login.patch

@@ -0,0 +1,55 @@
+From 4315d524be9ae7744411d1ea86c32e3d193c25d8 Mon Sep 17 00:00:00 2001
+From: Sean Schofield <schof@apache.org>
+Date: Fri, 30 May 2008 19:27:10 -0400
+Subject: [PATCH] Require login or user creation before checkout.
+
+---
+ app/controllers/checkout_controller.rb |    7 +++++++
+ app/controllers/users_controller.rb    |    9 +++++++++
+ 2 files changed, 16 insertions(+), 0 deletions(-)
+
+diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
+index 8a04824..54a4a00 100644
+--- a/app/controllers/checkout_controller.rb
++++ b/app/controllers/checkout_controller.rb
+@@ -1,4 +1,5 @@
+ class CheckoutController < Spree::BaseController
++  before_filter :new_or_login
+   before_filter :find_order, :except => [:index, :thank_you]
+     
+   def index
+@@ -141,6 +142,12 @@ class CheckoutController < Spree::BaseController
+           @order
+         end
+       end
++      
++      def new_or_login
++        # create a new user (or login an existing one)
++        return if logged_in?
++        redirect_to new_user_url
++      end
+ 
+       def finalize_order
+         Order.transaction do
+diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
+index b5c5cf6..968e630 100644
+--- a/app/controllers/users_controller.rb
++++ b/app/controllers/users_controller.rb
+@@ -2,4 +2,13 @@ class UsersController < Spree::BaseController
+   create.before do
+     @user.login = @user.email 
+   end
++
++  create.after do
++    #User.authenticate(@user.login, @user.password)    
++    self.current_user = @user       
++  end
++
++  create.response do |wants|  
++    wants.html {redirect_to :controller => :checkout, :action => :addresses}         
++  end
+ end
+
+-- 
+1.5.4.950.ga176
+

data/public/stylesheets/application.css

@@ -1,209 +1,4 @@
-body {
-  color:#333333;
-  font-family:Tahoma,"Lucida Grande",Verdana,Sans-serif;
-  font-size:76%;
-  font-size-adjust:none;
-  font-style:normal;
-  font-variant:normal;
-  font-weight:normal;
-  line-height:1.6em;
-  text-align:center;
-}
-
-#main {
-  background:#FFFFFF none repeat scroll 0%;
-  margin:20pt auto;
-  position:relative;
-  text-align:left;
-  width:780px;
-}
-
-#main-table {
-	width:780px;
-	border-collapse: collapse;
-  border:1px solid;
-}
-
-#main-content {
-	padding-left: 10px;
-	padding-right: 10px;
-}
-
-
-#shop-by-col {
-  width: 140px;
-}
-
-.even {
-  background-color: #EFEFEF;  
-}
-
-a {
-  text-decoration: none;
-  color: #0000ff;	
-}
-
-a:visited {
-  color: #0000ff;	
-}
-
-a:hover {
-  text-decoration:underline;
-}
-
-img {
-  border: 0px;
-}
-/* =============== begin: pagination stuff ===============  */
-
-/*Credits: Dynamic Drive CSS Library */
-/*URL: http://www.dynamicdrive.com/style/ */
-
-.pagination{
-padding-top: 10px;
-}
-
-.pagination ul{
-margin: 0;
-padding: 0;
-text-align: left; /*Set to "right" to right align pagination interface*/
-font-size: 16px;
-}
-
-.pagination li{
-list-style-type: none;
-display: inline;
-padding-bottom: 1px;
-}
-
-.pagination a, .pagination a:visited{
-padding: 0 5px;
-border: 1px solid #9aafe5;
-text-decoration: none; 
-color: #2e6ab1;
-}
-
-.pagination a:hover, .pagination a:active{
-border: 1px solid #2b66a5;
-color: #000;
-background-color: lightyellow;
-}
-
-.pagination li.currentpage{
-font-weight: bold;
-padding: 0 5px;
-border: 1px solid navy;
-background-color: #2e6ab1;
-color: #FFF;
-}
-
-.pagination li.disablepage{
-padding: 0 5px;
-border: 1px solid #929292;
-color: #929292;
-}
-
-.pagination li.nextpage{
-font-weight: bold;
-}
-
-* html .pagination li.currentpage, * html .pagination li.disablepage{ /*IE 6 and below. Adjust non linked LIs slightly to account for bugs*/
-margin-right: 5px;
-padding-right: 0;
-}
-/* =============== end: pagination stuff ===============  */
-
-.formError, .errorExplanation {
-  color: #FF0000;
-}
-
-/* ================ begin: flash ================  */
-#flash-errors, #errorExplanation {
-  margin: 0 auto;
-  background: #EF1D61;/*#F69A91;*/
-  padding: 10px;
-  color: #FFFFFF;
-  text-align: center;
-}
-#flash-notice {
-  background: #CAEFA5;
-  padding: 10px;
-  color: #051;
-  text-align: center;
-}
-/* ================ end: flash ================  */
-
-/* ================ begin: order-summary ================  */
-#order-num {
-  font-size: 16px;
-  font-weight: normal;
-  border-bottom: none;
-}
-.order-summary {
-  border-collapse:  collapse;
-  border: solid 1px;
-  margin-top: 10px;
-  margin-bottom: 10px;
-  width: 545px;
-}
-
-.order-summary th {
-  font-weight: bold;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 8px;
-  padding-right: 8px;
-  border-bottom: 1px solid
-}
-
-.order-summary td {
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 8px;
-  padding-right: 8px;
-}
-
-/* ================ end: order-summary ================  */
-
-/* ================ begin: header-menu ================ */
-#store-nav {
-  font-family:Arial,Arial,Helvetica,sans-serif;
-  font-size:12px;
-  float: right;
-}
-
-#store-nav li {
-  list-style-image:none;
-  list-style-position:outside;
-  list-style-type:none;	
-  float: right;
-  padding: 5px;
-}
-
-/* ================ end: header-menu ================ */
-
-/* ================ begin: product preview ================ */
-#product-listing a {
-  border: 0px;	
-}
-/* ================ end: product preview ================ */
-
-/* ================ begin: product-name ================ */
-.product-name, .product-price, .product-variants {
-  font-weight: bold;
-}
-/* ================ end: product-name ================ */
-
-#variants ul {
-	list-style: none;
-	margin-left: 0px;
-	padding-left: 1em;
-	text-indent: -1em;
-}
-
-
-/* ================ begin: product-listing ================ */
-#product-listing {
-	
-}
-/* ================ end: product-listing ================ */
+/** 
+This stylesheet loads after spree.css, spree-admin.css so feel free to use it to 
+override the default Spree styling.
+*/