spree_core 1.1.3 → 1.1.4

data/lib/spree/core/mail_settings.rb

@@ -21,7 +21,8 @@ module Spree
             mail_server_settings[:password] = mail_method.preferred_smtp_password
           end
 
-          mail_server_settings[:enable_starttls_auto] = (mail_method.preferred_secure_connection_type == 'TLS')
+          tls = mail_method.preferred_secure_connection_type == 'TLS'
+          mail_server_settings[:enable_starttls_auto] = tls
 
           ActionMailer::Base.smtp_settings = mail_server_settings
           ActionMailer::Base.perform_deliveries = true

data/lib/spree/core/search/base.rb

@@ -28,7 +28,7 @@ module Spree
           def get_base_scope
             base_scope = Spree::Product.active
             base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
-            base_scope = get_products_conditions_for(base_scope, keywords) unless keywords.blank?
+            base_scope = get_products_conditions_for(base_scope, keywords)
             base_scope = base_scope.on_hand unless Spree::Config[:show_zero_stock_products]
             base_scope = add_search_scopes(base_scope)
             base_scope
@@ -48,7 +48,10 @@ module Spree
 
           # method should return new scope based on base_scope
           def get_products_conditions_for(base_scope, query)
-            base_scope.like_any([:name, :description], query.split)
+            unless query.blank?
+              base_scope = base_scope.like_any([:name, :description], query.split)
+            end
+            base_scope
           end
 
           def prepare(params)

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

@@ -6,8 +6,11 @@ FactoryGirl.define do
 
   factory :tax_category_with_rates, :parent => :tax_category do
     after_create do |tax_category|
-      tax_category.tax_rates.create!(:amount => 0.05, :calculator => Spree::Calculator::DefaultTax.new,
-                                     :zone => Spree::Zone.global)
+      tax_category.tax_rates.create!({
+        :amount => 0.05,
+        :calculator => Spree::Calculator::DefaultTax.new,
+        :zone => Spree::Zone.find_by_name('GlobalZone') || FactoryGirl.create(:global_zone)
+      }, :without_protection => true)
     end
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.1.3"
+    "1.1.4"
   end
 end

data/lib/spree/product_filters.rb

@@ -4,7 +4,7 @@ module Spree
   #   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
+  #   1) Make a copy of it in your sites local /lib/spree folder
   #   2) Add it to the config load path, or require it in an initializer, e.g...
   #
   #      # config/initializers/spree.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70251996737660 !ruby/object:Gem::Requirement
+  requirement: &70334457829140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70251996737660
+  version_requirements: *70334457829140
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70251996735520 !ruby/object:Gem::Requirement
+  requirement: &70334457846380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,21 +32,21 @@ dependencies:
         version: 1.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70251996735520
+  version_requirements: *70334457846380
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70251996380040 !ruby/object:Gem::Requirement
+  requirement: &70334457842160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251996380040
+  version_requirements: *70334457842160
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70251996377420 !ruby/object:Gem::Requirement
+  requirement: &70334457856540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70251996377420
+  version_requirements: *70334457856540
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70251996375460 !ruby/object:Gem::Requirement
+  requirement: &70334457855080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70251996375460
+  version_requirements: *70334457855080
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70251996373560 !ruby/object:Gem::Requirement
+  requirement: &70334457852720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,21 +76,21 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70251996373560
+  version_requirements: *70334457852720
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70251996372140 !ruby/object:Gem::Requirement
+  requirement: &70334457878300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70251996372140
+  version_requirements: *70334457878300
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70251996370680 !ruby/object:Gem::Requirement
+  requirement: &70334457876360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70251996370680
+  version_requirements: *70334457876360
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &70251996369560 !ruby/object:Gem::Requirement
+  requirement: &70334457875260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,43 +109,43 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70251996369560
+  version_requirements: *70334457875260
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70251996368240 !ruby/object:Gem::Requirement
+  requirement: &70334457874320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.20.4
+        version: 1.28.0
   type: :runtime
   prerelease: false
-  version_requirements: *70251996368240
+  version_requirements: *70334457874320
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70251996367220 !ruby/object:Gem::Requirement
+  requirement: &70334457873700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70251996367220
+  version_requirements: *70334457873700
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70251996365100 !ruby/object:Gem::Requirement
+  requirement: &70334457873080 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70251996365100
+  version_requirements: *70334457873080
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70251996351260 !ruby/object:Gem::Requirement
+  requirement: &70334457872360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70251996351260
+  version_requirements: *70334457872360
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70251996338660 !ruby/object:Gem::Requirement
+  requirement: &70334457871700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,7 +164,7 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70251996338660
+  version_requirements: *70334457871700
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -279,6 +279,7 @@ files:
 - app/assets/images/icons/checkout.png
 - app/assets/images/icons/delete.png
 - app/assets/images/icons/update.png
+- app/assets/images/noimage/large.png
 - app/assets/images/noimage/mini.png
 - app/assets/images/noimage/product.png
 - app/assets/images/noimage/small.png
@@ -364,7 +365,6 @@ files:
 - app/controllers/spree/products_controller.rb
 - app/controllers/spree/states_controller.rb
 - app/controllers/spree/taxons_controller.rb
-- app/helpers/spree/account_helper.rb
 - app/helpers/spree/admin/base_helper.rb
 - app/helpers/spree/admin/inventory_settings_helper.rb
 - app/helpers/spree/admin/navigation_helper.rb
@@ -377,11 +377,9 @@ files:
 - app/helpers/spree/admin/zones_helper.rb
 - app/helpers/spree/base_helper.rb
 - app/helpers/spree/checkout_helper.rb
-- app/helpers/spree/orders_helper.rb
 - app/helpers/spree/products_helper.rb
 - app/helpers/spree/search_helper.rb
 - app/helpers/spree/taxons_helper.rb
-- app/helpers/spree/trackers_helper.rb
 - app/mailers/spree/order_mailer.rb
 - app/mailers/spree/shipment_mailer.rb
 - app/mailers/spree/test_mailer.rb
@@ -555,8 +553,10 @@ files:
 - app/views/spree/admin/shared/_product_sub_menu.html.erb
 - app/views/spree/admin/shared/_product_tabs.html.erb
 - app/views/spree/admin/shared/_report_criteria.html.erb
+- app/views/spree/admin/shared/_routes.html.erb
 - app/views/spree/admin/shared/_show_resource_links.html.erb
 - app/views/spree/admin/shared/_tabs.html.erb
+- app/views/spree/admin/shared/_translations.html.erb
 - app/views/spree/admin/shared/_update_order_state.js
 - app/views/spree/admin/shipments/_form.html.erb
 - app/views/spree/admin/shipments/edit.html.erb
@@ -669,8 +669,8 @@ files:
 - config/initializers/deprecation_checker.rb
 - config/initializers/form_builder.rb
 - config/initializers/rails_3_1.rb
+- config/initializers/rails_5868.rb
 - config/initializers/spree.rb
-- config/initializers/workarounds_for_ruby19.rb
 - config/locales/en.yml
 - config/routes.rb
 - lib/generators/spree/dummy/dummy_generator.rb
@@ -710,7 +710,6 @@ files:
 - lib/spree/core/middleware/seo_assist.rb
 - lib/spree/core/permalinks.rb
 - lib/spree/core/preference_rescue.rb
-- lib/spree/core/relation_serialization.rb
 - lib/spree/core/respond_with.rb
 - lib/spree/core/responder.rb
 - lib/spree/core/scopes.rb
@@ -719,7 +718,6 @@ files:
 - lib/spree/core/store_helpers.rb
 - lib/spree/core/testing_support/common_rake.rb
 - lib/spree/core/testing_support/controller_requests.rb
-- lib/spree/core/testing_support/env.rb
 - lib/spree/core/testing_support/factories/activator_factory.rb
 - lib/spree/core/testing_support/factories/address_factory.rb
 - lib/spree/core/testing_support/factories/adjustment_factory.rb
@@ -873,6 +871,7 @@ files:
 - db/migrate/20120604030249_add_deleted_at_to_spree_shipping_methods.rb
 - db/migrate/20120605211305_make_users_email_index_unique.rb
 - db/migrate/20120712172620_add_counter_cache_to_zone_members.rb
+- db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb
 - db/sample/users.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
@@ -973,7 +972,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 173937272433649960
+      hash: -1981517253698531698
 requirements:
 - none
 rubyforge_project: spree_core

data/app/helpers/spree/account_helper.rb

@@ -1,4 +0,0 @@
-module Spree
-  module AccountHelper
-  end
-end

data/app/helpers/spree/orders_helper.rb

@@ -1,5 +0,0 @@
-module Spree
-  module OrdersHelper
-
-  end
-end

data/app/helpers/spree/trackers_helper.rb

@@ -1,4 +0,0 @@
-module Spree
-  module TrackersHelper
-  end
-end

data/config/initializers/workarounds_for_ruby19.rb

@@ -1,72 +0,0 @@
-# encoding: utf-8
-if RUBY_VERSION.to_f >= 1.9
-
-  class String
-    def mb_chars
-      self.force_encoding(Encoding::UTF_8)
-    end
-
-    alias_method(:orig_concat, :concat)
-    def concat(value)
-      orig_concat value.frozen? || !value.respond_to?(:force_encoding) ? value : value.force_encoding(Encoding::UTF_8)
-    end
-  end
-
-  module ActionView
-    module Renderable #:nodoc:
-      private
-        def compile!(render_symbol, local_assigns)
-          locals_code = local_assigns.keys.map { |key| "#{key} = local_assigns[:#{key}];" }.join
-
-          source = <<-end_src
-            def #{render_symbol}(local_assigns)
-              old_output_buffer = output_buffer;#{locals_code};#{compiled_source}
-            ensure
-              self.output_buffer = old_output_buffer
-            end
-          end_src
-          source.force_encoding(Encoding::UTF_8) if source.respond_to?(:force_encoding)
-
-          begin
-            ActionView::Base::CompiledTemplates.module_eval(source, filename, 0)
-          rescue Errno::ENOENT => e
-            raise e # Missing template file, re-raise for Base to rescue
-          rescue Exception => e # errors from template code
-            if logger = defined?(ActionController) && Base.logger
-              logger.debug "ERROR: compiling #{render_symbol} RAISED #{e}"
-              logger.debug "Function body: #{source}"
-              logger.debug "Backtrace: #{e.backtrace.join("\n")}"
-            end
-
-            raise ActionView::TemplateError.new(self, {}, e)
-          end
-        end
-    end
-  end
-
-  if defined?(Mysql::Result)
-    class Mysql::Result
-      def encode(value, encoding = "utf-8")
-        String === value ? value.force_encoding(encoding) : value
-      end
-
-      def each_utf8(&block)
-        each_orig do |row|
-          yield row.map {|col| encode(col) }
-        end
-      end
-      alias each_orig each
-      alias each each_utf8
-
-      def each_hash_utf8(&block)
-        each_hash_orig do |row|
-          row.each {|k, v| row[k] = encode(v) }
-          yield(row)
-        end
-      end
-      alias each_hash_orig each_hash
-      alias each_hash each_hash_utf8
-    end
-  end
-
-end

data/lib/spree/core/relation_serialization.rb

@@ -1,9 +0,0 @@
-module Spree
-  module Core
-    module RelationSerialization
-      def serializable_hash(options = nil)
-        self.map { |a| a.serializable_hash(options) }
-      end
-    end
-  end
-end