effective_orders 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ec2b7db0f986ae5f26513e93e940bbf6daad8fd
-  data.tar.gz: e10dd21a55398487ab2460f14b74008a7d54ba20
+  metadata.gz: 087ee5d1dd1c2882afcbe2f455c21b9c9a88fb84
+  data.tar.gz: c51480679d42773312d8fd384515f3ca302dfaf2
 SHA512:
-  metadata.gz: a5e492bd4496e236c506b7b2656a0506100044c10f5c79b7c079da96c6e5a74c2b9b4020c8c66397d61ed94a0c1941f6c980231eca0bb2b41ae07cff3bc396f7
-  data.tar.gz: a2d8b2c04e632ddd1b61680e339fdd0a57356a33ff90ca02c17c82222028b0398806f7933b9e1c9d4efd41ba7f82fe45d6b4f209e006d77adcd7793345321de2
+  metadata.gz: ae149e37f2810d9dea9cb2c2177e2349f7addd84cc53d3350836f2605c84ec958e8d5691750785aa7a3f3e247e3302756663e73bd205712d86f6d8cd01c641b5
+  data.tar.gz: f52633ba98f00efe3c71740f7385106a9e557fbc3773d0f2c372a677ad1ff668585022ad3d7da952a2172e290bb9109e7295cb0a908146215dfbff248fb4aac0

data/README.md

@@ -26,7 +26,7 @@ Please first install the [effective_addresses](https://github.com/code-and-effec
 Add to your Gemfile:
 
 ```ruby
-gem 'effective_orders'
+gem 'effective_orders', '~> 3.0'
 ```
 
 Run the bundle command to install it:

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,154 +86,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: effective_datatables
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: stripe-ruby-mock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.4
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: effective_obfuscation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Quickly build an online store with carts, orders, automatic email receipts
   and payment collection via Stripe, StripeConnect, PayPal and Moneris.
 email:
@@ -376,67 +250,6 @@ files:
 - lib/generators/effective_orders/install_generator.rb
 - lib/generators/templates/effective_orders_mailer_preview.rb
 - lib/tasks/effective_orders_tasks.rake
-- spec/controllers/admin/orders_controller_spec.rb
-- spec/controllers/carts_controller_spec.rb
-- spec/controllers/ccbill_orders_controller_spec.rb
-- spec/controllers/moneris_orders_controller_spec.rb
-- spec/controllers/orders_controller_spec.rb
-- spec/controllers/stripe_orders_controller_spec.rb
-- spec/controllers/webhooks_controller_spec.rb
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/product.rb
-- spec/dummy/app/models/product_with_float_price.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/devise.rb
-- spec/dummy/config/initializers/effective_addresses.rb
-- spec/dummy/config/initializers/effective_orders.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/simple_form.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/fixtures/stripe_webhooks/invoice.payment_succeeded.without_renewals.json
-- spec/helpers/effective_orders_helper_spec.rb
-- spec/models/acts_as_purchasable_spec.rb
-- spec/models/customer_spec.rb
-- spec/models/factories_spec.rb
-- spec/models/order_item_spec.rb
-- spec/models/order_spec.rb
-- spec/models/stripe_charge_spec.rb
-- spec/models/subscription_spec.rb
-- spec/spec_helper.rb
-- spec/support/factories.rb
 homepage: https://github.com/code-and-effect/effective_orders
 licenses:
 - MIT
@@ -457,70 +270,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Quickly build an online store with carts, orders, automatic email receipts
   and payment collection via Stripe, StripeConnect, PayPal and Moneris.
-test_files:
-- spec/controllers/admin/orders_controller_spec.rb
-- spec/controllers/carts_controller_spec.rb
-- spec/controllers/ccbill_orders_controller_spec.rb
-- spec/controllers/moneris_orders_controller_spec.rb
-- spec/controllers/orders_controller_spec.rb
-- spec/controllers/stripe_orders_controller_spec.rb
-- spec/controllers/webhooks_controller_spec.rb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/product.rb
-- spec/dummy/app/models/product_with_float_price.rb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/devise.rb
-- spec/dummy/config/initializers/effective_addresses.rb
-- spec/dummy/config/initializers/effective_orders.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/simple_form.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/config.ru
-- spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
-- spec/dummy/README.rdoc
-- spec/fixtures/stripe_webhooks/invoice.payment_succeeded.without_renewals.json
-- spec/helpers/effective_orders_helper_spec.rb
-- spec/models/acts_as_purchasable_spec.rb
-- spec/models/customer_spec.rb
-- spec/models/factories_spec.rb
-- spec/models/order_item_spec.rb
-- spec/models/order_spec.rb
-- spec/models/stripe_charge_spec.rb
-- spec/models/subscription_spec.rb
-- spec/spec_helper.rb
-- spec/support/factories.rb
+test_files: []

data/spec/controllers/admin/orders_controller_spec.rb

@@ -1,243 +0,0 @@
-require 'spec_helper'
-
-describe Admin::OrdersController, type: :controller do
-  routes { EffectiveOrders::Engine.routes }
-
-  let!(:user1) { FactoryGirl.create(:user, email: 'bbb@example.com') }
-  let!(:user2) { FactoryGirl.create(:user, email: 'ccc@example.com') }
-  let!(:user3) { FactoryGirl.create(:user, email: 'aaa@example.com') }
-  let(:cart) { FactoryGirl.create(:cart, user: user1) }
-
-  before { sign_in cart.user }
-
-  describe 'GET #new' do
-    it 'should render admin new order page successfully' do
-      get :new
-
-      expect(response).to be_successful
-      expect(response).to render_template :new
-      expect(assigns(:order)).to be_an Effective::Order
-      expect(assigns(:order)).to be_new_record
-      expect(assigns(:page_title)).to eq 'New Order'
-    end
-  end
-
-  describe 'POST #create' do
-    let(:user1) { FactoryGirl.create(:user, email: 'bbb@example.com', billing_address: FactoryGirl.create(:address), shipping_address: FactoryGirl.create(:address)) }
-
-    context 'when success' do
-      let(:order_params) { { effective_order: { user_id: user1.id, order_items_attributes: { '0' => { purchasable_attributes: { title: 'test product 1', price: '10000', tax_exempt: '1' }, quantity: '2', '_destroy' => 'false' }, '1' => { purchasable_attributes: { title: 'test product 2', price: '30000', tax_exempt: '0' }, quantity: '3', '_destroy' => 'false' } }, send_payment_request_to_buyer: '1' } } }
-
-      shared_context 'creates objects in db correctly' do
-        it 'should create new custom order with pending state' do
-          expect { post :create, order_params.merge(commit: button_pressed) }.to change { Effective::Order.count }.from(0).to(1)
-
-          expect(assigns(:order)).to be_persisted
-          expect(assigns(:order).pending?).to be_truthy
-          expect(assigns(:order).user).to eq user1
-          expect(assigns(:order).billing_address).to eq user1.billing_address
-          expect(assigns(:order).shipping_address).to eq user1.shipping_address
-
-          expect(assigns(:order).order_items.count).to eq 2
-
-          first_item = assigns(:order).order_items.sort.first
-          expect(first_item).to be_persisted
-          expect(first_item.title).to eq 'test product 1'
-          expect(first_item.quantity).to eq 2
-          expect(first_item.price).to eq 10000
-          expect(first_item.tax_exempt).to be_truthy
-
-          second_item = assigns(:order).order_items.sort.last
-          expect(second_item).to be_persisted
-          expect(second_item.title).to eq 'test product 2'
-          expect(second_item.quantity).to eq 3
-          expect(second_item.price).to eq 30000
-          expect(second_item.tax_exempt).to be_falsey
-        end
-
-        it 'should create new effective products' do
-          expect { post :create, order_params.merge(commit: button_pressed) }.to change { Effective::Product.count }.from(0).to(2)
-
-          first_product = Effective::Product.all.sort.first
-          expect(first_product.title).to eq 'test product 1'
-          expect(first_product.price).to eq 10000
-
-          second_product = Effective::Product.all.sort.last
-          expect(second_product.title).to eq 'test product 2'
-          expect(second_product.price).to eq 30000
-        end
-      end
-
-      context 'when "Save" button is pressed' do
-        let(:button_pressed) { 'Save' }
-
-        it_should_behave_like 'creates objects in db correctly'
-
-        it 'should redirect to admin orders index page with success message' do
-          post :create, order_params.merge(commit: button_pressed)
-
-          expect(response).to be_redirect
-          expect(response).to redirect_to EffectiveOrders::Engine.routes.url_helpers.admin_order_path(assigns(:order))
-          expect(flash[:success]).to eq "Successfully created order. #{assigns(:order).user.email} has been sent a request for payment."
-        end
-      end
-
-      context 'when "Save and Add New" button is pressed' do
-        let(:button_pressed) { 'Save and Add New' }
-
-        it_should_behave_like 'creates objects in db correctly'
-
-        it 'should redirect to admin new order page with success message' do
-          post :create, order_params.merge(commit: button_pressed)
-
-          expect(response).to be_redirect
-          expect(response).to redirect_to EffectiveOrders::Engine.routes.url_helpers.new_admin_order_path(user_id: 1)
-          expect(flash[:success]).to eq "Successfully created order. #{assigns(:order).user.email} has been sent a request for payment."
-        end
-      end
-    end
-
-    context 'when failed' do
-      let(:order_params) { { effective_order: { user_id: user1.id, order_items_attributes: { '0' => { purchasable_attributes: { title: 'test product 1', price: '0', tax_exempt: '1' }, quantity: '2', '_destroy' => 'false' } } } } }
-
-      shared_context 'does not create objects in db and redirects to admin new order page with danger message' do
-        it 'should not create order' do
-          expect { post :create, order_params.merge(commit: button_pressed) }.not_to change { Effective::Order.count }
-
-          expect(assigns(:order)).to be_new_record
-          expect(assigns(:order).valid?).to be_falsey
-          expect(assigns(:order).pending?).to be_truthy
-          expect(assigns(:order).user).to eq user1
-          expect(assigns(:order).billing_address).to eq user1.billing_address
-          expect(assigns(:order).shipping_address).to eq user1.shipping_address
-
-          expect(assigns(:order).order_items.to_a.count).to eq 1
-
-          item = assigns(:order).order_items.first
-          expect(item).to be_new_record
-          expect(item.valid?).to be_falsey
-          expect(item.title).to eq 'test product 1'
-          expect(item.quantity).to eq 2
-          expect(item.price).to eq 0
-          expect(item.tax_exempt).to be_truthy
-        end
-
-        it 'should not create product' do
-          expect { post :create, order_params.merge(commit: button_pressed) }.not_to change { Effective::Product.count }
-        end
-
-        it 'should render admin new order page with danger message' do
-          post :create, order_params.merge(commit: button_pressed)
-
-          expect(response).to be_successful
-          expect(response).to render_template :new
-          expect(assigns(:page_title)).to eq 'New Order'
-          expect(flash[:danger].to_s.include?('Unable to create order')).to eq true
-        end
-      end
-
-      context 'when "Save" button is pressed' do
-        let(:button_pressed) { 'Save' }
-
-        it_should_behave_like 'does not create objects in db and redirects to admin new order page with danger message'
-      end
-
-      context 'when "Save and Add New" button is pressed' do
-        let(:button_pressed) { 'Save and Add New' }
-
-        it_should_behave_like 'does not create objects in db and redirects to admin new order page with danger message'
-      end
-    end
-  end
-
-  # This was changed to be a GET -> POST form, but it hasn't been updated in the test yet
-  # describe 'POST #mark_as_paid' do
-  #   let(:order) { FactoryGirl.create(:pending_order) }
-
-  #   before { request.env['HTTP_REFERER'] = 'where_i_came_from' }
-
-  #   context 'when success' do
-  #     it 'should update order state and redirect to orders admin index page with success message' do
-  #       post :mark_as_paid, id: order.to_param
-
-  #       expect(response).to be_redirect
-  #       expect(response).to redirect_to EffectiveOrders::Engine.routes.url_helpers.admin_order_path(assigns(:order))
-  #       expect(assigns(:order)).to eq order
-  #       expect(assigns(:order).purchased?).to be_truthy
-  #       expect(assigns(:order).payment).to eq(details: 'Marked as paid by admin')
-  #       expect(flash[:success]).to eq 'Order marked as paid successfully'
-  #     end
-  #   end
-
-  #   context 'when failed' do
-  #     before { Effective::Order.any_instance.stub(:purchase!).and_return(false) }
-
-  #     it 'should redirect back with danger message' do
-  #       post :mark_as_paid, id: order.to_param
-
-  #       expect(response).to be_redirect
-  #       expect(response).to redirect_to 'where_i_came_from'
-  #       expect(assigns(:order)).to eq order
-  #       expect(assigns(:order).purchased?).to be_falsey
-  #       expect(flash[:danger]).to eq 'Unable to mark order as paid'
-  #     end
-  #   end
-  # end
-
-  describe 'POST #send_payment_request' do
-    let(:user) { FactoryGirl.create(:user, email: 'user@example.com') }
-    let(:order) { FactoryGirl.create(:order, user: user) }
-
-    context 'when success' do
-      before { Effective::Order.any_instance.should_receive(:send_payment_request_to_buyer!).once.and_return(true) }
-
-      context 'when referrer page is present' do
-        before { request.env['HTTP_REFERER'] = 'where_i_came_from' }
-
-        it 'should redirect to previous page with success message' do
-          post :send_payment_request, id: order.to_param
-
-          expect(response).to be_redirect
-          expect(response).to redirect_to 'where_i_came_from'
-          expect(flash[:success]).to eq 'Successfully sent payment request to user@example.com'
-        end
-      end
-
-      context 'when referrer page is not present' do
-        it 'should redirect to admin order show page with success message' do
-          post :send_payment_request, id: order.to_param
-
-          expect(response).to be_redirect
-          expect(response).to redirect_to EffectiveOrders::Engine.routes.url_helpers.admin_order_path(order)
-          expect(flash[:success]).to eq 'Successfully sent payment request to user@example.com'
-        end
-      end
-    end
-
-    context 'when failed' do
-      before { Effective::Order.any_instance.should_receive(:send_payment_request_to_buyer!).once.and_return(false) }
-
-      context 'when referrer page is present' do
-        before { request.env['HTTP_REFERER'] = 'where_i_came_from' }
-
-        it 'should redirect to previous page with danger message' do
-          post :send_payment_request, id: order.to_param
-
-          expect(response).to be_redirect
-          expect(response).to redirect_to 'where_i_came_from'
-          expect(flash[:danger]).to eq 'Unable to send payment request'
-        end
-      end
-
-      context 'when referrer page is not present' do
-        it 'should redirect to admin order show page with danger message' do
-          post :send_payment_request, id: order.to_param
-
-          expect(response).to be_redirect
-          expect(response).to redirect_to EffectiveOrders::Engine.routes.url_helpers.admin_order_path(order)
-          expect(flash[:danger]).to eq 'Unable to send payment request'
-        end
-      end
-    end
-  end
-end