spree_core 0.70.1 → 0.70.2

data/app/controllers/admin/products_controller.rb

@@ -48,7 +48,7 @@ class Admin::ProductsController < Admin::ResourceController
   protected
 
   def find_resource
-    Product.find_by_permalink(params[:id])
+    Product.find_by_permalink!(params[:id])
   end
 
   def location_after_save

data/app/helpers/admin/product_groups_helper.rb

@@ -4,7 +4,7 @@ module Admin::ProductGroupsHelper
   def product_scope_field(product_scope, i)
     value = (product_scope.arguments || [])[i]
     name = "product_group[product_scopes_attributes][][arguments][]"
-    helper_method_for_scope = Scopes::Product::ATTRIBUTE_HELPER_METHODS[product_scope.name.to_sym] || :text_field_tag
+    helper_method_for_scope = ::Scopes::Product::ATTRIBUTE_HELPER_METHODS[product_scope.name.to_sym] || :text_field_tag
     send(helper_method_for_scope, name, value)
   end
 

data/app/models/product_scope.rb

@@ -41,7 +41,7 @@ class ProductScope < ActiveRecord::Base
 
   before_validation(:on => :create) {
     # Add default empty arguments so scope validates and errors aren't caused when previewing it
-     if name && args = Scopes::Product.arguments_for_scope_name(name)
+     if name && args = ::Scopes::Product.arguments_for_scope_name(name)
       self.arguments ||= ['']*args.length
     end
   }

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

@@ -6,7 +6,7 @@
     <% end %>
   </td>
   <td data-hook="arguments">
-    <% if arguments = Scopes::Product.arguments_for_scope_name(product_scope.name.strip) %>
+    <% if arguments = ::Scopes::Product.arguments_for_scope_name(product_scope.name.strip) %>
       <table><tr>
       <% arguments.each_with_index do |argument, i| %>
         <td>

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

@@ -14,7 +14,7 @@
 
       <%= f.field_container :order_scope do %>
         <%= f.label :order_scope, t(:sort_ordering) %><br />
-        <%= f.select(:order_scope, Scopes::Product::ORDERING.collect{|p| [ t(:name, :scope =>[:product_scopes, :scopes, p]), p.to_s ] }) %>
+        <%= f.select(:order_scope, ::Scopes::Product::ORDERING.collect{|p| [ t(:name, :scope =>[:product_scopes, :scopes, p]), p.to_s ] }) %>
       <% end %>
 
       <table id="product_scopes" data-hook>
@@ -29,7 +29,7 @@
     <%
     options =
     grouped_options_for_select(
-    Scopes::Product::SCOPES.map do |group_name, scopes|
+    ::Scopes::Product::SCOPES.map do |group_name, scopes|
       [
         t(:name, :scope => [:product_scopes, :groups, group_name]),
         scopes.keys.map do |scope_name|

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -28,6 +28,7 @@ module Spree
       opts[:skip_bundle] = true
       opts[:old_style_hash] = true
 
+      puts "Generating dummy Rails application..."
       invoke Rails::Generators::AppGenerator,
         [ File.expand_path(dummy_path, destination_root) ], opts
     end
@@ -90,7 +91,7 @@ module Spree
     end
 
     def remove_directory_if_exists(path)
-      run "rm -r #{path}" if File.directory?(path)
+      remove_dir(path) if File.directory?(path)
     end
 
     def gemfile_path

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

@@ -90,7 +90,13 @@ SpreeAuth::Engine.load_seed if defined?(SpreeAuth)
     end
 
     def install_migrations
-      silence_warnings { run 'bundle exec rake railties:install:migrations' }
+      puts "Copying migrations..."
+      cmd = 'bundle exec rake railties:install:migrations'
+      silence_stream(STDOUT) do
+        silence_warnings do
+          run cmd
+        end
+      end
     end
 
   end

data/lib/scopes.rb

@@ -56,7 +56,7 @@ module Scopes
   def generate_translations
     require 'ya2yaml'
     {
-      'product_scopes' => generate_translation(Scopes::Product::SCOPES)
+      'product_scopes' => generate_translation(::Scopes::Product::SCOPES)
     }.ya2yaml
   end
 end

data/lib/scopes/product.rb

@@ -239,7 +239,7 @@ SQL
   end
 
   def self.arguments_for_scope_name(name)
-    if group = Scopes::Product::SCOPES.detect{|k,v| v[name.to_sym]}
+    if group = ::Scopes::Product::SCOPES.detect{|k,v| v[name.to_sym]}
       group[1][name.to_sym]
     end
   end

data/lib/spree_core/railtie.rb

@@ -56,7 +56,7 @@ module SpreeCore
 
     # sets the manifests / assets to be precompiled
     initializer "spree.assets.precompile" 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']
+      app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/spree_dash.*', 'admin/orders/edit_form.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
     end
 
     # turn off asset debugging since that kills performance in development mode

data/lib/spree_core/testing_support/common_rake.rb

@@ -3,10 +3,16 @@ namespace :common do
   task :test_app do
     require "#{ENV['LIB_NAME']}"
 
-    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--database=#{ENV['DB_NAME']}"]
-    Spree::SiteGenerator.start ["--lib_name=#{ENV['LIB_NAME']}"]
-
+    Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--database=#{ENV['DB_NAME']}", "--quiet"]
+    Spree::SiteGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", "--quiet"]
+    puts "Setting up dummy database..."
     cmd = "bundle exec rake db:drop db:create db:migrate db:seed RAILS_ENV=test AUTO_ACCEPT=true"
-    puts cmd; system cmd
+    if RUBY_PLATFORM =~ /mswin/ #windows
+      cmd += " >nul"
+    else
+      cmd += " >/dev/null"
+    end
+
+    system(cmd)
   end
 end

data/lib/spree_core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "0.70.1"
+    "0.70.2"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 261
+  hash: 259
   prerelease: 
   segments: 
   - 0
   - 70
-  - 1
-  version: 0.70.1
+  - 2
+  version: 0.70.2
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 Z
+date: 2011-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -29,12 +31,12 @@ dependencies:
         - 1
         - 4
         version: 0.1.4
-  requirement: *id001
-  type: :runtime
-  prerelease: false
+  version_requirements: *id001
   name: acts_as_list
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -45,12 +47,12 @@ dependencies:
         - 6
         - 8
         version: 1.6.8
-  requirement: *id002
-  type: :runtime
-  prerelease: false
+  version_requirements: *id002
   name: nested_set
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -61,12 +63,12 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  requirement: *id003
-  type: :runtime
-  prerelease: false
+  version_requirements: *id003
   name: rd_find_by_param
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,28 +79,28 @@ dependencies:
         - 0
         - 14
         version: 1.0.14
-  requirement: *id004
-  type: :runtime
-  prerelease: false
+  version_requirements: *id004
   name: jquery-rails
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
         - 1
-        - 5
-        - 1
-        version: 1.5.1
-  requirement: *id005
-  type: :runtime
-  prerelease: false
+        - 6
+        - 2
+        version: 1.6.2
+  version_requirements: *id005
   name: highline
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -109,12 +111,12 @@ dependencies:
         - 0
         - 3
         version: 1.0.3
-  requirement: *id006
-  type: :runtime
-  prerelease: false
+  version_requirements: *id006
   name: stringex
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -125,12 +127,12 @@ dependencies:
         - 0
         - 1
         version: 1.0.1
-  requirement: *id007
-  type: :runtime
-  prerelease: false
+  version_requirements: *id007
   name: state_machine
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -141,12 +143,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id008
-  type: :runtime
-  prerelease: false
+  version_requirements: *id008
   name: faker
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -157,12 +159,12 @@ dependencies:
         - 4
         - 1
         version: 2.4.1
-  requirement: *id009
-  type: :runtime
-  prerelease: false
+  version_requirements: *id009
   name: paperclip
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -171,12 +173,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
-  type: :runtime
-  prerelease: false
+  version_requirements: *id010
   name: rd_resource_controller
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -187,12 +189,12 @@ dependencies:
         - 1
         - 1
         version: 1.1.1
-  requirement: *id011
-  type: :runtime
-  prerelease: false
+  version_requirements: *id011
   name: meta_search
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -203,15 +205,15 @@ dependencies:
         - 17
         - 0
         version: 1.17.0
-  requirement: *id012
-  type: :runtime
-  prerelease: false
+  version_requirements: *id012
   name: activemerchant
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 1
         segments: 
@@ -219,12 +221,20 @@ dependencies:
         - 1
         - 1
         version: 3.1.1
-  requirement: *id013
-  type: :runtime
-  prerelease: false
+    - - <=
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 1
+        - 2
+        version: 3.1.2
+  version_requirements: *id013
   name: rails
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -235,12 +245,12 @@ dependencies:
         - 12
         - 4
         version: 0.12.4
-  requirement: *id014
-  type: :runtime
-  prerelease: false
+  version_requirements: *id014
   name: kaminari
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -251,9 +261,7 @@ dependencies:
         - 7
         - 0
         version: 0.7.0
-  requirement: *id015
-  type: :runtime
-  prerelease: false
+  version_requirements: *id015
   name: deface
 description: Required dependency for Spree
 email: sean@railsdog.com