spree_sample 2.0.13 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 681f668cfb17ec7db808d69c072a17e779a717ad
-  data.tar.gz: 7c37f7ea21504c48bd81391bf0756bfd9c1e1a8b
+  metadata.gz: 91b9c6fb078e152ea04cce3cc38eca6335df2087
+  data.tar.gz: 490c6000db0e64bce2ca6bb1b873db2b4ef98973
 SHA512:
-  metadata.gz: 4286d943cde71f373871d9f04ba0bcf9a2e9803245da7571a307cb4d4511c83cc8fc33192b7dbf92c2f6ba8207e41cb9fb770f0e59388a7337970937b475899b
-  data.tar.gz: 2d34930be987f633f216da25577110aac0e46cba8d3b597bff05f4c52d1e87c51252530a32753aa21df11050a584e6439ad25562577bd771a0539867c6f948c2
+  metadata.gz: ca2d5fda940a853f259a684a2dae0a9d396bfa6b64b24751f4dca87cbd7318a201d948365505176390abd7a9a4a50ef5c4c6420f7c3584ad2192599d3aa27d6e
+  data.tar.gz: 044a879b9c7f98edb0faab57ef8569976197c5525de6642e2e5a637b8082adf7b22f191a26dd79ed4fb710c094024d992ae81c8e8767173e908f756bb2986a1e

data/db/samples/addresses.rb

@@ -2,7 +2,7 @@ united_states = Spree::Country.find_by_name!("United States")
 new_york = Spree::State.find_by_name!("New York")
 
 # Billing address
-Spree::Address.create!({
+Spree::Address.create!(
   :firstname => Faker::Name.first_name,
   :lastname => Faker::Name.last_name,
   :address1 => Faker::Address.street_address,
@@ -11,11 +11,10 @@ Spree::Address.create!({
   :state => new_york,
   :zipcode => 16804,
   :country => united_states,
-  :phone => Faker::PhoneNumber.phone_number
-}, :without_protection => true)
+  :phone => Faker::PhoneNumber.phone_number)
 
 #Shipping address
-Spree::Address.create!({
+Spree::Address.create!(
   :firstname => Faker::Name.first_name,
   :lastname => Faker::Name.last_name,
   :address1 => Faker::Address.street_address,
@@ -24,5 +23,4 @@ Spree::Address.create!({
   :state => new_york,
   :zipcode => 16804,
   :country => united_states,
-  :phone => Faker::PhoneNumber.phone_number
-}, :without_protection => true)
+  :phone => Faker::PhoneNumber.phone_number)

data/db/samples/adjustments.rb

@@ -3,38 +3,34 @@ Spree::Sample.load_sample("orders")
 first_order = Spree::Order.find_by_number!("R123456789")
 last_order = Spree::Order.find_by_number!("R987654321")
 
-first_order.adjustments.create!({
+first_order.adjustments.create!(
   :amount => 0,
   :source => first_order,
   :originator => Spree::TaxRate.find_by_name!("North America"),
   :label => "Tax",
   :state => "open",
-  :mandatory => true
-}, :without_protection => true)
+  :mandatory => true)
 
-last_order.adjustments.create!({
+last_order.adjustments.create!(
   :amount => 0,
   :source => last_order,
   :originator => Spree::TaxRate.find_by_name!("North America"),
   :label => "Tax",
   :state => "open",
-  :mandatory => true
-}, :without_protection => true)
+  :mandatory => true)
 
-first_order.adjustments.create!({
+first_order.adjustments.create!(
   :amount => 0,
   :source => first_order,
   :originator => Spree::ShippingMethod.find_by_name!("UPS Ground (USD)"),
   :label => "Shipping",
   :state => "finalized",
-  :mandatory => true
-}, :without_protection => true)
+  :mandatory => true)
 
-last_order.adjustments.create!({
+last_order.adjustments.create!(
   :amount => 0,
   :source => last_order,
   :originator => Spree::ShippingMethod.find_by_name!("UPS Ground (USD)"),
   :label => "Shipping",
   :state => "finalized",
-  :mandatory => true
-}, :without_protection => true)
+  :mandatory => true)

data/db/samples/option_types.rb

@@ -1,4 +1,4 @@
-option_types = [
+Spree::OptionType.create!([
   {
     :name => "tshirt-size",
     :presentation => "Size",
@@ -9,8 +9,4 @@ option_types = [
     :presentation => "Color",
     :position => 2
   }
-]
-
-option_types.each do |option_type_attrs|
-  Spree::OptionType.create!(option_type_attrs, :without_protection => true)
-end
+])

data/db/samples/option_values.rb

@@ -3,7 +3,7 @@ Spree::Sample.load_sample("option_types")
 size = Spree::OptionType.find_by_presentation!("Size")
 color = Spree::OptionType.find_by_presentation!("Color")
 
-option_values = [
+Spree::OptionValue.create!([
   {
     :name => "Small",
     :presentation => "S",
@@ -46,8 +46,4 @@ option_values = [
     :position => 3,
     :option_type => color
   }
-]
-
-option_values.each do |option_value_attrs|
-  Spree::OptionValue.create!(option_value_attrs, :without_protection => true)
-end
+])

data/db/samples/orders.rb

@@ -1,37 +1,33 @@
 Spree::Sample.load_sample("addresses")
 
 orders = []
-orders << Spree::Order.create!({
+orders << Spree::Order.create!(
   :number => "R123456789",
   :email => "spree@example.com",
   :item_total => 150.95,
   :adjustment_total => 150.95,
   :total => 301.90,
   :shipping_address => Spree::Address.first,
-  :billing_address => Spree::Address.last
-}, :without_protection => true)
+  :billing_address => Spree::Address.last)
 
-orders << Spree::Order.create!({
+orders << Spree::Order.create!(
   :number => "R987654321",
   :email => "spree@example.com",
   :item_total => 15.95,
   :adjustment_total => 15.95,
   :total => 31.90,
   :shipping_address => Spree::Address.first,
-  :billing_address => Spree::Address.last
-}, :without_protection => true)
+  :billing_address => Spree::Address.last)
 
-orders[0].line_items.create!({
+orders[0].line_items.create!(
   :variant => Spree::Product.find_by_name!("Ruby on Rails Tote").master,
   :quantity => 1,
-  :price => 15.99
-}, :without_protection => true)
+  :price => 15.99)
 
-orders[1].line_items.create!({
+orders[1].line_items.create!(
   :variant => Spree::Product.find_by_name!("Ruby on Rails Bag").master,
   :quantity => 1,
-  :price => 22.99
-}, :without_protection => true)
+  :price => 22.99)
 
 orders.each(&:create_proposed_shipments)
 

data/db/samples/payments.rb

@@ -12,15 +12,12 @@ end
 # reference it as such. Make it explicit here that this table has been renamed.
 Spree::CreditCard.table_name = 'spree_credit_cards'
 
-creditcard = Spree::CreditCard.create({ :cc_type => 'visa', :month => 12, :year => 2014, :last_digits => '1111',
-                                        :first_name => 'Sean', :last_name => 'Schofield',
-                                        :gateway_customer_profile_id => 'BGS-1234' }, :without_protection => true)
+creditcard = Spree::CreditCard.create(:cc_type => 'visa', :month => 12, :year => 2014, :last_digits => '1111',
+                                      :first_name => 'Sean', :last_name => 'Schofield',
+                                      :gateway_customer_profile_id => 'BGS-1234')
 
 Spree::Order.all.each_with_index do |order, index|
   order.update!
-  payment = order.payments.create!({ :amount => order.total, :source => creditcard.clone, :payment_method => method }, :without_protection => true)
-  payment.update_attributes_without_callbacks({
-    :state => 'pending',
-    :response_code => '12345'
-  })
+  payment = order.payments.create!(:amount => order.total, :source => creditcard.clone, :payment_method => method)
+  payment.update_attributes_without_callbacks(:state => 'pending', :response_code => '12345')
 end

data/db/samples/products.rb

@@ -2,7 +2,7 @@ Spree::Sample.load_sample("tax_categories")
 Spree::Sample.load_sample("shipping_categories")
 
 clothing = Spree::TaxCategory.find_by_name!("Clothing")
-shipping_category = Spree::ShippingCategory.find_by_name!("Default")
+shipping_category = Spree::ShippingCategory.find_by_name!("Default Shipping")
 
 default_attrs = {
   :description => Faker::Lorem.paragraph,
@@ -125,10 +125,12 @@ products.each do |product_attrs|
   eur_price = product_attrs.delete(:eur_price)
   Spree::Config[:currency] = "USD"
 
-  product = Spree::Product.create!(default_attrs.merge(product_attrs), :without_protection => true)
+  default_shipping_category = Spree::ShippingCategory.find_by_name!("Default Shipping")
+  product = Spree::Product.create!(default_attrs.merge(product_attrs))
   Spree::Config[:currency] = "EUR"
   product.reload
   product.price = eur_price
+  product.shipping_category = default_shipping_category
   product.save!
 end
 

data/db/samples/shipping_categories.rb

@@ -1 +1 @@
-Spree::ShippingCategory.create!(:name => "Default")
+Spree::ShippingCategory.create!(:name => "Default Shipping")

data/db/samples/shipping_methods.rb

@@ -7,37 +7,37 @@ rescue ActiveRecord::RecordNotFound
 end
 
 europe_vat = Spree::Zone.find_by_name!("EU_VAT")
-shipping_category = Spree::ShippingCategory.find_by_name!("Default")
+shipping_category = Spree::ShippingCategory.find_or_create_by!(name: 'Default')
 
 shipping_methods = [
   {
     :name => "UPS Ground (USD)",
     :zones => [north_america],
-    :calculator => Spree::Calculator::Shipping::FlatRate.create!,
+    :calculator => Spree::Calculator::FlatRate.create!,
     :shipping_categories => [shipping_category]
   },
   {
     :name => "UPS Two Day (USD)",
     :zones => [north_america],
-    :calculator => Spree::Calculator::Shipping::FlatRate.create!,
+    :calculator => Spree::Calculator::FlatRate.create!,
     :shipping_categories => [shipping_category]
   },
   {
     :name => "UPS One Day (USD)",
     :zones => [north_america],
-    :calculator => Spree::Calculator::Shipping::FlatRate.create!,
+    :calculator => Spree::Calculator::FlatRate.create!,
     :shipping_categories => [shipping_category]
   },
   {
     :name => "UPS Ground (EUR)",
     :zones => [europe_vat],
-    :calculator => Spree::Calculator::Shipping::FlatRate.create!,
+    :calculator => Spree::Calculator::FlatRate.create!,
     :shipping_categories => [shipping_category]
   }
 ]
 
 shipping_methods.each do |shipping_method_attrs|
-  Spree::ShippingMethod.create!(shipping_method_attrs, :without_protection => true)
+  Spree::ShippingMethod.create!(shipping_method_attrs)
 end
 
 {

data/db/samples/tax_rates.rb

@@ -1,10 +1,9 @@
 north_america = Spree::Zone.find_by_name!("North America")
 clothing = Spree::TaxCategory.find_by_name!("Clothing")
-tax_rate = Spree::TaxRate.create({
+tax_rate = Spree::TaxRate.create(
   :name => "North America",
   :zone => north_america, 
   :amount => 0.05,
-  :tax_category => clothing},
-  :without_protection => true)
+  :tax_category => clothing)
 tax_rate.calculator = Spree::Calculator::DefaultTax.create!
 tax_rate.save!

data/db/samples/taxons.rb

@@ -94,52 +94,28 @@ taxons = [
   {
     :name => "Ruby",
     :taxonomy => brands,
-    :parent => "Brand",
-    :products => [
-      products[:ruby_baseball_jersey]
-    ]
+    :parent => "Brand" 
   },
   {
     :name => "Apache",
     :taxonomy => brands,
-    :parent => "Brand",
-    :products => [
-      products[:apache_baseball_jersey]
-    ]
+    :parent => "Brand" 
   },
   {
     :name => "Spree",
     :taxonomy => brands,
-    :parent => "Brand",
-    :products => [
-      products[:spree_stein],
-      products[:spree_mug],
-      products[:spree_ringer],
-      products[:spree_baseball_jersey],
-      products[:spree_tote],
-      products[:spree_bag],
-      products[:spree_jr_spaghetti],
-    ]
+    :parent => "Brand"
   },
   {
     :name => "Rails",
     :taxonomy => brands,
-    :parent => "Brand",
-    :products => [
-      products[:ror_tote],
-      products[:ror_bag],
-      products[:ror_mug],
-      products[:ror_stein],
-      products[:ror_baseball_jersey],
-      products[:ror_jr_spaghetti],
-      products[:ror_ringer],
-    ]
+    :parent => "Brand"
   },
 ]
 
 taxons.each do |taxon_attrs|
   if taxon_attrs[:parent]
     taxon_attrs[:parent] = Spree::Taxon.find_by_name!(taxon_attrs[:parent])
-    Spree::Taxon.create!(taxon_attrs, :without_protection => true)
+    Spree::Taxon.create!(taxon_attrs)
   end
 end

data/db/samples/variants.rb

@@ -157,9 +157,7 @@ masters = {
   }
 }
 
-variants.each do |variant_attrs|
-  Spree::Variant.create!(variant_attrs, :without_protection => true)
-end
+Spree::Variant.create!(variants)
 
 masters.each do |product, variant_attrs|
   product.master.update_attributes!(variant_attrs)

data/lib/spree_sample.rb

@@ -24,7 +24,6 @@ module SpreeSample
       Spree::Sample.load_sample("assets")
 
       Spree::Sample.load_sample("orders")
-      Spree::Sample.load_sample("line_items")
       Spree::Sample.load_sample("adjustments")
       Spree::Sample.load_sample("payments")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_sample
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.1.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.1.0
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -31,7 +31,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- db/samples.rb
+- lib/spree/sample.rb
+- lib/spree_sample.rb
+- lib/tasks/sample.rake
 - db/samples/addresses.rb
 - db/samples/adjustments.rb
 - db/samples/assets.rb
@@ -67,7 +69,6 @@ files:
 - db/samples/images/spree_stein_back.jpeg
 - db/samples/images/spree_tote_back.jpeg
 - db/samples/images/spree_tote_front.jpeg
-- db/samples/line_items.rb
 - db/samples/option_types.rb
 - db/samples/option_values.rb
 - db/samples/orders.rb
@@ -85,9 +86,7 @@ files:
 - db/samples/taxonomies.rb
 - db/samples/taxons.rb
 - db/samples/variants.rb
-- lib/spree/sample.rb
-- lib/spree_sample.rb
-- lib/tasks/sample.rake
+- db/samples.rb
 homepage: http://spreecommerce.com
 licenses:
 - BSD-3
@@ -98,18 +97,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: Sample data (including images) for use with Spree.

data/db/samples/line_items.rb

@@ -1 +0,0 @@
-Spree::Sample.load_sample("orders")