radiant-shop_packages-extension 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/app/views/admin/shop/discounts/edit/buttons/_browse_packages.html.haml

@@ -0,0 +1 @@
+= link_to t('browse_packages'), '#browse_packages_popup', :class => 'popup button'

data/app/views/admin/shop/discounts/edit/parts/_packages.html.haml

@@ -0,0 +1,3 @@
+%ul#discount_packages.packages.discounteds
+  - @shop_discount.discountables.for('ShopPackage').each do |package|
+    = render :partial => 'admin/shop/discounts/edit/shared/package', :locals => { :package => package }

data/app/views/admin/shop/discounts/edit/popups/_browse_packages.html.haml

@@ -0,0 +1,6 @@
+%h3.title= t('browse_packages')
+
+%ul#available_packages.availables
+  = render :partial => '/admin/shop/discounts/edit/shared/package', :collection => @shop_discount.available_packages
+
+%a#browse_packages_popup_close.close{ :href => '#browse_packages_popup_close' }

data/app/views/admin/shop/discounts/edit/shared/_package.html.haml

@@ -0,0 +1,11 @@
+- discounted_type = package.class.to_s
+
+- discounted_id   = discounted_type != "ShopDiscountable" ? package.id          : package.discounted_id
+- discountable_id = discounted_type != "ShopDiscountable" ? nil                 : package.id
+- success_element = discounted_type != "ShopDiscountable" ? 'discount_packages' : 'available_packages'
+- class_type      = discounted_type != "ShopDiscountable" ? 'available'         : 'discounted'
+
+%li.product{:class => "discountable #{class_type} package", :id => "#{class_type}_#{package.id}", :'data-discounted_id' => discounted_id, :'data-discounted_type' => discounted_type, :'data-discounted_type_human' => 'Package', :'data-discountable_id' => discountable_id, :'data-success_element' => success_element }
+  %span.name= truncate((package.name rescue package.discounted.name), 30, '...')
+  .actions
+    %span.delete

data/config/locales/en.yml

@@ -5,6 +5,7 @@ en:
   add_package: Add Package
   new_package: New Package
   remove_package: Remove Package
+  browse_packages: Browse Packages
   text:
     remove_package:
       warning: Removing a package is irreversible

data/lib/shop_packages/controllers/discounts_controller.rb

@@ -0,0 +1,22 @@
+module ShopPackages
+  module Controllers
+    module DiscountsController
+      
+      def self.included(base)
+        base.class_eval do
+          
+          def config_edit_with_packages
+            config_edit_without_packages
+            
+            @buttons  << 'browse_packages'
+            @parts    << 'packages'
+            @popups   << 'browse_packages'
+          end
+          alias_method_chain :config_edit, :packages
+          
+        end
+      end
+      
+    end
+  end
+end

data/lib/shop_packages/models/shop_discount.rb

@@ -0,0 +1,19 @@
+module ShopPackages
+  module Models
+    module ShopDiscount
+      
+      def self.included(base)
+        base.class_eval do
+          
+          has_many :packages, :through => :discountables, :source => :package, :conditions => "shop_discountables.discounted_type = 'ShopPackage'"
+          
+          def available_packages
+            ShopPackage.all - packages
+          end
+          
+        end
+      end
+      
+    end
+  end
+end

data/lib/shop_packages/models/shop_discountable.rb

@@ -0,0 +1,15 @@
+module ShopPackages
+  module Models
+    module ShopDiscountable
+      
+      def self.included(base)
+        base.class_eval do
+          
+          belongs_to :package, :class_name => 'ShopPackage', :foreign_key => :discounted_id
+          
+        end
+      end
+      
+    end
+  end
+end

data/radiant-shop_packages-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop_packages-extension}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly"]
-  s.date = %q{2010-12-01}
+  s.date = %q{2010-12-17}
   s.description = %q{RadiantShop: Group up Products into packages, you can assign a price to a package}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,10 @@ Gem::Specification.new do |s|
     "app/datasets/shop_packages.rb",
     "app/models/shop_package.rb",
     "app/models/shop_packing.rb",
+    "app/views/admin/shop/discounts/edit/buttons/_browse_packages.html.haml",
+    "app/views/admin/shop/discounts/edit/parts/_packages.html.haml",
+    "app/views/admin/shop/discounts/edit/popups/_browse_packages.html.haml",
+    "app/views/admin/shop/discounts/edit/shared/_package.html.haml",
     "app/views/admin/shop/packages/edit.html.haml",
     "app/views/admin/shop/packages/edit/_foot.html.haml",
     "app/views/admin/shop/packages/edit/_form.html.haml",
@@ -53,7 +57,10 @@ Gem::Specification.new do |s|
     "cucumber.yml",
     "db/migrate/20101015161749_setup_shop_packages.rb",
     "lib/radiant-shop_packages-extension.rb",
+    "lib/shop_packages/controllers/discounts_controller.rb",
     "lib/shop_packages/interface/packages.rb",
+    "lib/shop_packages/models/shop_discount.rb",
+    "lib/shop_packages/models/shop_discountable.rb",
     "lib/shop_packages/models/shop_packageable.rb",
     "lib/shop_packages/tags/helpers.rb",
     "lib/shop_packages/tags/package.rb",
@@ -62,10 +69,13 @@ Gem::Specification.new do |s|
     "public/stylesheets/sass/admin/extensions/shop/packages/edit.sass",
     "radiant-shop_packages-extension.gemspec",
     "shop_packages_extension.rb",
+    "spec/controllers/admin/shop/discounts_controller_spec.rb",
     "spec/controllers/admin/shop/packages/packings_controller_spec.rb",
     "spec/controllers/admin/shop/packages_controller_spec.rb",
     "spec/datasets/shop_packages.rb",
     "spec/lib/shop_packages/tags/package_spec.rb",
+    "spec/models/shop_discount_spec.rb",
+    "spec/models/shop_discountable_spec.rb",
     "spec/models/shop_package_spec.rb",
     "spec/models/shop_packing_spec.rb",
     "spec/models/shop_product_spec.rb",
@@ -77,10 +87,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Shop Packages Extension for Radiant CMS}
   s.test_files = [
+    "spec/controllers/admin/shop/discounts_controller_spec.rb",
     "spec/controllers/admin/shop/packages/packings_controller_spec.rb",
     "spec/controllers/admin/shop/packages_controller_spec.rb",
     "spec/datasets/shop_packages.rb",
     "spec/lib/shop_packages/tags/package_spec.rb",
+    "spec/models/shop_discount_spec.rb",
+    "spec/models/shop_discountable_spec.rb",
     "spec/models/shop_package_spec.rb",
     "spec/models/shop_packing_spec.rb",
     "spec/models/shop_product_spec.rb",

data/shop_packages_extension.rb

@@ -26,8 +26,11 @@ class ShopPackagesExtension < Radiant::Extension
     ShopProduct.send :include, ShopPackages::Models::ShopPackageable
     Page.send        :include, ShopPackages::Tags::Package
     
-    if Radiant::Extension.descendants.any? { |extension| extension.extension_name == 'ShopDiscounts' }
-      ShopPackage.send  :include, ShopDiscounts::Models::Discountable
+    if defined?(ShopDiscount)
+      ShopPackage.send                      :include, ShopDiscounts::Models::Discountable
+      Admin::Shop::DiscountsController.send :include, ShopPackages::Controllers::DiscountsController
+      ShopDiscount.send                     :include, ShopPackages::Models::ShopDiscount
+      ShopDiscountable.send                 :include, ShopPackages::Models::ShopDiscountable
     end
     
   end

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

@@ -0,0 +1,27 @@
+require "#{File.dirname(__FILE__)}/../../../spec_helper"
+
+describe Admin::Shop::DiscountsController do
+  
+  dataset :users, :shop_discounts
+  
+  before :each do
+    login_as users(:admin)
+  end
+  
+  it 'should assign packages to the #edit method' do
+    get :edit, :id => shop_discounts(:ten_percent).id
+    
+    assigns(:buttons).include?('browse_packages').should be_true
+    assigns(:parts).include?('packages').should be_true
+    assigns(:popups).include?('browse_packages').should be_true
+  end
+  
+  it 'should assign packages to the #edit method' do
+    put :update, :id => shop_discounts(:ten_percent).id
+    
+    assigns(:buttons).include?('browse_packages').should be_true
+    assigns(:parts).include?('packages').should be_true
+    assigns(:popups).include?('browse_packages').should be_true
+  end
+  
+end

data/spec/datasets/shop_packages.rb

@@ -3,7 +3,8 @@ class ShopPackagesDataset < Dataset::Base
  
  def load
    packages = {
-     :bread  => [ :soft, :crusty, :warm ]
+     :bread  => [ :soft, :crusty, :warm ],
+     :milk   => [ :full, :hilo, :choc ]
    }
    packages.each do |package, products|
      create_record :shop_package, "all_#{package.to_s}".to_sym,
@@ -12,11 +13,11 @@ class ShopPackagesDataset < Dataset::Base
        :price    => 1 * 10
        
      products.each_with_index do |product, i|
-       create_record :shop_packing, "#{product.to_s}_bread".to_s.to_sym,
+       create_record :shop_packing, "#{product.to_s}_#{package.to_s}".to_s.to_sym,
          :quantity => 1,
          :position => 1,
          :package  => shop_packages("all_#{package.to_s}".to_sym),
-         :product  => shop_products("#{product.to_s}_bread".to_sym)
+         :product  => shop_products("#{product.to_s}_#{package.to_s}".to_sym)
      end
    end	
  end

data/spec/models/shop_discount_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe ShopDiscount do
+  
+  dataset :shop_packages, :shop_discounts
+  
+  it 'should have many #packages' do
+    shop_discounts(:ten_percent).packages.is_a?(Array).should be_true
+  end
+  
+  it 'should return a subset through #available_attributes' do
+    shop_discounts(:ten_percent).available_packages.should have(ShopPackage.all.count).packages
+    shop_discounts(:ten_percent).discountables.create(:discounted_id => shop_packages(:all_bread).id, :discounted_type => shop_packages(:all_bread).class.name)
+    shop_discounts(:ten_percent).available_packages.should have(ShopPackage.all.count-1).packages
+  end
+  
+end

data/spec/models/shop_discountable_spec.rb

@@ -0,0 +1,13 @@
+require "#{File.dirname(__FILE__)}/../spec_helper"
+
+describe ShopDiscountable do
+  
+  dataset :shop_packages, :shop_discounts
+  
+  it 'should have a #package' do
+    @discountable = ShopDiscountable.new
+    @discountable.package = shop_packages(:all_bread)
+    @discountable.package.is_a?(ShopPackage).should be_true
+  end
+  
+end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ end
 require "#{RADIANT_ROOT}/spec/spec_helper"
 
 Dataset::Resolver.default << (File.dirname(__FILE__) + "/../../shop/spec/datasets")
+Dataset::Resolver.default << (File.dirname(__FILE__) + "/../../shop_discounts/spec/datasets")
 Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets")
 
 if File.directory?(File.dirname(__FILE__) + "/matchers")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop_packages-extension
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 +08:00
+date: 2010-12-17 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,10 @@ files:
 - app/datasets/shop_packages.rb
 - app/models/shop_package.rb
 - app/models/shop_packing.rb
+- app/views/admin/shop/discounts/edit/buttons/_browse_packages.html.haml
+- app/views/admin/shop/discounts/edit/parts/_packages.html.haml
+- app/views/admin/shop/discounts/edit/popups/_browse_packages.html.haml
+- app/views/admin/shop/discounts/edit/shared/_package.html.haml
 - app/views/admin/shop/packages/edit.html.haml
 - app/views/admin/shop/packages/edit/_foot.html.haml
 - app/views/admin/shop/packages/edit/_form.html.haml
@@ -78,7 +82,10 @@ files:
 - cucumber.yml
 - db/migrate/20101015161749_setup_shop_packages.rb
 - lib/radiant-shop_packages-extension.rb
+- lib/shop_packages/controllers/discounts_controller.rb
 - lib/shop_packages/interface/packages.rb
+- lib/shop_packages/models/shop_discount.rb
+- lib/shop_packages/models/shop_discountable.rb
 - lib/shop_packages/models/shop_packageable.rb
 - lib/shop_packages/tags/helpers.rb
 - lib/shop_packages/tags/package.rb
@@ -87,10 +94,13 @@ files:
 - public/stylesheets/sass/admin/extensions/shop/packages/edit.sass
 - radiant-shop_packages-extension.gemspec
 - shop_packages_extension.rb
+- spec/controllers/admin/shop/discounts_controller_spec.rb
 - spec/controllers/admin/shop/packages/packings_controller_spec.rb
 - spec/controllers/admin/shop/packages_controller_spec.rb
 - spec/datasets/shop_packages.rb
 - spec/lib/shop_packages/tags/package_spec.rb
+- spec/models/shop_discount_spec.rb
+- spec/models/shop_discountable_spec.rb
 - spec/models/shop_package_spec.rb
 - spec/models/shop_packing_spec.rb
 - spec/models/shop_product_spec.rb
@@ -131,10 +141,13 @@ signing_key:
 specification_version: 3
 summary: Shop Packages Extension for Radiant CMS
 test_files: 
+- spec/controllers/admin/shop/discounts_controller_spec.rb
 - spec/controllers/admin/shop/packages/packings_controller_spec.rb
 - spec/controllers/admin/shop/packages_controller_spec.rb
 - spec/datasets/shop_packages.rb
 - spec/lib/shop_packages/tags/package_spec.rb
+- spec/models/shop_discount_spec.rb
+- spec/models/shop_discountable_spec.rb
 - spec/models/shop_package_spec.rb
 - spec/models/shop_packing_spec.rb
 - spec/models/shop_product_spec.rb