spree_core 1.2.0 → 1.2.2

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/permalinks.rb

@@ -39,8 +39,7 @@ module Spree
         end
       end
 
-      def save_permalink
-        permalink_value = self.to_param
+      def save_permalink(permalink_value=self.to_param)
         field = self.class.permalink_field
           # Do other links exist with this permalink?
           other = self.class.where("#{field} LIKE ?", "#{permalink_value}%")

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

@@ -3,6 +3,7 @@ module Spree
     module Search
       class Base
         attr_accessor :properties
+        attr_accessor :current_user
 
         def initialize(params)
           @properties = {}

data/lib/spree/core/testing_support/authorization_helpers.rb

@@ -0,0 +1,30 @@
+module AuthorizationHelpers
+  module Controller
+    def stub_authorization!
+      before do
+        controller.should_receive(:authorize!).twice.and_return(true)
+      end
+    end
+  end
+
+  module Request
+    class SuperAbility
+      include CanCan::Ability
+
+      def initialize(user)
+        # allow anyone to perform index on Order
+        can :manage, :all
+      end
+    end
+
+    def stub_authorization!
+      before(:all) { Spree::Ability.register_ability(AuthorizationHelpers::Request::SuperAbility) }
+      after(:all) { Spree::Ability.remove_ability(AuthorizationHelpers::Request::SuperAbility) }
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.extend AuthorizationHelpers::Controller, :type => :controller
+  config.extend AuthorizationHelpers::Request, :type => :request
+end

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

@@ -1,6 +1,6 @@
 FactoryGirl.define do
   factory :simple_product, :class => Spree::Product do
-    sequence(:name) { |n| "Product ##{n} - #{rand(9999)}" }
+    sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
     description { Faker::Lorem.paragraphs(1 + Kernel.rand(5)).join("\n") }
     price 19.99
     cost_price 17.00

data/lib/spree/core/testing_support/flash.rb

@@ -0,0 +1,17 @@
+module Spree
+  module Core
+    module TestingSupport
+      module Flash
+        def assert_flash_notice(flash)
+          if flash.is_a?(Symbol)
+            flash = I18n.t(flash)
+          end
+
+          within("[class='flash notice']") do
+            page.should have_content(flash)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/testing_support/preferences.rb

@@ -0,0 +1,26 @@
+module Spree
+  module Core
+    module TestingSupport
+      module Preferences
+        # Resets all preferences to default values, you can
+        # pass a block to override the defaults with a block
+        #
+        # reset_spree_preferences do |config|
+        #   config.site_name = "my fancy pants store"
+        # end
+        #
+        def reset_spree_preferences
+          Spree::Preferences::Store.instance.persistence = false
+          config = Rails.application.config.spree.preferences
+          config.reset
+          yield(config) if block_given?
+        end
+
+        def assert_preference_unset(preference)
+          find("#preferences_#{preference}")['checked'].should be_false
+          Spree::Config[preference].should be_false
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.2.0"
+    "1.2.2"
   end
 end

data/lib/spree/money.rb

@@ -3,10 +3,13 @@ require 'money'
 module Spree
   class Money
     def initialize(amount, options={})
-      @money = ::Money.new(amount * 100, Spree::Config[:currency])
+      @money = ::Money.parse([amount, Spree::Config[:currency]].join)
       @options = {}
       @options[:with_currency] = true if Spree::Config[:display_currency]
+      @options[:symbol_position] = Spree::Config[:currency_symbol_position].to_sym
       @options.merge!(options)
+      # Must be a symbol because the Money gem doesn't do the conversion
+      @options[:symbol_position] = @options[:symbol_position].to_sym
     end
 
     def to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70333195843340 !ruby/object:Gem::Requirement
+  requirement: &70281722132740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,21 +21,21 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70333195843340
+  version_requirements: *70281722132740
 - !ruby/object:Gem::Dependency
-  name: nested_set
-  requirement: &70333195842800 !ruby/object:Gem::Requirement
+  name: awesome_nested_set
+  requirement: &70281721877200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70333195842800
+  version_requirements: *70281721877200
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70333195842040 !ruby/object:Gem::Requirement
+  requirement: &70281721875700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333195842040
+  version_requirements: *70281721875700
 - !ruby/object:Gem::Dependency
   name: select2-rails
-  requirement: &70333195841300 !ruby/object:Gem::Requirement
+  requirement: &70281721873140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333195841300
+  version_requirements: *70281721873140
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70333195840660 !ruby/object:Gem::Requirement
+  requirement: &70281721870700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.11
   type: :runtime
   prerelease: false
-  version_requirements: *70333195840660
+  version_requirements: *70281721870700
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70333195839980 !ruby/object:Gem::Requirement
+  requirement: &70281721930460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70333195839980
+  version_requirements: *70281721930460
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70333195839260 !ruby/object:Gem::Requirement
+  requirement: &70281721928880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,21 +87,21 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333195839260
+  version_requirements: *70281721928880
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70333195838560 !ruby/object:Gem::Requirement
+  requirement: &70281721926040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70333195838560
+  version_requirements: *70281721926040
 - !ruby/object:Gem::Dependency
   name: aws-sdk
-  requirement: &70333195837920 !ruby/object:Gem::Requirement
+  requirement: &70281721939000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *70333195837920
+  version_requirements: *70281721939000
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &70333195837300 !ruby/object:Gem::Requirement
+  requirement: &70281721937840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333195837300
+  version_requirements: *70281721937840
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70333195836600 !ruby/object:Gem::Requirement
+  requirement: &70281721931200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -131,32 +131,32 @@ dependencies:
         version: 1.28.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333195836600
+  version_requirements: *70281721931200
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70333195835840 !ruby/object:Gem::Requirement
+  requirement: &70281723068920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70333195835840
+  version_requirements: *70281723068920
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70333195835140 !ruby/object:Gem::Requirement
+  requirement: &70281723088240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333195835140
+  version_requirements: *70281723088240
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70333195834460 !ruby/object:Gem::Requirement
+  requirement: &70281723086560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333195834460
+  version_requirements: *70281723086560
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70333195833680 !ruby/object:Gem::Requirement
+  requirement: &70281723085500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70333195833680
+  version_requirements: *70281723085500
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70333195698220 !ruby/object:Gem::Requirement
+  requirement: &70281723083600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -186,10 +186,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70333195698220
+  version_requirements: *70281723083600
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &70333195697580 !ruby/object:Gem::Requirement
+  requirement: &70281723082080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -197,7 +197,18 @@ dependencies:
         version: 5.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333195697580
+  version_requirements: *70281723082080
+- !ruby/object:Gem::Dependency
+  name: rabl
+  requirement: &70281722094420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70281722094420
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -334,6 +345,7 @@ files:
 - app/assets/javascripts/admin/product_autocomplete.js.erb
 - app/assets/javascripts/admin/shipping_methods.js.coffee
 - app/assets/javascripts/admin/spree_core.js
+- app/assets/javascripts/admin/taxon_autocomplete.js.erb
 - app/assets/javascripts/admin/taxonomy.js
 - app/assets/javascripts/admin/underscore-min.js
 - app/assets/javascripts/admin/zone.js.coffee
@@ -492,6 +504,7 @@ files:
 - app/views/spree/admin/adjustments/edit.html.erb
 - app/views/spree/admin/adjustments/index.html.erb
 - app/views/spree/admin/adjustments/new.html.erb
+- app/views/spree/admin/banners/_gateway.html.erb
 - app/views/spree/admin/configurations/index.html.erb
 - app/views/spree/admin/general_settings/edit.html.erb
 - app/views/spree/admin/general_settings/show.html.erb
@@ -569,6 +582,7 @@ files:
 - app/views/spree/admin/return_authorizations/edit.html.erb
 - app/views/spree/admin/return_authorizations/index.html.erb
 - app/views/spree/admin/return_authorizations/new.html.erb
+- app/views/spree/admin/search/users.rabl
 - app/views/spree/admin/shared/_address.html.erb
 - app/views/spree/admin/shared/_address_form.html.erb
 - app/views/spree/admin/shared/_alert.html.erb
@@ -585,8 +599,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
@@ -628,6 +644,7 @@ files:
 - app/views/spree/admin/taxons/_form.html.erb
 - app/views/spree/admin/taxons/_taxon_table.html.erb
 - app/views/spree/admin/taxons/edit.html.erb
+- app/views/spree/admin/taxons/search.rabl
 - app/views/spree/admin/trackers/_form.html.erb
 - app/views/spree/admin/trackers/edit.html.erb
 - app/views/spree/admin/trackers/index.html.erb
@@ -695,9 +712,9 @@ 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/user_class_extensions.rb
-- config/initializers/workarounds_for_ruby19.rb
 - config/locales/en.yml
 - config/routes.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -744,9 +761,9 @@ files:
 - lib/spree/core/search/base.rb
 - lib/spree/core/ssl_requirement.rb
 - lib/spree/core/store_helpers.rb
+- lib/spree/core/testing_support/authorization_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
@@ -782,6 +799,8 @@ files:
 - lib/spree/core/testing_support/factories/zone_factory.rb
 - lib/spree/core/testing_support/factories.rb
 - lib/spree/core/testing_support/fixtures.rb
+- lib/spree/core/testing_support/flash.rb
+- lib/spree/core/testing_support/preferences.rb
 - lib/spree/core/token_resource.rb
 - lib/spree/core/url_helpers.rb
 - lib/spree/core/user_banners.rb
@@ -903,6 +922,10 @@ files:
 - db/migrate/20120604030249_add_deleted_at_to_spree_shipping_methods.rb
 - db/migrate/20120604203654_remove_credit_total_from_orders.rb
 - db/migrate/20120712172620_add_counter_cache_to_zone_members.rb
+- db/migrate/20120905145253_add_tax_rate_label.rb
+- db/migrate/20120905151823_add_toggle_tax_rate_display.rb
+- db/migrate/20121009142519_add_lock_version_to_variant.rb
+- db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
@@ -1002,7 +1025,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3303214660829920251
+      hash: -3084741105755015925
 requirements:
 - none
 rubyforge_project: spree_core