radiant-shop-extension 0.90.0 → 0.90.1

data/shop_extension.rb

@@ -1,16 +1,16 @@
 class ShopExtension < Radiant::Extension
-  version "0.9"
-  description "Core extension for the Radiant shop"
-  url "http://github.com/squaretalent/radiant-shop-extension"
+  version YAML::load_file(File.join(File.dirname(__FILE__), 'VERSION'))
+  description "Radiant Shop provides"
+  url "http://github.com/dirkkelly/radiant-shop-extension"
   
   extension_config do |config|
     config.gem 'activemerchant',              :lib => 'active_merchant'
     config.gem 'fastercsv',                   :lib => 'fastercsv'
     config.gem 'radiant-settings-extension',  :lib => false
-    config.gem 'radiant-users-extension',     :lib => false
-    config.gem 'radiant-images-extension',    :lib => false
-    config.gem 'radiant-forms-extension',     :lib => false
-    config.gem 'radiant-drag-extension',      :lib => false
+    config.gem 'radiant-users-extension'
+    config.gem 'radiant-images-extension'
+    config.gem 'radiant-forms-extension'
+    config.gem 'radiant-drag_order-extension'
   end
   
   UserActionObserver.instance.send :add_observer!, ShopCategory
@@ -18,8 +18,13 @@ class ShopExtension < Radiant::Extension
   UserActionObserver.instance.send :add_observer!, ShopProduct
   UserActionObserver.instance.send :add_observer!, ShopProductAttachment
   
-  def activate    
-    # View Hooks
+  def activate
+    tab "Shop" do
+      add_item "Products",  "/admin/shop"
+      add_item "Orders",    "/admin/shop/orders"
+      add_item "Customers", "/admin/shop/customers"
+    end
+    
     unless defined? admin.products
       Radiant::AdminUI.send :include, Shop::Interface::Categories, Shop::Interface::Customers
       Radiant::AdminUI.send :include, Shop::Interface::Discounts,  Shop::Interface::Orders,    Shop::Interface::Products
@@ -31,28 +36,16 @@ class ShopExtension < Radiant::Extension
       admin.products   = Radiant::AdminUI.load_default_shop_products_regions
     end
     
-    # Tags
-    Page.send :include, Shop::Tags::Core,     Shop::Tags::Address, Shop::Tags::Card,    Shop::Tags::Cart
-    Page.send :include, Shop::Tags::Category, Shop::Tags::Item,    Shop::Tags::Product
-    Page.send :include, Shop::Tags::Tax
-    
-    # Model Includes
     Page.send :include,  Shop::Models::Page
     Image.send :include, Shop::Models::Image
     User.send :include,  Shop::Models::User
     
-    # Controller Includes
     ApplicationController.send :include, Shop::Controllers::ApplicationController
     SiteController.send :include, Shop::Controllers::SiteController
     
-    # Tabs    
-    tab "Shop" do
-      add_item "Products",      "/admin/shop"
-      add_item "Orders",        "/admin/shop/orders"
-      add_item "Customers",     "/admin/shop/customers"
-    end
-    
-    Radiant::Config['shop.root_page_id']    ||= nil
+    Page.send :include, Shop::Tags::Core,     Shop::Tags::Address, Shop::Tags::Card,    Shop::Tags::Cart
+    Page.send :include, Shop::Tags::Category, Shop::Tags::Item,    Shop::Tags::Product
+    Page.send :include, Shop::Tags::Tax
     
     Radiant::Config['shop.layout_product']  ||= 'Product'
     Radiant::Config['shop.layout_category'] ||= 'Products'
@@ -68,8 +61,8 @@ class ShopExtension < Radiant::Extension
     
     Radiant::Config['shop.date_format']     ||= '%d/%m/%Y'
     
-    # Scoped Customer Welcome Page
-    Radiant::Config['scoped.customer.redirect'] = '/cart'
+    Radiant::Config['users.customer.redirect'] = '/cart'
+
   end
   
 end

data/spec/controllers/admin/shop/categories_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Admin::Shop::CategoriesController do
   

data/spec/controllers/admin/shop/customers_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Admin::Shop::CustomersController do
   

data/spec/controllers/admin/shop/orders_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Admin::Shop::OrdersController do
   

data/spec/controllers/admin/shop/products/images_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../../spec_helper"
 
 describe Admin::Shop::Products::ImagesController do
   

data/spec/controllers/admin/shop/products_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Admin::Shop::ProductsController do
   

data/spec/controllers/admin/shops_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../spec_helper"
 
 describe Admin::ShopsController do
   dataset :users

data/spec/lib/shop/models/image_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 #
 # Tests for image model extensions

data/spec/lib/shop/models/page_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 #
 # Tests for Page extensions

data/spec/lib/shop/tags/address_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 #
 # Tests for shop address tags

data/spec/lib/shop/tags/card_spec.rb

@@ -1,5 +1,4 @@
-require 'spec/spec_helper'
-require 'spec/helpers/nested_tag_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 #
 # Test for Shop Line Item Tags
@@ -27,7 +26,7 @@ describe Shop::Tags::Card do
         exp = %{<select name="card[type]" id="card_type">
 <option value="amex">American Express</option>
 <option value="diners">Diners Club</option>
-<option value="mastercard">Master Card</option>
+<option value="master">Master Card</option>
 <option value="visa">Visa</option>
 </select>}
 
@@ -39,7 +38,7 @@ describe Shop::Tags::Card do
       it 'should output all except amex and diners' do
         tag = %{<r:form:card:type except="amex,diners" />}
         exp = %{<select name="card[type]" id="card_type">
-<option value="mastercard">Master Card</option>
+<option value="master">Master Card</option>
 <option value="visa">Visa</option>
 </select>}
 
@@ -86,7 +85,7 @@ describe Shop::Tags::Card do
     it 'should output the card years' do
       tag = %{<r:form:card:year />}
       exp = %{<select name="card[year]" id="card_year">\n}
-      (Time.new.year ... Time.new.year + 10).each do |year|
+      (Time.new.year ... Time.new.year + 15).each do |year|
         exp << %{<option value="#{year}">#{year}</option>\n}
       end
       exp << %{</select>}

data/spec/lib/shop/tags/cart_spec.rb

@@ -1,5 +1,4 @@
-require 'spec/spec_helper'
-require 'spec/helpers/nested_tag_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 #
 # Tests for shop order tags module

data/spec/lib/shop/tags/category_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Shop::Tags::Category do
   

data/spec/lib/shop/tags/core_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Shop::Tags::Core do
 

data/spec/lib/shop/tags/helpers_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Shop::Tags::Helpers do
   

data/spec/lib/shop/tags/item_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 require 'spec/helpers/nested_tag_helper'
 
 #

data/spec/lib/shop/tags/product_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Shop::Tags::Product do
   

data/spec/lib/shop/tags/tax_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 #
 # Tests for shop address tags

data/spec/models/form_address_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe FormAddress do
 

data/spec/models/form_checkout_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe FormCheckout do
 
@@ -9,25 +9,7 @@ describe FormCheckout do
   end
   
   describe '#create' do
-    context 'gateway' do
-      context 'order has no billing' do
-        before :each do
-          login_as :customer
-          @order = shop_orders(:empty)
-          mock_valid_form_checkout_request
-        end
-        
-        it 'should return the standard response' do
-          @checkout = FormCheckout.new(@form, @page, @form[:extensions][:bogus_checkout])
-          result = @checkout.create
-                    
-          result[:gateway].should be_nil
-          result[:payment].should be_nil
-          result[:card].should    be_nil
-          result[:message].should be_nil
-        end
-      end
-      
+    context 'gateway' do      
       context 'configured correctly' do
         before :each do
           login_as :customer
@@ -48,9 +30,10 @@ describe FormCheckout do
           @checkout = FormCheckout.new(@form, @page, @form[:extensions][:bogus_checkout])
           result = @checkout.create
           
-          result[:gateway].should === true
-          result[:card].should    === true
-          result[:payment].should === true
+          result[:gateway].should be_true
+          result[:card].should    be_true
+          result[:payment].should be_true
+          result[:message].should === "Order successfully processed"
         end
         
         it 'should assign a payment object' do
@@ -70,6 +53,24 @@ describe FormCheckout do
         end
       end
       
+      context 'no billing address sent' do
+        before :each do
+          login_as :customer
+          @order = shop_orders(:empty)
+          mock_valid_form_checkout_request
+        end
+        
+        it 'should return the standard response' do
+          @checkout = FormCheckout.new(@form, @page, @form[:extensions][:bogus_checkout])
+          result = @checkout.create
+                    
+          result[:gateway].should be_nil
+          result[:payment].should be_nil
+          result[:card].should    be_nil
+          result[:message].should === "Billing Address has not been set"
+        end
+      end
+      
       context 'configured incorrectly' do
         before :each do
           login_as :customer
@@ -84,11 +85,12 @@ describe FormCheckout do
             @checkout = FormCheckout.new(@form, @page, @form[:extensions][:bogus_checkout])
             result = @checkout.create
             
-            result[:gateway].should === false
+            result[:gateway].should be_false
             result[:card].should    be_nil
             result[:payment].should be_nil
+            result[:message].should === "Payment gateway has not been configured"
             
-            @order.payment.should be_nil
+            @order.payment.should   be_nil
           end
         end
         
@@ -99,32 +101,37 @@ describe FormCheckout do
             @checkout = FormCheckout.new(@form, @page, @form[:extensions][:bogus_checkout])
             result = @checkout.create
             
-            result[:gateway].should === true
+            result[:gateway].should be_true
             result[:card].should    be_nil
             result[:payment].should be_nil
+            result[:message].should === "Credit card details were not sent"
             
-            @order.payment.should be_nil
+            @order.payment.should   be_nil
           end
         end
         
         context 'invalid card' do
           it 'should return card and payment false' do
-            mock.instance_of(ActiveMerchant::Billing::CreditCard).valid? { false }
+            @card = ActiveMerchant::Billing::CreditCard.new
+            stub(@card).valid? { false }
+            
+            mock.instance_of(ActiveMerchant::Billing::CreditCard) { @card }
             
             @checkout = FormCheckout.new(@form, @page, @form[:extensions][:bogus_checkout])
             result = @checkout.create
             
-            result[:gateway].should === true
-            result[:card].should    === false
+            result[:gateway].should be_true
+            result[:card].should    be_false
             result[:payment].should be_nil
+            result[:message].should === "Type is not the correct card type"
             
-            @order.payment.should be_nil
+            @order.payment.should   be_nil
           end
         end
       end
     end
     
-    context 'mail' do
+    context 'result_extension' do
       before :each do
         mock.instance_of(ActiveMerchant::Billing::CreditCard).valid? { true }
       end

data/spec/models/shop_address_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe ShopAddress do
   

data/spec/models/shop_category_page_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe ShopCategoryPage do
 

data/spec/models/shop_category_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe ShopCategory do
   dataset :shop_categories, :users

data/spec/models/shop_customer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe ShopCustomer do
   

data/spec/models/shop_line_item_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe ShopLineItem do
   

data/spec/models/shop_order_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
   
 describe ShopOrder do
   

data/spec/models/shop_payment_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe ShopPayment do
   

data/spec/models/shop_product_attachment_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe ShopProductAttachment do
   

data/spec/models/shop_product_page_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe ShopProductPage do
 

data/spec/models/shop_product_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe ShopProduct do
   dataset :shop_products, :shop_line_items

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 375
+  hash: 373
   prerelease: false
   segments: 
   - 0
   - 90
-  - 0
-  version: 0.90.0
+  - 1
+  version: 0.90.1
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +08:00
+date: 2010-11-24 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,22 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
+        version: 0.1.2
+  name: acts_as_list
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -83,71 +99,71 @@ dependencies:
         - 1
         version: 1.1.1
   name: radiant-settings-extension
-  requirement: *id004
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 0
         - 4
-        - 0
-        version: 0.4.0
+        - 1
+        version: 0.4.1
   name: radiant-images-extension
-  requirement: *id005
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
         - 3
         - 2
-        - 1
-        version: 3.2.1
+        - 6
+        version: 3.2.6
   name: radiant-forms-extension
-  requirement: *id006
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 2
+        version: 0.0.2
   name: radiant-users-extension
-  requirement: *id007
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
         - 0
-        - 1
-        - 0
-        version: 0.1.0
-  name: radiant-drag-extension
-  requirement: *id008
+        - 3
+        - 8
+        version: 0.3.8
+  name: radiant-drag_order-extension
+  requirement: *id009
 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: []
@@ -158,7 +174,6 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .gitignore
 - HISTORY.md
 - LICENSE
 - README.md
@@ -279,7 +294,6 @@ files:
 - app/views/admin/shop/products/remove.html.haml
 - config/locales/en.yml
 - config/routes.rb
-- config/shop_cart.yml
 - db/migrate/20101011063133_setup_shop.rb
 - db/seed.rb
 - db/seeds/forms.rb
@@ -287,6 +301,7 @@ files:
 - db/seeds/pages.rb
 - db/seeds/products.rb
 - db/seeds/snippets.rb
+- lib/radiant-shop-extension.rb
 - lib/shop/controllers/application_controller.rb
 - lib/shop/controllers/site_controller.rb
 - lib/shop/interface/categories.rb
@@ -363,17 +378,13 @@ files:
 - spec/models/shop_product_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- vendor/plugins/acts_as_list/README
-- vendor/plugins/acts_as_list/init.rb
-- vendor/plugins/acts_as_list/lib/active_record/acts/list.rb
-- vendor/plugins/acts_as_list/test/list_test.rb
 has_rdoc: true
 homepage: http://github.com/squaretalent/radiant-shop-extension
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement