spree_favorite_products 2.0.3 → 2.2.0

data/README.md

@@ -13,12 +13,18 @@ Installation
 Add spree_favorite_products to your Gemfile:
 
 ```ruby
-gem 'spree_favorite_products', '2.0.2'
+gem 'spree_favorite_products'
 ```
 
-If you're still using Spree 2.0.x, you should do this instead:
+For older versions of spree.
 
 ```ruby
+# Spree 2.1.x
+gem 'spree_favorite_products', '2.0.1'
+```
+
+```ruby
+# Spree 2.0.x
 gem 'spree_favorite_products', '1.0.0'
 ```
 

data/app/assets/javascripts/admin/spree_favorite_products.js

@@ -1 +0,0 @@
-//= require admin/spree_backend

data/app/assets/javascripts/store/spree_favorite_products.js

@@ -1 +0,0 @@
-//= require store/spree_frontend

data/app/assets/stylesheets/admin/spree_favorite_products.css

@@ -1,3 +0,0 @@
-/*
- *= require admin/spree_backend
-*/

data/app/assets/stylesheets/store/spree_favorite_products.css

@@ -1,3 +1 @@
-/*
- *= require store/spree_frontend
-*/
+

data/app/controllers/spree/admin/favorite_products_controller.rb

@@ -3,20 +3,13 @@ module Spree
     class FavoriteProductsController < Spree::Admin::BaseController
 
       def index
-        @search = Spree::Product.favorite.search(params[:q])
-        @favorite_products = @search.result.order_by_favorite_users_count(sort_in_ascending_users_count?).page(params[:page])
+        @favorite_products = Spree::Product.favorite.page(params[:page])
       end
 
       def users
         @product = Spree::Product.where(:id => params[:id]).first
         @users = @product.favorite_users.page(params[:page])
       end
-
-
-      private
-        def sort_in_ascending_users_count?
-          params[:q] && params[:q][:s] == 'favorite_users_count asc'
-        end
     end
   end
 end

data/app/models/spree/product_decorator.rb

@@ -1,12 +1,8 @@
 Spree::Product.class_eval do
-  has_many :favorites, :dependent => :destroy
+  has_many :favorites
   has_many :favorite_users, :through => :favorites, :class_name => 'Spree::User', :source => 'user'
 
   def self.favorite
-    joins(:favorites).group('spree_favorites.product_id')
-  end
-
-  def self.order_by_favorite_users_count(asc=false)
-    order("count(spree_favorites.user_id) #{asc ? 'asc' : 'desc'}")
+    joins(:favorites).uniq
   end
 end

data/app/models/spree/user_decorator.rb

@@ -1,5 +1,5 @@
 Spree::User.class_eval do 
-  has_many :favorites, :dependent => :destroy
+  has_many :favorites
   has_many :favorite_products, :through => :favorites, :class_name => 'Spree::Product', :source => 'product'
 
   def has_favorite_product?(product_id)

data/app/views/spree/admin/favorite_products/index.html.erb

@@ -19,9 +19,9 @@
     <thead>
       <tr data-hook="admin_products_index_headers">
         <th><%= Spree.t(:sku) %></th>
-        <th colspan="2"><%= sort_link @search, :name, Spree.t(:name) %></th>
-        <th><%= sort_link @search, :master_default_price_amount, Spree.t(:master_price) %></th>
-        <th><%= sort_link @search, 'favorite_users_count', 'Favorite Users' %></th>
+        <th colspan="2"><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:master_price) %></th>
+        <th>Favorite Users</th>
       </tr>
     </thead>
     <tbody>
@@ -29,7 +29,7 @@
           <tr <%= "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
             <td class="align-center"><%= product.sku rescue '' %></td>
             <td class="align-center"><%= mini_image(product) %></td>
-            <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
+            <td><%= product.try(:name) %></td>
             <td class="align-center"><%= product.display_price.to_html rescue '' %></td>
             <td class='align-center'><%= link_to product.favorite_users.count, users_admin_favorite_product_path(:id => product.id) %></td>
           </tr>

data/app/views/spree/favorite_products/destroy.js.erb

@@ -5,9 +5,6 @@
   } else {
     $("#favorite_product_<%= @favorite.product_id%>").remove();
     alert("Successfully removed favorite product from your list");
-    if (!$('.favorite_product').length) {
-      window.location = '<%= favorite_products_path %>'
-    }
   }
 <% else %>
   alert("Could not remove product form your list")

data/app/views/spree/favorite_products/index.html.erb

@@ -1,7 +1,7 @@
 <div data-hook="account_my_favorite_products" class="account-my-favorite-products commonform">
   <h3><%= Spree.t(:my_favorite_products) %></h3>
   <% if @favorite_products.present? %>
-    <table class="favorite-products order-summary" width='100%'>
+    <table class="favorite-products order-summary">
       <thead>
       <tr>
         <th class="favorite-product-image"><%= Spree.t(:product_image) %></th>
@@ -11,10 +11,10 @@
       </thead>
       <tbody>
       <% @favorite_products.each do |product| %>
-        <tr class="<%= cycle('even', 'odd') %> favorite_product" id="favorite_product_<%= product.id %>">
+        <tr class="<%= cycle('even', 'odd') %>" id="favorite_product_<%= product.id %>">
           <td class="favorite-product-image"><%= link_to small_image(product), product_path(product) %></td>
           <td class="favorite-product-name"><%= product.name %></td>
-          <td class="favorite-product-remove"><%= link_to 'Remove', favorite_product_path(:id => product.id), :method => :delete, :remote => true, :confirm => 'Are you sure you want to remove the product?' %>
+          <td class="favorite-product-remove"><%= link_to 'Remove', favorite_product_path(:id => product.id), :method => :delete, :remote => true %>
         </tr>
       <% end %>
       </tbody>

data/lib/generators/spree_favorite_products/install/install_generator.rb

@@ -5,13 +5,13 @@ module SpreeFavoriteProducts
       class_option :auto_run_migrations, :type => :boolean, :default => false
 
       def add_javascripts
-        append_file 'app/assets/javascripts/store/all.js', "\n//= require store/spree_favorite_products\n"
-        append_file 'app/assets/javascripts/admin/all.js', "\n//= require admin/spree_favorite_products\n"
+        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "\n//= require store/spree_favorite_products\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "\n//= require admin/spree_favorite_products\n"
       end
 
       def add_stylesheets
-        inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_favorite_products\n", :before => /\*\//, :verbose => true
-        inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_favorite_products\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require store/spree_favorite_products\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require admin/spree_favorite_products\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations

data/spec/controllers/spree/admin/favorite_products_controller_spec.rb

@@ -15,51 +15,22 @@ describe Spree::Admin::FavoriteProductsController do
     roles.stub(:includes).with(:permissions).and_return(roles)
     controller.stub(:authorize_admin).and_return(true)
     controller.stub(:authorize!).and_return(true)
-
-    @favorite_products = double('favorite_products')
-    @favorite_products.stub(:order_by_favorite_users_count).and_return(@favorite_products)
-    @search = double('search', :result => @favorite_products)
-    @favorite_products.stub(:search).and_return(@search)
-    @favorite_products.stub(:page).and_return(@favorite_products)
-    Spree::Product.stub(:favorite).and_return(@favorite_products)
   end
 
   describe "GET index" do
     def send_request
-      get :index, :page => 1 ,:use_route => 'spree', :q => { 's' => 'name desc' }
-    end
-
-    it "returns favorite products" do
-      Spree::Product.should_receive(:favorite)
-      send_request
+      get :index, :page => 1 ,:use_route => 'spree'
     end
 
-    it "searches favorite products" do
-      @favorite_products.should_receive(:search).with('s' => 'name desc')
-      send_request
+    before(:each) do
+      @favorite_products = double('favorite_products')
+      @favorite_products.stub(:page).and_return(@favorite_products)
+      Spree::Product.stub(:favorite).and_return(@favorite_products)
     end
 
-    it "assigns @search" do
+    it "returns favorite products" do
+      Spree::Product.should_receive(:favorite)
       send_request
-      assigns(:search).should eq(@search)
-    end
-
-    context 'when order favorite products by users count in asc order' do
-      def send_request
-        get :index, :page => 1 ,:use_route => 'spree', :q => { :s => 'favorite_users_count asc' }
-      end
-
-      it "orders favorite products by users count in asc order" do
-        @favorite_products.should_receive(:order_by_favorite_users_count).with(true)
-        send_request
-      end
-    end
-
-    context 'when order favorite products by users count in desc order' do
-      it "orders favorite products by users count in asc order" do
-        @favorite_products.should_receive(:order_by_favorite_users_count).with(false)
-        send_request
-      end
     end
 
     it "paginates favorite products" do
@@ -98,21 +69,4 @@ describe Spree::Admin::FavoriteProductsController do
       send_request
     end
   end
-
-  describe "#sort_in_ascending_users_count?" do
-    
-    context 'when favorite_user_count asc present in params[q][s]' do
-      it "is true" do
-        get :index, :page => 1 ,:use_route => 'spree', :q => { 's' => 'favorite_users_count asc' }
-        controller.send(:sort_in_ascending_users_count?).should be_true
-      end
-    end
-
-    context 'when favorite_user_count not present in params' do
-      it "is false" do
-        get :index, :page => 1 ,:use_route => 'spree', :q => { 's' => 'name asc' }
-        controller.send(:sort_in_ascending_users_count?).should be_false
-      end
-    end
-  end
 end

data/spec/models/spree/product_decorator_spec.rb

@@ -1,39 +1,25 @@
 require 'spec_helper'
 
 describe Spree::Product do
-  before(:each) do
-    shipping_category = Spree::ShippingCategory.create! :name => 'shipping_category'
-    @favorite_product1 = Spree::Product.create! :name => 'favorite_product1', :price => 100, :shipping_category_id => shipping_category.id
-    @favorite_product2 = Spree::Product.create! :name => 'favorite_product2', :price => 100, :shipping_category_id => shipping_category.id
-    @product1 = Spree::Product.create! :name => 'product1', :price => 100, :shipping_category_id => shipping_category.id
-    @product2 = Spree::Product.create! :name => 'product2', :price => 100, :shipping_category_id => shipping_category.id
-    @user1 = Spree::User.create! :email => 'user1@example.com', :password => 'example', :password_confirmation => "example"
-    @user2 = Spree::User.create! :email => 'user2@example.com', :password => "example", :password_confirmation => 'example'
-    @user1.favorites.create! :product_id => @favorite_product1.id
-    @user2.favorites.create! :product_id => @favorite_product1.id
-    @user2.favorites.create! :product_id => @favorite_product2.id
-  end
-
-  it { should have_many(:favorites).dependent(:destroy) }
+  it { should have_many(:favorites) }
   it { should have_many(:favorite_users).through(:favorites).class_name('Spree::User') }
 
   describe "Spree::Product.favorite" do
-    it "returns favorite products" do
-      Spree::Product.favorite.should =~ [@favorite_product1, @favorite_product2]
+    before(:each) do
+      shipping_category = Spree::ShippingCategory.create! :name => 'shipping_category'
+      @favorite_product1 = Spree::Product.create! :name => 'favorite_product1', :price => 100, :shipping_category_id => shipping_category.id
+      @favorite_product2 = Spree::Product.create! :name => 'favorite_product2', :price => 100, :shipping_category_id => shipping_category.id
+      @product1 = Spree::Product.create! :name => 'product1', :price => 100, :shipping_category_id => shipping_category.id
+      @product2 = Spree::Product.create! :name => 'product2', :price => 100, :shipping_category_id => shipping_category.id
+      @user1 = Spree::User.create! :email => 'user1@example.com', :password => 'example', :password_confirmation => "example"
+      @user2 = Spree::User.create! :email => 'user2@example.com', :password => "example", :password_confirmation => 'example'
+      @user1.favorites.create! :product_id => @favorite_product1.id
+      @user2.favorites.create! :product_id => @favorite_product1.id
+      @user2.favorites.create! :product_id => @favorite_product2.id
     end
-  end
 
-  describe ".order_by_favorite_users_count" do
-    context 'when order not passed' do
-      it "returns products ordered by users_count in descending order" do
-        Spree::Product.favorite.order_by_favorite_users_count.should eq([@favorite_product1, @favorite_product2])
-      end
-    end
-
-    context 'when asc order passed' do
-      it "returns products ordered by users_count in ascending order" do
-        Spree::Product.favorite.order_by_favorite_users_count(true).should eq([@favorite_product2, @favorite_product1])
-      end
+    it "returns favorite products" do
+      Spree::Product.favorite.should =~ [@favorite_product1, @favorite_product2]
     end
   end
 end

data/spec/models/spree/user_decorator_spec.rb

@@ -11,7 +11,7 @@ describe Spree::User do
     favorite.save!
   end
 
-  it { should have_many(:favorites).dependent(:destroy) }
+  it { should have_many(:favorites) }
   it { should have_many(:favorite_products).through(:favorites).class_name('Spree::Product') }
 
   describe "has_favorite_product?" do

data/spree_favorite_products.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_favorite_products'
-  s.version     = '2.0.3'
+  s.version     = '2.2.0'
   s.summary     = 'users can mark product as favorite'
   s.description = 'This extension adds the following features: 1. Adds a link Mark as favorite on product detail page. 2. Favorite Products tab on header 3. Favorite Products tab in admin section'
   s.required_ruby_version = '>= 1.9.3'
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.1.0'
+  s.add_dependency 'spree_core', '~> 2.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_favorite_products
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 2
+  - 2
   - 0
-  - 3
-  version: 2.0.3
+  version: 2.2.0
 platform: ruby
 authors: 
 - Mohit Bansal
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-05-15 00:00:00 Z
+date: 2014-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 2
-        - 1
+        - 2
         - 0
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   version_requirements: *id001
 description: "This extension adds the following features: 1. Adds a link Mark as favorite on product detail page. 2. Favorite Products tab on header 3. Favorite Products tab in admin section"
@@ -63,7 +63,6 @@ files:
 - app/overrides/.DS_Store
 - app/overrides/add_favorite_products_per_page_configuration.rb
 - app/overrides/add_favorite_products_tab.rb
-- app/overrides/add_favorite_products_to_products_tab.rb
 - app/overrides/add_link_to_mark_product_as_favorite.rb
 - app/overrides/add_link_to_users_favorite_products.rb
 - app/views/spree/.DS_Store

data/app/overrides/add_favorite_products_to_products_tab.rb

@@ -1,11 +0,0 @@
-Deface::Override.new(
-  :virtual_path => 'spree/admin/shared/_tabs',
-  :name => 'select_products_tab',
-  :replace => "erb[silent]:contains('if can? :admin, Spree::Product')",
-  :closing_selector => "erb[silent]:contains('end')",
-  :text => %Q{
-    <% if can? :admin, Spree::Product %>
-      <%= tab :products, :option_types, :properties, :prototypes, :variants, :product_properties, :taxonomies, :favorite_products, :icon => 'icon-th-large' %>
-    <% end %>
-  } 
-)