radiant-shop-extension 0.9.3 → 0.10.0

data/spec/models/shop_category_page_spec.rb

@@ -3,8 +3,8 @@ require 'spec/spec_helper'
 describe ShopCategoryPage do
 
   it 'should not have a cache' do
-    s = ShopProductPage.new
-    s.cache?.should === false
+    page = ShopCategoryPage.new
+    page.cache?.should === false
   end
 
 end

data/spec/models/shop_order_spec.rb

@@ -27,51 +27,58 @@ describe ShopOrder do
       describe '#new?' do
         context 'success' do
           it 'should return true' do
-            shop_orders(:empty).update_attribute(:status, 'new')
-            shop_orders(:empty).new?.should === true
+            shop_orders(:one_item).update_attribute(:status, 'new')
+            shop_orders(:one_item).new?.should === true
           end
         end
         context 'failure' do
           it 'should return false' do
-            shop_orders(:empty).update_attribute(:status, 'paid')
-            shop_orders(:empty).new?.should === false
+            shop_orders(:one_item).update_attribute(:status, 'paid')
+            shop_orders(:one_item).new?.should === false
 
-            shop_orders(:empty).update_attribute(:status, 'shipped')
-            shop_orders(:empty).new?.should === false
+            shop_orders(:one_item).update_attribute(:status, 'shipped')
+            shop_orders(:one_item).new?.should === false
           end
         end
       end
-      describe '#paid?' do
+      describe '#shipped?' do
         context 'success' do
           it 'should return true' do
-            shop_orders(:empty).update_attribute(:status, 'paid')
-            shop_orders(:empty).paid?.should === true
+            shop_orders(:one_item).update_attribute(:status, 'shipped')
+            shop_orders(:one_item).shipped?.should === true
           end
         end
         context 'failure' do
           it 'should return false' do
-            shop_orders(:empty).update_attribute(:status, 'new')
-            shop_orders(:empty).paid?.should === false
+            shop_orders(:one_item).update_attribute(:status, 'new')
+            shop_orders(:one_item).shipped?.should === false
 
-            shop_orders(:empty).update_attribute(:status, 'shipped')
-            shop_orders(:empty).paid?.should === false
+            shop_orders(:one_item).update_attribute(:status, 'paid')
+            shop_orders(:one_item).shipped?.should === false
           end
         end
       end
-      describe '#shipped?' do
+      describe '#paid?' do
         context 'success' do
           it 'should return true' do
-            shop_orders(:empty).update_attribute(:status, 'shipped')
-            shop_orders(:empty).shipped?.should === true
+            payment = ShopPayment.create({
+              :amount       => shop_orders(:one_item).price,
+              :card_number  => '1234',
+              :card_type    => 'visa',
+              :gateway      => 'Eway',
+              :order        => shop_orders(:one_item)
+            })
+            shop_orders(:one_item).update_attribute(:status, 'paid')
+            shop_orders(:one_item).paid?.should === true
           end
         end
         context 'failure' do
           it 'should return false' do
-            shop_orders(:empty).update_attribute(:status, 'new')
-            shop_orders(:empty).shipped?.should === false
+            shop_orders(:one_item).update_attribute(:status, 'new')
+            shop_orders(:one_item).paid?.should === false
 
-            shop_orders(:empty).update_attribute(:status, 'paid')
-            shop_orders(:empty).shipped?.should === false
+            shop_orders(:one_item).update_attribute(:status, 'shipped')
+            shop_orders(:one_item).paid?.should === false
           end
         end
       end

data/spec/models/shop_product_attachment_spec.rb

@@ -34,6 +34,7 @@ describe ShopProductAttachment do
   context 'alias methods' do
     
     before(:each) do
+      stub(AWS::S3::Base).establish_connection!
       @product_image = shop_products(:soft_bread).attachments.first
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 55
   prerelease: false
   segments: 
   - 0
-  - 9
-  - 3
-  version: 0.9.3
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -16,13 +16,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 +08:00
+date: 2010-09-28 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: radiant-forms-extension
+  name: radiant
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 9
+        - 1
+        version: 0.9.1
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: radiant-forms-extension
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,11 +50,11 @@ dependencies:
         - 0
         version: 3.1.0
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: radiant-images-extension
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,11 +66,11 @@ dependencies:
         - 0
         version: 0.2.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: radiant-layouts-extension
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,11 +82,11 @@ dependencies:
         - 1
         version: 0.9.1
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: radiant-settings-extension
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -82,7 +98,7 @@ dependencies:
         - 1
         version: 1.1.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 description: Radiant Shop is an attempt at a simple but complete store. It includes Products, Categories, Orders and Credit Card Payments
 email: dk@dirkkelly.com
 executables: []
@@ -120,7 +136,6 @@ files:
 - app/models/shop_line_item.rb
 - app/models/shop_order.rb
 - app/models/shop_payment.rb
-- app/models/shop_payment_method.rb
 - app/models/shop_product.rb
 - app/models/shop_product_attachment.rb
 - app/models/shop_product_page.rb
@@ -140,7 +155,23 @@ files:
 - app/views/admin/shop/categories/index/_category.html.haml
 - app/views/admin/shop/categories/new.html.haml
 - app/views/admin/shop/categories/remove.html.haml
+- app/views/admin/shop/customers/edit.html.haml
+- app/views/admin/shop/customers/edit/_fields.html.haml
+- app/views/admin/shop/customers/edit/_head.html.haml
+- app/views/admin/shop/customers/edit/_meta.html.haml
+- app/views/admin/shop/customers/edit/_parts.html.haml
+- app/views/admin/shop/customers/edit/_popups.html.haml
+- app/views/admin/shop/customers/edit/meta/_login.html.haml
+- app/views/admin/shop/customers/edit/meta/_password.html.haml
+- app/views/admin/shop/customers/edit/meta/_password_confirmation.html.haml
+- app/views/admin/shop/customers/edit/parts/_address.html.haml
+- app/views/admin/shop/customers/edit/parts/_addresses.html.haml
+- app/views/admin/shop/customers/edit/parts/_orders.html.haml
 - app/views/admin/shop/customers/index.html.haml
+- app/views/admin/shop/customers/index/_bottom.html.haml
+- app/views/admin/shop/customers/index/_customer.html.haml
+- app/views/admin/shop/customers/new.html.haml
+- app/views/admin/shop/customers/remove.html.haml
 - app/views/admin/shop/orders/index.html.haml
 - app/views/admin/shop/products/edit.html.haml
 - app/views/admin/shop/products/edit/_fields.html.haml
@@ -171,17 +202,23 @@ files:
 - config/shop_cart.yml
 - cucumber.yml
 - db/migrate/20100311053701_initial.rb
-- db/migrate/20100520033059_create_layouts.rb
-- db/migrate/20100903122123_create_forms.rb
-- db/migrate/20100908063639_create_snippets.rb
+- db/migrate/20100927041219_remove_payment_methods.rb
+- db/migrate/20100927041624_change_payments_add_gateway.rb
+- db/migrate/20100927140446_change_payment_add_card_type_card_number.rb
+- db/seed.rb
+- db/seeds/forms.rb
+- db/seeds/layouts.rb
+- db/seeds/snippets.rb
 - features/support/env.rb
 - features/support/paths.rb
 - lib/shop/controllers/application_controller.rb
 - lib/shop/controllers/site_controller.rb
+- lib/shop/interface/customers.rb
 - lib/shop/interface/products.rb
 - lib/shop/models/image.rb
 - lib/shop/models/page.rb
 - lib/shop/tags/address.rb
+- lib/shop/tags/card.rb
 - lib/shop/tags/cart.rb
 - lib/shop/tags/category.rb
 - lib/shop/tags/core.rb
@@ -196,6 +233,7 @@ files:
 - public/javascripts/admin/extensions/shop/products/edit.js
 - public/javascripts/admin/extensions/shop/products/index.js
 - public/stylesheets/sass/admin/extensions/shop/edit.sass
+- public/stylesheets/sass/admin/extensions/shop/index.sass
 - public/stylesheets/sass/admin/extensions/shop/products/edit.sass
 - public/stylesheets/sass/admin/extensions/shop/products/index.sass
 - radiant-shop-extension.gemspec
@@ -212,6 +250,7 @@ files:
 - spec/datasets/images.rb
 - spec/datasets/shop_addresses.rb
 - spec/datasets/shop_categories.rb
+- spec/datasets/shop_customers.rb
 - spec/datasets/shop_line_items.rb
 - spec/datasets/shop_orders.rb
 - spec/datasets/shop_products.rb
@@ -219,12 +258,14 @@ files:
 - spec/lib/shop/models/image_spec.rb
 - spec/lib/shop/models/page_spec.rb
 - spec/lib/shop/tags/address_spec.rb
+- spec/lib/shop/tags/card_spec.rb
 - spec/lib/shop/tags/cart_spec.rb
 - spec/lib/shop/tags/category_spec.rb
 - spec/lib/shop/tags/core_spec.rb
 - spec/lib/shop/tags/helpers_spec.rb
 - spec/lib/shop/tags/item_spec.rb
 - spec/lib/shop/tags/product_spec.rb
+- spec/lib/shop/tags/responses_spec.rb
 - spec/matchers/comparison.rb
 - spec/matchers/render_matcher.rb
 - spec/models/form_checkout_spec.rb
@@ -298,6 +339,7 @@ test_files:
 - spec/datasets/images.rb
 - spec/datasets/shop_addresses.rb
 - spec/datasets/shop_categories.rb
+- spec/datasets/shop_customers.rb
 - spec/datasets/shop_line_items.rb
 - spec/datasets/shop_orders.rb
 - spec/datasets/shop_products.rb
@@ -305,12 +347,14 @@ test_files:
 - spec/lib/shop/models/image_spec.rb
 - spec/lib/shop/models/page_spec.rb
 - spec/lib/shop/tags/address_spec.rb
+- spec/lib/shop/tags/card_spec.rb
 - spec/lib/shop/tags/cart_spec.rb
 - spec/lib/shop/tags/category_spec.rb
 - spec/lib/shop/tags/core_spec.rb
 - spec/lib/shop/tags/helpers_spec.rb
 - spec/lib/shop/tags/item_spec.rb
 - spec/lib/shop/tags/product_spec.rb
+- spec/lib/shop/tags/responses_spec.rb
 - spec/matchers/comparison.rb
 - spec/matchers/render_matcher.rb
 - spec/models/form_checkout_spec.rb

data/app/models/shop_payment_method.rb

@@ -1,5 +0,0 @@
-class ShopPaymentMethod < ActiveRecord::Base
-  
-  has_many :payments, :class_name => 'ShopPayment'
-  
-end

data/db/migrate/20100903122123_create_forms.rb

@@ -1,44 +0,0 @@
-class CreateForms < ActiveRecord::Migration
-  def self.up
-    # Will only create a layout if it doesn't exist
-    Form.create({
-      :title  => 'AddCartItem',
-      :action => '/shop/cart/items',
-      :body   => <<-CONTENT
-<r:shop>
-  <r:product>
-    <input type="hidden" name="line_item[item_id]" value="<r:id />" />
-    <!-- Your Customisation Below -->
-    
-    <r:form:text name='line_item[quantity]' /> <!-- Amount of items to add -->
-    <input type="submit" name="add_to_cart" id="add_to_cart_<r:id />" value="Add To Cart" />
-    
-    <!-- Your Customisation Above -->
-  </r:product>
-</r:shop>
-CONTENT
-    })
-    
-    Form.create({
-      :title  => 'UpdateCartItem',
-      :action => '/shop/cart/items/x',
-      :body   => <<-CONTENT
-<r:shop:cart>
-  <r:item>
-    <input type="hidden" name="_method" value="put" />
-    <input type="hidden" name="line_item[id]" value="<r:item:id />" />
-    <!-- Your Customisation Below -->
-    
-    <input type="text" name="line_item[quantity]" value="" />
-    <input type="submit" name="add_to_cart" id="update_<r:id />" value="Update" />
-    
-    <!-- Your Customisation Above -->
-  </r:item>
-</r:shop:cart>
-CONTENT
-    })
-  end
-
-  def self.down
-  end
-end

data/db/migrate/20100908063639_create_snippets.rb

@@ -1,22 +0,0 @@
-class CreateSnippets < ActiveRecord::Migration
-  def self.up
-    Snippet.create({
-      :name     => 'CartOverview',
-      :content  => <<-BEGIN
-<r:shop:cart>
-  <r:if_items>
-    <span class="quantity"><r:quantity /></span>
-    <span class="price"><r:price /></span>
-    <r:link>checkout</r:link>
-  </r:if_items>
-  <r:unless_items>
-    <p>Your cart is empty</p>
-  </r:unless_items>
-</r:shop:cart>
-BEGIN
-    })
-  end
-
-  def self.down
-  end
-end