spree_minicart 1.1.0 → 1.1.1

data/.bundle/config

@@ -1,2 +1 @@
----
-BUNDLE_DISABLE_SHARED_GEMS: '1'
+--- {}

data/README.md

@@ -18,7 +18,7 @@ To install Spree Minicart, just add the following to your Gemfile:
 gem 'spree_minicart', '~> 1.0.0'
 
 # Spree 1.1.X
-gem 'spree_size_chart', '~> 1.1.0'
+gem 'spree_minicart', '~> 1.1.0'
 ```
 
 Now, bundle up with:

data/app/controllers/orders_controller_decorator.rb

@@ -1,5 +1,13 @@
 module Spree
   OrdersController.class_eval do
+    before_filter :set_current_order, :only => [:populate]
+
     respond_to :js, :only => [:populate, :update]
+
+    ssl_allowed :populate, :update
+
+    def set_current_order
+      current_order(true)
+    end
   end
 end

data/app/helpers/spree/base_helper_decorator.rb

@@ -0,0 +1,21 @@
+module Spree
+  BaseHelper.module_eval do
+
+    # removed current_page? check because link_to_cart is called everywhere by spree_minicart
+    def link_to_cart(text = nil)
+      text = text ? h(text) : t('cart')
+      css_class = nil
+
+      if current_order.nil? or current_order.line_items.empty?
+        text = "#{text}: (#{t('empty')})"
+        css_class = 'empty'
+      else
+        text = "#{text}: (#{current_order.item_count})  <span class='amount'>#{order_subtotal(current_order)}</span>".html_safe
+        css_class = 'full'
+      end
+
+      link_to text, cart_path, :class => css_class
+    end
+
+  end
+end

data/app/views/spree/shared/_minicart.html.erb

@@ -1,8 +1,7 @@
-<% @minicart_order ||= current_order(true) %>
 <div id="minicart">
   <% @body_id = 'cart' %>
 
-  <% if @minicart_order.line_items.empty? %>
+  <% if current_order.nil? || current_order.line_items.empty? %>
 
     <div data-hook="empty_minicart">
       <p><%= t(:your_cart_is_empty) %></p>
@@ -13,11 +12,11 @@
     <div data-hook="outside_minicart_form">
       <div id="minicart-details" data-hook="minicart_details" class="clearfix">
         <p>
-          <span><%= t(:subtotal) %>: <span class="order-total"><%= order_subtotal(@minicart_order) %></span></span>
+          <span><%= t(:subtotal) %>: <span class="order-total"><%= order_subtotal(current_order) %></span></span>
           <%= link_to t(:checkout), checkout_path, :class => 'button checkout primary', :id => 'checkout-link' %>
         </p>
       </div>
-      <%= form_for @minicart_order, :url => update_cart_path, :html => {:id => 'update-minicart'}, :remote => true do |order_form| %>
+      <%= form_for current_order, :url => update_cart_path, :html => {:id => 'update-minicart'}, :remote => true do |order_form| %>
         <div data-hook="inside_minicart_form">
 
           <div data-hook="minicart_items" class="clearfix">

data/app/views/spree/shared/_minicart_line_items.html.erb

@@ -11,7 +11,7 @@
       <span><%= link_to variant.product.name, product_path(variant.product) %></span>
       <span><%= "x#{line_item.quantity}" -%></span>
       <%= variant.options_text %>
-      <% if @minicart_order.insufficient_stock_lines.include? line_item %>
+      <% if current_order.insufficient_stock_lines.include? line_item %>
         <span class="out-of-stock">
           <%= variant.in_stock? ? t(:insufficient_stock, :on_hand => variant.on_hand) : t(:out_of_stock) %><br />
         </span>

data/lib/spree_minicart/version.rb

@@ -1,3 +1,3 @@
 module SpreeMinicart
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/requests/minicart_spec.rb

@@ -1,12 +1,17 @@
 require 'spec_helper'
 
 feature "minicart", :js => true do
-  background { @product = Factory(:product, :name => "ror mug", :price => 30) }
+  background { @product = FactoryGirl.create(:product, :name => "ror mug", :price => 30) }
 
   scenario "customer should be able to add and delete a product in the minicart" do
     visit spree.products_path
+
     click_link("ror mug")
 
+    within("li#link-to-cart") do
+      page.should have_content("Cart: (Empty)")
+    end
+
     click_button "Add To Cart"
 
     within("#link-to-cart a") do
@@ -26,6 +31,52 @@ feature "minicart", :js => true do
       click_link "Delete"
     end
 
+    within("li#link-to-cart") do
+      page.should have_content("Cart: (Empty)")
+    end
+
+    URI.parse(current_url).path.should =~ /products/
+
+    within("#minicart") do
+      page.should_not have_content("ror mug")
+      page.should_not have_content("$30")
+    end
+
+  end
+
+  scenario "delete a line item with multiple quantity should totally remove from minicart" do
+    visit spree.products_path
+    click_link("ror mug")
+
+    within("li#link-to-cart") do
+      page.should have_content("Cart: (Empty)")
+    end
+
+    click_button "Add To Cart"
+    click_button "Add To Cart"
+
+    within("#link-to-cart a") do
+      page.should have_content("(2)")
+    end
+
+    within("#minicart") do
+      page.should have_content("ror mug")
+      page.should have_content("$30")
+    end
+
+    page.execute_script '$("#minicart-items li").trigger("mouseenter")'
+
+    within "li div.minicart-actions" do
+      page.should have_content("Delete")
+      # manually sliding down the minicart actions, dont know why its not working
+      page.execute_script '$("#minicart-items li div.minicart-actions").slideDown()'
+      click_link "Delete"
+    end
+
+    within("li#link-to-cart") do
+      page.should have_content("Cart: (Empty)")
+    end
+
     URI.parse(current_url).path.should =~ /products/
 
     within("#minicart") do
@@ -41,4 +92,10 @@ feature "minicart", :js => true do
     click_button "Add To Cart"
     URI.parse(current_url).path.should == "/cart"
   end
+
+  scenario 'minicart should not create new order for every visitor', :js => false do
+    expect {
+      visit spree.products_path
+    }.to_not change(Spree::Order, :count)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_minicart
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-05 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &2152731160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152731160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: spree_sample
-  requirement: &2152730600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152730600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152729680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2152729680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2152729180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152729180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &2152728720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152728720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152728200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *2152728200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152727720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152727720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2152727260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152727260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &2152726840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152726840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Spree Minicart allows customer to add/remove an item from their cart
   without ever leaving the page they're on.Let your customers preview their cart before
   they start the checkout process.
@@ -132,6 +177,7 @@ files:
 - app/assets/stylesheets/admin/spree_minicart.css
 - app/assets/stylesheets/store/spree_minicart.css
 - app/controllers/orders_controller_decorator.rb
+- app/helpers/spree/base_helper_decorator.rb
 - app/overrides/layout.rb
 - app/overrides/minicart.rb
 - app/views/spree/orders/populate.js.erb
@@ -171,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Spree Minicart displays a minicart in your spree store