spree_core 0.70.0.rc2 → 0.70.0

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

@@ -1,24 +1,24 @@
 <table class="index" data-hook="order_details">
-  <tbody id='line-items' data-hook>
+  <tbody id="line-items" data-hook>
     <tr data-hook="order_details_line_items_headers">
-      <th><%= t('item_description') %></th>
-      <th class="price"><%= t('price') %></th>
-      <th class="qty"><%= t('qty') %></th>
-      <th class="total"><span><%= t('total') %></span></th>
+      <th><%= t(:item_description) %></th>
+      <th class="price"><%= t(:price) %></th>
+      <th class="qty"><%= t(:qty) %></th>
+      <th class="total"><span><%= t(:total) %></span></th>
     </tr>
 
     <% @order.line_items.each do |item| %>
       <tr data-hook="order_details_line_item_row">
-        <td width="300"><%=item.variant.product.name%> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
+        <td width="300"><%= item.variant.product.name %> <%= "(" + variant_options(item.variant) + ")" unless item.variant .option_values.empty? %></td>
         <td class="price"><%= number_to_currency item.price %></td>
-        <td class="qty"><%=item.quantity%></td>
-        <td class="total"><span><%= number_to_currency (item.price * item.quantity)%></span></td>
+        <td class="qty"><%= item.quantity %></td>
+        <td class="total"><span><%= number_to_currency (item.price * item.quantity) %></span></td>
       </tr>
     <% end %>
   </tbody>
-  <tbody id='subtotal' data-hook="order_details_subtotal">
+  <tbody id="subtotal" data-hook="order_details_subtotal">
     <tr class="total" id="subtotal-row">
-      <td colspan="3"><b><%= t('subtotal') %>:</b></td>
+      <td colspan="3"><b><%= t(:subtotal) %>:</b></td>
       <td class="total"><span><%= number_to_currency @order.item_total %></span></td>
     </tr>
   </tbody>
@@ -31,9 +31,9 @@
       </tr>
     <% end %>
   </tbody>
-  <tbody id='order-total' data-hook="order_details_total">
+  <tbody id="order-total" data-hook="order_details_total">
     <tr class="total">
-      <td colspan="3"><b><%= t('order_total') %>:</b></td>
+      <td colspan="3"><b><%= t(:order_total) %>:</b></td>
       <td class="total"><span id="order_total"><%= number_to_currency @order.total %></span></td>
     </tr>
   </tbody>

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

@@ -1,3 +1,3 @@
-<li id="home-link" data-hook><%= link_to t("home") , root_path %></li>
+<li id="home-link" data-hook><%= link_to t(:home), root_path %></li>
 <li id="link-to-cart" data-hook><%= link_to_cart %></li>
 

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

@@ -1,6 +1,6 @@
 <div id="taxonomies" class="sidebar-item" data-hook>
   <% get_taxonomies.each do |taxonomy| %>
-    <h3 class='taxonomy-root'><%= t("shop_by_taxonomy", :taxonomy => taxonomy.name.singularize) %></h3>
+    <h3 class='taxonomy-root'><%= t(:shop_by_taxonomy, :taxonomy => taxonomy.name.singularize) %></h3>
     <%= taxons_tree(taxonomy.root, @taxon, Spree::Config[:max_level_in_taxons_menu] || 1) %>
   <% end %>
 </div>

data/app/views/shipment_mailer/shipped_email.text.erb

@@ -5,8 +5,8 @@ Your order has been shipped
 ============================================================
 Shipment Summary
 ============================================================
-<% for item in @shipment.line_items %>
-<%=item.variant.sku %> <%=item.variant.product.name%> <%= variant_options(item.variant) %> (<%=item.quantity%>)
+<% @shipment.line_items.each do |item| %>
+  <%= item.variant.sku %> <%= item.variant.product.name %> <%= variant_options(item.variant) %> (<%= item.quantity %>)
 <% end %>
 ============================================================
 

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

@@ -1,4 +1,4 @@
 <div class="taxon" data-hook="taxon">
   <h2><%= link_to taxon.name, seo_url(taxon), :class => 'breadcrumbs' %></h2>
-  <%= render :partial => "shared/products", :locals => {:products => taxon_preview(taxon), :taxon => taxon} %>
+  <%= render :partial => 'shared/products', :locals => {:products => taxon_preview(taxon), :taxon => taxon} %>
 </div>

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

@@ -2,18 +2,18 @@
 
 <% content_for :sidebar do %>
   <div data-hook="taxon_sidebar_navigation">
-    <%= render :partial => "shared/taxonomies" %>
-    <%= render(:partial => "shared/filters") if @taxon.children.empty? %>
+    <%= render :partial => 'shared/taxonomies' %>
+    <%= render :partial => 'shared/filters' if @taxon.children.empty? %>
   </div>
 <% end %>
 
 <% if @taxon.children.empty? || !params[:keywords].blank? %>
   <div data-hook="taxon_products">
-    <%= render :partial => "shared/products", :locals => {:products => @products, :taxon => @taxon } %>
+    <%= render :partial => 'shared/products', :locals => {:products => @products, :taxon => @taxon } %>
   </div>
 <% else %>
   <div data-hook="taxon_children">
-    <%= render :partial => "taxon", :collection => @taxon.children %>
+    <%= render :partial => 'taxon', :collection => @taxon.children %>
   </div>
 <% end %>
 

data/app/views/test_mailer/test_email.text.erb

@@ -1,4 +1,4 @@
-<%= t('greeting', :scope => 'test_mailer.test_email') %>
+<%= t('test_mailer.test_email.greeting') %>
 ================
 
-<%= t('message', :scope => 'test_mailer.test_email') %>
+<%= t('test_mailer.test_email.message') %>

data/config/locales/en.yml

@@ -387,7 +387,7 @@ en:
   enable_login_via_openid: "Use OpenID instead"
   enable_mail_delivery: Enable Mail Delivery
   enter_exactly_as_shown_on_card: Please enter exactly as shown on the card
-  enter_atleast_five_letters: Enter at least five letters of customer name
+  enter_at_least_five_letters: Enter at least five letters of customer name
   enter_password_to_confirm: "(we need your current password to confirm your changes)"
   environment: "Environment"
   error: error
@@ -533,6 +533,7 @@ en:
   new_billing_integration: New Billing Integration
   new_category: "New category"
   new_customer: "New Customer"
+  new_group: New Group
   new_image: "New Image"
   new_mail_method: New Mail Method
   new_option_type: "New Option Type"
@@ -628,7 +629,7 @@ en:
   out_of_stock_products: "Out of Stock Products"
   over_paid: "Over Paid"
   overview: Overview
-  overview_welcome: "Welcome to your store overview, currently we do not have enough data to display the Overview Dashboard.<br/><br/> The dashboard will display automatically once the system has sufficent orders to allow generation of the statistics."
+  overview_welcome: "Welcome to your store overview, currently we do not have enough data to display the Overview Dashboard.<br /><br /> The dashboard will display automatically once the system has sufficent orders to allow generation of the statistics."
   page_only_viewable_when_logged_in: You attempted to visit a page which can only be viewed when you are logged in
   page_only_viewable_when_logged_out: You attempted to visit a page which can only be viewed when you are logged out
   paid: Paid
@@ -1025,6 +1026,7 @@ en:
     must_be_int: "must be an integer"
     must_be_non_negative: "must be a non-negative value"
   value: Value
+  variant: Variant
   variants: Variants
   vat: "VAT"
   version: Version

data/lib/environment_extension.rb

@@ -0,0 +1,26 @@
+module EnvironmentExtension
+  extend ActiveSupport::Concern
+
+  module InstanceMethods
+
+    def add_class(name)
+      self.instance_variable_set "@#{name}", Set.new
+      create_method( "#{name}=".to_sym ) { |val| 
+        instance_variable_set( "@" + name, val)
+      }
+
+      create_method( name.to_sym ) { 
+        instance_variable_get( "@" + name ) 
+      }
+    end
+
+    private
+
+      def create_method( name, &block )
+        self.class.send( :define_method, name, &block )
+      end
+
+  end
+
+end
+

data/lib/generators/spree/site/site_generator.rb

@@ -11,6 +11,14 @@ module Spree
       [File.expand_path('../templates', __FILE__)]
     end
 
+    def config_spree_yml
+      create_file "config/spree.yml" do
+        settings = { 'version' => Spree.version }
+
+        settings.to_yaml
+      end
+    end
+
     def remove_unneeded_files
       remove_file "public/index.html"
     end

data/lib/product_filters.rb

@@ -2,6 +2,14 @@
 #   the exact code probably won't be useful, though you're welcome to modify and reuse
 #   the current contents are mainly for testing and documentation
 
+# To override this file...
+#   1) Make a copy of it in your sites local /lib folder
+#   2) Add it to the config load path, or require it in an initializer, e.g...
+#      
+#      # config/initializers/spree.rb
+#      require 'product_filters'
+#
+
 # set up some basic filters for use with products
 #
 # Each filter has two parts

data/lib/spree/calculated_adjustments.rb

@@ -5,15 +5,9 @@ module Spree::CalculatedAdjustments
       accepts_nested_attributes_for :calculator
       validates :calculator, :presence => true if options[:require]
 
-      class_attribute :calculators
-      self.calculators = Set.new
-      # @available_calculators = []
-      def register_calculator(calculator)
-        self.calculators.add(calculator)
+      def self.calculators
+        Rails.application.config.spree.calculators.send(self.to_s.tableize.gsub("/", "_"))
       end
-      # def calculators
-      #   @available_calculators
-      # end
 
       if options[:default]
         default_calculator_class = options[:default]
@@ -31,6 +25,11 @@ module Spree::CalculatedAdjustments
         end
       end
 
+      #Remove in 0.80.0
+      def self.register(*args)
+        ActiveSupport::Deprecation.warn("Calculator registration has changed, add your calculator to the relevant Rails.application.config.spree.calculators collection.", caller)
+      end
+
       include InstanceMethods
     end
   end
@@ -72,3 +71,4 @@ module Spree::CalculatedAdjustments
     receiver.extend Spree::CalculatedAdjustments::ClassMethods
   end
 end
+

data/lib/spree/environment.rb

@@ -0,0 +1,12 @@
+module Spree
+
+  class Environment
+    include EnvironmentExtension
+
+    attr_accessor :calculators, :payment_methods
+
+    def initialize
+      @calculators = Calculators.new
+    end
+  end
+end

data/lib/spree/environment/calculators.rb

@@ -0,0 +1,10 @@
+module Spree
+  class Environment
+    class Calculators
+      include EnvironmentExtension
+
+      attr_accessor :shipping_methods, :tax_rates
+    end
+  end
+end
+

data/lib/spree_core.rb

@@ -1,5 +1,5 @@
 #++
-# Copyright (c) 2007-2010, Rails Dog LLC and other contributors
+# Copyright (c) 2007-2011, Rails Dog LLC and other contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/spree_core/railtie.rb

@@ -3,53 +3,8 @@ module SpreeCore
     engine_name 'spree_core'
 
     config.autoload_paths += %W(#{config.root}/lib)
-    # TODO - register state monitor observer?
 
-
-    # TODO: Is there a better way to make sure something within 'self.activate' only runs once in development?
     def self.activate
-
-
-      #register all payment methods (unless we're in middle of rake task since migrations cannot be run for this first time without this check)
-      if File.basename( $0 ) != "rake"
-        [
-          Gateway::Bogus,
-          Gateway::AuthorizeNet,
-          Gateway::AuthorizeNetCim,
-          Gateway::Eway,
-          Gateway::Linkpoint,
-          Gateway::PayPal,
-          Gateway::SagePay,
-          Gateway::Beanstream,
-          Gateway::Braintree,
-          PaymentMethod::Check
-        ].each{|gw|
-          begin
-            gw.register
-          rescue Exception => e
-            $stderr.puts "Error registering gateway #{gw}: #{e}"
-          end
-        }
-
-        #register all calculators
-        [
-          Calculator::FlatPercentItemTotal,
-          Calculator::FlatRate,
-          Calculator::FlexiRate,
-          Calculator::PerItem,
-          Calculator::SalesTax,
-          Calculator::Vat,
-          Calculator::PriceBucket
-        ].each{|c_model|
-          begin
-            c_model.register if c_model.table_exists?
-          rescue Exception => e
-            $stderr.puts "Error registering calculator #{c_model}"
-          end
-        }
-
-      end
-
     end
 
     config.to_prepare &method(:activate).to_proc
@@ -63,14 +18,49 @@ module SpreeCore
       end
     end
 
+    initializer "spree.environment" do |app|
+      app.config.spree = Spree::Environment.new
+    end
+
+    initializer "spree.register.calculators" do |app|
+      app.config.spree.calculators.shipping_methods = [
+          Calculator::FlatPercentItemTotal,
+          Calculator::FlatRate,
+          Calculator::FlexiRate,
+          Calculator::PerItem,
+          Calculator::PriceBucket]
+
+       app.config.spree.calculators.tax_rates = [
+          Calculator::SalesTax,
+          Calculator::Vat]
+    end
+
+    initializer "spree.register.payment_methods" do |app|
+      app.config.spree.payment_methods = [
+          Gateway::Bogus,
+          Gateway::AuthorizeNet,
+          Gateway::AuthorizeNetCim,
+          Gateway::Eway,
+          Gateway::Linkpoint,
+          Gateway::PayPal,
+          Gateway::SagePay,
+          Gateway::Beanstream,
+          Gateway::Braintree,
+          PaymentMethod::Check ]
+    end
+
     # filter sensitive information during logging
     initializer "spree.params.filter" do |app|
       app.config.filter_parameters += [:password, :password_confirmation, :number]
     end
 
     # sets the manifests / assets to be precompiled
-    initializer "spree.assets.precompile" do |app|
+    initializer "spree.assets.precompile", :group => :assets do |app|
       app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/spree_dash.*', 'admin/orders/edit_form.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js']
+    end
+
+    # turn off asset debugging since that kills performance in development mode
+    initializer "spree.asset.pipeline" do |app|
       app.config.assets.debug = false
     end
 

data/lib/spree_core/ssl_requirement.rb

@@ -1,5 +1,5 @@
 # ++
-# Copyright (c) 2007-2010, Rails Dog LLC and other contributors
+# Copyright (c) 2007-2011, Rails Dog LLC and other contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,

data/lib/spree_core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "0.70.0.rc2"
+    "0.70.0"
   end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 15425137
-  prerelease: 7
+  hash: 263
+  prerelease: 
   segments: 
   - 0
   - 70
   - 0
-  - rc
-  - 2
-  version: 0.70.0.rc2
+  version: 0.70.0
 platform: ruby
 authors: 
 - Sean Schofield
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-30 00:00:00 Z
+date: 2011-10-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -217,14 +215,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424105
+        hash: 1
         segments: 
         - 3
         - 1
         - 1
-        - rc
-        - 2
-        version: 3.1.1.rc2
+        version: 3.1.1
   version_requirements: *id013
   name: rails
 - !ruby/object:Gem::Dependency 
@@ -755,11 +751,11 @@ files:
 - config/initializers/form_builder.rb
 - config/initializers/rails_3_1.rb
 - config/initializers/spree.rb
-- config/initializers/sprockets_precompile_patch.rb
 - config/initializers/workarounds_for_ruby19.rb
 - config/locales/en.yml
 - config/routes.rb
 - lib/custom_fixtures.rb
+- lib/environment_extension.rb
 - lib/generators/spree/dummy/dummy_generator.rb
 - lib/generators/spree/dummy/templates/cucumber/cucumber.rb
 - lib/generators/spree/dummy/templates/rails/application.rb
@@ -782,6 +778,8 @@ files:
 - lib/spree/calculated_adjustments.rb
 - lib/spree/config.rb
 - lib/spree/current_order.rb
+- lib/spree/environment/calculators.rb
+- lib/spree/environment.rb
 - lib/spree/file_utilz.rb
 - lib/spree/gateway_error.rb
 - lib/spree/mail_interceptor.rb
@@ -845,7 +843,6 @@ files:
 - lib/spree_core/version.rb
 - lib/spree_core.rb
 - lib/store_helpers.rb
-- lib/subclass_registration.rb
 - lib/tasks/assets.rake
 - lib/tasks/core.rake
 - lib/tasks/install.rake
@@ -1037,14 +1034,12 @@ 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