spree_core 0.60.0.RC1 → 0.60.0

data/app/helpers/spree/base_helper.rb

@@ -55,7 +55,8 @@ module Spree::BaseHelper
   end
 
   def meta_data_tags
-    return unless self.respond_to?(:object) && object
+    object = instance_variable_get('@'+controller_name.singularize)
+    return unless object
     "".tap do |tags|
       if object.respond_to?(:meta_keywords) and object.meta_keywords.present?
         tags << tag('meta', :name => 'keywords', :content => object.meta_keywords) + "\n"

data/app/models/app_configuration.rb

@@ -34,6 +34,7 @@ class AppConfiguration < Configuration
   preference :cache_static_content, :boolean, :default => true
   preference :use_content_controller, :boolean, :default => true
   preference :allow_checkout_on_gateway_error, :boolean, :default => false
+  preference :select_taxons_from_tree, :boolean, :default => false # provide opportunity to select taxons from tree instead of search with autocomplete
 
   validates :name, :presence => true, :uniqueness => true
 

data/app/models/creditcard.rb

@@ -96,7 +96,7 @@ class Creditcard < ActiveRecord::Base
       gateway_error(response) unless response.success?
     end
   rescue ActiveMerchant::ConnectionError
-    gateway_error t(:unable_to_connect_to_gateway)
+    gateway_error I18n.t(:unable_to_connect_to_gateway)
   end
 
   def capture(payment)

data/app/views/admin/orders/history.html.erb

@@ -21,7 +21,7 @@
   <% end %>
   <% if @order.state_events.empty? %>
     <tr>
-      <td colspan="3"><%= t("none_available") %></td>
+      <td colspan="5"><%= t("none_available") %></td>
     </tr>
   <% end %>
 </table>

data/app/views/admin/reports/index.html.erb

@@ -7,11 +7,11 @@
       <th><%= t("description") %></th>
     </tr>
   </thead>
-  <tbody>     
+  <tbody>
     <% @reports.each do |key, value| %>
     <tr>
-      <td><%= link_to t(value[:name].downcase.gsub(" ","_")), send("#{key}_admin_reports_url".to_sym) %></td>
-      <td><%= t(value[:description].downcase.gsub(" ","_")) %></td>
+      <td><%= link_to value[:name], send("#{key}_admin_reports_url".to_sym) %></td>
+      <td><%= value[:description] %></td>
     </tr>
     <% end %>
   </tbody>

data/app/views/admin/taxons/available.js.erb

@@ -15,7 +15,7 @@
     </tr>
   </thead>
   <tbody>
-    <% @available_taxons.each do |taxon| %>
+    <% @taxons.each do |taxon| %>
       <tr id="<%= dom_id(taxon, :sel) %>">
         <td><%= taxon.name %></td>
         <td><%= taxon_path taxon %></td>
@@ -26,7 +26,7 @@
         </td>        
       </tr>
     <% end %>
-    <% if @available_taxons.empty? %>
+    <% if @taxons.empty? %>
      <tr><td colspan="3"><%= t('no_match_found') %>.</td></tr>
     <% end %>
   </tbody>

data/app/views/admin/taxons/selected.html.erb

@@ -15,6 +15,7 @@
   function search_for_taxons(){
     jQuery.ajax({
      data: {q: jQuery("#searchtext").val() }, 
+     dataType: 'script',
      success: function(request){
        jQuery('#search_hits').html(request);
      },

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

@@ -1,16 +1,14 @@
-<div id="order">
-  <%= link_to t('back_to_store'), products_path %> 
+<h1><%= accurate_title %></h1>
 
+<div id="order">
   <% if params.has_key? :checkout_complete %>
-  	<br/><br/>
-  	<h3><%= t('thank_you_for_your_order') %></h3>         
-  <% else %>
-  	| <%= link_to t('my_account'), account_path if current_user%>
+  	<h3><%= t('thank_you_for_your_order') %></h3>
   <% end %>
-  <br/><br/>
-
   <%= render :partial => 'shared/order_details', :locals => {:order => @order} %>
-
-  <br/>
-  <%= link_to t('back_to_store'), products_path %>
-</div>
+  <p>
+    <%= link_to t('back_to_store'), root_path %>
+    <% unless params.has_key? :checkout_complete %>
+    	| <%= link_to t('my_account'), account_path if current_user%>
+    <% end %>
+  </p>
+</div>

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

@@ -1,5 +1,5 @@
 <% @body_id = 'product-details' %>
-<h1><%= @product.name %></h1>
+<h1><%= accurate_title %></h1>
 
 <div id="product-images">
   <%= hook :product_images do %>

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

@@ -1,4 +1,4 @@
-<h1><%= @taxon.name %></h1>
+<h1><%= accurate_title %></h1>
 
 <% content_for :sidebar do %>
   <%= hook :taxon_sidebar_navigation do %>

data/config/locales/en.yml

@@ -822,9 +822,7 @@ en:
   roles: Roles
   sales_tax: "Sales Tax"
   sales_total: "Sales Total"
-  sales_total_for_all_orders: "Sales total for all orders"
-  sales_totals: "Sales Totals"
-  sales_totals_description: "Sales Total For All Orders"
+  sales_total_description: "Sales Total For All Orders"
   save_and_continue: Save and Continue
   save_preferences: Save Preferences
   scope: Scope

data/config/routes.rb

@@ -101,6 +101,7 @@ Rails.application.routes.draw do
         end
         collection do
           post :available
+          post :batch_select
           get  :selected
         end
       end

data/lib/product_filters.rb

@@ -88,7 +88,7 @@ module ProductFilters
       }
 
     def ProductFilters.brand_filter
-      brands = ProductProperty.find_all_by_property_id(@@brand_property).map(&:value).compact.uniq
+      brands = ProductProperty.where(:property_id => @@brand_property).map(&:value).compact.uniq
       conds  = Hash[*brands.map {|b| [b, "product_properties.value = '#{b}'"]}.flatten]
       { :name   => "Brands",
         :scope  => :brand_any,
@@ -125,7 +125,7 @@ module ProductFilters
       if taxon.nil?
         taxon = Taxonomy.first.root
       end
-      all_brands = ProductProperty.find_all_by_property_id(@@brand_property).map(&:value).uniq
+      all_brands = ProductProperty.where(:property_id => @@brand_property).map(&:value).uniq
       scope = ProductProperty.scoped(:conditions => ["property_id = ?", @@brand_property]).
                               scoped(:joins      => {:product => :taxons},
                                      :conditions => ["taxons.id in (?)", [taxon] + taxon.descendants])

data/lib/spree_base.rb

@@ -106,6 +106,7 @@ module SpreeBase
 
     receiver.send :helper_method, 'title'
     receiver.send :helper_method, 'title='
+    receiver.send :helper_method, 'accurate_title'
     receiver.send :helper_method, 'get_taxonomies'
     receiver.send :helper_method, 'current_gateway'
     receiver.send :helper_method, 'current_order'

data/lib/spree_core.rb

@@ -41,12 +41,18 @@ require "meta_search"
 require "find_by_param"
 
 require 'spree_core/ext/active_record'
+require 'spree_core/ext/hash'
 
 require 'spree_core/delegate_belongs_to'
 ActiveRecord::Base.send :include, DelegateBelongsTo
 
 require 'spree_core/theme_support'
 require 'spree_core/enumerable_constants'
+
+require 'spree_core/spree_custom_responder'
+require 'spree_core/spree_respond_with'
+
+
 require 'spree_core/ssl_requirement'
 require 'spree_core/preferences/model_hooks'
 require 'spree_core/preferences/preference_definition'

data/lib/spree_core/ext/hash.rb

@@ -0,0 +1,75 @@
+#
+# = Hash Recursive Merge
+#
+# Merges a Ruby Hash recursively, Also known as deep merge.
+# Recursive version of Hash#merge and Hash#merge!.
+#
+# Category::    Ruby
+# Package::     Hash
+# Author::      Simone Carletti <weppos@weppos.net>
+# Copyright::   2007-2008 The Authors
+# License::     MIT License
+# Link::        http://www.simonecarletti.com/
+# Source::      http://gist.github.com/gists/6391/
+#
+module HashRecursiveMerge
+
+  #
+  # Recursive version of Hash#merge!
+  #
+  # Adds the contents of +other_hash+ to +hsh+,
+  # merging entries in +hsh+ with duplicate keys with those from +other_hash+.
+  #
+  # Compared with Hash#merge!, this method supports nested hashes.
+  # When both +hsh+ and +other_hash+ contains an entry with the same key,
+  # it merges and returns the values from both arrays.
+  #
+  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
+  #    h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}}
+  #    h1.rmerge!(h2)   #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
+  #
+  # Simply using Hash#merge! would return
+  #
+  #    h1.merge!(h2)    #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
+  #
+  def rmerge!(other_hash)
+    merge!(other_hash) do |key, oldval, newval|
+        oldval.class == self.class ? oldval.rmerge!(newval) : newval
+    end
+  end
+
+  #
+  # Recursive version of Hash#merge
+  #
+  # Compared with Hash#merge!, this method supports nested hashes.
+  # When both +hsh+ and +other_hash+ contains an entry with the same key,
+  # it merges and returns the values from both arrays.
+  #
+  # Compared with Hash#merge, this method provides a different approch
+  # for merging nasted hashes.
+  # If the value of a given key is an Hash and both +other_hash+ abd +hsh
+  # includes the same key, the value is merged instead replaced with
+  # +other_hash+ value.
+  #
+  #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
+  #    h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}}
+  #    h1.rmerge(h2)    #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
+  #
+  # Simply using Hash#merge would return
+  #
+  #    h1.merge(h2)     #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
+  #
+  def rmerge(other_hash)
+    r = {}
+    merge(other_hash)  do |key, oldval, newval|
+      r[key] = oldval.class == self.class ? oldval.rmerge(newval) : newval
+    end
+  end
+
+end
+
+
+class Hash
+  include HashRecursiveMerge
+end
+

data/lib/spree_core/spree_custom_responder.rb

@@ -0,0 +1,29 @@
+module Spree
+  class Responder < ::ActionController::Responder #:nodoc:
+
+    attr_accessor :on_success, :on_failure
+
+    def initialize(controller, resources, options={})
+      super
+
+      class_name = controller.class.name.to_sym
+      action_name = options.delete(:action_name)
+
+      if result = Spree::BaseController.spree_responders[class_name].try(:[],action_name).try(:[], self.format.to_sym)
+        self.on_success = (result.respond_to?(:call) ? result : result[:success])
+        self.on_failure = (result.respond_to?(:call) ? result : result[:failure])
+      end
+    end
+
+    def to_html
+      super and return if !(on_success || on_failure)
+      has_errors? ? controller.instance_exec(&on_failure) : controller.instance_exec(&on_success)
+    end
+
+    def to_format
+      super and return if !(on_success || on_failure)
+      has_errors? ? controller.instance_exec(&on_failure) : controller.instance_exec(&on_success)
+    end
+
+  end
+end

data/lib/spree_core/spree_respond_with.rb

@@ -0,0 +1,57 @@
+module ActionController
+  class Base
+    def respond_with(*resources, &block)
+      raise "In order to use respond_with, first you need to declare the formats your " <<
+            "controller responds to in the class level" if self.class.mimes_for_respond_to.empty?
+
+      if response = retrieve_response_from_mimes(&block)
+        options = resources.size == 1 ? {} : resources.extract_options!
+        options.merge!(:default_response => response)
+
+        # following statement is not present in rails code. The action name is needed for processing
+        options.merge!(:action_name => action_name.to_sym)
+
+        # if responder is not specified then pass in Spree::Responder
+        (options.delete(:responder) || Spree::Responder).call(self, resources, options)
+      end
+    end
+  end
+end
+
+
+module SpreeRespondWith
+  extend ActiveSupport::Concern
+
+  included do
+    cattr_accessor :spree_responders
+    self.spree_responders = {}
+  end
+
+  module ClassMethods
+    def respond_override(options={})
+
+      unless options.blank?
+        action_name = options.keys.first
+        action_value = options.values.first
+
+        if action_name.blank? || action_value.blank?
+          raise ArgumentError, "invalid values supplied #{options.inspect}"
+        end
+
+        format_name = action_value.keys.first
+        format_value = action_value.values.first
+
+        if format_name.blank? || format_value.blank?
+          raise ArgumentError, "invalid values supplied #{options.inspect}"
+        end
+
+        if format_value.is_a?(Proc)
+          options = {action_name.to_sym => {format_name.to_sym => {:success => format_value}}}
+        end
+
+        self.spree_responders.rmerge!(self.name.intern => options)
+      end
+    end
+  end
+
+end

data/lib/spree_core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "0.60.0.RC1"
+    "0.60.0"
   end
 end

data/public/javascripts/taxonomy.js

@@ -17,7 +17,8 @@ var handle_move = function(e, data) {
 
   jQuery.ajax({
     type: "POST",
-    url: base_url + node.attr("id") + ".json",
+    dataType: "json",
+    url: base_url + node.attr("id"),
     data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position, authenticity_token: AUTH_TOKEN}),
     error: handle_ajax_error
   });
@@ -34,11 +35,12 @@ var handle_create = function(e, data) {
 
   jQuery.ajax({
     type: "POST",
+    dataType: "json",
     url: base_url,
     data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position, authenticity_token: AUTH_TOKEN}),
     error: handle_ajax_error,
-    success: function(id,result) {
-      node.attr('id', id);
+    success: function(data,result) {
+      node.attr('id', data.taxon.id);
     }
   });
 
@@ -51,7 +53,8 @@ var handle_rename = function(e, data) {
 
   jQuery.ajax({
     type: "POST",
-    url: base_url + node.attr("id") + ".json",
+    dataType: "json",
+    url: base_url + node.attr("id"),
     data: ({_method: "put", "taxon[name]": name, authenticity_token: AUTH_TOKEN}),
     error: handle_ajax_error
   });
@@ -65,6 +68,7 @@ var handle_delete = function(e, data){
     if(r){
       jQuery.ajax({
         type: "POST",
+        dataType: "json",
         url: base_url + node.attr("id"),
         data: ({_method: "delete", authenticity_token: AUTH_TOKEN}),
         error: handle_ajax_error

data/public/stylesheets/admin/admin-reset.css

@@ -65,3 +65,5 @@ table {
 
 a img { border: none }
 
+#taxons-tree li { list-style-type: none; }
+

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 11094359
-  prerelease: 7
+  hash: 239
+  prerelease: false
   segments: 
   - 0
   - 60
   - 0
-  - RC
-  - 1
-  version: 0.60.0.RC1
+  version: 0.60.0
 platform: ruby
 authors: 
 - Sean Schofield
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 -04:00
+date: 2011-05-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -186,12 +184,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 29
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 5
+        version: 1.0.5
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -202,12 +200,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 47
         segments: 
         - 1
-        - 12
+        - 14
         - 0
-        version: 1.12.0
+        version: 1.14.0
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -218,12 +216,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1923831917
+        hash: -1876988247
         segments: 
         - 3
         - 0
-        - pre
-        - 2
+        - pre2
         version: 3.0.pre2
   type: :runtime
   version_requirements: *id013
@@ -676,10 +673,13 @@ files:
 - lib/spree_core/enumerable_constants.rb
 - lib/spree_core/ext/active_record.rb
 - lib/spree_core/ext/array.rb
+- lib/spree_core/ext/hash.rb
 - lib/spree_core/ext/string.rb
 - lib/spree_core/preferences/model_hooks.rb
 - lib/spree_core/preferences/preference_definition.rb
 - lib/spree_core/railtie.rb
+- lib/spree_core/spree_custom_responder.rb
+- lib/spree_core/spree_respond_with.rb
 - lib/spree_core/ssl_requirement.rb
 - lib/spree_core/testing_support/factories/address_factory.rb
 - lib/spree_core/testing_support/factories/adjustment_factory.rb
@@ -1133,18 +1133,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: 
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.