spree_core 1.0.7 → 1.1.0.rc1

data/app/models/spree/product_group.rb

@@ -1,200 +0,0 @@
-# *ProductGroups* are used for creating and managing sets of products.
-# Product group can be either anonymous(adhoc) or named.
-#
-# Anonymous Product groups are created by combining product scopes generated from url
-# in 2 formats:
-#
-#   /t/*taxons/s/name_of_scope/comma_separated_arguments/name_of_scope_that_doesn_take_any//order
-#   */s/name_of_scope/comma_separated_arguments/name_of_scope_that_doesn_take_any//order
-#
-# Named product groups can be created from anonymous ones, lub from another named scope
-# (using ProductGroup.from_url method).
-# Named product groups have pernament urls, that don't change even after changes
-# to scopes are made, and come in two types.
-#
-#   /t/*taxons/pg/named_product_group
-#   */pg/named_product_group
-#
-# first one is used for combining named scope with taxons, named product group can
-# have #in_taxon or #taxons_name_eq scope defined, result should combine both
-# and return products that exist in both taxons.
-#
-# ProductGroup#dynamic_products returns chain of named scopes generated from order and
-# product scopes. So you can do counting, calculations etc, on resulted set of products,
-# without retriving all records.
-#
-# ProductGroup operates on named scopes defined for product in Scopes::Product,
-# or generated automatically by meta_search
-#
-module Spree
-  class ProductGroup < ActiveRecord::Base
-    validates :name, :permalink, :presence => true
-    validates_associated :product_scopes
-
-    after_save :update_memberships
-
-    has_and_belongs_to_many :cached_products, :class_name => 'Spree::Product',
-                                              :join_table => 'spree_product_groups_products'
-    has_many :product_scopes
-    accepts_nested_attributes_for :product_scopes
-
-    make_permalink
-
-    # Testing utility: creates new *ProductGroup* from search permalink url.
-    # Follows conventions for accessing PGs from URLs, as decoded in routes
-    def self.from_url(url)
-      pg = nil;
-      case url
-      when /\/t\/(.+?)\/s\/(.+)/  then taxons = $1; attrs = $2;
-      when /\/t\/(.+?)\/pg\/(.+)/ then taxons = $1; pg_name = $2;
-      when /(.*?)\/s\/(.+)/       then attrs = $2;
-      when /(.*?)\/pg\/(.+)/      then pg_name = $2;
-      else                        return(nil)
-      end
-
-      if pg_name && opg = ProductGroup.find_by_permalink(pg_name)
-        pg = new.from_product_group(opg)
-      elsif attrs
-        attrs = url.split('/')
-        pg = new.from_route(attrs)
-      end
-      taxon = taxons && taxons.split('/').last
-      pg.add_scope('in_taxon', taxon) if taxon
-
-      pg
-    end
-
-    def from_product_group(opg)
-      self.product_scopes = opg.product_scopes.map{|ps|
-        ps = ps.clone;
-        ps.product_group_id = nil;
-        ps.product_group = self;
-        ps
-      }
-      self
-    end
-
-    def from_route(attrs)
-      self.order_scope = attrs.pop if attrs.length % 2 == 1
-      attrs.each_slice(2) do |scope|
-        next unless Product.respond_to?(scope.first)
-        add_scope(scope.first, scope.last.split(','))
-      end
-      self
-    end
-
-    def from_search(search_hash)
-      search_hash.each_pair do |scope_name, scope_attribute|
-        add_scope(scope_name, scope_attribute)
-      end
-
-      self
-    end
-
-    def add_scope(scope_name, arguments=[])
-      if scope_name.to_s !~ /eval|send|system|[^a-z0-9_!?]/
-        self.product_scopes << ProductScope.new({
-            :name => scope_name.to_s,
-            :arguments => [*arguments]
-          })
-      else
-        raise ArgumentError.new("'#{scope_name}` can't be used as scope")
-      end
-      self
-    end
-
-    def apply_on(scopish, use_order = true)
-      # There's bug in AR, it doesn't merge :order, instead it takes order
-      # from first nested_scope so we have to apply ordering FIRST.
-      # see #2253 on rails LH
-      base_product_scope = scopish
-      if use_order && !self.order_scope.blank? && Product.respond_to?(self.order_scope.intern)
-        base_product_scope = base_product_scope.send(self.order_scope)
-      end
-
-      return self.product_scopes.reject { |s| s.is_ordering? }.inject(base_product_scope) do |result, scope|
-        scope.apply_on(result)
-      end
-
-    end
-
-    # returns chain of named scopes generated from order scope and product scopes.
-    def dynamic_products(use_order = true)
-      apply_on(Product.group_by_products_id, use_order)
-    end
-
-    # Does the final ordering if requested
-    # TODO: move the order stuff out of the above - is superfluous now
-    def products(use_order = true)
-      cached_group = Product.in_cached_group(self)
-      if cached_group.limit(1).blank?
-        dynamic_products(use_order)
-      elsif !use_order
-        cached_group
-      else
-        product_scopes.select { |s|
-          s.is_ordering?
-        }.inject(cached_group) { |res,order|
-          order.apply_on(res)
-        }
-      end
-    end
-
-    def include?(product)
-      res = apply_on(Product.where(:id => product.id), false)
-      res.count > 0
-    end
-
-    def scopes_to_hash
-      result = {}
-      self.product_scopes.each do |scope|
-        result[scope.name] = scope.arguments
-      end
-      result
-    end
-
-    def to_param
-      permalink.present? ? permalink : (permalink_was || name.to_s.to_url)
-    end
-
-    def update_memberships
-      # wipe everything directly to avoid expensive in-rails sorting
-      ActiveRecord::Base.connection.execute "DELETE FROM spree_product_groups_products WHERE product_group_id = #{self.id}"
-
-      # and generate the new group entirely in SQL
-      ActiveRecord::Base.connection.execute "INSERT INTO spree_product_groups_products #{dynamic_products(false).scoped(:select => "spree_products.id, #{self.id}").to_sql}"
-    end
-
-    def generate_preview(size = Spree::Config[:admin_pgroup_preview_size])
-      count = self.class.count_by_sql ["SELECT COUNT(*) FROM spree_product_groups_products WHERE spree_product_groups_products.product_group_id = ?", self]
-
-      return count, products.limit(size)
-    end
-
-    def to_s
-      "<Spree::ProductGroup" + (id && "[#{id}]").to_s + ":'#{to_url}'>"
-    end
-
-
-    def order_scope
-      if scope = product_scopes.detect {|s| s.is_ordering?}
-        scope.name
-      end
-    end
-
-    def order_scope=(scope_name)
-      if scope = product_scopes.detect {|s| s.is_ordering?}
-        scope.update_attribute(:name, scope_name)
-      else
-        self.product_scopes.build(:name => scope_name, :arguments => [])
-      end
-    end
-
-    # Build a new product group with a scope to filter by specified products
-    def self.new_from_products(products, attrs = {})
-      pg = new(attrs)
-      pg.product_scopes.build(:name => 'with_ids', :arguments => [products.map(&:id).join(',')])
-      pg
-    end
-  end
-end

data/app/models/spree/product_scope.rb

@@ -1,79 +0,0 @@
-# *Spree::ProductScope* is model for storing named scopes with their arguments,
-# to be used with Spree::ProductGroups.
-#
-# Each product Scope can be applied to Spree::Product (or product scope) with #apply_on method
-# which returns new combined named scope
-#
-module Spree
-  class ProductScope < ActiveRecord::Base
-    # name
-    # arguments
-    belongs_to :product_group
-    serialize :arguments
-
-    validate :check_validity_of_scope
-
-    extend ::Spree::Scopes::Dynamic
-
-    # Get all products with this scope
-    def products
-      if Product.respond_to?(name)
-        Product.send(name, *arguments)
-      end
-    end
-
-    # Applies product scope on Spree::Product model or another named scope
-    def apply_on(another_scope)
-      array = Array.wrap(self.arguments)
-      if Product.respond_to?(self.name.intern)
-        relation2 = if (array.blank? || array.size < 2)
-                      if Product.method(self.name.intern).arity == 0
-                        Product.send(self.name.intern)
-                      else
-                        Product.send(self.name.intern, array.try(:first))
-                      end
-                    else
-                        Product.send(self.name.intern, *array)
-                    end
-      else
-        relation2 = Product.metasearch({ self.name.intern => array.join("") }).relation
-      end
-      unless another_scope.class == ActiveRecord::Relation
-        another_scope = another_scope.send(:relation)
-      end
-      another_scope.merge(relation2)
-    end
-
-    # checks validity of the named scope (if its safe and can be applied on Spree::Product)
-    def check_validity_of_scope
-      errors.add(:name, 'is not a valid scope name') unless Product.respond_to?(self.name.intern)
-      apply_on(Product).limit(0) != nil
-    rescue Exception => e
-      unless Rails.env.production?
-
-        puts "name: #{self.name}"
-        puts "arguments: #{self.arguments.inspect}"
-        puts e.message
-        puts e.backtrace
-      end
-      errors.add(:arguments, 'are incorrect')
-    end
-
-    # test ordering scope by looking for name pattern or missed arguments
-    def is_ordering?
-      name =~ /^(ascend_by|descend_by)/ || arguments.blank?
-    end
-
-    def to_sentence
-      result = I18n.t(:sentence, :scope => [:product_scopes, :scopes, self.name], :default => '')
-      result = I18n.t(:name, :scope => [:product_scopes, :scopes, self.name]) if result.blank?
-      result % [*self.arguments]
-    end
-
-    def to_s
-      to_sentence
-    end
-  end
-end
-
-require_dependency 'spree/product_scope/scopes'

data/app/views/spree/admin/banners/_gateway.html.erb

@@ -1,14 +0,0 @@
-<% if !current_user.dismissed_banner?(:gateway) &&
-      Spree::PaymentMethod.production.where("type != 'Spree::Gateway::Bogus'").empty?  %>
-
-  <div class="banner payment_banner">
-    <p class="message">
-      <%= t(:payment_processor_choose_banner_text)%>
-      <%= link_to t(:payment_processor_choose_link), "http://spreecommerce.com/products/payment_processing", :target => '_blank' %>
-    </p>
-
-    <%= link_to t(:dismiss_banner), dismiss_banner_admin_user_path(current_user, :banner_id => :gateway),
-                :remote => true, :method => :post, :class => 'dismiss' %>
-  </div>
-
-<% end %>

data/app/views/spree/admin/product_groups/_preview.html.erb

@@ -1,33 +0,0 @@
-<% count, preview = @product_group.generate_preview(Spree::Config[:admin_pgroup_preview_size]) %>
-
-<h2><%= Spree::ProductGroup.human_attribute_name(:products) %> (<%= count %>)</h2>
-
-<% if count == 0 %>
-  <p data-hook="preview_empty"><%= t(:no_match_found) %></p>
-<% else %>
-
-  <% if count > Spree::Config[:admin_pgroup_preview_size] %>
-    <p data-hook="preview_showing"><%= t(:showing_first_n, :n => Spree::Config[:admin_pgroup_preview_size]) %></p>
-  <% end %>
-
-  <table class="index" data-hook="preview">
-    <thead>
-      <tr data-hook="preview_header">
-        <th><%= Spree::Product.human_attribute_name(:name) %></th>
-        <th><%= t(:action) %></th>
-      </tr>
-    </thead>
-    <tbody>
-    <% preview.each do |product| %>
-      <tr data-hook="preview_row">
-        <td>
-          <%= link_to product.name, product_url(product) %>
-        </td>
-        <td>
-          <%= link_to t(:edit), edit_admin_product_path(product) %>
-        </td>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
-<% end %>

data/app/views/spree/admin/product_groups/_product_scope.html.erb

@@ -1,24 +0,0 @@
-<tr id="<%= dom_id product_scope %>" data-hook="product_scope">
-  <td data-hook="description">
-    <%= label_tag nil, t(:name, :scope => [:product_scopes, :scopes, product_scope.name]) %>
-    <% if description = t(:description, :scope => [:product_scopes, :scopes, product_scope.name], :default => "") and description.present? %>
-      <br /><%= description %>
-    <% end %>
-  </td>
-  <td data-hook="arguments">
-    <% if arguments = Spree::ProductScope.arguments_for_scope_name(product_scope.name.strip) %>
-      <table><tr>
-      <% arguments.each_with_index do |argument, i| %>
-        <td>
-          <%= label_tag nil, t(argument, :scope => [:product_scopes, :scopes, product_scope.name, :args]) %><br />
-          <%= hidden_field_tag 'product_group[product_scopes_attributes][][id]', product_scope.id %>
-          <%= product_scope_field product_scope, i %>
-        </td>
-      <% end %>
-      </tr></table>
-    <% end %>
-  </td>
-  <td class="actions" data-hook="actions">
-    <%= link_to_with_icon 'cross', '', admin_product_group_product_scope_path(@product_group, product_scope), :remote => true, :method => 'delete' %>
-  </td>
-</tr>

data/app/views/spree/admin/product_groups/edit.html.erb

@@ -1,59 +0,0 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
-<h1><%= t(:editing_product_group) %></h1>
-
-<fieldset id="product_group_forms_container" data-hook>
-
-  <%= form_for [:admin, @product_group], :html => { :id => 'product-group-form', :method => :put } do |f| %>
-
-      <%= f.field_container :name do %>
-        <%= f.label :name, t(:name) %><br />
-        <%= f.text_field :name %>
-        <%= f.error_message_on :name %>
-      <% end %>
-
-      <%= f.field_container :permalink do %>
-        <%= f.label :permalink, t(:permalink) %><br />
-        <%= f.text_field :permalink %>
-        <%= f.error_message_on :permalink %>
-      <% end %>
-
-      <%= f.field_container :order_scope do %>
-        <%= f.label :order_scope, t(:sort_ordering) %><br />
-        <%= f.select(:order_scope, Spree::Product.simple_scopes.collect{|p| [ t(:name, :scope =>[:product_scopes, :scopes, p]), p.to_s ] }) %>
-      <% end %>
-
-      <table id="product_scopes" data-hook>
-        <%= render :partial => 'product_scope', :collection => @product_group.product_scopes.reject {|s| s.is_ordering? } %>
-      </table>
-
-    <%= button t(:update) %>
-
-  <% end %>
-
-  <%= form_tag admin_product_group_product_scopes_path(@product_group), :remote => true, :id => 'new_product_group_form' do %>
-    <%
-    options =
-    grouped_options_for_select(
-    Spree::ProductScope.all_scopes.map do |group_name, scopes|
-      [
-        t(:name, :scope => [:product_scopes, :groups, group_name]),
-        scopes.keys.map do |scope_name|
-          [ t(:name, :scope => [:product_scopes, :scopes, scope_name]), scope_name]
-        end
-      ]
-    end
-    )
-    %>
-    <p>
-      <%= label_tag :product_scope_name, t(:add_scope) %>
-      <%= select_tag 'product_scope[name]', options %>
-      <%= submit_tag t(:add) %>
-    </p>
-  <% end %>
-
-</fieldset>
-
-<fieldset id="preview_container" data-hook>
-  <%= render :partial => 'preview' %>
-</fieldset>

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

@@ -1,37 +0,0 @@
-<% render :partial => 'spree/admin/shared/product_sub_menu' %>
-<div class="toolbar" data-hook="toolbar">
-  <ul class="actions">
-    <li>
-      <%= button_link_to t(:new_product_group), new_object_url, :icon => 'add', :id => 'new_product_group_link' %>
-    </li>
-  </ul>
-  <br class="clear" />
-</div>
-
-<h1><%= t(:listing_product_groups) %></h1>
-
-<table class="index" id='listing_product_groups' data-hook>
-  <thead>
-    <tr data-hook="product_group_header">
-      <th><%= Spree::ProductGroup.human_attribute_name(:name) %></th>
-      <th><%= Spree::ProductGroup.human_attribute_name(:url) %></th>
-      <th><%= Spree::ProductGroup.human_attribute_name(:product_scopes) %></th>
-      <th><%= Spree::ProductGroup.human_attribute_name(:product_count) %></th>
-      <th><%= t(:action) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @product_groups.each do |pg| %>
-      <tr id="<%= dom_id pg %>" data-hook="product_group_row">
-        <td><%= link_to pg.name, [:admin, pg] %></td>
-        <td><%= link_to pg_search_path(:product_group_name => pg.permalink), pg_search_path(:product_group_name => pg.permalink) %></td>
-        <td><%== pg.product_scopes.map(&:to_sentence).join('<br />') %></td>
-        <td><%= pg.products.count %></td>
-        <td>
-          <%= link_to_edit pg, :class => 'admin_edit_product_group' %> &nbsp; <%= link_to_delete pg %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-<%= paginate @product_groups %>

data/app/views/spree/admin/product_groups/new.html.erb

@@ -1,12 +0,0 @@
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-<%= form_for [:admin, @product_group], :html => { :id => 'product-group-form', :multipart => true } do |f| %>
-  <fieldset data-hook="name">
-    <legend><%= t(:product_group) %></legend>
-    <%= f.field_container :name do %>
-      <%= f.label :name, t(:name) %>
-      <%= f.text_field :name %>
-      <%= f.error_message_on :name %>
-    <% end %>
-  </fieldset>
-  <%=  button t(:create) %>
-<% end %>

data/app/views/spree/admin/product_groups/show.html.erb

@@ -1,32 +0,0 @@
-<% render :partial => 'spree/admin/shared/product_sub_menu' %>
-<h2><%= Spree::ProductGroup.model_name.human %></h2>
-<p>
-  <%= Spree::ProductGroup.human_attribute_name(:name) %>: <%= @product_group.name %>
-</p>
-<p>
-  <%= Spree::ProductGroup.human_attribute_name(:url) %>: <%= link_to @product_group.permalink, "/pg/#{@product_group.permalink}" %>
-</p>
-
-<h2><%= Spree::ProductGroup.human_attribute_name(:product_scopes) %>(<%= @product_group.product_scopes.count %>)</h2>
-<table class="product-scopes" data-hook="product_scopes">
-  <thead>
-    <tr data-hook="product_scopes_header">
-      <th><%= Spree::ProductScope.human_attribute_name(:description) %></th>
-      <th><%= Spree::ProductScope.human_attribute_name(:arguments) %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @product_group.product_scopes.each do |product_scope| %>
-      <tr <%= !product_scope.valid? ? "class='invalid'":'' %> data-hook="product_scopes_row">
-        <td>
-          <%= product_scope.to_sentence %>
-        </td>
-        <td>
-          <%= product_scope.arguments.join(', ') %>
-        </td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<%= render :partial => 'preview.html' %>

data/app/views/spree/admin/product_scopes/create.js.erb

@@ -1,6 +0,0 @@
-$('#product_scopes').append('<%= escape_javascript( render('spree/admin/product_groups/product_scope', :product_scope => @product_scope) ) %>');
-$('#<%= dom_id @product_scope %>').hide();
-$('#<%= dom_id @product_scope %>').fadeIn();
-if(!$('.token-input-list').is('*')){
-  $('.tokeninput.products').productPicker();
-}

data/app/views/spree/admin/product_scopes/destroy.js.erb

@@ -1,3 +0,0 @@
-$('#<%= dom_id @product_scope %>').fadeOut();
-$('#<%= dom_id @product_scope %>').remove();
-$('#preview_container').html('<%= escape_javascript( render('spree/admin/product_groups/preview') ) %>');

data/app/views/spree/admin/product_scopes/new.html.erb

@@ -1 +0,0 @@
-<%= object.errors.full_messages %>

data/app/views/spree/admin/shared/_group_from_products_form.html.erb

@@ -1,12 +0,0 @@
-<% if products.any? %>
-  <% form_tag admin_product_groups_path do %>
-    <%= hidden_field_tag 'product_group[product_scopes_attributes][][name]', 'with_ids' %>
-    <%= hidden_field_tag 'product_group[product_scopes_attributes][][arguments][]', products.map(&:id).join(',') %>
-    <fieldset data-hook="create_group">
-      <legend><%= t(:create_product_group_from_products) %></legend>
-      <%= label_tag nil, t(:name) %>
-      <%= text_field_tag 'product_group[name]', t(:new_group) %>
-      <%= submit_tag t(:create) %>
-    </fieldset>
-  <% end %>
-<% end %>

data/db/migrate/20091012120519_product_groups_and_scopes.rb

@@ -1,18 +0,0 @@
-class ProductGroupsAndScopes < ActiveRecord::Migration
-  def change
-    create_table :product_groups do |t|
-      t.string :name, :permalink, :order
-    end
-
-    create_table :product_scopes do |t|
-      t.string   :name
-      t.text     :arguments
-      t.references :product_group
-    end
-
-    add_index :product_groups, :name
-    add_index :product_groups, :permalink
-    add_index :product_scopes, :name
-    add_index :product_scopes, :product_group_id
-  end
-end

data/db/migrate/20100126103714_create_products_product_groups.rb

@@ -1,8 +0,0 @@
-class CreateProductsProductGroups < ActiveRecord::Migration
-  def change
-    create_table :product_groups_products, :id => false do |t|
-      t.references :product
-      t.references :product_group
-    end
-  end
-end

data/db/migrate/20100306153445_fix_by_popularity.rb

@@ -1,9 +0,0 @@
-class FixByPopularity < ActiveRecord::Migration
-  def up
-    execute("UPDATE product_scopes SET name='descend_by_popularity' WHERE name='by_popularity'")
-  end
-
-  def down
-    execute("UPDATE product_scopes SET name='by_popularity' WHERE name='descend_by_popularity'")
-  end
-end

data/db/migrate/20120523061241_convert_sales_tax_to_default_tax.rb

@@ -1,9 +0,0 @@
-class ConvertSalesTaxToDefaultTax < ActiveRecord::Migration
-  def up
-    execute "UPDATE spree_calculators SET type='Spree::Calculator::DefaultTax' WHERE type='Spree::Calculator::SalesTax'"
-  end
-
-  def down
-    execute "UPDATE spree_calculators SET type='Spree::Calculator::SalesTax' WHERE type='Spree::Calculator::DefaultTax'"
- end
-end

data/lib/spree/core/testing_support/factories/product_group_factory.rb

@@ -1,5 +0,0 @@
-FactoryGirl.define do
-  factory :product_group, :class => Spree::ProductGroup do
-    name 'sports'
-  end
-end

data/lib/spree/core/testing_support/factories/product_scope_factory.rb

@@ -1,7 +0,0 @@
-FactoryGirl.define do
-  factory :product_scope, :class => Spree::ProductScope do
-    product_group { Factory(:product_group) }
-    name 'on_hand'
-    arguments 'some arguments'
-  end
-end