railscart 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.0.3 2008-02-07
+
+* Added --edge option to railscart command (which gets latest version of all plugins from SVN.)
+* Refactored the product optioning stuff.
+
 == 0.0.2 2008-01-29
 
 * Additional gem release testing.

data/Manifest.txt

@@ -8,7 +8,6 @@ config/hoe.rb
 config/requirements.rb
 lib/railscart.rb
 lib/railscart/version.rb
-log/debug.log
 script/destroy
 script/generate
 script/txt2html
@@ -23,6 +22,7 @@ starter_app/app/models/tagging.rb
 starter_app/app/models/user.rb
 starter_app/app/views/layouts/application.rhtml
 starter_app/config/boot.rb
+starter_app/config/database.master.yml
 starter_app/config/database.yml
 starter_app/config/environment.rb
 starter_app/config/environments/development.rb
@@ -35,14 +35,15 @@ starter_app/db/migrate/003_railscart_to_version_19.rb
 starter_app/db/migrate/004_railscart_to_version_20.rb
 starter_app/db/migrate/005_create_users.rb
 starter_app/db/migrate/006_create_roles.rb
+starter_app/db/migrate/007_railscart_to_version_23.rb
 starter_app/db/sample/addresses.yml
 starter_app/db/sample/categories.yml
 starter_app/db/sample/countries.yml
 starter_app/db/sample/line_items.yml
-starter_app/db/sample/option_groups.yml
+starter_app/db/sample/option_types.yml
 starter_app/db/sample/option_values.yml
-starter_app/db/sample/options.yml
 starter_app/db/sample/orders.yml
+starter_app/db/sample/product_option_types.yml
 starter_app/db/sample/products.yml
 starter_app/db/sample/roles.yml
 starter_app/db/sample/skus.yml
@@ -210,9 +211,7 @@ starter_app/vendor/plugins/railscart/VERSION
 starter_app/vendor/plugins/railscart/app/controllers/account_controller.rb
 starter_app/vendor/plugins/railscart/app/controllers/admin/base_controller.rb
 starter_app/vendor/plugins/railscart/app/controllers/admin/categories_controller.rb
-starter_app/vendor/plugins/railscart/app/controllers/admin/option_groups_controller.rb
-starter_app/vendor/plugins/railscart/app/controllers/admin/option_values_controller.rb
-starter_app/vendor/plugins/railscart/app/controllers/admin/options_controller.rb
+starter_app/vendor/plugins/railscart/app/controllers/admin/option_types_controller.rb
 starter_app/vendor/plugins/railscart/app/controllers/admin/orders_controller.rb
 starter_app/vendor/plugins/railscart/app/controllers/admin/overview_controller.rb
 starter_app/vendor/plugins/railscart/app/controllers/admin/products_controller.rb
@@ -226,10 +225,10 @@ starter_app/vendor/plugins/railscart/app/controllers/store_controller.rb
 starter_app/vendor/plugins/railscart/app/helpers/account_helper.rb
 starter_app/vendor/plugins/railscart/app/helpers/admin/base_helper.rb
 starter_app/vendor/plugins/railscart/app/helpers/admin/categories_helper.rb
-starter_app/vendor/plugins/railscart/app/helpers/admin/option_groups_helper.rb
 starter_app/vendor/plugins/railscart/app/helpers/admin/option_values_helper.rb
 starter_app/vendor/plugins/railscart/app/helpers/admin/orders_helper.rb
 starter_app/vendor/plugins/railscart/app/helpers/admin/overview_helper.rb
+starter_app/vendor/plugins/railscart/app/helpers/admin/products_helper.rb
 starter_app/vendor/plugins/railscart/app/helpers/admin/users_helper.rb
 starter_app/vendor/plugins/railscart/app/helpers/admin/variations_helper.rb
 starter_app/vendor/plugins/railscart/app/helpers/cart_helper.rb
@@ -242,14 +241,15 @@ starter_app/vendor/plugins/railscart/app/models/cart.rb
 starter_app/vendor/plugins/railscart/app/models/cart_item.rb
 starter_app/vendor/plugins/railscart/app/models/category.rb
 starter_app/vendor/plugins/railscart/app/models/country.rb
+starter_app/vendor/plugins/railscart/app/models/good.rb
 starter_app/vendor/plugins/railscart/app/models/line_item.rb
-starter_app/vendor/plugins/railscart/app/models/option.rb
-starter_app/vendor/plugins/railscart/app/models/option_group.rb
+starter_app/vendor/plugins/railscart/app/models/option_type.rb
 starter_app/vendor/plugins/railscart/app/models/option_value.rb
 starter_app/vendor/plugins/railscart/app/models/order.rb
 starter_app/vendor/plugins/railscart/app/models/order_mailer.rb
 starter_app/vendor/plugins/railscart/app/models/payment.rb
 starter_app/vendor/plugins/railscart/app/models/product.rb
+starter_app/vendor/plugins/railscart/app/models/product_option_type.rb
 starter_app/vendor/plugins/railscart/app/models/search_criteria.rb
 starter_app/vendor/plugins/railscart/app/models/sku.rb
 starter_app/vendor/plugins/railscart/app/models/state.rb
@@ -263,16 +263,14 @@ starter_app/vendor/plugins/railscart/app/views/admin/categories/_form.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/categories/edit.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/categories/list.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/categories/new.rhtml
-starter_app/vendor/plugins/railscart/app/views/admin/option_groups/_form.rhtml
-starter_app/vendor/plugins/railscart/app/views/admin/option_groups/new.rhtml
-starter_app/vendor/plugins/railscart/app/views/admin/option_values/_form.rhtml
-starter_app/vendor/plugins/railscart/app/views/admin/option_values/edit.rhtml
-starter_app/vendor/plugins/railscart/app/views/admin/option_values/list.rhtml
-starter_app/vendor/plugins/railscart/app/views/admin/option_values/new.rhtml
-starter_app/vendor/plugins/railscart/app/views/admin/options/_form.rhtml
-starter_app/vendor/plugins/railscart/app/views/admin/options/edit.rhtml
-starter_app/vendor/plugins/railscart/app/views/admin/options/list.rhtml
-starter_app/vendor/plugins/railscart/app/views/admin/options/new.rhtml
+starter_app/vendor/plugins/railscart/app/views/admin/option_types/_form.rhtml
+starter_app/vendor/plugins/railscart/app/views/admin/option_types/_new_option_value.rhtml
+starter_app/vendor/plugins/railscart/app/views/admin/option_types/_option_values.rhtml
+starter_app/vendor/plugins/railscart/app/views/admin/option_types/edit.rhtml
+starter_app/vendor/plugins/railscart/app/views/admin/option_types/index.rhtml
+starter_app/vendor/plugins/railscart/app/views/admin/option_types/new.rhtml
+starter_app/vendor/plugins/railscart/app/views/admin/option_types/select.rhtml
+starter_app/vendor/plugins/railscart/app/views/admin/option_types/test.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/orders/_address.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/orders/index.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/orders/show.rhtml
@@ -280,6 +278,8 @@ starter_app/vendor/plugins/railscart/app/views/admin/overview/index.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/products/_form.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/products/_menu.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/products/_new_variation.rhtml
+starter_app/vendor/plugins/railscart/app/views/admin/products/_option_types.rhtml
+starter_app/vendor/plugins/railscart/app/views/admin/products/_variations.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/products/edit.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/products/index.rhtml
 starter_app/vendor/plugins/railscart/app/views/admin/products/new.rhtml
@@ -316,7 +316,6 @@ starter_app/vendor/plugins/railscart/app/views/shared/_order_details.rhtml
 starter_app/vendor/plugins/railscart/app/views/shared/_paginate.rhtml
 starter_app/vendor/plugins/railscart/app/views/shared/_report_criteria.rhtml
 starter_app/vendor/plugins/railscart/app/views/shared/_tax_treatments.rhtml
-starter_app/vendor/plugins/railscart/app/views/shared/_variations.rhtml
 starter_app/vendor/plugins/railscart/app/views/store/_menu.rhtml
 starter_app/vendor/plugins/railscart/app/views/store/_products.rhtml
 starter_app/vendor/plugins/railscart/app/views/store/list.rhtml
@@ -381,6 +380,9 @@ starter_app/vendor/plugins/railscart/db/migrate/017_create_skus.rb
 starter_app/vendor/plugins/railscart/db/migrate/018_create_countries.rb
 starter_app/vendor/plugins/railscart/db/migrate/019_create_states.rb
 starter_app/vendor/plugins/railscart/db/migrate/020_modify_users.rb
+starter_app/vendor/plugins/railscart/db/migrate/021_create_option_types.rb
+starter_app/vendor/plugins/railscart/db/migrate/022_create_product_option_types.rb
+starter_app/vendor/plugins/railscart/db/migrate/023_create_option_values_variations.rb
 starter_app/vendor/plugins/railscart/init.rb
 starter_app/vendor/plugins/railscart/install.rb
 starter_app/vendor/plugins/railscart/lib/constants/enumerable_constants.rb

data/bin/railscart

@@ -9,7 +9,7 @@ Signal.trap("INT") { puts; exit }
 starter_app = File.join(File.dirname(__FILE__), "../starter_app")
 
 #USAGE = "USAGE: railscart [ --user-model <model-name-or-false> ] [ --svn ] [--db] [--hobo-src <path to hobo src>] <app-path>"
-USAGE = "USAGE: railscart <app-path>"
+USAGE = "USAGE: railscart [ --edge ] <app-path> "
 
 RAILSCART_REPO = "http://railscart.googlecode.com/svn/trunk/railscart/"
 
@@ -37,21 +37,26 @@ if ARGV.length == 0 || ARGV.include?("--help")
 end
 
 app_path = ARGV.pop
+plugins_dir = app_path + "/vendor/plugins"
 
-user_model = "user"
-hobo_svn = create_db = false
+#user_model = "user"
+#hobo_svn = create_db = false
+
+edge = false
 
 until ARGV.empty?
   case ARGV.shift
-  when "--user-model"
-    arg = ARGV.shift
-    user_model = arg == "false" ? nil : arg
-  when "--svn"
-    hobo_svn = true
-  when "--db"
-    create_db = true
-  when "--hobo-src"
-    hobo_src = "../" + ARGV.shift
+  when "--edge"
+    edge = true
+  #when "--user-model"
+  #  arg = ARGV.shift
+  #  user_model = arg == "false" ? nil : arg
+  #when "--svn"
+  #  hobo_svn = true
+  #when "--db"
+  #  create_db = true
+  #when "--hobo-src"
+  #  hobo_src = "../" + ARGV.shift
   else
     puts USAGE
     exit 1
@@ -69,6 +74,41 @@ FileUtils.mkdir_p "#{app_path}/log"
 #require 'erb'
 #File.open("#{app_path}/config/database.yml", 'w') {|f| f.write ERB.new(IO.read("configs/databases/mysql.yml"), nil, '-').result(binding)}
   
+# replace plugins with latest versions from SVN
+if edge
+  FileUtils.remove_dir plugins_dir
+  FileUtils.mkdir_p plugins_dir
+  puts "\nGrabbing edge versions of required plugins from SVN ...\n"
+
+  Dir.chdir(app_path) do
+    gen = "ruby #{File.join('script', 'generate')}"
+    plugin = "ruby #{File.join('script', 'plugin')}"
+
+    puts "\nInstalling acts_as_list\n"
+    command(plugin, "install http://svn.rubyonrails.org/rails/plugins/acts_as_list")
+
+    puts "\nInstalling acts_as_tree\n"
+    command(plugin, "install http://svn.rubyonrails.org/rails/plugins/acts_as_tree")
+
+    puts "\nInstalling calendar_date_select\n"
+    command(plugin, "install http://calendardateselect.googlecode.com/svn/tags/calendar_date_select")
+
+    puts "\nInstalling engines\n"
+    command(plugin, "install http://svn.rails-engines.org/engines/trunk")
+
+    puts "\nInstalling in_place_editing\n"
+    command(plugin, "install http://svn.rubyonrails.org/rails/plugins/in_place_editing")
+
+    puts "\nInstalling paginating_find\n"
+    command(plugin, "install http://svn.cardboardrocket.com/paginating_find")
+
+    puts "\nInstalling railscart\n"
+    command(plugin, "install http://railscart.googlecode.com/svn/trunk/railscart/")
+
+  end
+   
+end  
+  
 #Dir.chdir(app_path) do
   #gen = "ruby #{File.join('script', 'generate')}"
   #plugin = "ruby #{File.join('script', 'plugin')}"

data/config/requirements.rb

@@ -6,8 +6,6 @@ require 'rubygems'
   begin
     require req_gem
   rescue LoadError
-    #special hack for activemerchant gem which is required as active_merchant
-    req_gem = "activemerchant" if req_gem == "active_merchant"
     puts "This Rakefile requires the '#{req_gem}' RubyGem."
     puts "Installation: gem install #{req_gem} -y"
     exit

data/lib/railscart/version.rb

@@ -2,7 +2,7 @@ module Railscart #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/starter_app/config/database.master.yml

@@ -0,0 +1,23 @@
+development:
+  adapter: mysql
+  database: railscart_development
+  username: railscart
+  password: railscart
+  host: localhost
+
+# Warning: The database defined as 'test' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+test:
+  adapter: mysql
+  database: railscart_test
+  username: railscart
+  password: railscart
+  host: localhost
+
+production:
+  adapter: mysql
+  database: railscart_production
+  username: root
+  password: 
+  host: localhost

data/starter_app/config/database.yml

@@ -1,23 +1,9 @@
-development:
-  adapter: mysql
-  database: railscart_development
-  username: railscart
-  password: railscart
-  host: localhost
+# We currently use a single master database.yml file that exists in the repository.
+# If you wish to override this with your own customized version, do so using
+# the database.local.yml file (which does not/will not exist in the repository).
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql
-  database: railscart_test
-  username: railscart
-  password: railscart
-  host: localhost
+<%= file = File.join(RAILS_ROOT, "config", "database.master.yml")
+    IO.read(file) %>
 
-production:
-  adapter: mysql
-  database: railscart_production
-  username: root
-  password: 
-  host: localhost
+<%= file = File.join(RAILS_ROOT, "config", "database.local.yml")
+    IO.read(file) if File.exist?(file) %>

data/starter_app/config/environment.rb

@@ -13,6 +13,7 @@ require File.join(File.dirname(__FILE__), 'boot')
 #required for engines
 require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
 
+
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence over those specified here
   
@@ -54,6 +55,7 @@ require 'active_merchant'
 require 'has_many_polymorphs'
 require 'tagging_extensions'
 
+
 # Add new inflection rules using the following format 
 # (all these examples are active by default):
 # Inflector.inflections do |inflect|

data/starter_app/db/migrate/007_railscart_to_version_23.rb

@@ -0,0 +1,9 @@
+class RailscartToVersion23 < ActiveRecord::Migration
+  def self.up
+    Engines.plugins["railscart"].migrate(23)
+  end
+
+  def self.down
+    Engines.plugins["railscart"].migrate(0)
+  end
+end

data/starter_app/db/sample/line_items.yml

@@ -1,32 +1,23 @@
 <% for i in 1..30 do%>
 li_<%= i %>:
-  id: <%= i %>
   order_id: <%= i %>
-  product_id: 1
+  product: ror_tote
   quantity: 1
   price: 8.99
-  created_at: <%= 3.days.ago.to_s :db %>
-  updated_at: <%= 3.days.ago.to_s :db %>
 <% end %>
 
 <% for i in 1..30 do%>
 li_<%= i + 30 %>:
-  id: <%= i + 30 %>
   order_id: <%= i %>
-  product_id: 2
+  product: ror_bag
   quantity: 1
   price: 8.99
-  created_at: <%= 3.days.ago.to_s :db %>
-  updated_at: <%= 3.days.ago.to_s :db %>
 <% end %>
 
 <% for i in 1..30 do%>
 li_<%= i + 60 %>:
-  id: <%= i + 60 %>
   order_id: <%= i %>
-  product_id: 3
+  product: ror_baseball_jersey
   quantity: 1
-  price: 8.99
-  created_at: <%= 3.days.ago.to_s :db %>
-  updated_at: <%= 3.days.ago.to_s :db %>
+  price: 19.99
 <% end %>

data/starter_app/db/sample/option_types.yml

@@ -0,0 +1,6 @@
+size:
+  name: tshirt-size
+  presentation: Size
+color:
+  name: tshirt-color
+  presentation: Color

data/starter_app/db/sample/option_values.yml

@@ -1,13 +1,35 @@
-small:
-  id: 1
-  name: S
-medium:
-  id: 2
-  name: M
-large:
-  id: 3
-  name: L
-extralarge:
-  id: 4
-  name: XL
-  
+s:
+  name: Small
+  presentation: S
+  position: 1
+  option_type: size
+m:
+  name: Medium
+  presentation: M
+  position: 2
+  option_type: size
+l:
+  name: Large
+  presentation: L
+  position: 3
+  option_type: size
+xl:
+  name: Extra Large
+  presentation: XL
+  position: 4
+  option_type: size
+red:
+  name: Red
+  presentation: Red
+  position: 1
+  option_type: color
+green:
+  name: Green
+  presentation: Green
+  position: 2
+  option_type: color
+blue:
+  name: Blue
+  presentation: Blue
+  position: 3
+  option_type: color

data/starter_app/db/sample/orders.yml

@@ -12,6 +12,4 @@ order_<%= i %>:
   ship_address_id: <%= 1+(i%2) %>
   bill_address_id: <%= 1+(i%2) %>
   ip_address: 127.0.0.1
-  created_at: <%= 3.days.ago.to_s :db %>
-  updated_at: <%= 3.days.ago.to_s :db %>
 <% end %>

data/starter_app/db/sample/product_option_types.yml

@@ -0,0 +1,8 @@
+baseball_size:
+  product: ror_baseball_jersey
+  option_type: size
+  position: 1
+baseball_color:
+  product: ror_baseball_jersey
+  option_type: color
+  position: 2

data/starter_app/db/sample/products.yml

@@ -1,70 +1,49 @@
 ror_tote:
-  id: 1
   name: Ruby on Rails Tote
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   price: 15.99
   quantity: 25
   filename: ror_tote.jpg
   category_id: 4
-  created_at: <%= 2.days.ago.to_s :db %>
-  updated_at: <%= 2.days.ago.to_s :db %>  
 ror_bag:
-  id: 2
   name: Ruby on Rails Bag
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   price: 22.99
   quantity: 15
   filename: ror_bag.jpg  
   category_id: 4
-  created_at: <%= 2.days.ago.to_s :db %>
-  updated_at: <%= 2.days.ago.to_s :db %>
 ror_baseball_jersey:
-  id: 3
   name: Ruby on Rails Baseball Jersey
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   price: 19.99
   quantity: 35
   filename: ror_baseball_jersey.jpg
   category_id: 2
-  created_at: <%= 2.days.ago.to_s :db %>
-  updated_at: <%= 2.days.ago.to_s :db %>
 ror_jr_spaghetti:
-  id: 4
   name: Ruby on Rails Jr. Spaghetti
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   price: 19.99
   quantity: 75
   filename: ror_jr_spaghetti.jpg
   category_id: 2
-  created_at: <%= 2.days.ago.to_s :db %>
-  updated_at: <%= 2.days.ago.to_s :db %>
 ror_mug:
-  id: 5
   name: Ruby on Rails Mug
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   price: 13.99
   quantity: 5
   filename: ror_mug.jpg
   category_id: 3
-  created_at: <%= 2.days.ago.to_s :db %>
-  updated_at: <%= 2.days.ago.to_s :db %>
 ror_ringer:
-  id: 6
   name: Ruby on Rails Ringer T-Shirt
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   price: 17.99
   quantity: 15
   filename: ror_ringer_tshirt.jpg
   category_id: 2
-  created_at: <%= 2.days.ago.to_s :db %>
-  updated_at: <%= 2.days.ago.to_s :db %>
 ror_stein:
-  id: 7
   name: Ruby on Rails Stein
   description: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla nonummy aliquet mi. Proin lacus. Ut placerat. Proin consequat, justo sit amet tempus consequat, elit est adipiscing odio, ut egestas pede eros in diam. Proin varius, lacus vitae suscipit varius, ipsum eros convallis nisi, sit amet sodales lectus pede non est. Duis augue. Suspendisse hendrerit pharetra metus. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Curabitur nec pede. Quisque volutpat, neque ac porttitor sodales, sem lacus rutrum nulla, ullamcorper placerat ante tortor ac odio. Suspendisse vel libero. Nullam volutpat magna vel ligula. Suspendisse sit amet metus. Nunc quis massa. Nulla facilisi. In enim. In venenatis nisi id eros. Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc sit amet felis sed lectus tincidunt egestas. Mauris nibh.
   price: 16.99
   quantity: 25
   filename: ror_stein.jpg
-  category_id: 3
-  created_at: <%= 2.days.ago.to_s :db %>
-  updated_at: <%= 2.days.ago.to_s :db %>  
+  category_id: 3