radiant-shop_variants-extension 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/app/controllers/admin/shop/products/variants_controller.rb

@@ -2,7 +2,7 @@ class Admin::Shop::Products::VariantsController < Admin::ResourceController
   
   model_class ShopProductVariant
   
-  before_filter :find_product
+  before_filter :find_product, :except => [:sort]
     
   def create
     notice  = 'Successfully created variant.'
@@ -29,6 +29,40 @@ class Admin::Shop::Products::VariantsController < Admin::ResourceController
     end
   end
   
+  # PUT /admin/shop/products/1/variants/sort
+  # PUT /admin/shop/products/1/variants/sort.js
+  # PUT /admin/shop/products/1/variants/sort.json                   AJAX and HTML
+  #----------------------------------------------------------------------------
+  def sort
+    notice = 'Successfully sorted Variants.'
+    error  = 'Could not sort Variants.'
+    begin
+      @shop_product = ShopProduct.find(params[:product_id])
+      
+      @variants = CGI::parse(params[:variants])['variants[]']
+      @variants.each_with_index do |id, index|
+        ShopProductVariant.find(id).update_attributes!({ :position => index+1 })
+      end
+      
+      respond_to do |format|
+        format.html {
+          redirect_to edit_admin_shop_product_path(@shop_product)
+        }
+        format.js   { render :partial => '/admin/shop/products/edit/shared/variant', :collection => @shop_product.variants }
+        format.json { render :json    => @shop_product.variants.to_json }
+      end
+    rescue
+      respond_to do |format|
+        format.html {
+          flash[:error] = error
+          redirect_to edit_admin_shop_product_path(@shop_product)
+        }
+        format.js   { render :text  => error, :status => :unprocessable_entity }
+        format.json { render :json  => { :error => error }, :status => :unprocessable_entity }
+      end
+    end
+  end
+
   def destroy
     notice  = 'Successfully destroyed variant.'
     error   = 'Could not destroy variant.'

data/app/models/shop_product_variant.rb

@@ -1,7 +1,9 @@
 class ShopProductVariant < ActiveRecord::Base
   
   belongs_to :product, :class_name => 'ShopProduct', :foreign_key => :product_id
-  
+  acts_as_list  :scope => :product
+  default_scope :order => :position
+
   validates_presence_of   :product
   validates_presence_of   :name
   validates_uniqueness_of :name, :scope => :product_id
@@ -14,6 +16,10 @@ class ShopProductVariant < ActiveRecord::Base
   has_many  :discountables, :class_name => 'ShopDiscountable',      :foreign_key  => :discounted_id
   has_many    :discounts,   :class_name => 'ShopDiscount',          :through      => :discountables
   
+  def name
+    %{#{product.name} #{self[:name]}}
+  end
+  
   # Returns the price of the variant plus the product price
   def price
     price = product.price
@@ -25,7 +31,11 @@ class ShopProductVariant < ActiveRecord::Base
   
   # Returns a mixed sku of product and variant name
   def sku
-    %{#{product.sku}-#{ShopProduct.to_sku(name)}}
+    sku = nil
+    if self[:name].present?
+      sku = %{#{product.sku}-#{self[:name].gsub(/[^a-zA-Z0-9_]/,"_")}}
+    end
+    sku
   end
   
   # Returns slug of the product
@@ -41,4 +51,4 @@ class ShopProductVariant < ActiveRecord::Base
     product.to_param
   end
   
-end
+end

data/config/routes.rb

@@ -4,7 +4,7 @@ ActionController::Routing::Routes.draw do |map|
     admin.namespace :shop, :member => { :remove => :get } do |shop| 
        
       shop.resources :products, :except => :new, :collection => { :sort => :put } do |product|
-        product.resources :variants,          :controller => 'products/variants',           :only => [ :create, :destroy]
+        product.resources :variants,          :controller => 'products/variants',           :only => [ :create, :destroy], :collection => { :sort => :put } 
         product.resources :variant_templates, :controller => 'products/variant_templates',  :only => [ :update ]
       end
       shop.resources :variants
@@ -13,4 +13,4 @@ ActionController::Routing::Routes.draw do |map|
     end
   end
 
-end
+end

data/db/migrate/20110330100134_add_position_to_product_variant.rb

@@ -0,0 +1,17 @@
+class AddPositionToProductVariant < ActiveRecord::Migration
+  def self.up
+    add_column :shop_product_variants, :position, :integer
+
+    ShopProduct.find_each do |p|
+      i = 1
+      p.variants.find_each do |v|
+        v.update_attribute(:position, i)
+        i += 1
+      end
+    end
+  end
+
+  def self.down
+    remove_column :shop_product_variants, :position
+  end
+end

data/lib/shop_variants/controllers/products_controller.rb

@@ -34,6 +34,10 @@ module ShopVariants
               :name => 'admin_shop_product_variant_path',
               :path => admin_shop_product_variant_path(@shop_product, ':id')
             }
+            @routes << {
+              :name => 'sort_admin_shop_product_variants_path',
+              :path => sort_admin_shop_product_variants_path(@shop_product)
+            }
           end
           
         end
@@ -41,4 +45,4 @@ module ShopVariants
       
     end
   end
-end
+end

data/lib/shop_variants/models/product.rb

@@ -4,7 +4,7 @@ module ShopVariants
       
       def self.included(base)
         base.class_eval do
-          has_many :variants, :class_name => 'ShopProductVariant', :foreign_key  => :product_id, :dependent => :destroy, :order => 'name ASC'
+          has_many :variants, :class_name => 'ShopProductVariant', :foreign_key  => :product_id, :dependent => :destroy, :order => :position
           
           accepts_nested_attributes_for :variants
         end
@@ -12,4 +12,4 @@ module ShopVariants
       
     end
   end
-end
+end

data/lib/shop_variants/tags/product_variant.rb

@@ -33,7 +33,11 @@ module ShopVariants
         tag.expand if tag.locals.shop_product_variant.present?
       end
       
-      [:id, :name, :sku].each do |symbol|
+      tag 'shop:product:variant:name' do |tag|
+        tag.locals.shop_product_variant[:name]
+      end
+      
+      [:id, :sku].each do |symbol|
         desc %{ outputs the #{symbol} of the current shop variant }
         tag "shop:product:variant:#{symbol}" do |tag|
           tag.locals.shop_product_variant.send(symbol)

data/public/javascripts/admin/extensions/shop/variants/edit.js

@@ -10,6 +10,26 @@ document.observe("dom:loaded", function() {
 var ShopVariantEdit = Class.create({
   
   initialize: function() {
+    this.variantsSort();
+  },
+
+  variantsSort: function(element) {
+    var route = shop.getRoute('sort_admin_shop_product_variants_path');
+
+    Sortable.create('variants', {
+      constraint: false, 
+      overlap: 'horizontal',
+      containment: ['variants'],
+      onUpdate: function(element) {
+        new Ajax.Request(route, {
+          method: 'put',
+          parameters: {
+            'product_id': $('shop_product_id').value,
+            'variants':   Sortable.serialize('variants')
+          }
+        });
+      }.bind(this)
+    })
   },
   
   variantRemove: function(element) {
@@ -35,4 +55,4 @@ var ShopVariantEdit = Class.create({
     }
   }
   
-});
+});

data/radiant-shop_variants-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop_variants-extension}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly"]
-  s.date = %q{2011-01-17}
+  s.date = %q{2011-03-30}
   s.description = %q{RadiantShop: Create variants of products, with alternative prices}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
     "config/routes.rb",
     "cucumber.yml",
     "db/migrate/20101015162238_setup_shop_variants.rb",
+    "db/migrate/20110330100134_add_position_to_product_variant.rb",
     "features/support/env.rb",
     "features/support/paths.rb",
     "lib/radiant-shop_variants-extension.rb",
@@ -81,7 +82,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{https://github.com/thefrontiergroup/radiant-shop_variants-extension}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.1}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Shop Variants Extension for Radiant CMS}
   s.test_files = [
     "spec/controllers/admin/shop/products/variant_templates_controller_spec.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop_variants-extension
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +08:00
+date: 2011-03-30 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   name: radiant-shop-extension
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -31,6 +30,7 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
+  type: :runtime
   requirement: *id001
 description: "RadiantShop: Create variants of products, with alternative prices"
 email: dk@dirkkelly.com
@@ -78,6 +78,7 @@ files:
 - config/routes.rb
 - cucumber.yml
 - db/migrate/20101015162238_setup_shop_variants.rb
+- db/migrate/20110330100134_add_position_to_product_variant.rb
 - features/support/env.rb
 - features/support/paths.rb
 - lib/radiant-shop_variants-extension.rb
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Shop Variants Extension for Radiant CMS