spree 0.9.3 → 0.9.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.9.4
+
+* # - 961 Fixed an issue with RDoc (which occured when installing the 0.9.3 gem)
+
 == 0.9.3
 
 * # - 947 Stylesheets broken when running under a sub uri 

data/Rakefile

@@ -37,7 +37,12 @@ begin
     s.add_dependency 'tlsmail', '= 0.0.1' 
     s.add_dependency 'rspec', '>= 1.2.0'
     s.add_dependency 'rspec-rails', '>= 1.2.0'
-    s.add_dependency 'searchlogic', ">=2.3.5" 
+    s.add_dependency 'searchlogic', ">=2.3.5"
+    s.has_rdoc = true
+    rdoc_excludes = Dir["**"].reject { |f| !File.directory? f }
+    rdoc_excludes.each do |e|
+      s.rdoc_options << '--exclude' << e
+    end     
     files = FileList['**/*']
     files.exclude '**/._*'
     files.exclude '**/*.rej'
@@ -61,6 +66,7 @@ begin
     files.exclude 'vendor/plugins/resource_controller/test/*'
     s.files = files.to_a
   end
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end

data/config/database.yml

@@ -3,26 +3,53 @@
 development:
   adapter: mysql
   database: spree_dev
-  username: root
-  password:
+  username: spree
+  password: spree
   host: localhost
 
-# development:
-#   adapter: sqlite3
-#   database: db/development.sqlite3
+#development:
+#  adapter: postgresql
+#  database: spree_dev
+#  username: spree
+#  password: spree_dev
+#  host: localhost
+  
+#development:
+#  adapter: sqlite3
+#  database: db/development.sqlite3
 
 test:
   adapter: mysql
   database: spree_test
-  username: root
-  password:
+  username: spree
+  password: spree
   host: localhost
+  
+staging:
+  #adapter: sqlite3
+  #database: db/staging.sqlite3
+  adapter: mysql
+  database: spree_dev
+  username: spree
+  password: spree
+  host: localhost
+  
+#test:
+#  adapter: postgresql
+#  database: spree_test
+#  username: spree
+#  password: spree_dev
+#  host: localhost
+
+#test:
+#  adapter: sqlite3
+#  database: db/test.sqlite3
 
 production:
   adapter: sqlite3
   database: db/production.sqlite3
-                                    
-# special mode for demo.spreehq.org (you probably don't need this)                                    
+
+# special mode for demo.spreehq.org (you can ignore this)                                    
 demo:
   adapter: sqlite3
   database: db/production.sqlite3

data/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-SPREE_GEM_VERSION = '0.9.3' unless defined? SPREE_GEM_VERSION
+SPREE_GEM_VERSION = '0.9.4' unless defined? SPREE_GEM_VERSION
           
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

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 => 20090908141056) do
+ActiveRecord::Schema.define(:version => 20091126190904) do
 
   create_table "addresses", :force => true do |t|
     t.string   "firstname"
@@ -30,14 +30,13 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
   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.decimal  "amount",                 :precision => 8, :scale => 2
     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|
@@ -53,10 +52,23 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
     t.integer  "attachment_height"
   end
 
+  add_index "assets", ["viewable_id"], :name => "index_assets_on_viewable_id"
+  add_index "assets", ["viewable_type", "type"], :name => "index_assets_on_viewable_type_and_type"
+
+  create_table "billing_integrations", :force => true do |t|
+    t.string   "type"
+    t.string   "name"
+    t.text     "description"
+    t.boolean  "active",      :default => true
+    t.string   "environment", :default => "development"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "calculators", :force => true do |t|
     t.string   "type"
-    t.integer  "calculable_id",   :null => false
-    t.string   "calculable_type", :null => false
+    t.integer  "calculable_id",                   :null => false
+    t.string   "calculable_type", :default => "", :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -67,9 +79,9 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
     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"
+    t.string   "state"
   end
 
   create_table "configurations", :force => true do |t|
@@ -129,34 +141,14 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
     t.integer  "checkout_id"
   end
 
-  create_table "gateway_configurations", :force => true do |t|
-    t.integer  "gateway_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "gateway_option_values", :force => true do |t|
-    t.integer  "gateway_configuration_id"
-    t.integer  "gateway_option_id"
-    t.text     "value"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "gateway_options", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "gateway_id"
-    t.boolean  "textarea",    :default => false
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "gateways", :force => true do |t|
-    t.string   "clazz"
+    t.string   "type"
     t.string   "name"
     t.text     "description"
-    t.boolean  "active"
+    t.boolean  "active",      :default => true
+    t.string   "environment", :default => "development"
+    t.string   "server",      :default => "test"
+    t.boolean  "test_mode",   :default => true
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -170,6 +162,9 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
     t.datetime "updated_at"
   end
 
+  add_index "inventory_units", ["order_id"], :name => "index_inventory_units_on_order_id"
+  add_index "inventory_units", ["variant_id"], :name => "index_inventory_units_on_variant_id"
+
   create_table "line_items", :force => true do |t|
     t.integer  "order_id"
     t.integer  "variant_id"
@@ -182,6 +177,21 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
   add_index "line_items", ["order_id"], :name => "index_line_items_on_order_id"
   add_index "line_items", ["variant_id"], :name => "index_line_items_on_variant_id"
 
+  create_table "open_id_authentication_associations", :force => true do |t|
+    t.integer "issued"
+    t.integer "lifetime"
+    t.string  "handle"
+    t.string  "assoc_type"
+    t.binary  "server_url"
+    t.binary  "secret"
+  end
+
+  create_table "open_id_authentication_nonces", :force => true do |t|
+    t.integer "timestamp",                  :null => false
+    t.string  "server_url"
+    t.string  "salt",       :default => "", :null => false
+  end
+
   create_table "option_types", :force => true do |t|
     t.string   "name",         :limit => 100
     t.string   "presentation", :limit => 100
@@ -208,6 +218,7 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
     t.integer "option_value_id"
   end
 
+  add_index "option_values_variants", ["variant_id", "option_value_id"], :name => "index_option_values_variants_on_variant_id_and_option_value_id"
   add_index "option_values_variants", ["variant_id"], :name => "index_option_values_variants_on_variant_id"
 
   create_table "orders", :force => true do |t|
@@ -221,6 +232,7 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
     t.string   "token"
     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
+    t.datetime "completed_at"
   end
 
   add_index "orders", ["number"], :name => "index_orders_on_number"
@@ -235,18 +247,27 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
   end
 
   create_table "preferences", :force => true do |t|
-    t.string   "attribute",  :null => false
-    t.integer  "owner_id",   :null => false
-    t.string   "owner_type", :null => false
+    t.string   "attribute",  :default => "", :null => false
+    t.integer  "owner_id",                   :null => false
+    t.string   "owner_type", :default => "", :null => false
     t.integer  "group_id"
     t.string   "group_type"
-    t.string   "value"
+    t.text     "value"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "preferences", ["owner_id", "owner_type", "attribute", "group_id", "group_type"], :name => "index_preferences_on_owner_and_attribute_and_preference", :unique => true
 
+  create_table "product_groups", :force => true do |t|
+    t.string "name"
+    t.string "permalink"
+    t.string "order"
+  end
+
+  add_index "product_groups", ["name"], :name => "index_product_groups_on_name"
+  add_index "product_groups", ["permalink"], :name => "index_product_groups_on_permalink"
+
   create_table "product_option_types", :force => true do |t|
     t.integer  "product_id"
     t.integer  "option_type_id"
@@ -263,6 +284,17 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
     t.datetime "updated_at"
   end
 
+  add_index "product_properties", ["product_id"], :name => "index_product_properties_on_product_id"
+
+  create_table "product_scopes", :force => true do |t|
+    t.integer "product_group_id"
+    t.string  "name"
+    t.text    "arguments"
+  end
+
+  add_index "product_scopes", ["name"], :name => "index_product_scopes_on_name"
+  add_index "product_scopes", ["product_group_id"], :name => "index_product_scopes_on_product_group_id"
+
   create_table "products", :force => true do |t|
     t.string   "name",                 :default => "", :null => false
     t.text     "description"
@@ -275,6 +307,7 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
     t.datetime "deleted_at"
     t.string   "meta_description"
     t.string   "meta_keywords"
+    t.integer  "count_on_hand",        :default => 0,  :null => false
   end
 
   add_index "products", ["available_on"], :name => "index_products_on_available_on"
@@ -292,7 +325,7 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
 
   create_table "properties", :force => true do |t|
     t.string   "name"
-    t.string   "presentation", :null => false
+    t.string   "presentation", :default => "", :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -386,25 +419,31 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
   end
 
   create_table "taxonomies", :force => true do |t|
-    t.string   "name",       :null => false
+    t.string   "name",       :default => "", :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "taxons", :force => true do |t|
-    t.integer  "taxonomy_id",                :null => false
+    t.integer  "taxonomy_id",                 :null => false
     t.integer  "parent_id"
     t.integer  "position",    :default => 0
-    t.string   "name",                       :null => false
+    t.string   "name",        :default => "", :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "permalink"
+    t.integer  "lft"
+    t.integer  "rgt"
   end
 
+  add_index "taxons", ["parent_id"], :name => "index_taxons_on_parent_id"
+  add_index "taxons", ["permalink"], :name => "index_taxons_on_permalink"
+  add_index "taxons", ["taxonomy_id"], :name => "index_taxons_on_taxonomy_id"
+
   create_table "users", :force => true do |t|
     t.string   "email"
-    t.string   "crypted_password",          :limit => 128, :default => "", :null => false
-    t.string   "salt",                      :limit => 128, :default => "", :null => false
+    t.string   "crypted_password"
+    t.string   "salt"
     t.string   "remember_token"
     t.string   "remember_token_expires_at"
     t.datetime "created_at"
@@ -412,8 +451,8 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
     t.string   "persistence_token"
     t.string   "single_access_token"
     t.string   "perishable_token"
-    t.integer  "login_count",                              :default => 0,  :null => false
-    t.integer  "failed_login_count",                       :default => 0,  :null => false
+    t.integer  "login_count",               :default => 0, :null => false
+    t.integer  "failed_login_count",        :default => 0, :null => false
     t.datetime "last_request_at"
     t.datetime "current_login_at"
     t.datetime "last_login_at"
@@ -422,18 +461,22 @@ ActiveRecord::Schema.define(:version => 20090908141056) do
     t.string   "login"
     t.integer  "ship_address_id"
     t.integer  "bill_address_id"
+    t.string   "openid_identifier"
   end
 
+  add_index "users", ["openid_identifier"], :name => "index_users_on_openid_identifier"
+
   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.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.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
+    t.boolean  "is_master",                                   :default => false
+    t.integer  "count_on_hand",                               :default => 0,     :null => false
   end
 
   add_index "variants", ["product_id"], :name => "index_variants_on_product_id"

data/lib/spree.rb

@@ -9,7 +9,7 @@ unless defined? Spree::Version
     module Version
       Major = '0'
       Minor = '9'
-      Tiny  = '3'
+      Tiny  = '4'
 
       class << self
         def to_s

data/public/javascripts/calendar_date_select/format_db.js

@@ -0,0 +1,27 @@
+// DB No Seconds Format: 2007-12-05 12:00
+
+Date.padded2 = function(hour) { padded2 = hour.toString(); if ((parseInt(hour) < 10) || (parseInt(hour) == null)) padded2="0" + padded2; return padded2; }
+Date.prototype.getAMPMHour = function() { hour=Date.padded2(this.getHours()); return (hour == null) ? 00 : (hour > 24 ? hour - 24 : hour ) }
+Date.prototype.getAMPM = function() { return (this.getHours() < 12) ? "" : ""; }
+
+Date.prototype.toFormattedString = function(include_time){
+  str = this.getFullYear() + "-" + (this.getMonth() + 1) + "-" + Date.padded2(this.getDate());
+  if (include_time) { hour=this.getHours(); str += " " + this.getAMPMHour() + ":" + this.getPaddedMinutes() }
+  return str;
+}
+
+Date.parseFormattedString = function (string) {
+  var regexp = '([0-9]{4})-(([0-9]{1,2})-(([0-9]{1,2})( ([0-9]{1,2}):([0-9]{2})? *)?)?)?';
+  var d = string.match(new RegExp(regexp, "i"));
+  if (d==null) return Date.parse(string); // at least give javascript a crack at it.
+  var offset = 0;
+  var date = new Date(d[1], 0, 1);
+  if (d[3]) { date.setMonth(d[3] - 1); }
+  if (d[5]) { date.setDate(d[5]); }
+  if (d[7]) {
+    date.setHours(parseInt(d[7], 10));    
+  }
+  if (d[8]) { date.setMinutes(d[8]); }
+  if (d[10]) { date.setSeconds(d[10]); }
+  return date;
+}

data/public/javascripts/calendar_date_select/format_euro_24hr_ymd.js

@@ -0,0 +1,7 @@
+// Formats date and time as "2000.01.20 17:00"
+Date.prototype.toFormattedString = function(include_time)
+{
+   str = this.getFullYear() + "." + Date.padded2(this.getMonth()+1) + "." + Date.padded2(this.getDate());
+   if (include_time) { str += " " + this.getHours() + ":" + this.getPaddedMinutes() }
+   return str;
+}

data/public/javascripts/calendar_date_select/format_iso_date.js

@@ -0,0 +1,46 @@
+Date.prototype.toFormattedString = function(include_time) {
+	var hour;
+    var str = this.getFullYear() + "-" + Date.padded2(this.getMonth() + 1) + "-" +Date.padded2(this.getDate());
+    if (include_time) {
+        hour = this.getHours();
+        str += " " + this.getHours() + ":" + this.getPaddedMinutes();
+    }
+    return str;
+};
+
+Date.parseFormattedString = function (string) {
+
+    var regexp = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})" + 
+        "( ([0-9]{1,2}):([0-9]{2})?" +
+        "?)?)?)?"; 
+
+    var d = string.match(new RegExp(regexp, "i"));
+    if (d === null) {
+        return Date.parse(string); // at least give javascript a crack at it.
+    }
+    var offset = 0; 
+    var date = new Date(d[1], 0, 1); 
+    if (d[3]) {
+        date.setMonth(d[3] - 1);
+    } 
+    if (d[5]) {
+        date.setDate(d[5]);
+    } 
+    if (d[7]) {
+        date.setHours(d[7]);
+    } 
+    if (d[8]) {
+        date.setMinutes(d[8]);
+    } 
+    if (d[0]) {
+        date.setSeconds(d[0]);
+    } 
+    if (d[2]) {
+        date.setMilliseconds(Number("0." + d[2]));
+    } 
+    if (d[4]) {
+        offset = (Number(d[6])) + Number(d[8]);
+        offset = ((d[5] == '-') ? 1 : -1); 
+    } 
+    return date; 
+};