effective_orders 1.8.1 → 2.0.0

data/spec/models/stripe_charge_spec.rb

@@ -1,28 +1,28 @@
 require 'spec_helper'
 
 # # Attributes
-describe Effective::StripeCharge do
+describe Effective::Providers::StripeCharge do
   let(:order) { FactoryGirl.create(:order_with_subscription) }
-  let(:charge) { Effective::StripeCharge.new(order) }
+  let(:charge) { Effective::Providers::StripeCharge.new(order) }
 
   before { StripeMock.start }
   after { StripeMock.stop }
 
   it 'can be initialized with an order' do
-    charge = Effective::StripeCharge.new(order)
+    charge = Effective::Providers::StripeCharge.new(order)
     charge.order.should eq order
     charge.effective_order_id.should eq order.to_param
   end
 
   it 'can be initialized without an order' do
-    charge = Effective::StripeCharge.new(:token => 'tok_123', :effective_order_id => 3)
+    charge = Effective::Providers::StripeCharge.new(:token => 'tok_123', :effective_order_id => 3)
     charge.token.should eq 'tok_123'
     charge.effective_order_id.should eq 3
     charge.order.nil?.should eq true
   end
 
   it 'performs validations' do
-    charge = Effective::StripeCharge.new()
+    charge = Effective::Providers::StripeCharge.new()
     charge.valid?.should eq false
     charge.errors[:token].present?.should eq true
     charge.errors[:effective_order_id].present?.should eq true

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rspec/rails'
 require 'factory_girl_rails'
 require 'stripe_mock'
 require 'pry'
+require 'shoulda-matchers'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -15,6 +16,7 @@ RSpec.configure do |config|
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
   config.include Devise::TestHelpers, :type => :controller
+  config.include Shoulda::Matchers::ActiveModel, :type => :model
 
   Rails.logger.level = 4    # Output only minimal stuff to test.log
 

data/spec/support/factories.rb

@@ -1,14 +1,14 @@
 require 'factory_girl'
 
 FactoryGirl.define do
-  factory :address, :class => Effective::Address do
+  factory :address, class: Effective::Address do
     category 'billing'
     full_name 'Peter Pan'
     sequence(:address1) { |n| "1234#{n} Fake Street" }
-    city 'San Antonio'
-    state_code 'TX'
-    country_code 'US'
-    postal_code '92387'
+    city 'A canadian city'
+    state_code ['AB', 'BC', 'MB', 'NB', 'NL', 'NT', 'NS', 'ON', 'PE', 'QC', 'SK', 'YT', 'NU'].sample
+    country_code 'CA'
+    postal_code 'T5T2T1'
   end
 
   factory :product do # This only exists in the dummy/ app
@@ -33,15 +33,15 @@ FactoryGirl.define do
     after(:build) { |user| user.skip_confirmation! if user.respond_to?(:skip_confirmation!) }
   end
 
-  factory :customer, :class => Effective::Customer do
+  factory :customer, class: Effective::Customer do
     association :user
   end
 
-  factory :subscription, :class => Effective::Subscription do
+  factory :subscription, class: Effective::Subscription do
     association :customer
 
     before(:create) do |subscription|
-      stripe_plan = Stripe::Plan.create(:id => "stripe_plan_#{subscription.object_id}", :name => 'Stripe Plan', :amount => 1000, :currency => 'USD', :interval => 'month')
+      stripe_plan = Stripe::Plan.create(id: "stripe_plan_#{subscription.object_id}", name: 'Stripe Plan', amount: 1000, currency: 'USD', interval: 'month')
       stripe_coupon = FactoryGirl.create(:stripe_coupon)
 
       subscription.stripe_plan_id = stripe_plan.id
@@ -49,73 +49,89 @@ FactoryGirl.define do
     end
   end
 
-  factory :cart, :class => Effective::Cart do
+  factory :cart, class: Effective::Cart do
     association :user
 
     before(:create) do |cart|
-      3.times { cart.cart_items << FactoryGirl.create(:cart_item, :cart => cart) }
+      3.times { cart.cart_items << FactoryGirl.create(:cart_item, cart: cart) }
     end
   end
 
-  factory :cart_item, :class => Effective::CartItem do
-    association :purchasable, :factory => :product
-    association :cart, :factory => :cart
+  factory :cart_item, class: Effective::CartItem do
+    association :purchasable, factory: :product
+    association :cart, factory: :cart
 
     quantity 1
   end
 
-  factory :cart_with_subscription, :class => Effective::Cart do
+  factory :cart_with_subscription, class: Effective::Cart do
     association :user
 
     before(:create) do |cart|
-      cart.cart_items << FactoryGirl.create(:cart_item, :cart => cart)
-      cart.cart_items << FactoryGirl.create(:cart_item, :cart => cart, :purchasable => FactoryGirl.create(:subscription))
+      cart.cart_items << FactoryGirl.create(:cart_item, cart: cart)
+      cart.cart_items << FactoryGirl.create(:cart_item, cart: cart, purchasable: FactoryGirl.create(:subscription))
     end
   end
 
-  factory :order, :class => Effective::Order do
+  factory :cart_with_items, class: Effective::Cart do
+    association :user
+
+    before(:create) do |cart|
+      3.times { cart.cart_items << FactoryGirl.create(:cart_item, cart: cart) }
+    end
+  end
+
+  factory :order, class: Effective::Order do
     association :user
 
     before(:create) do |order|
-      order.billing_address = FactoryGirl.build(:address, :addressable => order)
-      order.shipping_address = FactoryGirl.build(:address, :addressable => order)
+      order.billing_address = FactoryGirl.build(:address, addressable: order)
+      order.shipping_address = FactoryGirl.build(:address, addressable: order)
 
-      3.times { order.order_items << FactoryGirl.create(:order_item, :order => order) }
+      3.times { order.order_items << FactoryGirl.create(:order_item, order: order) }
     end
   end
 
-  factory :order_with_subscription, :class => Effective::Order do
+  factory :order_with_subscription, class: Effective::Order do
     association :user
 
     before(:create) do |order|
-      order.billing_address = FactoryGirl.build(:address, :addressable => order)
-      order.shipping_address = FactoryGirl.build(:address, :addressable => order)
+      order.billing_address = FactoryGirl.build(:address, addressable: order)
+      order.shipping_address = FactoryGirl.build(:address, addressable: order)
 
-      order.order_items << FactoryGirl.create(:order_item, :order => order)
-      order.order_items << FactoryGirl.create(:order_item, :purchasable => FactoryGirl.create(:subscription), :order => order)
+      order.order_items << FactoryGirl.create(:order_item, order: order)
+      order.order_items << FactoryGirl.create(:order_item, purchasable: FactoryGirl.create(:subscription), order: order)
     end
   end
 
-  factory :order_item, :class => Effective::OrderItem do
-    association :purchasable, :factory => :product
-    association :order, :factory => :order
+  factory :order_item, class: Effective::OrderItem do
+    association :purchasable, factory: :product
+    association :order, factory: :order
 
     sequence(:title) { |n| "Order Item #{n}" }
     quantity 1
     price 1000
     tax_exempt false
-    tax_rate 0.05
   end
 
-  factory :purchased_order, :parent => :order do
-    after(:create) { |order| order.purchase!('by a test') }
+  factory :purchased_order, parent: :order do
+    payment_provider 'admin'
+    payment_card 'unknown'
+
+    after(:create) { |order| order.purchase! }
   end
 
-  factory :declined_order, :parent => :order do
+  factory :declined_order, parent: :order do
+    payment_provider 'admin'
+
     after(:create) { |order| order.decline! }
   end
 
-  factory :stripe_coupon, :class => Stripe::Coupon do
+  factory :pending_order, parent: :order do
+    purchase_state 'pending'
+  end
+
+  factory :stripe_coupon, class: Stripe::Coupon do
     to_create {|c| c.save}
     duration 'once'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: devise
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: migrant
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,28 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: effective_obfuscation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: stripe-ruby-mock
   requirement: !ruby/object:Gem::Requirement
@@ -207,47 +193,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
-  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: guard-rspec
-  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: guard-livereload
+  name: effective_obfuscation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -305,9 +263,9 @@ files:
 - active_admin/effective_orders.rb
 - app/assets/images/effective_orders/stripe_connect.png
 - app/assets/javascripts/effective_orders.js
+- app/assets/javascripts/effective_orders/providers/stripe_charges.js.coffee
+- app/assets/javascripts/effective_orders/providers/stripe_subscriptions.js.coffee
 - app/assets/javascripts/effective_orders/shipping_address_toggle.js.coffee
-- app/assets/javascripts/effective_orders/stripe_charges.js.coffee
-- app/assets/javascripts/effective_orders/stripe_subscriptions.js.coffee
 - app/assets/stylesheets/effective_orders.scss
 - app/assets/stylesheets/effective_orders/_order.scss
 - app/controllers/admin/customers_controller.rb
@@ -317,13 +275,17 @@ files:
 - app/controllers/effective/carts_controller.rb
 - app/controllers/effective/orders_controller.rb
 - app/controllers/effective/providers/app_checkout.rb
+- app/controllers/effective/providers/ccbill.rb
+- app/controllers/effective/providers/cheque.rb
 - app/controllers/effective/providers/moneris.rb
 - app/controllers/effective/providers/paypal.rb
+- app/controllers/effective/providers/pretend.rb
 - app/controllers/effective/providers/stripe.rb
 - app/controllers/effective/providers/stripe_connect.rb
 - app/controllers/effective/subscriptions_controller.rb
 - app/controllers/effective/webhooks_controller.rb
 - app/helpers/effective_carts_helper.rb
+- app/helpers/effective_ccbill_helper.rb
 - app/helpers/effective_orders_helper.rb
 - app/helpers/effective_paypal_helper.rb
 - app/helpers/effective_stripe_helper.rb
@@ -338,8 +300,11 @@ files:
 - app/models/effective/datatables/orders.rb
 - app/models/effective/order.rb
 - app/models/effective/order_item.rb
-- app/models/effective/stripe_charge.rb
+- app/models/effective/product.rb
+- app/models/effective/providers/ccbill_postback.rb
+- app/models/effective/providers/stripe_charge.rb
 - app/models/effective/subscription.rb
+- app/models/effective/tax_rate_calculator.rb
 - app/models/inputs/price_field.rb
 - app/models/inputs/price_form_input.rb
 - app/models/inputs/price_formtastic_input.rb
@@ -349,36 +314,50 @@ files:
 - app/views/admin/customers/_actions.html.haml
 - app/views/admin/customers/index.html.haml
 - app/views/admin/order_items/index.html.haml
+- app/views/admin/orders/_actions.html.haml
+- app/views/admin/orders/_form.html.haml
+- app/views/admin/orders/_order_item_fields.html.haml
 - app/views/admin/orders/index.html.haml
+- app/views/admin/orders/new.html.haml
 - app/views/admin/orders/show.html.haml
 - app/views/effective/carts/_cart.html.haml
+- app/views/effective/carts/_cart_actions.html.haml
 - app/views/effective/carts/show.html.haml
-- app/views/effective/orders/_checkout_step_1.html.haml
-- app/views/effective/orders/_checkout_step_2.html.haml
-- app/views/effective/orders/_my_purchases.html.haml
+- app/views/effective/orders/_checkout_step1.html.haml
+- app/views/effective/orders/_checkout_step2.html.haml
 - app/views/effective/orders/_order.html.haml
 - app/views/effective/orders/_order_actions.html.haml
+- app/views/effective/orders/_order_footer.html.haml
 - app/views/effective/orders/_order_header.html.haml
 - app/views/effective/orders/_order_items.html.haml
+- app/views/effective/orders/_order_note.html.haml
+- app/views/effective/orders/_order_note_fields.html.haml
 - app/views/effective/orders/_order_payment_details.html.haml
 - app/views/effective/orders/_order_shipping.html.haml
 - app/views/effective/orders/_order_user_fields.html.haml
+- app/views/effective/orders/_orders_table.html.haml
 - app/views/effective/orders/app_checkout/_form.html.haml
-- app/views/effective/orders/checkout.html.haml
+- app/views/effective/orders/ccbill/_form.html.haml
+- app/views/effective/orders/checkout_step1.html.haml
+- app/views/effective/orders/checkout_step2.html.haml
+- app/views/effective/orders/cheque/_form.html.haml
+- app/views/effective/orders/cheque/pay_by_cheque.html.haml
 - app/views/effective/orders/declined.html.haml
 - app/views/effective/orders/moneris/_form.html.haml
 - app/views/effective/orders/my_purchases.html.haml
 - app/views/effective/orders/my_sales.html.haml
-- app/views/effective/orders/new.html.haml
 - app/views/effective/orders/paypal/_form.html.haml
 - app/views/effective/orders/pretend/_form.html.haml
 - app/views/effective/orders/purchased.html.haml
 - app/views/effective/orders/show.html.haml
 - app/views/effective/orders/stripe/_form.html.haml
 - app/views/effective/orders/stripe/_subscription_fields.html.haml
+- app/views/effective/orders_mailer/order_error.html.haml
 - app/views/effective/orders_mailer/order_receipt_to_admin.html.haml
 - app/views/effective/orders_mailer/order_receipt_to_buyer.html.haml
 - app/views/effective/orders_mailer/order_receipt_to_seller.html.haml
+- app/views/effective/orders_mailer/payment_request_to_buyer.html.haml
+- app/views/effective/orders_mailer/pending_order_invoice_to_buyer.html.haml
 - app/views/effective/subscriptions/index.html.haml
 - app/views/effective/subscriptions/new.html.haml
 - app/views/effective/subscriptions/show.html.haml
@@ -386,6 +365,7 @@ files:
 - config/routes.rb
 - db/migrate/01_create_effective_orders.rb.erb
 - db/upgrade/02_upgrade_effective_orders_from03x.rb.erb
+- db/upgrade/03_upgrade_effective_orders_from1x.rb.erb
 - db/upgrade/upgrade_price_column_on_table.rb.erb
 - lib/effective_orders.rb
 - lib/effective_orders/app_checkout_service.rb
@@ -393,11 +373,14 @@ files:
 - lib/effective_orders/version.rb
 - lib/generators/effective_orders/install_generator.rb
 - lib/generators/effective_orders/upgrade_from03x_generator.rb
+- lib/generators/effective_orders/upgrade_from1x_generator.rb
 - lib/generators/effective_orders/upgrade_price_column_generator.rb
 - lib/generators/templates/README
 - lib/generators/templates/effective_orders.rb
 - lib/generators/templates/effective_orders_mailer_preview.rb
+- 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
@@ -439,7 +422,6 @@ files:
 - 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
@@ -476,13 +458,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.6
 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
@@ -522,7 +506,6 @@ test_files:
 - 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