spree_msrp 2.1.7 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7db34e4148901f3dffa7490a0d88b6bdd0d8057
-  data.tar.gz: f87cc0189b17db31a42922cfbe7767c1bfa707e8
+  metadata.gz: 2ba2647076f4e270cf2683a992f6df8db32d2860
+  data.tar.gz: 2cd468b06a4688788819911afd41e8157c1175a4
 SHA512:
-  metadata.gz: 92939e302a186dbdb584af90839e4106306e58da251a699514caa2000258e530f94011d876a9c6fe9f558fd3ace106e8856f32e3aa3315d1ce6a175cab64c6db
-  data.tar.gz: fbf659245c1efc346edff579b16d34dda243c15bf95e46eda1a8b5d935100c9746c39a2cb4e1f7f71bfec05a69376f92d13cb86e9518c850ed1738686abfa963
+  metadata.gz: a0a3d8944fc00636c8cab5152c48baf1968d8d23e18500c823050125012f6074059a057b8ecbd26a032b40625923e12e3162798672a808124327e55f962f9c30
+  data.tar.gz: 4229621b8be1ca5b6de8cd18885749f7b8347c07a98bfb7fb1578c3168d5f651ea4baa7764b1f2e8afc533d248bedec692250a18bcd55db5d3e01cd4e98f07de

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
+gem 'spree', github: 'spree/spree', branch: '2-2-stable'
 # Provides basic authentication functionality for testing parts of your engine
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', :branch => '2-1-stable'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-2-stable'
 
 gemspec

data/Rakefile

@@ -6,7 +6,13 @@ require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new
 
-task :default => [:spec]
+task :default do
+  if Dir["spec/dummy"].empty?
+    Rake::Task[:test_app].invoke
+    Dir.chdir("../../")
+  end
+  Rake::Task[:spec].invoke
+end
 
 desc 'Generates a dummy app for testing'
 task :test_app do

data/lib/generators/spree_msrp/install/install_generator.rb

@@ -5,13 +5,13 @@ module SpreeMsrp
       class_option :auto_run_migrations, :type => :boolean, :default => false
 
       def add_javascripts
-        append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_msrp\n"
-        append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_msrp\n"
+        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_msrp\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_msrp\n"
       end
 
       def add_stylesheets
-        inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_msrp\n", :before => /\*\//, :verbose => true
-        inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_msrp\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_msrp\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_msrp\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations

data/lib/spree_msrp/engine.rb

@@ -4,8 +4,6 @@ module SpreeMsrp
     isolate_namespace Spree
     engine_name 'spree_msrp'
 
-    config.autoload_paths += %W(#{config.root}/lib)
-
     # use rspec for tests
     config.generators do |g|
       g.test_framework :rspec

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require 'pry'
+
 # Run Coverage report
 require 'simplecov'
 SimpleCov.start do
@@ -23,10 +25,11 @@ require 'ffaker'
 # in spec/support/ and its subdirectories.
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
 
-# Requires factories defined in spree_core
-require 'spree/testing_support/factories'
-require 'spree/testing_support/controller_requests'
+# Requires factories and other useful helpers defined in spree_core.
 require 'spree/testing_support/authorization_helpers'
+require 'spree/testing_support/capybara_ext'
+require 'spree/testing_support/controller_requests'
+require 'spree/testing_support/factories'
 require 'spree/testing_support/url_helpers'
 
 # Requires factories defined in lib/spree_msrp/factories.rb
@@ -79,4 +82,5 @@ RSpec.configure do |config|
   end
 
   config.fail_fast = ENV['FAIL_FAST'] || false
+  config.order = "random"
 end

data/spree_msrp.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_msrp'
-  s.version     = '2.1.7'
+  s.version     = '2.2.4'
   s.summary     = 'Add MSRP to Spree products'
   s.description = 'Add MSRP to Spree products'
   s.required_ruby_version = '>= 1.9.3'
@@ -16,15 +16,15 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.1.7'
+  s.add_dependency 'spree_core', '~> 2.2.4'
 
   s.add_development_dependency 'capybara', '~> 2.1'
   s.add_development_dependency 'coffee-rails'
   s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'factory_girl', '~> 4.2'
+  s.add_development_dependency 'factory_girl', '~> 4.4'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'rspec-rails',  '~> 2.13'
-  s.add_development_dependency 'sass-rails'
+  s.add_development_dependency 'sass-rails', '~> 4.0.2'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'sqlite3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_msrp
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.2.4
 platform: ruby
 authors:
 - Colin Mattson
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.7
+        version: 2.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.7
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -191,14 +191,10 @@ files:
 - README.md
 - Rakefile
 - Versionfile
-- app/assets/javascripts/admin/spree_msrp.js
 - app/assets/javascripts/spree/backend/spree_msrp.js
 - app/assets/javascripts/spree/frontend/spree_msrp.js
-- app/assets/javascripts/store/spree_msrp.js
-- app/assets/stylesheets/admin/spree_msrp.css
 - app/assets/stylesheets/spree/backend/spree_msrp.css
 - app/assets/stylesheets/spree/frontend/spree_msrp.css
-- app/assets/stylesheets/store/spree_msrp.css
 - app/models/spree/product_decorator.rb
 - app/overrides/add_msrp_to_product_edit.rb
 - app/overrides/add_msrp_to_variants_edit.rb

data/app/assets/javascripts/admin/spree_msrp.js

@@ -1 +0,0 @@
-//= require admin/spree_backend

data/app/assets/javascripts/store/spree_msrp.js

@@ -1 +0,0 @@
-//= require store/spree_frontend

data/app/assets/stylesheets/admin/spree_msrp.css

@@ -1,3 +0,0 @@
-/*
- *= require admin/spree_backend
-*/

data/app/assets/stylesheets/store/spree_msrp.css

@@ -1,3 +0,0 @@
-/*
- *= require store/spree_frontend
-*/