radiant-shop-extension 0.10.0 → 0.11.0

data/shop_extension.rb

@@ -4,33 +4,38 @@ class ShopExtension < Radiant::Extension
   url "http://github.com/squaretalent/radiant-shop-extension"
   
   extension_config do |config|
-    config.gem 'activemerchant',      :version => '1.7.3', :lib => 'active_merchant'
-    config.gem 'will_paginate',       :version => '2.3.14'
-    config.gem 'radiant-layouts-extension', :version => '0.9.1', :lib => false
+    config.gem 'activemerchant',            :version => '1.7.3',    :lib => 'active_merchant'
+    config.gem 'will_paginate',             :version => '2.3.14'
   end
   
   UserActionObserver.instance.send :add_observer!, ShopProduct
   UserActionObserver.instance.send :add_observer!, ShopCategory
   UserActionObserver.instance.send :add_observer!, ShopOrder
+  UserActionObserver.instance.send :add_observer!, ShopProductAttachment
+  UserActionObserver.instance.send :add_observer!, ShopProductVariant
+  UserActionObserver.instance.send :add_observer!, ShopVariant
+  UserActionObserver.instance.send :add_observer!, ShopPackage
   
-  def activate
-    
+  def activate    
     # View Hooks
     unless defined? admin.products
-      Radiant::AdminUI.send :include, Shop::Interface::Products, Shop::Interface::Customers
-      
-      admin.products    = Radiant::AdminUI.load_default_shop_products_regions
-      admin.categories  = Radiant::AdminUI.load_default_shop_categories_regions
-      admin.customers   = Radiant::AdminUI.load_default_shop_customers_regions
+      Radiant::AdminUI.send :include, Shop::Interface::Categories, Shop::Interface::Customers, Shop::Interface::Orders, Shop::Interface::Packages, Shop::Interface::Products, Shop::Interface::Variants
+
+      admin.categories= Radiant::AdminUI.load_default_shop_categories_regions
+      admin.customers = Radiant::AdminUI.load_default_shop_customers_regions
+      admin.orders    = Radiant::AdminUI.load_default_shop_orders_regions
+      admin.packages  = Radiant::AdminUI.load_default_shop_packages_regions      
+      admin.products  = Radiant::AdminUI.load_default_shop_products_regions
+      admin.variants  = Radiant::AdminUI.load_default_shop_variants_regions
     end
     
-    if admin.respond_to? :page
-      admin.page.edit.add :layout_row, 'shop_category'
-      admin.page.edit.add :layout_row, 'shop_product' 
-    end
+    # if admin.respond_to? :page
+    #   admin.page.edit.add :layout_row, 'shop_category'
+    #   admin.page.edit.add :layout_row, 'shop_product' 
+    # end
     
     # Tags
-    Page.send :include, Shop::Tags::Core, Shop::Tags::Cart, Shop::Tags::Category, Shop::Tags::Item, Shop::Tags::Product, Shop::Tags::Address, Shop::Tags::Responses, Shop::Tags::Card
+    Page.send :include, Shop::Tags::Core, Shop::Tags::Address, Shop::Tags::Card, Shop::Tags::Cart, Shop::Tags::Category, Shop::Tags::Item, Shop::Tags::Package, Shop::Tags::Product, Shop::Tags::ProductVariant, Shop::Tags::Responses
     
     # Model Includes
     Page.send :include, Shop::Models::Page
@@ -41,23 +46,22 @@ class ShopExtension < Radiant::Extension
     SiteController.send :include, Shop::Controllers::SiteController
     
     # Tabs3
+    
     tab "Shop" do
-      add_item "Products", "/admin/shop"
-      add_item "Customers", "/admin/shop/customers"
+      add_item "Products",      "/admin/shop"
+      add_item "Orders",        "/admin/shop/orders"
+      add_item "Customers",     "/admin/shop/customers"
     end
     
-    # Ensure there is always a shop prefix, otherwise we'll lose admin and pages
-    Radiant::Config['shop.url_prefix'] = Radiant::Config['shop.url_prefix'].blank? ? 'shop' : Radiant::Config['shop.url_prefix']
-    Radiant::Config['shop.product_layout']  ||= 'Product'
-    Radiant::Config['shop.category_layout'] ||= 'Products'
-    Radiant::Config['shop.order_layout']    ||= 'Cart'
+    Radiant::Config['shop.root_page_id']    ||= (Page.first(:conditions => { :slug => 'shop'}).id rescue (Page.first.id rescue nil))
+    Radiant::Config['shop.root_page_slug']  ||= 'shop'
     
-    Radiant::Config['shop.cart_thanks_path']||= 'cart/thanks'
-    Radiant::Config['shop.cart_path']       ||= 'cart'
+    Radiant::Config['shop.layout_product']  ||= 'Product'
+    Radiant::Config['shop.layout_category'] ||= 'Products'
     
     Radiant::Config['shop.price_unit']      ||= '$'
     Radiant::Config['shop.price_precision'] ||= 2
-    Radiant::Config['shop.price_seperator'] ||= '.'
+    Radiant::Config['shop.price_separator'] ||= '.'
     Radiant::Config['shop.price_delimiter'] ||= ','
     
     # Scoped Customer Welcome Page

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

@@ -2,121 +2,40 @@ require 'spec/spec_helper'
 
 describe Admin::Shop::CategoriesController do
   
-  dataset :users
+  dataset :users, :shop_categories, :shop_products, :pages
     
   before(:each) do
     login_as  :admin
     
-    @shop_category = ShopCategory.new
-    @shop_categories = [ @shop_category ]
-    
-    @shop_product = ShopProduct.new
-    @shop_products = [ @shop_product ]
-    
-    stub(@shop_category).id { 1 }
-    stub(@shop_category).products { @shop_products }
+    @category = shop_categories(:bread)
+    @products = @category.products
   end
   
   describe '#index' do
-    before :each do
-      mock(ShopCategory).find(:all) { @shop_categories } # Resource Controller
-      mock(ShopCategory).search('search') { @shop_categories }
-    end
-    
     context 'html' do
-      before :each do
-        get :index, :search => 'search'
-      end
-      
-      it 'should not assign an error or notice and redirect to shop_products path' do
-        response.should redirect_to(admin_shop_products_path)
+      it 'should redirect to shop_products path' do
+        get :index
+        
         flash.now[:error].should be_nil
-        flash.now[:notice].should be_nil
-      end
-      
-      it 'should assign the shop_product_images instance variable' do
-        assigns(:shop_categories).should === @shop_categories
+        response.should redirect_to(admin_shop_products_path)
       end
     end
     
     context 'js' do
-      before :each do
-        get :index, :search => 'search', :format => 'js'
-      end
-      
       it 'should render the collection partial and success status' do
+        get :index, :format => 'js'
+        
         response.should be_success
         response.should render_template('/admin/shop/categories/index/_category')
       end
-      
-      it 'should assign the shop_categories instance variable' do
-        assigns(:shop_categories).should === @shop_categories
-      end
     end
     
-    context 'json' do
-      before :each do
-        get :index, :search => 'search', :format => 'json'
-      end
-      
+    context 'json' do      
       it 'should return a json object of the array and success status' do
+        get :index, :format => 'json'
+        
         response.should be_success
-        response.body.should === @shop_categories.to_json(ShopCategory.params)
-      end
-      
-      it 'should assign the shop_product_images instance variable' do
-        assigns(:shop_categories).should === @shop_categories
-      end
-    end
-    
-  end
-  
-  describe '#products' do
-    before :each do
-      mock(ShopCategory).find('1') { @shop_category }
-    end
-    
-    context 'html' do
-      before :each do
-        get :products, :id => @shop_category.id
-      end
-      
-      it 'should render successfully' do
-        response.should render_template( '/admin/shop/products/index' )
-      end
-      
-      it 'should assign the shop_products instance variable' do
-        assigns(:shop_products).should ===  @shop_products
-      end
-    end
-    
-    context 'js' do
-      before :each do
-        get :products, :id => @shop_category.id, :format => 'js'
-      end
-      
-      it 'should render the collection template' do
-        response.should be_success
-        response.should render_template( '/admin/shop/products/index/_product' )
-      end
-      
-      it 'should assign the shop_products instance variable' do
-        assigns(:shop_products).should ===  @shop_products
-      end
-    end
-    
-    context 'json' do
-      before :each do
-        get :products, :id => @shop_category.id, :format => 'json'
-      end
-      
-      it 'should assign the shop_products and render the collection template' do
-        response.should be_success
-        response.body.should === @shop_products.to_json(ShopProduct.params)
-      end
-
-      it 'should assign the shop_products instance variable' do
-        assigns(:shop_products).should ===  @shop_products
+        response.body.should === assigns(:shop_categories).to_json
       end
     end
     
@@ -124,9 +43,9 @@ describe Admin::Shop::CategoriesController do
   
   describe '#sort' do
     before :each do
-      @categories = [
-        'shop_categories[]=2',
-        'shop_categories[]=1'
+      @params = [
+        "categories[]=2",
+        "categories[]=1"
       ].join('&')
     end
     
@@ -134,6 +53,7 @@ describe Admin::Shop::CategoriesController do
       context 'html' do
         it 'should assign an error and redirect to admin_shop_products_path path' do
           put :sort
+          
           flash.now[:error].should_not be_nil
           response.should redirect_to(admin_shop_products_path)
         end
@@ -142,6 +62,7 @@ describe Admin::Shop::CategoriesController do
       context 'js' do
         it 'should return an error string and failure status' do
           put :sort, :format => 'js'
+          
           response.should_not be_success
           response.body.should === 'Could not sort Categories.'
         end
@@ -150,6 +71,7 @@ describe Admin::Shop::CategoriesController do
       context 'json' do
         it 'should return a json error object and failure status' do
           put :sort, :format => 'json'
+          
           response.should_not be_success
           JSON.parse(response.body)['error'].should === 'Could not sort Categories.'
         end
@@ -159,12 +81,13 @@ describe Admin::Shop::CategoriesController do
     context 'categories are passed' do
       context 'could not sort' do
         before :each do
-          mock(ShopCategory).find('2').stub!.update_attributes!({:position => 1}) { raise ActiveRecord::RecordNotSaved }
+          mock(ShopCategory).sort(anything) { raise ActiveRecord::RecordNotFound }
         end
         
         context 'html' do
           it 'should assign an error and redirect to admin_shop_products_path path' do
-            put :sort, :categories => @categories
+            put :sort, :categories => @params
+            
             flash.now[:error].should === 'Could not sort Categories.'
             response.should redirect_to(admin_shop_products_path)
           end
@@ -172,7 +95,8 @@ describe Admin::Shop::CategoriesController do
         
         context 'js' do
           it 'should return an error string and failure status' do
-            put :sort, :categories => @categories, :format => 'js'
+            put :sort, :categories => @params, :format => 'js'
+            
             response.should_not be_success
             response.body.should === 'Could not sort Categories.'
           end
@@ -180,7 +104,8 @@ describe Admin::Shop::CategoriesController do
         
         context 'json' do
           it 'should return a json error object and failure status' do
-            put :sort, :categories => @categories, :format => 'json'
+            put :sort, :categories => @params, :format => 'json'
+            
             response.should_not be_success
             JSON.parse(response.body)['error'].should === 'Could not sort Categories.'
           end
@@ -189,21 +114,22 @@ describe Admin::Shop::CategoriesController do
       
       context 'successfully sorted' do
         before :each do
-          mock(ShopCategory).find('2').stub!.update_attributes!({:position => 1}) { true }
-          mock(ShopCategory).find('1').stub!.update_attributes!({:position => 2}) { true }
+          mock(ShopCategory).sort(anything) { true }
         end
         
         context 'html' do
           it 'should assign a notice and redirect to admin_shop_products_path path' do
-            put :sort, :categories => @categories
-            flash.now[:notice].should === 'Categories successfully sorted.'
+            put :sort, :categories => @params
+            
+            flash.now[:error].should be_nil
             response.should redirect_to(admin_shop_products_path)
           end
         end
         
         context 'js' do
           it 'should return success string and success status' do
-            put :sort, :categories => @categories, :format => 'js'
+            put :sort, :categories => @params, :format => 'js'
+            
             response.should be_success
             response.body.should === 'Categories successfully sorted.'
           end
@@ -211,7 +137,8 @@ describe Admin::Shop::CategoriesController do
         
         context 'json' do
           it 'should return a json success object and success status' do
-            put :sort, :categories => @categories, :format => 'json'
+            put :sort, :categories => @params, :format => 'json'
+            
             response.should be_success
             JSON.parse(response.body)['notice'].should === 'Categories successfully sorted.'
           end
@@ -221,14 +148,7 @@ describe Admin::Shop::CategoriesController do
   end
   
   describe '#create' do
-    before :each do
-      mock(ShopCategory).new { @shop_category }
-    end
     context 'category could not be created' do
-      before :each do
-        mock(@shop_category).save! { raise ActiveRecord::RecordNotSaved }
-      end
-      
       context 'html' do
         it 'should assign a flash error and render new' do
           post :create, :shop_category => {}
@@ -259,58 +179,60 @@ describe Admin::Shop::CategoriesController do
 
     context 'category successfully created' do
       before :each do
-        mock(@shop_category).save! { @shop_category }
+        @params = {
+          :page_attributes => { 
+            :title     => 'name', 
+            :parent_id => pages(:home).id,
+            :parts_attributes => [{
+              :name    => 'description',
+              :content => '*name*' 
+            }]
+          }
+        }
       end
-      
       context 'html' do
         context 'not continue' do
           it 'should assign a notice and redirect to edit_shop_product path' do
-            post :create, :shop_category => {}
-            flash.now[:notice].should === 'Category created successfully.'
+            post :create, :shop_category => @params
+            
             response.should redirect_to(admin_shop_categories_path)
           end
         end
         context 'continue' do
           it 'should assign a notice and redirect to edit_shop_product path' do
-            post :create, :shop_category => {}, :continue => true
-            flash.now[:notice].should === 'Category created successfully.'
-            response.should redirect_to(edit_admin_shop_category_path(@shop_category))
+            post :create, :shop_category => @params, :continue => true
+            
+            response.should redirect_to(edit_admin_shop_category_path(assigns(:shop_category)))
           end
         end
       end
       
       context 'js' do
         it 'should render the collection partial and success status' do
-          post :create, :shop_category => {}, :format => 'js'
+          post :create, :shop_category => @params, :format => 'js'
+          
           response.should be_success
-          assigns(:shop_category).should === @shop_category
           response.should render_template('/admin/shop/categories/index/_category')
         end
       end
       
       context 'json' do
         it 'should render the json object and redirect to json show' do
-          post :create ,:shop_category => {}, :format => 'json'
+          post :create ,:shop_category => @params, :format => 'json'
+          
           response.should be_success
-          response.body.should === @shop_category.to_json(ShopCategory.params)
+          response.body.should === assigns(:shop_category).to_json
         end
       end
     end
   end
   
   describe '#update' do
-    before :each do
-      mock(ShopCategory).find('1') { @shop_category }
-    end
-    
     context 'could not update' do
-      before :each do
-        stub(@shop_category).update_attributes!({}) { raise ActiveRecord::RecordNotSaved }
-      end
-      
       context 'html' do
         it 'should assign a flash error and render edit' do
-          put :update, :id => @shop_category.id, :shop_category => {}        
+          put :update, :id => @category.id, :shop_category => { :title => 'failure' }
+          
           response.should render_template(:edit)
           flash.now[:error].should === 'Could not update Category.'
         end
@@ -318,7 +240,8 @@ describe Admin::Shop::CategoriesController do
       
       context 'js' do
         it 'should render the error and failure status' do
-          put :update, :id => @shop_category.id, :shop_category => {}, :format => 'js'
+          put :update, :id => @category.id, :shop_category => { :title => 'failure' }, :format => 'js'
+          
           response.should_not be_success
           response.body.should === 'Could not update Category.'
         end
@@ -326,7 +249,8 @@ describe Admin::Shop::CategoriesController do
       
       context 'json' do
         it 'should assign an error json object and failure status' do
-          put :update, :id => @shop_category.id, :shop_category => {}, :format => 'json'
+          put :update, :id => @category.id, :shop_category => { :title => 'failure' }, :format => 'json'
+          
           response.should_not be_success
           JSON.parse(response.body)['error'].should === 'Could not update Category.'
         end
@@ -334,30 +258,27 @@ describe Admin::Shop::CategoriesController do
     end
     
     context 'successfully updated' do
-      before :each do
-        stub(@shop_category).update_attributes!({}) { true }
-      end
-      
       context 'html' do
         context 'not continue' do
           it 'should assign a notice and redirect to edit_shop_product path' do
-            put :update, :id => @shop_category.id, :shop_category => {}
-            flash.now[:notice].should === 'Category updated successfully.'
+            put :update, :id => @category.id, :shop_category => { :page_attributes => { :title => 'success' } }
+            
             response.should redirect_to(admin_shop_categories_path)
           end
         end
         context 'continue' do
           it 'should assign a notice and redirect to edit_shop_product path' do
-            put :update, :id => @shop_category.id, :shop_category => {}, :continue => true
-            flash.now[:notice].should === 'Category updated successfully.'
-            response.should redirect_to(edit_admin_shop_category_path(@shop_category))
+            put :update, :id => @category.id, :shop_category => { :page_attributes => { :title => 'success' } }, :continue => true
+            
+            response.should redirect_to(edit_admin_shop_category_path(assigns(:shop_category)))
           end
         end
       end
       
       context 'js' do
         it 'should render the partial and success status' do
-          put :update, :id => @shop_category.id, :shop_category => {}, :format => 'js'
+          put :update, :id => @category.id, :shop_category => { :page_attributes => { :title => 'success' } }, :format => 'js'
+          
           response.should be_success
           response.should render_template('/admin/shop/categories/index/_category')
         end
@@ -365,66 +286,29 @@ describe Admin::Shop::CategoriesController do
       
       context 'json' do
         it 'should assign the json object and success status' do
-          put :update, :id => @shop_category.id, :shop_category => {}, :format => 'json'
+          put :update, :id => @category.id, :shop_category => {}, :format => 'json'
+          
           response.should be_success
-          response.body.should === @shop_category.to_json(ShopCategory.params)
+          response.body.should === assigns(:shop_category).to_json
         end
       end
     end
   end
 
   describe '#destroy' do
-    before :each do
-      mock(ShopCategory).find('1') { @shop_category }
-    end
-    
-    context 'product not destroyed' do
-      before :each do
-        stub(@shop_category).destroy { raise ActiveRecord::RecordNotFound }
-      end
-      
-      context 'html' do
-        it 'should assign a flash error and render remove' do
-          delete :destroy, :id => 1
-          flash.now[:error].should === 'Could not delete Category.'
-          response.should render_template(:remove)
-        end
-      end
-      
-      context 'js' do
-        it 'should render an error and failure status' do
-          delete :destroy, :id => 1, :format => 'js'
-          response.body.should === 'Could not delete Category.'
-          response.should_not be_success
-        end
-      end
-      
-      context 'json' do
-        it 'should render an error and failure status' do
-          delete :destroy, :id => 1, :format => 'json'
-          JSON.parse(response.body)['error'].should === 'Could not delete Category.'
-          response.should_not be_success
-        end
-      end
-      
-    end
-    
     context 'product successfully destroyed' do
-      before :each do
-        stub(@shop_category).destroy { true }
-      end
-      
       context 'html' do
         it 'should assign a flash notice and redirect to shop_categories path' do
-          delete :destroy, :id => 1
-          flash.now[:notice].should === 'Category deleted successfully.'
+          delete :destroy, :id => @category.id
+          
           response.should redirect_to(admin_shop_categories_path)
         end
       end
       
       context 'js' do
         it 'should render success message and success status' do
-          delete :destroy, :id => 1, :format => 'js'
+          delete :destroy, :id => @category.id, :format => 'js'
+          
           response.body.should === 'Category deleted successfully.'
           response.should be_success
         end
@@ -432,7 +316,8 @@ describe Admin::Shop::CategoriesController do
       
       context 'json' do
         it 'should return a success json object and success status' do
-          delete :destroy, :id => 1, :format => 'json'
+          delete :destroy, :id => @category.id, :format => 'json'
+          
           JSON.parse(response.body)['notice'].should === 'Category deleted successfully.'
           response.should be_success
         end