spree 0.4.1 → 0.5.0

data/lib/generators/extension_migration/extension_migration_generator.rb

@@ -0,0 +1,32 @@
+require 'rails_generator/base'
+
+class ExtensionMigrationGenerator < Rails::Generator::NamedBase
+  
+  attr_reader :extension_path, :extension_file_name
+  
+  def initialize(runtime_args, runtime_options = {})
+    super
+    @extension_file_name = "#{file_name}_extension"
+    @extension_path = "vendor/extensions/#{file_name}"
+    @migration_name = runtime_args[1]
+  end
+
+  # overload the super method which was causing problems for some unknown reason (too lazy to debug properly)
+  def attributes
+    []
+  end
+
+  #def banner
+  #  "Usage: #{$0} extension_migration ExtensionName MigrationName"
+  #end
+
+  def manifest    
+    record do |m|
+      m.migration_template 'migration.rb', 
+                           "#{extension_path}/db/migrate", 
+                           :assigns => {:migration_name => @migration_name},
+                           :migration_file_name => @migration_name
+    end
+  end
+
+end

data/lib/generators/extension_migration/templates/migration.rb

@@ -0,0 +1,7 @@
+class <%= migration_name.titleize.gsub(" ", "") %> < ActiveRecord::Migration
+  def self.up
+  end
+
+  def self.down
+  end
+end

data/lib/spree.rb

@@ -8,8 +8,8 @@ unless defined? Spree::Version
   module Spree
     module Version
       Major = '0'
-      Minor = '4'
-      Tiny  = '1'
+      Minor = '5'
+      Tiny  = '0'
 
       class << self
         def to_s

data/lib/spree/extension.rb

@@ -37,13 +37,6 @@ module Spree
       end
       alias :activate :activate_extension
 
-      def deactivate_extension
-        return unless instance.active?
-        instance.active = false
-        instance.deactivate if instance.respond_to? :deactivate
-      end
-      alias :deactivate :deactivate_extension
-
       def define_routes(&block)
         route_definitions << block
       end

data/lib/spree/extension_loader.rb

@@ -14,10 +14,6 @@ module Spree
         @config = rails_config
       end
       
-      def before_clear(*args)
-        ExtensionLoader.deactivate_extensions
-      end
-      
       def after_clear(*args)
         ExtensionLoader.load_extensions
         ExtensionLoader.activate_extensions
@@ -84,10 +80,6 @@ module Spree
       end.compact
     end
     
-    def deactivate_extensions
-      extensions.each &:deactivate
-    end
-    
     def activate_extensions
 #      initializer.initialize_default_admin_tabs
       # Reset the view paths after 

data/lib/tasks/extensions.rake

@@ -117,6 +117,53 @@ namespace :spec do
   end
 end
 
+namespace :extensions do
+  desc "List the gems that the extensions depends on"
+  task :gems => [ 'gems:base' ] do
+    config = create_config
+
+    config.gems.each do |gem|
+      gem.add_load_paths
+      gem.load
+      code = gem.loaded? ? (gem.frozen? ? "F" : "I") : " "
+      puts "[#{code}] #{gem.name} #{gem.requirement.to_s}"
+    end
+    puts
+    puts "I = Installed"
+    puts "F = Frozen"
+  end
+
+  namespace :gems do
+    task :base do
+      $rails_gem_installer = true
+      Rake::Task[:environment].invoke
+    end
+  
+    def create_config
+      config = Rails::Configuration.new
+  
+      Spree::Extension.descendants.each do |extension|
+        if extension.respond_to? :require_gems
+          extension.require_gems(config)
+        end
+      end
+      
+      config
+    end
+  
+    desc "Installs all required gems for the extensions."
+    task :install => :base do
+      require 'rubygems'
+      require 'rubygems/gem_runner'
+
+      config = create_config
+
+      config.gems.each { |gem| gem.install unless gem.loaded? }
+    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 }

data/public/javascripts/application.js

@@ -1,2 +1,36 @@
 // Place your application-specific JavaScript functions and classes here
 // This file is automatically included by javascript_include_tag :defaults
+
+var shipping_costs = new Hash();
+
+function calculate_order_total(radio){
+	$('order_total_cell').update(number_to_currency(order_total_without_shipping + shipping_costs.get(radio.value)));
+}
+
+function number_to_currency(number, options) {
+	try {
+ 		var options   = options || {};
+		var precision = options["precision"] || 2;
+ 		var unit      = options["unit"] || "$";
+ 		var separator = precision > 0 ? options["separator"] || "." : "";
+		var delimiter = options["delimiter"] || ",";
+   
+ 		var parts = parseFloat(number).toFixed(precision).split('.');
+		return unit + number_with_delimiter(parts[0], delimiter) + separator + parts[1].toString();
+	} catch(e) {
+		return number
+	}
+ }
+
+function number_with_delimiter(number, delimiter, separator) {
+	try {
+		var delimiter = delimiter || ",";
+ 		var separator = separator || ".";
+
+		var parts = number.toString().split('.');
+		parts[0] = parts[0].replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1" + delimiter);
+		return parts.join(separator);
+	} catch(e) {
+		return number
+	}
+}

data/public/javascripts/spree-yui.js

@@ -31,8 +31,8 @@ spree.YUI = {
 
 		var target_url = target.data.object_url.split('/');
  		var parent_id = target_url.last();
-		target_url = target_url.without(parent_id);
-		
+		target_url = target_url.slice(0, (target_url.length - 1))
+				
 		//add inplace creator
 		var ipe = new Ajax.InPlaceEditor('new_taxon_node_' + rand_no, target_url.join('/'), {
 				callback: function(form, value) { return 'taxon[name]=' + encodeURIComponent(value) + '&taxon[parent_id]=' + encodeURIComponent(parent_id)},  	

data/public/stylesheets/spree.css

@@ -393,4 +393,14 @@ li.preview a {
 #variants li {
   list-style-type: none;
 }
-/** ================ end: product-related =================== */
+/** ================ end: product-related =================== */
+
+/** ================ begin: simple-radios =================== */
+.simple-radios li {
+  list-style-type: none;
+}
+/** ================ end: simple-radios =================== */
+
+.disabled {
+  color: #AFAFAF;
+}

data/spec/fixtures/preferences.yml

@@ -1,7 +1,15 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+inventory_allow_backorders:
+  id: 1
+  attribute: allow_backorders
+  owner_id: 1
+  owner_type: Configuration
+  value: 0
+  created_at: <%= Time.now %>
 
-# one:
-#   column: value
-#
-# two:
-#   column: value
+inventory_show_zero_stock_products:
+  id: 2
+  attribute: show_zero_stock_products
+  owner_id: 1
+  owner_type: Configuration
+  value: 0
+  created_at: <%= Time.now %>

data/spec/models/address_spec.rb

@@ -0,0 +1,78 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module AddressSpecHelper
+  def valid_address_attributes
+    {
+      :firstname => "First",
+      :lastname => "Last",
+      :address1 => "Address1",
+      :city => "City",
+      :state_name => "A State",
+      :zipcode => "00000",
+      :country => Country.new,
+      :phone => "00000000"
+    }
+  end
+end
+
+
+describe Address do
+  include AddressSpecHelper
+
+  before(:each) do
+    @address = Address.new
+  end
+
+  it "should not be valid when empty" do
+    @address.should_not be_valid
+  end
+
+  ['firstname', 'lastname', 'address1', 'city', 'country', 'zipcode', 'phone'].each do |field|
+    it "should require #{field}" do
+      @address.should_not be_valid
+      @address.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}")
+    end
+  end
+
+  it "should require a state name when the associated country don't have states" do
+    @address.attributes = valid_address_attributes.with(:state_name => "")
+
+    @address.should_not be_valid
+    @address.errors.full_messages.should include("#{'state_name'.intern.l('state_name').humanize} #{:error_message_blank.l}")
+  end
+
+  it "should require a state when the associated country have states" do
+    @address.attributes = valid_address_attributes.with(
+      :country => Country.new(:states => [State.new(:name => "A State", :abbr => "ST")])
+    )
+
+    @address.should_not be_valid
+    @address.errors.full_messages.should include("#{'state'.intern.l('state').humanize} #{:error_message_blank.l}")
+  end
+  
+  it "should be valid when having correct information" do
+    @address.attributes = valid_address_attributes
+    @address.should be_valid
+  end
+
+  it "should return full name when requested" do
+    @address.attributes = valid_address_attributes
+    @address.full_name.should == @address.firstname + " " + @address.lastname
+  end
+  
+  it "should return state text as state_name attribute when the associated state is nil" do
+    @address.attributes = valid_address_attributes.except(:state)
+    @address.state_text.should == @address.state_name
+  end
+    
+  it "should return state text as state.name attribute when the associated state is not nil but the abbreviation is empty" do
+    @address.attributes = valid_address_attributes.with(:state => State.new(:name => "A State", :abbr => ""))
+    @address.state_text.should == @address.state.name
+  end
+    
+  it "should return state text as state.abbr attribute when the associated state is not nil and the abbreviation is not empty" do
+    @address.attributes = valid_address_attributes.with(:state => State.new(:name => "A State", :abbr => "ST"))
+    @address.state_text.should == @address.state.abbr
+  end
+
+end

data/spec/models/country_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Country do
+
+  before(:each) do
+    @country = Country.new
+  end
+
+  it "should not be valid when empty" do
+    pending "Can it really be valid when empty?"
+    @country.should_not be_valid
+  end
+  
+  it "should be valid when having correct information" do
+    @country.iso_name = "A Country"
+
+    @country.should be_valid
+  end
+
+
+  ['iso_name'].each do |field|
+    it "should require #{field}" do
+      pending "Is this field mandatory?"
+      @country.should_not be_valid
+      @country.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}")
+    end
+  end
+  
+end

data/spec/models/option_type_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module OptionTypeSpecHelper
+  def valid_option_type_attributes
+    {
+      :name => "an_option_type",
+      :presentation => "An Option Type"
+    }
+  end
+end
+
+
+describe OptionType do
+  include OptionTypeSpecHelper
+
+  before(:each) do
+    @option_type = OptionType.new
+  end
+
+  it "should not be valid when empty" do
+    @option_type.should_not be_valid
+  end
+
+  ['name', 'presentation'].each do |field|
+    it "should require #{field}" do
+      @option_type.should_not be_valid
+      @option_type.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}")
+    end
+  end
+
+  it "should be valid when having correct information" do
+    @option_type.attributes = valid_option_type_attributes
+    @option_type.should be_valid
+  end
+  
+end

data/spec/models/option_value_spec.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module OptionValueSpecHelper
+  def valid_option_value_attributes
+    {
+      :name => "an_option_value",
+      :presentation => "An Option Value",
+      :position => 1
+    }
+  end
+end
+
+
+describe OptionValue do
+  include OptionValueSpecHelper
+
+  before(:each) do
+    @option_value = OptionValue.new
+  end
+
+  it "should not be valid when empty" do
+    pending "Shouldn't it require a name and a presentation?"
+    @option_value.should_not be_valid
+  end
+
+  ['name', 'presentation'].each do |field|
+    it "should require #{field}" do
+      pending "Shouldn't it require a name and a presentation?"
+      @option_value.should_not be_valid
+      @option_value.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}")
+    end
+  end
+
+  it "should be valid when having correct information" do
+    @option_value.attributes = valid_option_value_attributes
+    @option_value.should be_valid
+  end
+  
+end

data/spec/models/product_option_type_spec.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module ProductOptionTypeSpecHelper
+  def valid_product_option_type_attributes
+    {
+      :position => 1
+    }
+  end
+end
+
+
+describe ProductOptionType do
+  include ProductOptionTypeSpecHelper
+
+  before(:each) do
+    @product_option_type = ProductOptionType.new
+  end
+
+  it "should not be valid when empty" do
+    pending "Shouldn't it require a position?"
+    @product_option_type.should_not be_valid
+  end
+
+  ['position'].each do |field|
+    it "should require #{field}" do
+      pending "Shouldn't it require a position?"
+      @product_option_type.should_not be_valid
+      @product_option_type.errors.full_messages.should include("#{field.intern.l(field).humanize} #{:error_message_blank.l}")
+    end
+  end
+
+  it "should be valid when having correct information" do
+    pending "Shouldn't it require a product and an option type too?"
+    @product_option_type.attributes = valid_product_option_type_attributes
+    @product_option_type.should be_valid
+  end
+
+end