spree_favorite_products 3.0.0 → 3.2.0

data/app/views/spree/admin/products/favorite_users.html.erb

@@ -0,0 +1,14 @@
+<% content_for :page_actions do %>
+  <% if can?(:create, Spree::Product) %>
+    <%= button_link_to Spree.t(:new_product), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_product' } %>
+  <% end %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :favorited_by } %>
+
+
+<%= paginate @users if @user.present? %>
+
+<%= render 'spree/admin/favorite_products/users', users: @users %>
+
+<%= paginate @users if @user.present? %>

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

@@ -0,0 +1,50 @@
+<%= render partial: 'spree/admin/users/sidebar', locals: { current: :favorite_products } %>
+<%= render partial: 'spree/admin/users/user_page_actions' %>
+
+<% content_for :page_title do %>
+  <%= @user.email %>
+<% end %>
+
+<div data-hook="admin_user_edit_general_settings" class="panel panel-default">
+  <div class="panel-heading">
+    <h1 class="panel-title">
+      <%= Spree.t(:favorite_product) %>
+    </h1>
+  </div>
+
+  <div class="panel-body">
+    <div data-hook="account_my_favorite_products" class="account-my-favorite-products commonform">
+      <h3><%= Spree.t(:favorite_products, scope: [:admin, :tab]) %></h3>
+      <% if @favorite_products.present? %>
+        <table class="favorite-products order-summary table table-striped" width="100%">
+          <thead>
+          <tr>
+            <th class="favorite-product-image"><%= Spree.t(:product_image) %></th>
+            <th class="favorite-product-name"><%= Spree.t(:product_name) %></th>
+            <th class="favorite-product-action actions"></th>
+          </tr>
+          </thead>
+          <tbody>
+          <% @favorite_products.each do |product| %>
+            <tr class="<%= cycle('even', 'odd') %> favorite_product" id="favorite_product_<%= product.id %>">
+              <td class="favorite-product-image"><%= link_to admin_product_path(product) do %>
+                <%= mini_image product %>
+                <% end %>
+              </td>
+              <td class="favorite-product-name"><%=link_to product.name, admin_product_path(product) %></td>
+              <td class="favorite-product-remove actions text-right">
+                <%= link_to_edit product, no_text: true, url: admin_product_path(product) %>
+                <%= link_to_delete product, no_text: true, url: admin_favorite_product_path(id: product.favorites.where(user_id: @user.id).first) %>
+            </tr>
+          <% end %>
+          </tbody>
+        </table>
+      <% else %>
+        <p><%= Spree.t(:you_have_no_favorite_products_yet) %></p>
+      <% end %>
+
+      <%= paginate @favorite_products %>
+    </div>
+  </div>
+</div>
+

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

@@ -11,4 +11,4 @@
   }
 <% else %>
   alert("Could not remove product form your list")
-<% end %>
+<% end %>

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

@@ -1,20 +1,20 @@
 <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 table table-striped" width="100%">
       <thead>
       <tr>
         <th class="favorite-product-image"><%= Spree.t(:product_image) %></th>
         <th class="favorite-product-name"><%= Spree.t(:product_name) %></th>
-        <th class="favorite-product-action">Action</th>        
+        <th class="favorite-product-action text-right"><%= Spree.t(:action) %></th>
       </tr>
       </thead>
       <tbody>
       <% @favorite_products.each do |product| %>
         <tr class="<%= cycle('even', 'odd') %> favorite_product" id="favorite_product_<%= product.id %>">
-          <td class="favorite-product-image"><%= link_to small_image(product), product_path(product) %></td>
+          <td class="favorite-product-image"><%= link_to mini_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 text-right"><%= link_to Spree.t(:remove), favorite_product_path(id: product.id), method: :delete, remote: true, confirm: 'Are you sure you want to remove the product?' %>
         </tr>
       <% end %>
       </tbody>
@@ -22,6 +22,6 @@
   <% else %>
     <p><%= Spree.t(:you_have_no_favorite_products_yet) %></p>
   <% end %>
-  
+
   <%= paginate @favorite_products %>
-</div>
+</div>

data/config/locales/bg.yml

@@ -0,0 +1,13 @@
+bg:
+  spree:
+    duplicate_favorite: 'Вече е добавено в любимо'
+    favorite_products:
+      create:
+        success: 'Успешно маркиран като любим'
+    favorite_products_per_page: "Любими продукти на страница"
+    favorite_products_settings: "Любими продукти настойки"
+    mark_as_favorite: "Добави в любими"
+    unmark_as_favorite: "Премахни от любими"
+    admin:
+      tab:
+        favorite_products: "Любими продукти"

data/config/locales/en.yml

@@ -3,7 +3,25 @@
 
 en:
   spree:
-    favorite_products_settings: "Favorite Products Settings"
+    admin:
+      tab:
+        favorite_products: Favorite Products
+    duplicate_favorite: 'already marked as favorite'
+    favorite_products:
+      create:
+        success: 'Product has been successfully marked as favorite'
+    favorite_users: "Favorite users"
     favorite_products_per_page: "Favorite Products Shown Per Page"
-    mark_as_favorite: "Mark as favorite"
-    unmark_as_favorite: "Unmark as favorite"
+    favorite_products_settings: "Favorite Products Settings"
+    mark_as_favorite: "Mark As Favorite"
+    unmark_as_favorite: "Remove From Favorite"
+    listing_favorite_products: Listing Favorite Products
+    listing_favorite_products_users: Listing Favorite Product Users
+    user_count: User Count
+    my_favorite_products: My Favorite Products
+    product_image: Product Image
+    product_name: Product Name
+    favorites: Favorites
+    are_you_sure_to_remove_product: Are you sure you want to remove the product?
+    login_to_add_favorite: Please Login to Add Favorite
+    favorited_by: Favorited By

data/config/locales/pl.yml

@@ -0,0 +1,19 @@
+pl:
+  spree:
+    duplicate_favorite: 'Produkt jest już dodany do ulubionych'
+    favorite_products:
+      title: Ulubione produkty
+      create:
+        success: 'Polubiono produkt!'
+    favorite_products_per_page: "Liczba ulubionych produktów wyświetlona na stronie"
+    favorite_products_settings: "Ustawienia ulubionych produktów"
+    favorite_users: "Użytkownicy"
+    listing_favorite_products: "Lista polubionych produktów"
+    listing_favorite_products_users: "Użytkownicy, którzy polubili produkt"
+    my_favorite_products: Polubione przeze mnie
+    mark_as_favorite: "Dodaj do ulubionych"
+    unmark_as_favorite: "Usuń z ulubionych"
+    you_have_no_favorite_products_yet: "Nie polubiono jeszcze żadnego produktu."
+    admin:
+      tab:
+        favorite_products: "Lista polubionych produktów"

data/config/routes.rb

@@ -1,10 +1,18 @@
 Spree::Core::Engine.routes.draw do
   # Add your extension routes here
   namespace :admin do
-    resources :favorite_products, :only => :index do
-      get :users, :on => :member
+    resources :favorite_products, only: [:index, :destroy] do
+      get :users, on: :member, to: 'products#favorite_users'
+    end
+
+    resources :products do
+      get :favorite_users, on: :member
+    end
+
+    resources :users do
+      get :favorite_products, on: :member
     end
   end
 
-  resources :favorite_products, :only => [:index, :create, :destroy]
+  resources :favorite_products, only: [:index, :create, :destroy]
 end

data/db/migrate/20130705080641_create_table_favorites.rb

@@ -3,7 +3,7 @@ class CreateTableFavorites < ActiveRecord::Migration
     create_table :favorites do |t|
       t.integer :user_id
       t.integer :product_id
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20130710105100_rename_favorites_to_spree_favorites.rb

@@ -1,7 +1,7 @@
 class RenameFavoritesToSpreeFavorites < ActiveRecord::Migration
   def change
     rename_table :favorites, :spree_favorites
-    add_index :spree_favorites, [:user_id, :product_id], :unique => true
+    add_index :spree_favorites, [:user_id, :product_id], unique: true
     add_index :spree_favorites, :user_id
   end
 end

data/db/migrate/20160304152800_add_favorites_user_counts_to_product.rb

@@ -0,0 +1,6 @@
+class AddFavoritesUserCountsToProduct < ActiveRecord::Migration
+  def change
+    add_column :spree_products, :favorite_users_count, :integer, default: 0
+    add_index :spree_products, :favorite_users_count
+  end
+end

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

@@ -2,16 +2,17 @@ module SpreeFavoriteProducts
   module Generators
     class InstallGenerator < Rails::Generators::Base
 
-      class_option :auto_run_migrations, :type => :boolean, :default => false
+      class_option :auto_run_migrations, type: :boolean, default: false
 
       def add_javascripts
         append_file 'vendor/assets/javascripts/spree/frontend/all.js', "\n//= require store/spree_favorite_products\n"
+        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "\n//= require spree/frontend/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 '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
+        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

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe Spree::Admin::FavoriteProductsController do
-  let(:role) { Spree::Role.create!(:name => 'user') }
+  let(:role) { Spree::Role.create!(name: 'user') }
   let(:roles) { [role] }
   let(:product) { mock_model( Spree::Product) }
   let(:proxy_object) { Object.new }
 
   before(:each) do
-    @user = mock_model(Spree::User, :generate_spree_api_key! => false)
+    @user = mock_model(Spree::User, generate_spree_api_key!: false)
     allow(@user).to receive(:roles).and_return(proxy_object)
     allow(proxy_object).to receive(:includes).and_return([])
 
@@ -20,8 +20,9 @@ describe Spree::Admin::FavoriteProductsController do
     allow(controller).to receive(:authorize!).and_return(true)
 
     @favorite_products = double('favorite_products')
+    allow(@favorite_products).to receive(:includes).and_return(@favorite_products)
     allow(@favorite_products).to receive(:order_by_favorite_users_count).and_return(@favorite_products)
-    @search = double('search', :result => @favorite_products)
+    @search = double('search', result: @favorite_products)
     allow(@favorite_products).to receive(:search).and_return(@search)
     allow(@favorite_products).to receive(:page).and_return(@favorite_products)
     allow(Spree::Product).to receive(:favorite).and_return(@favorite_products)
@@ -29,93 +30,82 @@ describe Spree::Admin::FavoriteProductsController do
 
   describe "GET index" do
     def send_request
-      get :index, :page => 1 ,:use_route => 'spree', :q => { 's' => 'name desc' }
+      get :index, params: { page: 1, q: { s: 'name desc' } }
     end
 
     it "returns favorite products" do
-      Spree::Product.should_receive(:favorite)
+      expect(Spree::Product).to receive(:favorite)
       send_request
     end
 
     it "searches favorite products" do
-      @favorite_products.should_receive(:search).with('s' => 'name desc')
+      search_params = ActionController::Parameters.new(s: 'name desc')
+      expect(@favorite_products).to receive(:search).with(search_params)
       send_request
     end
 
     it "assigns @search" do
       send_request
-      assigns(:search).should eq(@search)
+      expect(assigns(:search)).to 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' }
+        get :index, params: { page: 1, 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)
+        expect(@favorite_products).to 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)
+        expect(@favorite_products).to receive(:order_by_favorite_users_count).with(false)
         send_request
       end
     end
 
     it "paginates favorite products" do
-      @favorite_products.should_receive(:page).with("1")
+      expect(@favorite_products).to receive(:page).with("1")
       send_request
     end
 
     it "renders favorite products template" do
       send_request
-      response.should render_template(:index)
-    end
-  end
-
-  describe "#users" do
-    before do
-      @users = [@user]
-      allow(@users).to receive(:page).and_return(@users)
-      allow(product).to receive(:favorite_users).and_return(@users)
-      @products = [product]
-      allow(Spree::Product).to receive(:where).with(:id => product.id).and_return(@products)
-    end
-
-    def send_request
-      get :users, :use_route => 'spree', :id => product.id, :format => :js
-    end
-
-    it 'fetches the product' do
-      Spree::Product.should_receive(:where).with(:id => product.id).and_return(@products)
-    end
-
-    it 'fetches the users who marked the product as favorite' do
-      product.should_receive(:favorite_users).and_return(@users)
-    end
-
-    after do
-      send_request
+      expect(response).to render_template(:index)
     end
   end
 
   describe "#sort_in_ascending_users_count?" do
 
     context 'when favorite_user_count asc present in params[q][s]' do
+      def send_request
+        get :index, params: { page: 1, q: { s: 'favorite_users_count asc' } }
+      end
+
       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
+        controller.send(:sort_in_ascending_users_count?).should be true
+      end
+
+      before do
+        send_request
       end
     end
 
     context 'when favorite_user_count not present in params' do
+      def send_request
+        get :index, params: { page: 1, q: { s: 'name asc' } }
+      end
+
       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
+
+      before do
+        send_request
+      end
     end
   end
 end

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

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+RSpec.describe Spree::Admin::ProductsController, type: :controller do
+
+  describe 'GET users' do
+    stub_authorization!
+    let(:product) { mock_model(Spree::Product, id: 10) }
+    let(:favorite_product) { mock_model(Spree::Product) }
+    let(:favorite_users) { double(ActiveRecord::Relation) }
+
+    def send_request
+      get :favorite_users, params: { id: product.id }
+    end
+
+
+    before do
+      allow(Spree::Product).to receive_message_chain( :with_deleted, :friendly, :find).and_return(product)
+      allow(product).to receive(:favorite_users).and_return(favorite_users)
+      allow(favorite_users).to receive_message_chain(:page, :per).and_return(favorite_users)
+    end
+
+    it 'is expected to set favorite_users' do
+      expect(product).to receive(:favorite_users).and_return(favorite_users)
+      send_request
+    end
+
+  end
+end

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

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+RSpec.describe Spree::Admin::UsersController, type: :controller do
+  let(:user) { mock_model(Spree::User) }
+  let(:favorite_product) { mock_model(Spree::Product) }
+  let(:favorite_products) { double(ActiveRecord::Relation) }
+
+  describe 'favorite_products' do
+    stub_authorization!
+
+    def send_request
+      get :favorite_products, params: { id: user.id }
+    end
+
+
+    before do
+      allow(Spree::User).to receive(:find).and_return(user)
+      allow(user).to receive(:favorite_products).and_return(favorite_products)
+      allow(favorite_products).to receive_message_chain(:page, :per).and_return(favorite_products)
+    end
+
+    it 'is expected to set favorite_products' do
+      expect(user).to receive(:favorite_products).and_return(favorite_products)
+      send_request
+    end
+
+  end
+end