spree_favorite_products 1.0.1 → 2.0.0

data/Gemfile

@@ -1,9 +1,8 @@
 source 'https://rubygems.org'
 
 # Provides basic authentication functionality for testing parts of your engine
-gem 'spree', '2.0.3'
-gem 'rails', '3.2.15'
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-0-stable'
+gem 'spree', '2.1.0'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable'
 gem 'mysql2'
 
 group :test do

data/README.md

@@ -2,6 +2,7 @@ SpreeFavoriteProducts [![Code Climate](https://codeclimate.com/github/vinsol/spr
 =====================
 
 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 
@@ -15,6 +16,12 @@ Add spree_favorite_products to your Gemfile:
 gem 'spree_favorite_products'
 ```
 
+If you're still using Spree 2.0.x, you should do this instead:
+
+```ruby
+gem 'spree_favorite_products', '1.0.0'
+```
+
 Bundle your dependencies and run the installation generator:
 
 ```shell

data/app/controllers/spree/favorite_products_controller.rb

@@ -5,7 +5,7 @@ module Spree
     before_filter :find_favorite_product, :only => :destroy
 
     def index
-      @favorite_products = spree_current_user.favorite_products.page(params[:page]).per(Spree::Config.favorite_products_per_page)
+      @favorite_products = spree_current_user.favorite_products
     end
 
     def create
@@ -28,7 +28,7 @@ module Spree
 
     private
       def find_favorite_product
-        @favorite = spree_current_user.favorites.joins(:product).where(:spree_products => {:id => params[:id]}).first
+        @favorite = spree_current_user.favorites.joins(:product).readonly(false).where(:spree_products => {:permalink => params[:id]}).first
       end
   end
 end

data/app/models/spree/favorite.rb

@@ -1,6 +1,5 @@
 module Spree
   class Favorite < ActiveRecord::Base
-    attr_accessible :product_id
     belongs_to :product
     belongs_to :user
     validates :user_id, :product_id, :presence => true

data/app/models/spree/user_decorator.rb

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

data/app/overrides/add_link_to_mark_product_as_favorite.rb

@@ -2,11 +2,5 @@ Deface::Override.new(
   :virtual_path => 'spree/products/show',
   :name => 'add_link_to_mark_product_as_favorite',
   :insert_after => "div[itemprop='description']",
-  :text => %Q{
-    <% if spree_user_signed_in? && spree_current_user.has_favorite_product?(@product.id) %>
-      <%= link_to Spree.t(:unmark_as_favorite), favorite_product_path(:id => @product.id), :method => :delete, :remote => true, :class => 'favorite_link' %>
-    <% else %>
-      <%= link_to Spree.t(:mark_as_favorite), favorite_products_path(:id => @product.id), :method => :post, :remote => spree_user_signed_in?, :class => 'favorite_link' %>
-    <% end %>
-  }
+  :text => "<%= link_to 'Mark as favorite', favorite_products_path(:id => @product.id), :method => :post, :remote => spree_user_signed_in? %>"
 )

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

@@ -1,4 +1 @@
-<% if @success %>
-  $('.favorite_link').attr('href', '<%= favorite_product_path(:id => params[:id]) %>').data('method', 'delete').text('<%= Spree.t(:unmark_as_favorite) %>')
-<% end %>
 alert("<%=j @message%>");

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

@@ -1,11 +1,6 @@
 <% if @success %>
-  if($('.favorite_link').length) {
-    $('.favorite_link').attr('href', '<%= favorite_products_path(:id => @favorite.product_id) %>').data('method', 'post').text('<%= Spree.t(:mark_as_favorite) %>');
-    alert('Successfully unmarked as favorite');
-  } else {
-    $("#favorite_product_<%= @favorite.product_id%>").remove();
-    alert("Successfully removed favorite product from your list");
-  }
+  $("#favorite_product_<%= @favorite.product_id%>").remove();
+  alert("Successfully removed favorite product from your list")
 <% else %>
-  alert("Could not remove product form your list");
+  alert("Could not remove product form your list")
 <% end %>

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

@@ -14,7 +14,7 @@
         <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 %>
+          <td class="favorite-product-remove"><%= link_to 'Remove', favorite_product_path(product), :method => :delete, :remote => true %>
         </tr>
       <% end %>
       </tbody>
@@ -22,6 +22,4 @@
   <% else %>
     <p><%= Spree.t(:you_have_no_favorite_products_yet) %></p>
   <% end %>
-  
-  <%= paginate @favorite_products %>
 </div>

data/config/locales/en.yml

@@ -3,8 +3,3 @@
 
 en:
   hello: "Hello world"
-  spree:
-    favorite_products_settings: "Favorite Products Settings"
-    favorite_products_per_page: "Per Page"
-    mark_as_favorite: "Mark as favorite"
-    unmark_as_favorite: "Unmark as favorite"

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

@@ -40,7 +40,7 @@ describe Spree::Admin::FavoriteProductsController do
 
     it "renders favorite products template" do
       send_request
-      response.should render_template(:favorite)
+      response.should render_template(:index)
     end
   end
 

data/spec/controllers/spree/favorite_products_controller_spec.rb

@@ -11,7 +11,12 @@ describe Spree::FavoriteProductsController do
 
   shared_examples_for "request which finds favorite product" do
     it "finds favorite product" do
-      @current_user_favorites.should_receive(:where).with(:spree_products => {:id => 'permalink'})
+      @current_user_favorites.should_receive(:where).with(:spree_products => {:permalink => 'permalink'})
+      send_request
+    end
+
+    it "sets readonly to false" do
+      @current_user_favorites.should_receive(:readonly).with(false)
       send_request
     end
 
@@ -79,15 +84,12 @@ describe Spree::FavoriteProductsController do
 
   describe 'GET index' do
     def send_request
-      get :index, :page => 'current_page', :use_route => 'spree'
+      get :index, :use_route => 'spree'
     end
 
     before(:each) do
-      @favorite_products = double('favorite_products')
-      @favorite_products.stub(:page).and_return(@favorite_products)
-      @favorite_products.stub(:per).and_return(@favorite_products)
-      Spree::Config.stub(:favorite_products_per_page).and_return('favorite_products_per_page')
-      @user = mock_model(Spree::User, :favorite_products => @favorite_products, :generate_spree_api_key! => false, :last_incomplete_spree_order => nil)
+      @favorite_product = mock_model(Spree::Product)
+      @user = mock_model(Spree::User, :favorite_products => [@favorite_product], :generate_spree_api_key! => false, :last_incomplete_spree_order => nil)
       controller.stub(:authenticate_spree_user!).and_return(true)
       controller.stub(:spree_current_user).and_return(@user)
     end
@@ -104,17 +106,7 @@ describe Spree::FavoriteProductsController do
 
     it "assigns @favorite_products" do
       send_request
-      assigns(:favorite_products).should eq(@favorite_products)
-    end
-
-    it "paginates favorite products" do
-      @favorite_products.should_receive(:page).with('current_page')
-      send_request
-    end
-
-    it "shows Spree::Config.favorite_products_per_page" do
-      @favorite_products.should_receive(:per).with('favorite_products_per_page')
-      send_request
+      assigns(:favorite_products).should eq([@favorite_product])
     end
   end
 
@@ -127,6 +119,7 @@ describe Spree::FavoriteProductsController do
       @favorite = mock_model(Spree::Favorite)
       @current_user_favorites = double('spree_favorites')
       @current_user_favorites.stub(:where).and_return([@favorite])
+      @current_user_favorites.stub(:readonly).and_return(@current_user_favorites)
       @favorites = double('spree_favorites')
       @favorites.stub(:joins).with(:product).and_return(@current_user_favorites)
       @user = mock_model(Spree::User, :favorites => @favorites, :generate_spree_api_key! => false, :last_incomplete_spree_order => nil)

data/spec/models/spree/favorite_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Spree::Favorite do
-  it { should allow_mass_assignment_of :product_id }
   it { should belong_to(:product) }
   it { should belong_to(:user) }
   it { should validate_uniqueness_of(:product_id).scoped_to(:user_id).with_message("already marked as favorite") }

data/spec/models/spree/user_decorator_spec.rb

@@ -1,28 +1,6 @@
 require 'spec_helper'
 
 describe Spree::User do
-  
-  before(:each) do
-    @user = Spree::User.create! :email => 'test@example.com', :password => 'spree123'
-    @product1 = Spree::Product.create! :name => 'product1', :price => 100, :shipping_category_id => 1
-    @product2 = Spree::Product.create! :name => 'product2', :price => 100, :shipping_category_id => 1
-    favorite = Spree::Favorite.new
-    favorite.product_id = @product1.id
-    favorite.user_id = @user.id
-    favorite.save!
-  end
-
   it { should have_many(:favorites) }
   it { should have_many(:favorite_products).through(:favorites).class_name('Spree::Product') }
-
-
-  describe "has_favorite_product?" do
-    context "when product in user's favorite products" do
-      it { @user.has_favorite_product?(@product1.id).should be_true }
-    end
-
-    context 'when product is not in users favorite products' do
-      it { @user.has_favorite_product?(@product2.id).should be_false }
-    end
-  end
 end

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     = '1.0.1'
+  s.version     = '2.0.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.0.3'
+  s.add_dependency 'spree_core', '~> 2.1.0'
 end

metadata

@@ -1,47 +1,40 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_favorite_products
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Mohit Bansal
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-03-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-02-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spree_core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 0
-        - 3
-        version: 2.0.3
+      - !ruby/object:Gem::Version
+        version: 2.1.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"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+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'
 email: info@vinsol.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .rspec
 - .travis.yml
 - Gemfile
@@ -56,12 +49,10 @@ files:
 - app/assets/stylesheets/store/spree_favorite_products.css
 - app/controllers/spree/admin/favorite_products_controller.rb
 - app/controllers/spree/favorite_products_controller.rb
-- app/models/spree/app_configuration_decorator.rb
 - app/models/spree/favorite.rb
 - app/models/spree/product_decorator.rb
 - app/models/spree/user_decorator.rb
 - app/overrides/.DS_Store
-- app/overrides/add_favorite_products_per_page_configuration.rb
 - app/overrides/add_favorite_products_tab.rb
 - app/overrides/add_link_to_mark_product_as_favorite.rb
 - app/overrides/add_link_to_users_favorite_products.rb
@@ -82,46 +73,35 @@ files:
 - script/rails
 - spec/controllers/spree/admin/favorite_products_controller_spec.rb
 - spec/controllers/spree/favorite_products_controller_spec.rb
-- spec/models/spree/app_configuration_decorator_spec.rb
 - spec/models/spree/favorite_spec.rb
 - spec/models/spree/product_decorator_spec.rb
 - spec/models/spree/user_decorator_spec.rb
 - spec/spec_helper.rb
 - spree_favorite_products.gemspec
 homepage: http://vinsol.com
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 53
-      segments: 
-      - 1
-      - 9
-      - 3
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.3
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: users can mark product as favorite
 test_files: []
-

data/app/models/spree/app_configuration_decorator.rb

@@ -1,3 +0,0 @@
-Spree::AppConfiguration.class_eval do
-  preference :favorite_products_per_page, :integer, default: 10
-end

data/app/overrides/add_favorite_products_per_page_configuration.rb

@@ -1,16 +0,0 @@
-Deface::Override.new(
-  :virtual_path => 'spree/admin/general_settings/edit',
-  :name => 'add_favorite_products_per_page_configuration',
-  :insert_after => "#preferences .row",
-  :text => %Q{
-    <div class="row">
-      <fieldset class="no-border-bottom">
-        <legend align="center"><%= Spree.t(:favorite_products_settings) %></legend>
-        <div class="field">
-          <%= label_tag :favorite_products_per_page, Spree.t(:favorite_products_per_page) %><br>
-          <%= text_field_tag :favorite_products_per_page, Spree::Config[:favorite_products_per_page], :size => 3 %>
-        </div>
-      </fieldset>
-    </div>
-  }
-)

data/spec/models/spree/app_configuration_decorator_spec.rb

@@ -1,3 +0,0 @@
-describe Spree::AppConfiguration do
-  it { Spree::Config.favorite_products_per_page.should eq 10 }
-end