radiant-shop-extension 0.94.0 → 0.94.1

data/VERSION

@@ -1 +1 @@
-0.94.0
+0.94.1

data/app/controllers/admin/shop/categories_controller.rb

@@ -72,7 +72,7 @@ class Admin::Shop::CategoriesController < Admin::ResourceController
         format.js   { render :partial => '/admin/shop/categories/index/category', :locals => { :product => @shop_category } }
         format.json { render :json    => @shop_category.to_json }
       end
-    rescue
+    rescue Exception => error
       respond_to do |format|
         format.html { 
           flash[:error] = error
@@ -103,7 +103,7 @@ class Admin::Shop::CategoriesController < Admin::ResourceController
         format.js   { render :partial => '/admin/shop/categories/index/category', :locals => { :product => @shop_category } }
         format.json { render :json    => @shop_category.to_json }
       end
-    rescue
+    rescue Exception => error
       respond_to do |format|
         format.html { 
           flash[:error] = error

data/app/controllers/admin/shop/products_controller.rb

@@ -79,7 +79,7 @@ class Admin::Shop::ProductsController < Admin::ResourceController
         format.js   { render :partial => '/admin/shop/products/index/product', :locals => { :excerpt => @shop_product } }
         format.json { render :json    => @shop_product.to_json }
       end
-    rescue
+    rescue Exception => error
       respond_to do |format|
         format.html {
           flash[:error] = error
@@ -111,7 +111,7 @@ class Admin::Shop::ProductsController < Admin::ResourceController
         format.js   { render  :partial  => '/admin/shop/products/index/product', :locals => { :product => @shop_product } }
         format.json { render  :json     => @shop_product.to_json }
       end
-    rescue
+    rescue Exception => error
       respond_to do |format|
         format.html {
           flash[:error] = error

data/app/models/shop_category.rb

@@ -27,11 +27,7 @@ class ShopCategory < ActiveRecord::Base
   
   # Returns the content of the product's page's description part
   def description
-    begin
-      page.parts.find_by_name('description').content
-    rescue 
-      ''
-    end
+    page.render_part('description')
   end
   
   # Returns products through the pages children

data/app/models/shop_product.rb

@@ -35,11 +35,7 @@ class ShopProduct < ActiveRecord::Base
   
   # Returns the content of the product's page's description part
   def description
-    begin
-      page.parts.find_by_name('description').content
-    rescue 
-      ''
-    end
+    page.render_part('description')
   end
   
   # Returns the url of the page

data/lib/shop/tags/category.rb

@@ -82,7 +82,7 @@ module Shop
       
       desc %{ outputs the description of the current shop category }
       tag "shop:category:description" do |tag|
-        tag.locals.shop_category.page.parts('description').render rescue nil
+        tag.locals.shop_category.description
       end
       
       desc %{ returns a link to the current category }

data/lib/shop/tags/product.rb

@@ -64,7 +64,7 @@ module Shop
       
       desc %{ outputs the description of the current shop product}
       tag "shop:product:description" do |tag|
-        tag.locals.shop_product.page.parts('description').render rescue nil
+        tag.locals.shop_product.description
       end
       
       desc %{ generates a link to the products generated page }

data/radiant-shop-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.94.0"
+  s.version = "0.94.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "John Barker", "Darcy Laycock"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 359
+  hash: 357
   prerelease: 
   segments: 
   - 0
   - 94
-  - 0
-  version: 0.94.0
+  - 1
+  version: 0.94.1
 platform: ruby
 authors: 
 - Dirk Kelly