radiant-shop-extension 0.92.1 → 0.92.2

data/VERSION

@@ -1 +1 @@
-0.92.1
+0.92.2

data/app/models/shop_order.rb

@@ -130,6 +130,11 @@ class ShopOrder < ActiveRecord::Base
   
   class << self
     
+    # A hookable method used by the site controller 
+    def find_by_session(session)
+      find(session)
+    end
+    
     # Will scope the contained find calls to a specific status
     def scope_by_status(status)
       case status

data/app/models/shop_product.rb

@@ -14,7 +14,7 @@ class ShopProduct < ActiveRecord::Base
   before_validation             :assign_slug, :assign_breadcrumb, :assign_page_class_name
   validates_presence_of         :page
   
-  validates_numericality_of     :price, :greater_than => 0.00, :allow_nil => true, :precisions => 2
+  validates_numericality_of     :price, :greater_than_or_equal_to => 0.00, :allow_nil => false, :precisions => 2
   
   accepts_nested_attributes_for :page
   

data/lib/shop/controllers/application_controller.rb

@@ -7,33 +7,25 @@ module Shop
           filter_parameter_logging :password, :password_confirmation, :credit
           
           def current_shop_order
-            return @current_shop_order if defined?(@current_shop_order)
-            @current_shop_order = find_or_create_shop_order if request.session[:shop_order]
+            find_or_create_shop_order
           end
           
           def find_shop_order
-            shop_order = nil
-            
             begin
-              shop_order = ShopOrder.find(request.session[:shop_order])
+              ShopOrder.find_by_session(request.session[:shop_order])
             rescue
-              shop_order = nil
+              nil
             end
-                        
-            shop_order
           end
           
           def find_or_create_shop_order
-            shop_order = nil
-            
             if find_shop_order
-              shop_order = find_shop_order
+              return find_shop_order
             else
-              shop_order = ShopOrder.create({ :customer_id => (current_user.id rescue nil) })
+              shop_order = ShopOrder.create(:customer_id => (current_user.id rescue nil))
               request.session[:shop_order] = shop_order.id
+              return shop_order
             end
-            
-            shop_order
           end
         end
       end

data/lib/shop/tags/cart.rb

@@ -11,6 +11,7 @@ module Shop
         tag.expand
       end
       
+      desc %{ Clears the cart from the memory of the application}
       tag 'shop:cart:forget' do |tag|
         tag.locals.page.request.session[:shop_order] = nil
       end

data/lib/shop/tags/category.rb

@@ -33,8 +33,10 @@ module Shop
       
       tag 'shop:category' do |tag|
         tag.locals.shop_category = Helpers.current_category(tag)
-        tag.locals.shop_categories = tag.locals.shop_category.categories
-        
+        if tag.locals.shop_category.present?
+          tag.locals.shop_categories = tag.locals.shop_category.categories 
+        end
+          
         tag.expand unless tag.locals.shop_category.nil?
       end
       

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.92.1"
+  s.version = "0.92.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "John Barker", "Darcy Laycock"]
-  s.date = %q{2010-12-14}
+  s.date = %q{2010-12-17}
   s.description = %q{Radiant Shop is an attempt at a simple but complete store. It includes Products, Categories, Orders and Credit Card Payments}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [

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

@@ -13,11 +13,11 @@ describe Admin::Shop::CustomersController do
       it 'should be assigned' do
         get :new
         
-        assigns(:inputs).should   === ['name','email']
-        assigns(:meta).should     === ['login','password','password_confirmation']
-        assigns(:buttons).should  === []
-        assigns(:parts).should    === []
-        assigns(:popups).should   === []
+        assigns(:inputs).should   include('name','email')
+        assigns(:meta).should     include('login','password','password_confirmation')
+        assigns(:buttons).should  include()
+        assigns(:parts).should    include()
+        assigns(:popups).should   include()
       end
     end
   end
@@ -27,11 +27,11 @@ describe Admin::Shop::CustomersController do
       it 'should be assigned' do
         get :edit, :id => shop_customers(:customer).id
         
-        assigns(:inputs).should   === ['name','email']
-        assigns(:meta).should     === ['login','password','password_confirmation']
-        assigns(:buttons).should  === []
-        assigns(:parts).should    === ['orders','addresses']
-        assigns(:popups).should   === []
+        assigns(:inputs).should   include('name','email')
+        assigns(:meta).should     include('login','password','password_confirmation')
+        assigns(:buttons).should  include()
+        assigns(:parts).should    include('orders','addresses')
+        assigns(:popups).should   include()
       end
     end
   end
@@ -41,11 +41,11 @@ describe Admin::Shop::CustomersController do
       it 'should be assigned' do
         post :create, :shop_customer => {}
         
-        assigns(:inputs).should   === ['name','email']
-        assigns(:meta).should     === ['login','password','password_confirmation']
-        assigns(:buttons).should  === []
-        assigns(:parts).should    === []
-        assigns(:popups).should   === []
+        assigns(:inputs).should   include('name','email')
+        assigns(:meta).should     include('login','password','password_confirmation')
+        assigns(:buttons).should  include()
+        assigns(:parts).should    include()
+        assigns(:popups).should   include()
       end
     end
   end
@@ -55,11 +55,11 @@ describe Admin::Shop::CustomersController do
       it 'should be assigned' do
         put :update, :id => shop_customers(:customer).id, :shop_customer => {}
         
-        assigns(:inputs).should   === ['name','email']
-        assigns(:meta).should     === ['login','password','password_confirmation']
-        assigns(:buttons).should  === []
-        assigns(:parts).should    === ['orders','addresses']
-        assigns(:popups).should   === []
+        assigns(:inputs).should   include('name','email')
+        assigns(:meta).should     include('login','password','password_confirmation')
+        assigns(:buttons).should  include()
+        assigns(:parts).should    include('orders','addresses')
+        assigns(:popups).should   include()
       end
     end
   end

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

@@ -45,33 +45,33 @@ describe Admin::Shop::OrdersController do
         it 'should assign the following' do
           get :edit, :id => shop_orders(:empty).id
           
-          assigns(:inputs).should   === []
-          assigns(:meta).should     === []
-          assigns(:buttons).should  === []
-          assigns(:parts).should    === ['items']
-          assigns(:popups).should   === []
+          assigns(:inputs).should   include()
+          assigns(:meta).should     include()
+          assigns(:buttons).should  include()
+          assigns(:parts).should    include('items')
+          assigns(:popups).should   include()
         end
       end
       context 'order with no address and customer' do
         it 'should assign the following' do
           get :edit, :id => shop_orders(:one_item).id
           
-          assigns(:inputs).should   === []
-          assigns(:meta).should     === []
-          assigns(:buttons).should  === []
-          assigns(:parts).should    === ['items','customer']
-          assigns(:popups).should   === []
+          assigns(:inputs).should   include()
+          assigns(:meta).should     include()
+          assigns(:buttons).should  include()
+          assigns(:parts).should    include('items','customer')
+          assigns(:popups).should   include()
         end
       end
       context 'order with no address and customer' do
         it 'should assign the following' do
           get :edit, :id => shop_orders(:several_items).id
           
-          assigns(:inputs).should   === []
-          assigns(:meta).should     === []
-          assigns(:buttons).should  === []
-          assigns(:parts).should    === ['items','addresses','customer']
-          assigns(:popups).should   === []
+          assigns(:inputs).should   include()
+          assigns(:meta).should     include()
+          assigns(:buttons).should  include()
+          assigns(:parts).should    include('items','addresses','customer')
+          assigns(:popups).should   include()
         end
       end
     end
@@ -82,33 +82,33 @@ describe Admin::Shop::OrdersController do
       it 'should assign the following' do
         put :update, :id => shop_orders(:empty).id, :shop_order => {}
         
-        assigns(:inputs).should   === []
-        assigns(:meta).should     === []
-        assigns(:buttons).should  === []
-        assigns(:parts).should    === ['items']
-        assigns(:popups).should   === []
+        assigns(:inputs).should   include()
+        assigns(:meta).should     include()
+        assigns(:buttons).should  include()
+        assigns(:parts).should    include('items')
+        assigns(:popups).should   include()
       end
     end
     context 'order with no address and customer' do
       it 'should assign the following' do
         put :update, :id => shop_orders(:one_item).id, :shop_order => {}
         
-        assigns(:inputs).should   === []
-        assigns(:meta).should     === []
-        assigns(:buttons).should  === []
-        assigns(:parts).should    === ['items','customer']
-        assigns(:popups).should   === []
+        assigns(:inputs).should   include()
+        assigns(:meta).should     include()
+        assigns(:buttons).should  include()
+        assigns(:parts).should    include('items','customer')
+        assigns(:popups).should   include()
       end
     end
     context 'order with no address and customer' do
       it 'should assign the following' do
         put :update, :id => shop_orders(:several_items).id, :shop_order => {}
         
-        assigns(:inputs).should   === []
-        assigns(:meta).should     === []
-        assigns(:buttons).should  === []
-        assigns(:parts).should    === ['items','addresses','customer']
-        assigns(:popups).should   === []
+        assigns(:inputs).should   include()
+        assigns(:meta).should     include()
+        assigns(:buttons).should  include()
+        assigns(:parts).should    include('items','addresses','customer')
+        assigns(:popups).should   include()
       end
     end
   end

data/spec/datasets/shop_customers.rb

@@ -18,7 +18,7 @@ class ShopCustomersDataset < Dataset::Base
   
   helpers do
     def login_as(user)
-      login_user = user.is_a?(User) ? user : users(user)
+      login_user = users(user)
       flunk "Can't login as non-existing user #{user.to_s}." unless login_user
       UserActionObserver.current_user = login_user
       login_user

data/spec/datasets/shop_orders.rb

@@ -1,14 +1,14 @@
 class ShopOrdersDataset < Dataset::Base
   
-  uses :shop_products, :shop_customers
+  uses :shop_products, :users
   
   def load
     create_record :shop_order, :empty
     
     create_record :shop_order, :one_item,
-      :customer => shop_customers(:customer)
+      :customer => users(:admin)
           
     create_record :shop_order, :several_items,
-      :customer => shop_customers(:customer)
+      :customer => users(:admin)
   end
 end

data/spec/models/form_address_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../spec_helper"
 
 describe FormAddress do
 
-  dataset :shop_orders, :pages, :forms, :shop_addresses
+  dataset :shop_orders, :pages, :forms, :shop_addresses, :shop_customers
   
   before :each do
     mock_page_with_request_and_data

data/spec/models/form_checkout_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../spec_helper"
 
 describe FormCheckout do
 
-  dataset :shop_orders, :pages, :forms, :shop_addresses
+  dataset :shop_orders, :pages, :forms, :shop_addresses, :shop_customers
   
   before :each do
     mock_page_with_request_and_data

data/spec/models/shop_product_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
 describe ShopProduct do
-  dataset :shop_products, :shop_line_items
+  dataset :shop_products, :shop_line_items, :shop_customers
   
   describe 'relationships' do
     before :each do
@@ -13,12 +13,12 @@ describe ShopProduct do
     end
     
     it 'should have a created_by User' do
-      @product.created_by = users(:customer)
+      @product.created_by = shop_customers(:customer)
       @product.created_by.is_a?(User).should be_true
     end
     
     it 'should have a updated_by User' do
-      @product.updated_by = users(:customer)
+      @product.updated_by = shop_customers(:customer)
       @product.updated_by.is_a?(User).should be_true
     end
     

data/spec/spec_helper.rb

@@ -11,12 +11,18 @@ unless defined? RADIANT_ROOT
 end
 require "#{RADIANT_ROOT}/spec/spec_helper"
 
-Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets")
-
-if File.directory?(File.dirname(__FILE__) + "/matchers")
-  Dir[File.dirname(__FILE__) + "/matchers/*.rb"].each {|file| require file }
-end
-
-Spec::Runner.configure do |config|
-  config.mock_with :rr
+unless defined? SHOP_ROOT
+  
+  SHOP_ROOT = ShopExtension.root + '/spec'
+  
+  Dataset::Resolver.default << (SHOP_ROOT + "/datasets")
+  
+  if File.directory?(SHOP_ROOT + "/matchers")
+    Dir[SHOP_ROOT + "/matchers/**/*.rb"].each {|file| require file }
+  end
+  
+  Spec::Runner.configure do |config|
+    config.mock_with :rr
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 365
+  hash: 363
   prerelease: false
   segments: 
   - 0
   - 92
-  - 1
-  version: 0.92.1
+  - 2
+  version: 0.92.2
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 +08:00
+date: 2010-12-17 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency