spree_compare_products 0.40.90 → 0.50.0

data/app/controllers/compare_products_controller.rb

@@ -1,60 +1,75 @@
 class CompareProductsController < Spree::BaseController
-  
-  before_filter :find_taxon
-  before_filter :verify_comparable_taxon
-  before_filter :find_products
-  
+  COMPARE_LIMIT = 4
+  before_filter :find_taxon, :only => [:show, :add]
+
   helper :products, :taxons
-  
+
   def show
-    @properties = @products.map(&:properties).flatten.uniq # We return the list of properties here so we can use them latter.
+    if @comparable_products.count > 1
+      @properties = @comparable_products.includes(:product_properties => :property).map(&:properties).flatten.uniq # We return the list of properties here so we can use them latter.
+    else
+      flash[:error] = I18n.t(:insufficient_data, :scope => :compare_products)
+    end
   end
-  
-  private
-  
-  # Find the taxon from the url.
-  def find_taxon
-    permalink = ''
-    
-    if params[:taxon_path]
-      permalink = "#{params[:taxon_path]}/"
-    elsif params[:taxon]
-      permalink = "#{params[:taxon]}/"
+
+  def add
+    product = Product.find_by_permalink(params[:id])
+    if product && (product.taxons.map(&:id).include?(@taxon.try(:id)) || @comparable_products.size < 1)
+      if session[:comparable_product_ids].include?(product.id)
+        flash[:notice] = I18n.t(:already_in_list, :product => product.name, :scope => :compare_products)
+      else
+        if @comparable_products.size < COMPARE_LIMIT
+          @added_product = product
+          session[:comparable_product_ids] << product.id
+          flash[:notice] = I18n.t(:added_to_comparsion, :product => product.name, :scope => :compare_products)
+        else
+          flash[:notice] = I18n.t(:limit_is_reached, :scope => :compare_products, :count => COMPARE_LIMIT)
+        end
+      end
+    else
+      session[:comparable_product_ids].delete(product.id)
+      flash[:error] = I18n.t(:invalid_taxon, :scope => :compare_products)
+    end
+    respond_to do |format|
+      format.html { redirect_back_or_default(products_path) }
+      format.js { render :layout => false }
     end
-    
-    @taxon = Taxon.find_by_permalink(permalink) unless permalink.blank?
-    
-    if @taxon.nil?
-      flash[:error] = I18n.t('compare_products.invalid_taxon')
-      
-      redirect_to products_path
+  end
+
+  def remove
+    session[:comparable_product_ids] ||= []
+    product = Product.find_by_permalink(params[:id])
+    if product
+      @deleted_product = product if session[:comparable_product_ids].include?(product.id)
+      session[:comparable_product_ids].delete(product.id)
+      flash[:notice] = I18n.t(:removed_from_comparsion, :product => product.name, :scope => :compare_products)
+    end
+    respond_to do |format|
+      format.html { redirect_back_or_default(products_path) }
+      format.js { render :layout => false }
     end
   end
-  
-  # Verifies that the comparison can be made inside this taxon.
-  def verify_comparable_taxon
-    unless @taxon.is_comparable?
-      flash[:error] = I18n.t('compare_products.taxon_not_comparable')
-      
-      redirect_to "/t/#{@taxon.permalink}"
+
+  def destroy
+    session[:comparable_product_ids] = []
+    flash[:notice] = I18n.t(:comparsion_cleared, :scope => :compare_products)
+    respond_to do |format|
+      format.html { redirect_back_or_default(products_path) }
+      format.js { render :layout => false }
     end
   end
-  
-  # Find the products inside the taxon, manually adding product ids to
-  # the url will silently be ignored if they can't be compared inside
-  # the taxon or don't exists.
-  def find_products
-    product_ids = params[:product_ids].split('/')
-    
-    if product_ids.length > 4
-      flash[:notice] = I18n.t('compare_products.limit_is_4')
-      product_ids = product_ids[0..3]
-    elsif product_ids.length < 2
-      flash[:error] = I18n.t('compare_products.insufficient_data')
-      redirect_to "/t/#{@taxon.permalink}"
+
+  private
+
+  def find_taxon
+    if @comparable_products.size > 1
+      @taxon = @comparable_products.inject(@comparable_products[0].taxons) { |t, p| t & p.taxons }.select { |t| t.is_comparable? }.first
+
+      if @taxon.nil?
+        flash[:error] = I18n.t(:invalid_taxon, :scope => :compare_products)
+      end
+    elsif @comparable_products.size == 1
+      @taxon = @comparable_products[0].taxons.select { |t| t.is_comparable? }.first
     end
-    
-    @products = @taxon.products.find(:all, :conditions => { :id => product_ids}, :include => { :product_properties => :property }, :limit => 4)
   end
-  
-end
+end

data/app/helpers/compare_products_helper.rb

@@ -11,7 +11,7 @@ module CompareProductsHelper
   def comparison_rows_for(products, properties)
     fields = [comparison_fields_for(products, properties)]
     products.each do |product|
-      fields << (fields_for(product, properties))
+      fields << (product_fields_for(product, properties))
     end
     fields.transpose
   end
@@ -21,7 +21,8 @@ module CompareProductsHelper
   # 
   # Example:
   #   ["product1 image", "product1 name", ..., "product1 price"]
-  def fields_for(product, properties)
+  
+  def product_fields_for(product, properties)
     [ link_to(small_image(product), product), link_to(product.name, product)].tap { |fields|
       properties.each do |property|
         fields << product.product_properties.find_by_property_id(property.id).try(:value)

data/app/models/product_decorator.rb

@@ -0,0 +1,5 @@
+Product.class_eval do
+  def can_be_compared?
+    !self.taxons.to_a.find{|t| t.is_comparable? }.nil?
+  end
+end

data/app/views/compare_products/add.js.erb

@@ -0,0 +1,16 @@
+<% if @added_product %>
+var line_item = "<%= escape_javascript(render(:partial => "shared/comparable_line_item", :object => @added_product)) %>";
+var product_id = <%= @added_product.id %>
+onAddCompareProduct(line_item, product_id);
+<% end %>
+
+<% notice = flash.delete(:notice)
+if notice %>
+  var notice = "<%= notice %>";
+  onCompareProductNotice(notice);
+<% end
+error = flash.delete(:error)
+if error %>
+  var error = "<%= error %>";
+  onCompareProductError(error);
+<% end %>

data/app/views/compare_products/remove.js.erb

@@ -0,0 +1,15 @@
+<% if @deleted_product %>
+var product_id = <%= @deleted_product.id %>
+onRemoveCompareProduct(product_id);
+<% end %>
+
+<% notice = flash.delete(:notice)
+if notice %>
+  var notice = "<%= notice %>";
+  onCompareProductNotice(notice);
+<% end
+error = flash.delete(:error)
+if error %>
+  var error = "<%= error %>";
+  onCompareProductError(error);
+<% end %>

data/app/views/compare_products/show.html.erb

@@ -1,17 +1,15 @@
-<% content_for :head do %>
-  <%= stylesheet_link_tag 'compiled/compare_products' %>
-<% end %>
+<% @body_class = 'one-col' %>
 
-<% content_for :sidebar do %>
-  <%= render :partial => 'shared/taxonomies' %>
+<% content_for :head do %>
+  <%= stylesheet_link_tag 'compare_products' %>
 <% end %>
 
 <h1>
   <%= t('compare_products.product_comparison') %>
 </h1>
-
-<table>
-  <% comparison_rows_for(@products, @properties).each do |row| %>
+<% if @comparable_products.count > 1 %>
+<table class="compare_product_show">
+  <% comparison_rows_for(@comparable_products, @properties).each do |row| %>
     <tr>
       <th><%= row.shift -%></th>
       
@@ -21,5 +19,8 @@
     </tr>
   <% end %>
 </table>
+<% else %>
+  <p><%= t('compare_products.insufficient_data') %></p>
+<% end %>
 
-<%= link_to t('continue_shopping'), seo_url(@taxon), :class => 'continue button' %>
+<%= link_to t('continue_shopping'), @taxon ? seo_url(@taxon) : products_path, :class => 'continue button' %>

data/app/views/products/_compare.html.erb

@@ -0,0 +1,3 @@
+<% if @product.can_be_compared? %>
+  <%= link_to t(:add_to_comparison, :scope => :compare_products), add_to_comparison_path(@product), :class => 'compare', :remote => true %>
+<% end %>

data/app/views/shared/_comparable_line_item.html.erb

@@ -0,0 +1 @@
+<li id="comp_item_<%= comparable_line_item.id %>"><%= link_to comparable_line_item.name, comparable_line_item %> <%= link_to "", remove_from_comparison_path(comparable_line_item), :remote => true, :class => "remove-comparable-item" %></li>

data/app/views/shared/_comparable_products.html.erb

@@ -0,0 +1,9 @@
+<div id="comparable_products_wrapper" >
+  <h3><%= t('сomparable_products', :scope => :compare_products) %></h3>
+  <ul id="comparable_products">
+    <%= render :partial => 'shared/comparable_line_item', :collection => @comparable_products %>
+  </ul>
+  <div style="display: none" class="no_products_message"><%= t(:no_products_to_compare, :scope => :compare_products) %></div>
+  <div id="compare_products_link"><%= link_to t(:compare, :scope => :compare_products), compare_products_path %></div>
+  <div id="clear_comparable_products_link"><%= link_to t(:compare_clear, :scope => :compare_products), destroy_comparison_path %></div>
+</div>

data/app/views/shared/_compare_product_field.html.erb

@@ -1,5 +1,3 @@
-<% if @comparable %>
-<span class="comparable">
-  <%= check_box_tag('product_id[]', product.id, false, :id => "compare_product_#{product.id}", :class => 'compare') %>
-</span>
+<% if product.can_be_compared? %>
+<%= link_to t(:add_to_comparison, :scope => :compare_products), add_to_comparison_path(product), :class => 'compare', :style => "z-index:10;", :remote => true %>
 <% end %>

data/app/views/shared/_compare_product_javascript.html.erb

@@ -0,0 +1,19 @@
+<%= javascript_include_tag 'product_comparison' %>
+
+<script type="text/javascript">
+  function onAddCompareProduct() {
+    // override in your application
+  }
+
+  function onRemoveCompareProduct() {
+    // override in your application
+  }
+
+  function onCompareProductNotice() {
+    // override in your application
+  }
+
+  function onCompareProductError() {
+    // override in your application
+  }
+</script>

data/app/views/taxons/_comparable_taxon.html.erb

@@ -1,12 +1,7 @@
 <% content_for :head do %>
-  <%= javascript_include_tag 'product_comparison' %>
-  
+  <%= javascript_include_tag 'product_comparison' %>  
   <%= stylesheet_link_tag 'compiled/compare_products' %>
 <% end %>
 
-<% form_tag(compare_products_path, :method => :get) do %>
-  <%= hidden_field_tag('taxon_permalink', params[:id]) %>
-  <% @comparable = true %>
-  <%= render 'shared/products.html.erb', :products => @products, :taxon => @taxon %>
-  <%= submit_tag t('compare_products.compare'), :id => 'compare', :class => 'button' %>
-<% end %>
+<%= render 'shared/products.html.erb', :products => @comparable_products, :taxon => @taxon %>
+

data/app/views/taxons/_taxon_products.html.erb

@@ -1,5 +1 @@
-<% if @taxon && @taxon.taxonomy.comparable? && @products.length > 1 %>
-  <%= render('taxons/comparable_taxon') %>
-<% else %>
-  <%= render('shared/products.html.erb', :products => @products, :taxon => @taxon) %>
-<% end %>
+<%= render('shared/products', :products => @products, :taxon => @taxon) %>

data/config/locales/en-US.yml

@@ -8,3 +8,5 @@ en:
     limit_is_4: You can only compare up to 4 products.
     product_comparison: Product comparison
     taxon_not_comparable: "Products inside this taxon can't be compared"
+    add_to_comparison: "Compare"
+    no_products_to_compare: "There is no products to compare"

data/config/locales/ru.yml

@@ -1,10 +1,20 @@
 ru:
   compare_products:
+    add_to_comparison: "Добавить к сравнению"
+    added_to_comparsion: "%{product} добавлен к сравнению"
+    already_in_list: "%{product} уже находится в списке сравниваемых товаров."
     comparable_container: "разрешить сравнение товаров"
+    сomparable_products: "Сравниваемые товары"
     compare: "Сравнить"
+    compare_clear: "Очистить список"
     compare_selected: "Сравнить выбранные товары"
+    compare_products: "Сравнение товаров (%{count})"
+    comparsion_cleared: "Сравнение очищено"
     insufficient_data: "Недостаточно данных, нужно выбрать хотя бы 2 товара."
     invalid_taxon: "Нельзя сравнивать товары из разных категорий"
     limit_is_4: "Вы можете сравнить не более четырёх товаров одновременно."
+    limit_is_reached: "Вы можете сравнить не более %{count} товаров одновременно."
     product_comparison: "Сравнение товаров"
+    removed_from_comparsion: "%{product} убран из сравнения"
     taxon_not_comparable: "Товары данной категории не могут быть сравнены."
+    no_products_to_compare: "Вы можете добавить товары к сравнению, воспользовавшись соответствующей ссылкой на странице просмотра товара."

data/config/routes.rb

@@ -1,4 +1,7 @@
 Rails.application.routes.draw do
-  match '/t/compare_products' => 'compare_products#show', :as => 'compare_products'
+  match '/compare_products' => 'compare_products#show', :as => 'compare_products'
+  match '/compare_products/add/:id' => 'compare_products#add', :as => 'add_to_comparison'
+  match '/compare_products/remove/:id' => 'compare_products#remove', :as => 'remove_from_comparison'
+  match '/compare_products/destroy' => 'compare_products#destroy', :as => 'destroy_comparison'
   match '/t/*taxon_path/compare/*product_ids' => 'compare_products#show'
-end
+end

data/lib/spree_compare_products.rb

@@ -4,27 +4,54 @@ require 'spree_compare_products/comparable_container'
 
 module SpreeCompareProducts
   class Engine < Rails::Engine
-    
+
     config.autoload_paths += %W(#{config.root}/lib)
-    
+
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), '../app/**/*_decorator*.rb')) do |c|
         Rails.env.production? ? require(c) : load(c)
       end
-      
+
       Taxonomy.class_eval do
         include SpreeCompareProducts::ComparableContainer
       end
-      
+
       Taxon.class_eval do
         include SpreeCompareProducts::ComparableContainer
-        
+
         def is_comparable?
           comparable? || taxonomy.comparable?
         end
       end
     end
-    
+
     config.to_prepare &method(:activate).to_proc
   end
-end
+end
+
+module SpreeBase
+  module InstanceMethods
+    protected
+
+    def find_comparable_products
+      session[:comparable_product_ids] ||= []
+      product_ids = session[:comparable_product_ids]
+      if product_ids.size > 0
+        @comparable_products = Product.where(:id => product_ids)
+      else
+        @comparable_products = []
+      end
+    end
+  end
+
+  class << self
+
+    def included_with_compare_products(receiver)
+      included_without_compare_products(receiver)
+      receiver.send :before_filter, 'find_comparable_products'
+    end
+
+    alias_method_chain :included, :compare_products
+  end
+end
+

data/lib/spree_compare_products_hooks.rb

@@ -3,7 +3,13 @@ class SpreeCompareProductsHooks < Spree::ThemeSupport::HookListener
   insert_after :admin_inside_taxonomy_form, 'admin/taxonomies/comparable_field'
   
   replace :taxon_products, 'taxons/taxon_products'
+
+  #insert_after :products_list_item, 'shared/compare_product_field'
   
-  insert_after :products_list_item, 'shared/compare_product_field'
+  insert_after :shared_login_bar, 'shared/comparable_products'
+  
+  insert_after :inside_head, 'shared/compare_product_javascript'
+
+  #insert_after :cart_form, 'products/compare'
   
 end

data/public/javascripts/product_comparison.js

@@ -97,8 +97,3 @@ var ProductComparison = function(params) {
   
   _init(); // Initialize product comparison
 }
-
-
-$(document).ready(function() {
-  var productComparison = new ProductComparison();
-});

data/public/stylesheets/compare_products.css

@@ -0,0 +1,11 @@
+table.compare_product_show th {
+  background: #dddddd;
+  padding: 10px;
+  text-align: right;
+  border: 1px solid #dddddd;
+}
+
+table.compare_product_show td {
+  border: 1px solid #dddddd;
+  text-align: center;
+}

data/spree_compare_products.gemspec

@@ -1,14 +1,10 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-require 'spree_compare_products/version'
-
 Gem::Specification.new do |s|
   s.name        = 'spree_compare_products'
-  s.version     = SpreeCompareProducts::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = [ 'Jorge Calás', 'Maik Kempe' ]
+  s.version     = "0.50.0"
+  s.authors     = [ 'Jorge Calás', 'Maik Kempe', 'Roman Smirnov', 'Alexander Shuhin' ]
   s.email       = [ 'calas@qvitta.net', 'dev@breaking-limits.com' ]
-  s.homepage    = 'https://github.com/mkempe/spree_compare_products'
+  s.homepage    = 'https://github.com/romul/spree_compare_products'
   s.summary     = %q{Provides product comparison with other products within the same taxon.}
   # s.description = %q{}
   
@@ -22,5 +18,5 @@ Gem::Specification.new do |s|
   
   s.required_ruby_version = '>= 1.8.7'
   
-  s.add_dependency('spree_core', '>= 0.40.99')
+  s.add_dependency('spree_core', '>= 0.50.2')
 end

metadata

@@ -4,18 +4,20 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 40
-  - 90
-  version: 0.40.90
+  - 50
+  - 0
+  version: 0.50.0
 platform: ruby
 authors: 
 - "Jorge Cal\xC3\xA1s"
 - Maik Kempe
+- Roman Smirnov
+- Alexander Shuhin
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 +03:00
+date: 2011-05-17 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +29,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 40
-        - 99
-        version: 0.40.99
+        - 50
+        - 2
+        version: 0.50.2
   type: :runtime
   version_requirements: *id001
 description: 
@@ -50,10 +52,17 @@ files:
 - app/controllers/compare_products_controller.rb
 - app/helpers/compare_products_helper.rb
 - app/metal/bookmarkable_comparison.rb
+- app/models/product_decorator.rb
 - app/views/admin/taxonomies/_comparable_field.html.erb
 - app/views/admin/taxonomies/_list.html.erb
+- app/views/compare_products/add.js.erb
+- app/views/compare_products/remove.js.erb
 - app/views/compare_products/show.html.erb
+- app/views/products/_compare.html.erb
+- app/views/shared/_comparable_line_item.html.erb
+- app/views/shared/_comparable_products.html.erb
 - app/views/shared/_compare_product_field.html.erb
+- app/views/shared/_compare_product_javascript.html.erb
 - app/views/taxons/_comparable_taxon.html.erb
 - app/views/taxons/_taxon_products.html.erb
 - config/locales/en-US.yml
@@ -63,17 +72,16 @@ files:
 - config/routes.rb
 - lib/spree_compare_products.rb
 - lib/spree_compare_products/comparable_container.rb
-- lib/spree_compare_products/version.rb
 - lib/spree_compare_products_hooks.rb
 - lib/tasks/install.rake
 - lib/tasks/spree_compare_products.rake
+- public/images/remove.png
 - public/javascripts/product_comparison.js
-- public/stylesheets/compiled/compare_products.css
-- public/stylesheets/sass/compare_products.sass
+- public/stylesheets/compare_products.css
 - spec/spec_helper.rb
 - spree_compare_products.gemspec
 has_rdoc: true
-homepage: https://github.com/mkempe/spree_compare_products
+homepage: https://github.com/romul/spree_compare_products
 licenses: []
 
 post_install_message: 

data/lib/spree_compare_products/version.rb

@@ -1,3 +0,0 @@
-module SpreeCompareProducts
-  VERSION = '0.40.90'
-end

data/public/stylesheets/compiled/compare_products.css

@@ -1,8 +0,0 @@
-table th {
-  background: #dddddd;
-  padding: 10px;
-  text-align: right;
-  border: 1px solid #dddddd; }
-table td {
-  border: 1px solid #dddddd;
-  text-align: center; }

data/public/stylesheets/sass/compare_products.sass

@@ -1,9 +0,0 @@
-table
-  th
-    :background #DDD
-    :padding 10px
-    :text-align right
-    :border 1px solid #DDD
-  td
-    :border 1px solid #DDD
-    :text-align center