spree 0.0.7 → 0.0.8

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/helpers/more_explicit_helper.rb

@@ -0,0 +1,5 @@
+module MoreExplicitHelper
+  def method_in_more_explicit_helper
+    "<div>This is text from a method in the MoreExplicitHelper</div>"
+  end
+end

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/helpers/plugin_application_helper.rb

@@ -0,0 +1,6 @@
+# Methods added to this helper will be available to all templates in the application.
+module ApplicationHelper
+  def method_in_plugin_application_helper
+    "<div>This is text from a method in the ApplicationHelper</div>"
+  end
+end

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/helpers/view_spec_helper.rb

@@ -0,0 +1,13 @@
+module ViewSpecHelper
+  def method_in_helper
+    "<div>This is text from a method in the ViewSpecHelper</div>"
+  end
+
+  def method_in_template_with_partial
+    "<div>method_in_template_with_partial in ViewSpecHelper</div>"
+  end
+
+  def method_in_partial
+    "<div>method_in_partial in ViewSpecHelper</div>"
+  end
+end

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml

@@ -0,0 +1 @@
+

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml

@@ -0,0 +1 @@
+

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_errors_in_template.rhtml

@@ -0,0 +1 @@
+<% raise %>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/controller_spec/action_with_template.rhtml

@@ -0,0 +1 @@
+<div>This is action_with_template.rhtml</div>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.js.rjs

@@ -0,0 +1 @@
+# This is used for rails > 1.2.3

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/render_spec/some_action.rjs

@@ -0,0 +1 @@
+# This is used for rails <= 1.2.3

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/_replacement_partial.rhtml

@@ -0,0 +1 @@
+This is the text in the replacement partial.

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_div.rjs

@@ -0,0 +1 @@
+page.hide 'mydiv'

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/hide_page_element.rjs

@@ -0,0 +1 @@
+page['mydiv'].hide

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/insert_html.rjs

@@ -0,0 +1 @@
+page.insert_html 'mydiv', 'replacement text'

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace.rjs

@@ -0,0 +1 @@
+page.replace 'mydiv', 'replacement text'

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html.rjs

@@ -0,0 +1 @@
+page.replace_html 'mydiv', 'replacement text'

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/replace_html_with_partial.rjs

@@ -0,0 +1 @@
+page.replace_html 'mydiv', :partial => 'rjs_spec/replacement_partial'

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_effect.rjs

@@ -0,0 +1 @@
+page.visual_effect :fade, 'mydiv'

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/rjs_spec/visual_toggle_effect.rjs

@@ -0,0 +1 @@
+page.visual_effect :toggle_blind, 'mydiv'

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/no_tags.rhtml

@@ -0,0 +1 @@
+<!-THIS FILE HAS NO TAGS->

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_no_attributes.rhtml

@@ -0,0 +1 @@
+<div></div>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/tag_spec/single_div_with_one_attribute.rhtml

@@ -0,0 +1 @@
+<div key="value"></div>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial.rhtml

@@ -0,0 +1,2 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_partial %>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_local_variable.rhtml

@@ -0,0 +1 @@
+<div><%= x %></div>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_partial_with_sub_partial.rhtml

@@ -0,0 +1 @@
+<%= render :partial => 'partial', :object => partial %>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/_spacer.rhtml

@@ -0,0 +1 @@
+<hr id="spacer" />

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/accessor.rhtml

@@ -0,0 +1,3 @@
+<div id="session"><%= session[:key] %></div>
+<div id="params"><%= params[:key] %></div>
+<div id="flash"><%= flash[:key] %></div>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/entry_form.rhtml

@@ -0,0 +1,2 @@
+<% form_tag do %>
+<% end %>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/explicit_helper.rhtml

@@ -0,0 +1,2 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_explicit_helper %>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/foo/show.rhtml

@@ -0,0 +1 @@
+<%= method_in_plugin_application_helper %>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/implicit_helper.rhtml

@@ -0,0 +1,2 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_helper %>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/multiple_helpers.rhtml

@@ -0,0 +1,3 @@
+<%= method_in_plugin_application_helper %>
+<%= method_in_explicit_helper %>
+<%= method_in_more_explicit_helper %>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial.rhtml

@@ -0,0 +1,5 @@
+<%= method_in_template_with_partial %>
+<%= render :partial => 'partial' %>
+
+<%= render :partial => 'partial_used_twice' %>
+<%= render :partial => 'partial_used_twice' %>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_using_collection.rhtml

@@ -0,0 +1,3 @@
+<%= render :partial => 'partial',
+           :collection => ['Alice', 'Bob'],
+           :spacer_template => 'spacer' %>

data/starter-app/vendor/plugins/rspec_on_rails/spec_resources/views/view_spec/template_with_partial_with_array.rhtml

@@ -0,0 +1 @@
+<%= render :partial => @array %>

data/starter-app/vendor/plugins/rspec_on_rails/stories/all.rb

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), *%w[helper])
+require File.join(File.dirname(__FILE__), *%w[steps people])
+
+# Run transactions_should_rollback in Ruby
+require File.join(File.dirname(__FILE__), *%w[transactions_should_rollback])
+
+# Run transactions_should_rollback in Plain Text
+with_steps_for :people do
+  run File.join(File.dirname(__FILE__), *%w[transactions_should_rollback]), :type => RailsStory
+end

data/starter-app/vendor/plugins/rspec_on_rails/stories/helper.rb

@@ -0,0 +1,5 @@
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift File.expand_path("#{dir}/../lib")
+require File.expand_path("#{dir}/../../../../spec/spec_helper")
+
+require 'spec/rails/story_adapter'

data/starter-app/vendor/plugins/rspec_on_rails/stories/steps/people.rb

@@ -0,0 +1,8 @@
+steps_for :people do
+  When "I add a Person" do
+    Person.create!(:name => "Foo")
+  end
+  Then "there should be one person" do
+    Person.count.should == 1
+  end
+end

data/starter-app/vendor/plugins/rspec_on_rails/stories/transactions_should_rollback

@@ -0,0 +1,15 @@
+Story: transactions should rollback in plain text
+  As an RSpec/Rails Story author
+  I want transactions to roll back between scenarios in plain text
+  So that I can have confidence in the state of the database
+
+  Scenario: add one Person
+    When I add a Person
+
+  Scenario: add another person
+    GivenScenario: add one Person
+    Then there should be one person
+
+  Scenario: add yet another person
+    GivenScenario: add one Person
+    Then there should be one person

data/starter-app/vendor/plugins/rspec_on_rails/stories/transactions_should_rollback.rb

@@ -0,0 +1,25 @@
+require File.join(File.dirname(__FILE__), *%w[helper])
+
+Story "transactions should rollback", %{
+  As an RSpec/Rails Story author
+  I want transactions to roll back between scenarios
+  So that I can have confidence in the state of the database
+}, :type => RailsStory do
+  Scenario "add one Person" do
+    When "I add a Person" do
+      Person.create!(:name => "Foo")
+    end
+  end
+  
+  Scenario "add another person" do
+    GivenScenario "add one Person"
+    Then "there should be one person" do
+      Person.count.should == 1
+    end
+  end
+
+  Scenario "add yet another person" do
+    GivenScenario "add one Person"
+    Then "there should be one person"
+  end
+end

data/starter-app/vendor/plugins/rspec_on_rails/tasks/rspec.rake

@@ -0,0 +1,137 @@
+# In rails 1.2, plugins aren't available in the path until they're loaded.
+# Check to see if the rspec plugin is installed first and require
+# it if it is.  If not, use the gem version.
+rspec_base = File.expand_path(File.dirname(__FILE__) + '/../../rspec/lib')
+$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
+require 'spec/rake/spectask'
+require 'spec/translator'
+
+spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop
+task :noop do
+end
+
+task :default => :spec
+task :stats => "spec:statsetup"
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+Spec::Rake::SpecTask.new(:spec => spec_prereq) do |t|
+  t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+namespace :spec do
+  desc "Run all specs in spec directory with RCov (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.rcov = true
+    t.rcov_opts = lambda do
+      IO.readlines("#{RAILS_ROOT}/spec/rcov.opts").map {|l| l.chomp.split " "}.flatten
+    end
+  end
+  
+  desc "Print Specdoc for all specs (excluding plugin specs)"
+  Spec::Rake::SpecTask.new(:doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
+
+  desc "Print Specdoc for all plugin specs"
+  Spec::Rake::SpecTask.new(:plugin_doc) do |t|
+    t.spec_opts = ["--format", "specdoc", "--dry-run"]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*')
+  end
+
+  [:models, :controllers, :views, :helpers, :lib].each do |sub|
+    desc "Run the specs under spec/#{sub}"
+    Spec::Rake::SpecTask.new(sub => spec_prereq) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
+    end
+  end
+  
+  desc "Run the specs under vendor/plugins (except RSpec's own)"
+  Spec::Rake::SpecTask.new(:plugins => spec_prereq) do |t|
+    t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+    t.spec_files = FileList['vendor/plugins/**/spec/**/*_spec.rb'].exclude('vendor/plugins/rspec/*').exclude("vendor/plugins/rspec_on_rails/*")
+  end
+  
+  namespace :plugins do
+    desc "Runs the examples for rspec_on_rails"
+    Spec::Rake::SpecTask.new(:rspec_on_rails) do |t|
+      t.spec_opts = ['--options', "\"#{RAILS_ROOT}/spec/spec.opts\""]
+      t.spec_files = FileList['vendor/plugins/rspec_on_rails/spec/**/*_spec.rb']
+    end
+  end
+
+  desc "Translate/upgrade specs using the built-in translator"
+  task :translate do
+    translator = ::Spec::Translator.new
+    dir = RAILS_ROOT + '/spec'
+    translator.translate(dir, dir)
+  end
+
+  # Setup specs for stats
+  task :statsetup do
+    require 'code_statistics'
+    ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
+    ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
+    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
+    ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
+    ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
+    ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
+    ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
+    ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
+    ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
+    ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
+    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
+  end
+
+  namespace :db do
+    namespace :fixtures do
+      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+      task :load => :environment do
+        require 'active_record/fixtures'
+        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
+        end
+      end
+    end
+  end
+
+  namespace :server do
+    daemonized_server_pid = File.expand_path("spec_server.pid", RAILS_ROOT + "/tmp")
+
+    desc "start spec_server."
+    task :start do
+      if File.exist?(daemonized_server_pid)
+        $stderr.puts "spec_server is already running."
+      else
+        $stderr.puts "Starting up spec server."
+        system("ruby", "script/spec_server", "--daemon", "--pid", daemonized_server_pid)
+      end
+    end
+
+    desc "stop spec_server."
+    task :stop do
+      unless File.exist?(daemonized_server_pid)
+        $stderr.puts "No server running."
+      else
+        $stderr.puts "Shutting down spec_server."
+        system("kill", "-s", "TERM", File.read(daemonized_server_pid).strip) && 
+        File.delete(daemonized_server_pid)
+      end
+    end
+
+    desc "reload spec_server."
+    task :restart do
+      unless File.exist?(daemonized_server_pid)
+        $stderr.puts "No server running."
+      else
+        $stderr.puts "Reloading down spec_server."
+        system("kill", "-s", "USR2", File.read(daemonized_server_pid).strip)
+      end
+    end
+  end
+end

data/starter-app/vendor/plugins/spree/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007, Schofield Tech Works LLC
+Copyright (c) 2007-2008, Schofield Tech Works LLC and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 

data/starter-app/vendor/plugins/spree/app/controllers/admin/categories_controller.rb

@@ -39,16 +39,6 @@ class Admin::CategoriesController < Admin::BaseController
     # clear out previous tax treatments since deselecting them will not communicated via POST
     @category.tax_treatments.clear
     @category.tax_treatments = TaxTreatment.find(params[:tax_treatments]) if params[:tax_treatments]
-
-    #if params[:variation]
-    #  @variation = Variation.new(params[:variation]) 
-    #  unless @variation.valid?
-    #    flash[:error] = "Problem saving variation"
-    #    redirect_to :action => "edit", :id => @category and return
-    #  end
-      
-    #  @category.variations << @variation if @variation
-    #end
     @category.save
       
     if @category.update_attributes(params[:category])
@@ -82,20 +72,6 @@ class Admin::CategoriesController < Admin::BaseController
             :layout => false
   end
 
-  # AJAX method to show variations based on change in parent category
-  def category_variations
-    category = Category.find_or_create_by_id(params[:category_id])
-    if params[:parent_id].blank?
-      category.parent = nil
-    else
-      category.parent = Category.find(params[:parent_id])      
-    end
-    
-    render  :partial => 'shared/variations',
-            :locals => {:variations => category.variations, :category => category},
-            :layout => false
-  end
-
   private
   
       def load_data

data/starter-app/vendor/plugins/spree/app/controllers/admin/products_controller.rb

@@ -70,13 +70,13 @@ class Admin::ProductsController < Admin::BaseController
       @product.sku.number = params[:sku][:number]
       @product.sku.save
       
-      if params[:variation]
-        @variation = Variation.new(params[:variation])
-        unless @variation.valid?
-          flash[:error] = "Problem saving variation"
+      if params[:variant]
+        @variant = Variant.new(params[:variant])
+        unless @variant.valid?
+          flash[:error] = "Problem saving variant"
           redirect_to :action => "edit", :id => @product and return
         end
-        @product.variations << @variation if @variation
+        @product.variants << @variant if @variant
       end
       
       # need to clear this every time in case user removes tags (those won't show up in the post)
@@ -91,13 +91,13 @@ class Admin::ProductsController < Admin::BaseController
         end
       end
       
-      if params[:new_variation]
-        v = Variation.new
-        params[:new_variation].each do |key, value|
+      if params[:new_variant]
+        v = Variant.new
+        params[:new_variant].each do |key, value|
           v.option_values << OptionValue.find(value)
         end
         v.save
-        @product.variations << v
+        @product.variants << v
         @product.save
       end
       
@@ -164,20 +164,20 @@ class Admin::ProductsController < Admin::BaseController
   end
     
   #AJAX method   
-  def new_variation
+  def new_variant
     @product = Product.find(params[:id])
-    @variation = Variation.new    
-    render  :partial => 'new_variation', 
+    @variant = Variant.new    
+    render  :partial => 'new_variant', 
             :locals => {:product => @product},
             :layout => false    
   end
   
   #AJAX method
-  def delete_variation
+  def delete_variant
     @product = Product.find(params[:id])
-    Variation.destroy(params[:variation_id])
-    flash.now[:notice] = 'Variation successfully removed.'
-    render  :partial => 'variations', 
+    Variant.destroy(params[:variant_id])
+    flash.now[:notice] = 'Variant successfully removed.'
+    render  :partial => 'variants', 
             :locals => {:product => @product},
             :layout => false    
   end