solidus_volume_pricing 0.2.1 → 1.1.0

data/spec/spec_helper.rb

@@ -1,44 +1,24 @@
-require 'simplecov'
-SimpleCov.start 'rails' do
-  add_filter "/lib/generators"
-  add_filter "/lib/solidus_volume_pricing"
-end
+# frozen_string_literal: true
 
+# Configure Rails Environment
 ENV['RAILS_ENV'] ||= 'test'
 
-begin
-  require File.expand_path('../dummy/config/environment', __FILE__)
-rescue LoadError
-  puts 'Could not load dummy application. Please ensure you have run `bundle exec rake test_app`'
-  exit
-end
+# Run Coverage report
+require 'solidus_dev_support/rspec/coverage'
 
-require 'rspec/rails'
-require 'ffaker'
-require 'shoulda-matchers'
-require 'pry'
+require File.expand_path('dummy/config/environment.rb', __dir__)
 
-RSpec.configure do |config|
-  config.fail_fast = false
-  config.filter_run focus: true
-  config.run_all_when_everything_filtered = true
+# Requires factories and other useful helpers defined in spree_core.
+require 'solidus_dev_support/rspec/feature_helper'
 
-  config.mock_with :rspec
-  config.use_transactional_fixtures = false
-  config.raise_errors_for_deprecations!
-  config.infer_spec_type_from_file_location!
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
 
-  config.expect_with :rspec do |expectations|
-    expectations.syntax = :expect
-  end
-end
+# Requires factories defined in lib/solidus_volume_pricing/testing_support/factories.rb
+SolidusDevSupport::TestingSupport::Factories.load_for(SolidusVolumePricing::Engine)
 
-# From: https://github.com/thoughtbot/shoulda-matchers/issues/384
-Shoulda::Matchers.configure do |config|
-  config.integrate do |with|
-    with.test_framework :rspec
-    with.library :rails
-  end
+RSpec.configure do |config|
+  config.infer_spec_type_from_file_location!
+  config.use_transactional_fixtures = false
 end
-
-Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |file| require file }

data/spec/support/shoulda.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'shoulda-matchers'
+
+# From: https://github.com/thoughtbot/shoulda-matchers/issues/384
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end

metadata

@@ -1,93 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: solidus_volume_pricing
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Sean Schofield
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: solidus_core
+  name: solidus_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 2.4.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.10
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.10
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 2.4.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: ffaker
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.32.1
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,172 +59,130 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: factory_girl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.5'
-- !ruby/object:Gem::Dependency
-  name: pry-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 2.4.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
+        version: '4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: solidus_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
+        version: '0.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: '0'
 description: Allow prices to be configured in quantity ranges for each variant
 email: sean@railsdog.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".gem_release.yml"
+- ".github/dependabot.yml"
+- ".github/stale.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
-- CONTRIBUTING.md
+- ".rubocop_todo.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
-- LICENSE.md
+- LICENSE
 - README.md
 - Rakefile
 - app/assets/javascripts/spree/backend/solidus_volume_pricing.js
-- app/controllers/spree/admin/variants_controller_decorator.rb
 - app/controllers/spree/admin/volume_price_models_controller.rb
 - app/controllers/spree/admin/volume_prices_controller.rb
-- app/helpers/spree/base_helper_decorator.rb
-- app/models/spree/line_item_decorator.rb
-- app/models/spree/user_decorator.rb
-- app/models/spree/variant_decorator.rb
+- app/decorators/controllers/solidus_volume_pricing/spree/admin/variants_controller_decorator.rb
+- app/decorators/helpers/solidus_volume_pricing/spree/base_helper_decorator.rb
+- app/decorators/models/solidus_volume_pricing/spree/line_item_decorator.rb
+- app/decorators/models/solidus_volume_pricing/spree/variant_decorator.rb
+- app/models/solidus_volume_pricing/price_display.rb
+- app/models/solidus_volume_pricing/pricer.rb
+- app/models/solidus_volume_pricing/pricing_options.rb
 - app/models/spree/volume_price.rb
 - app/models/spree/volume_price_model.rb
-- app/overrides/spree/admin/shared/sub_menu/_configuration/add_volume_price_model_admin_menu_links.html.erb.deface
+- app/overrides/spree/admin/shared/_settings_sub_menu/add_volume_price_model_admin_menu_links.html.erb.deface
 - app/overrides/views_decorator.rb
 - app/views/spree/admin/shared/_vp_product_tab.html.erb
 - app/views/spree/admin/variants/_edit_fields.html.erb
 - app/views/spree/admin/variants/volume_prices.html.erb
 - app/views/spree/admin/volume_price_models/_form.html.erb
 - app/views/spree/admin/volume_price_models/_list.html.erb
+- app/views/spree/admin/volume_price_models/_select.html.erb
 - app/views/spree/admin/volume_price_models/edit.html.erb
 - app/views/spree/admin/volume_price_models/index.html.erb
 - app/views/spree/admin/volume_price_models/new.html.erb
-- app/views/spree/admin/volume_prices/_edit_fields.html.erb
+- app/views/spree/admin/volume_prices/_table.html.erb
 - app/views/spree/admin/volume_prices/_volume_price_fields.html.erb
 - app/views/spree/products/_volume_pricing.html.erb
+- bin/console
 - bin/rails
+- bin/setup
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/pt.yml
@@ -277,27 +199,30 @@ files:
 - lib/generators/solidus_volume_pricing/install/install_generator.rb
 - lib/solidus_volume_pricing.rb
 - lib/solidus_volume_pricing/engine.rb
+- lib/solidus_volume_pricing/range_from_string.rb
+- lib/solidus_volume_pricing/testing_support/factories.rb
 - lib/solidus_volume_pricing/version.rb
 - solidus_volume_pricing.gemspec
 - spec/controllers/spree/admin/variants_controller_spec.rb
-- spec/factories/volume_price_factory.rb
 - spec/features/manage_volume_price_models_feature_spec.rb
 - spec/features/manage_volume_prices_feature_spec.rb
 - spec/helpers/base_helper_spec.rb
+- spec/lib/solidus_volume_pricing/range_from_string_spec.rb
+- spec/models/solidus_volume_pricing/pricer_spec.rb
+- spec/models/solidus_volume_pricing/pricing_options_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/models/spree/variant_spec.rb
 - spec/models/spree/volume_price_spec.rb
 - spec/spec_helper.rb
-- spec/support/capybara.rb
-- spec/support/database_cleaner.rb
-- spec/support/factory_girl.rb
-- spec/support/spree.rb
+- spec/support/shoulda.rb
 homepage: https://github.com/solidusio-contrib/solidus_volume_pricing
 licenses:
-- BSD-3
-metadata: {}
-post_install_message: 
+- BSD-3-Clause
+metadata:
+  homepage_uri: https://github.com/solidusio-contrib/solidus_volume_pricing
+  source_code_uri: https://github.com/solidusio-contrib/solidus_volume_pricing
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -305,31 +230,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- none
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+requirements: []
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Allow prices to be configured in quantity ranges for each variant
 test_files:
 - spec/controllers/spree/admin/variants_controller_spec.rb
-- spec/factories/volume_price_factory.rb
 - spec/features/manage_volume_price_models_feature_spec.rb
 - spec/features/manage_volume_prices_feature_spec.rb
 - spec/helpers/base_helper_spec.rb
+- spec/lib/solidus_volume_pricing/range_from_string_spec.rb
+- spec/models/solidus_volume_pricing/pricer_spec.rb
+- spec/models/solidus_volume_pricing/pricing_options_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/models/spree/variant_spec.rb
 - spec/models/spree/volume_price_spec.rb
 - spec/spec_helper.rb
-- spec/support/capybara.rb
-- spec/support/database_cleaner.rb
-- spec/support/factory_girl.rb
-- spec/support/spree.rb
+- spec/support/shoulda.rb

data/.hound.yml

@@ -1,40 +0,0 @@
----
-# Too picky.
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/AbcSize:
-  Enabled: false
-
-# This should truly be on for well documented gems.
-Style/Documentation:
-  Enabled: false
-
-# Neatly aligned code is too swell.
-Style/SingleSpaceBeforeFirstArg:
-  Enabled: false
-
-# Don't mess with RSpec DSL.
-Style/BlockDelimiters:
-  Exclude:
-    - 'spec/**/*'
-
-# We really like the readability with newline in beginning of classes.
-Style/EmptyLinesAroundBlockBody:
-  Enabled: false
-
-Style/EmptyLinesAroundClassBody:
-  Enabled: false
-
-# It say we should use fail over raise.
-Style/SignalException:
-  Enabled: false
-
-# Use nested module/class definitions instead of compact style.
-# Too high git impact to change this now.
-Style/ClassAndModuleChildren:
-  Enabled: false
-
-# Avoid contradictory style rules by enforce single quotes.
-Style/StringLiterals:
-  EnforcedStyle: single_quotes

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-rvm:
-  - 2.3.3
-sudo: false
-cache: bundler
-only: master
-env:
-  matrix:
-    - SOLIDUS_BRANCH=v1.3 DB=mysql
-    - SOLIDUS_BRANCH=v1.3 DB=postgresql
-    - SOLIDUS_BRANCH=v1.4 DB=mysql
-    - SOLIDUS_BRANCH=v1.4 DB=postgresql

data/CONTRIBUTING.md

@@ -1,81 +0,0 @@
-# Contributing
-
-Spree Reviews is an open source project and we encourage contributions. Please see the [contributors guidelines](http://spreecommerce.com/documentation/contributing_to_spree.html) for more information before contributing.
-
-In the spirit of [free software][1], **everyone** is encouraged to help improve this project.
-
-Here are some ways *you* can contribute:
-
-* by using prerelease versions
-* by reporting [bugs][2]
-* by suggesting new features
-* by writing [translations][3]
-* by writing or editing documentation
-* by writing specifications
-* by writing code (*no patch is too small*: fix typos, add comments, clean up inconsistent whitespace)
-* by refactoring code
-* by resolving [issues][2]
-* by reviewing patches
-
----
-
-## Filing an issue
-
-When filing an issue on this extension, please first do these things:
-
-* Verify you can reproduce this issue in a brand new application.
-* Run through the steps to reproduce the issue again.
-
-In the issue itself please provide:
-
-* A comprehensive list of steps to reproduce the issue.
-* What you're *expecting* to happen compared with what's *actually* happening.
-* The version of Spree *and* the version of Rails.
-* A list of all extensions.
-* Any relevant stack traces ("Full trace" preferred)
-* Your `Gemfile`
-
-In 99% of cases, this information is enough to determine the cause and solution to the problem that is being described.
-
----
-
-## Pull requests
-
-We gladly accept pull requests to fix bugs and, in some circumstances, add new features to this extension.
-
-Here's a quick guide:
-
-1. Fork the repo.
-
-2. Run the tests. We only take pull requests with passing tests, and it's great to know that you have a clean slate.
-
-3. Create new branch then make changes and add tests for your changes. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, we need tests!
-
-4. Push to your fork and submit a pull request. If the changes will apply cleanly to the latest stable branches and master branch, you will only need to submit one pull request.
-
-At this point you're waiting on us. We may suggest some changes or improvements or alternatives.
-
-Some things that will increase the chance that your pull request is accepted, taken straight from the Ruby on Rails guide:
-
-* Use Rails idioms and helpers.
-* Include tests that fail without your code, and pass with it.
-* Update the documentation, the surrounding one, examples elsewhere, guides, whatever is affected by your contribution.
-
----
-
-## TL;DR
-
-* Fork the repo
-* Clone your repo
-* Run `bundle install`
-* Run `bundle exec rake test_app` to create the test application in `spec/dummy`
-* Make your changes
-* Ensure specs pass by running `bundle exec rspec spec`
-* Ensure all syntax ok by running `rubocop .`
-* Submit your pull request
-
-And in case we didn't emphasize it enough: **we love tests!**
-
-[1]: http://www.fsf.org/licensing/essays/free-sw.html
-[2]: https://github.com/solidusio-contrib/solidus_volume_pricing/issues
-[3]: https://github.com/solidusio-contrib/solidus_volume_pricing/tree/master/config/locales

data/app/controllers/spree/admin/variants_controller_decorator.rb

@@ -1,32 +0,0 @@
-Spree::Admin::VariantsController.class_eval do
-
-  def edit
-    @variant.volume_prices.build if @variant.volume_prices.empty?
-    super
-  end
-
-  def volume_prices
-    @product = @variant.product
-    @variant.volume_prices.build if @variant.volume_prices.empty?
-  end
-
-  private
-
-  # this loads the variant for the master variant volume price editing
-  def load_resource_instance
-    parent
-
-    if new_actions.include?(params[:action].to_sym)
-      build_resource
-    elsif params[:id]
-      Spree::Variant.find(params[:id])
-    end
-  end
-
-  def location_after_save
-    if @product.master.id == @variant.id && params[:variant].key?(:volume_prices_attributes)
-      return volume_prices_admin_product_variant_url(@product, @variant)
-    end
-    super
-  end
-end

data/app/helpers/spree/base_helper_decorator.rb

@@ -1,19 +0,0 @@
-Spree::BaseHelper.class_eval do
-  def display_volume_price(variant, quantity = 1, user = nil)
-    Spree::Money.new(
-      variant.volume_price(quantity, user),
-      currency: Spree::Config[:currency]
-    ).to_html
-  end
-
-  def display_volume_price_earning_percent(variant, quantity = 1, user = nil)
-    variant.volume_price_earning_percent(quantity, user).round.to_s
-  end
-
-  def display_volume_price_earning_amount(variant, quantity = 1, user = nil)
-    Spree::Money.new(
-      variant.volume_price_earning_amount(quantity, user),
-      currency: Spree::Config[:currency]
-    ).to_html
-  end
-end

data/app/models/spree/line_item_decorator.rb

@@ -1,13 +0,0 @@
-module Spree
-  module LineItemPriceUpdater
-    def set_pricing_attributes
-      super
-
-      if quantity_changed?
-        self.price = variant.volume_price(quantity, order.user)
-      end
-    end
-  end
-end
-
-Spree::LineItem.prepend(Spree::LineItemPriceUpdater)