op_cart 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a055877b518c695c504b0910b9ee3b53d7dee695
-  data.tar.gz: b09e9b447b40d0185ef69a7f108a2807798ae29e
+  metadata.gz: 695ceaa47d75df3df79ef2d8049909b2cd605662
+  data.tar.gz: edfc90597c37f748372219b032568a26d17012c0
 SHA512:
-  metadata.gz: de05c032008bf45018a3e243bfa6dea54f4dae090fcce0213625b60c8bcffa1f661af8a1a983674cd41373c00e7ba7a43930db10dad57d5cb01b7a733164a7da
-  data.tar.gz: 8fe5ab19e078945cfe0b34b1ddbd062a26718a9390f3b71058ef4489fcfd4005e1e41ed7e4f2b324b4c7b5ff8469e39688c76c4d79d6f23ed27c00d6f705f486
+  metadata.gz: b9f7d545228109490cb3a503023943b4ae6a5dcf196eca748609af70a633fb4c229251570e7b723a9fea78f1eb369c713ac0c31cdf51b98f78eb89e094bba267
+  data.tar.gz: 88aa09d43bea2327481b99d933ac087a8093c2e857a22e0b0bf2bb6a253df0208565d43ac1958a6c556e320212230df1e35856c22f7a2383d343a824293a9a6a

data/app/controllers/op_cart/orders_controller.rb

@@ -105,7 +105,7 @@ module OpCart
 
     def add_shipping_address
       @order.shipping_address = @shipping_address = ShippingAddress.new(
-        shipping_address_params.merge user_id: @user.try(:id)
+        shipping_address_params.merge user: @user
       )
     end
   end

data/app/models/op_cart/order.rb

@@ -1,6 +1,7 @@
 module OpCart
   class Order < ActiveRecord::Base
     has_many :line_items
+    has_many :subscriptions
     belongs_to :shipping_address
     belongs_to :user
 
@@ -19,6 +20,7 @@ module OpCart
     before_validation :set_total
     before_validation -> { self.status = :pending }, unless: :status?
     before_save :charge_customer, if: -> { self.status == 'pending' }
+    before_create :create_subscriptions
 
     private
 
@@ -40,10 +42,9 @@ module OpCart
     end
 
     def charge_customer
-      customer = Customer.find_or_create_by user: user
       if processor_token.present?
         customer.update_card processor_token
-        processor_token = nil
+        self.processor_token = nil
       end
 
       self.processor_response = Stripe::Charge.create(
@@ -53,6 +54,7 @@ module OpCart
       ).to_hash
       self.status = :paid if processor_response['captured']
     rescue Stripe::InvalidRequestError, Stripe::CardError => e
+      self.processor_token = nil
       if e.try(:code) == 'card_declined'
         self.status = :payment_declined
       end
@@ -68,5 +70,17 @@ module OpCart
       self.errors.add :card_error, (message || e.message)
       false
     end
+
+    def create_subscriptions
+      line_items.each do |li|
+        if li.sellable.is_a? Plan
+          subscriptions.new customer: customer, plan: li.sellable, quantity: li.quantity
+        end
+      end
+    end
+
+    def customer
+      @customer ||= Customer.find_or_create_by user: user
+    end
   end
 end

data/app/models/op_cart/subscription.rb

@@ -0,0 +1,66 @@
+module OpCart
+  class Subscription < ActiveRecord::Base
+    belongs_to :plan
+    belongs_to :order
+    belongs_to :customer
+
+    before_validation -> { self.status = :pending }, unless: :status?
+    before_validation -> { self.quantity = 1 }, unless: :quantity?
+    before_validation :create_subscription, on: :create
+    before_validation :update_subscription, on: :update
+
+    validates :processor_token, uniqueness: true, presence: true
+    validates :status, presence: true
+    validates :quantity, numericality: { only_integer: true, greater_than: 0 }
+    validates :started_at, presence: true
+    validates :plan, :order, :customer, presence: true
+
+    def processor_object
+      @processor_object ||= customer.processor_object.subscriptions.retrieve processor_token
+    rescue Stripe::InvalidRequestError => e
+      raise e unless e.message.include? 'does not have subscription'
+    end
+
+    private
+
+    def create_subscription
+      subscriptions_attributes = { plan: plan.processor_token, quantity: quantity }
+      subscriptions_attributes[:trial_end] = trial_ended_at.to_i if trial_ended_at
+      update_local_object customer.processor_object.subscriptions.create(subscriptions_attributes)
+    rescue Stripe::InvalidRequestError => e
+      if e.param
+        self.errors.add e.param, e.message
+      else
+        self.errors.add :base, e.message
+      end
+      false
+    end
+
+    def update_subscription
+      subscriptions_attributes = {}
+      subscriptions_attributes[:quantity] = quantity if quantity_changed?
+      subscriptions_attributes[:trial_end] = trial_ended_at.to_i if trial_ended_at_changed?
+      subscriptions_attributes[:plan] = plan.processor_token if plan_id_changed?
+      update_local_object customer.processor_object.subscriptions.create(subscriptions_attributes)
+    rescue Stripe::InvalidRequestError => e
+      if e.param
+        self.errors.add e.param, e.message
+      else
+        self.errors.add :base, e.message
+      end
+      false
+    end
+
+    def update_local_object subscription=processor_object
+      self.processor_token = subscription.id
+      self.status = subscription.status
+      self.quantity = subscription.quantity
+      self.started_at = Time.at subscription.start
+      self.canceled_at = Time.at subscription.canceled_at if subscription.canceled_at
+      self.ended_at = Time.at subscription.ended_at if subscription.ended_at
+      self.trial_started_at = Time.at subscription.trial_start if subscription.trial_start
+      self.trial_ended_at = Time.at subscription.trial_end if subscription.trial_end
+      self.plan = Plan.find_by! processor_token: subscription.plan.id
+    end
+  end
+end

data/db/migrate/20150205220423_create_op_cart_subscriptions.rb

@@ -0,0 +1,19 @@
+class CreateOpCartSubscriptions < ActiveRecord::Migration
+  def change
+    create_table :op_cart_subscriptions do |t|
+      t.string :processor_token
+      t.string :status
+      t.integer :quantity
+      t.datetime :started_at
+      t.datetime :canceled_at
+      t.datetime :ended_at
+      t.datetime :trial_started_at
+      t.datetime :trial_ended_at
+      t.references :plan, index: true
+      t.references :order, index: true
+      t.references :customer, index: true
+
+      t.timestamps null: false
+    end
+  end
+end

data/db/seeds.rb

@@ -1,3 +1,13 @@
+shipping_address1_attrs = {
+  full_name: User.first.name,
+  street: '123 N 4th',
+  locality: 'New York',
+  region: 'New York',
+  postal_code: '12345',
+  user: User.first,
+}
+shipping_address1 = OpCart::ShippingAddress.where(street: shipping_address1_attrs[:street]).first_or_create! shipping_address1_attrs
+
 product1_attrs = {
              name: 'Device 3000',
       description: 'The original Device 3000',
@@ -7,8 +17,7 @@ product1_attrs = {
      charge_taxes: true,
              user: User.first,
 }
-
-product1 = OpCart::Product.where(sku: product1_attrs[:sku]).first_or_create product1_attrs
+product1 = OpCart::Product.where(sku: product1_attrs[:sku]).first_or_create! product1_attrs
 
 product2_attrs = {
              name: 'Device 9000',
@@ -19,8 +28,7 @@ product2_attrs = {
      charge_taxes: true,
              user: User.first,
 }
-
-product2 = OpCart::Product.where(sku: product2_attrs[:sku]).first_or_create product2_attrs
+product2 = OpCart::Product.where(sku: product2_attrs[:sku]).first_or_create! product2_attrs
 
 rand_plan_no = rand 10**9
 plan1_attrs = {
@@ -35,8 +43,7 @@ plan1_attrs = {
   allow_purchases: true,
   user: User.first,
 }
-
-plan1 = OpCart::Plan.where(name: plan1_attrs[:name]).first_or_create plan1_attrs
+plan1 = OpCart::Plan.where(name: plan1_attrs[:name]).first_or_create! plan1_attrs
 
 plan_addon1_attrs = {
   recurring: false,
@@ -44,5 +51,10 @@ plan_addon1_attrs = {
   plan: plan1,
   user: User.first,
 }
+plan_addon1 = OpCart::PlanAddon.first_or_create! plan_addon1_attrs
 
-plan_addon1 = OpCart::PlanAddon.first_or_create plan_addon1_attrs
+token1 = Stripe::Token.create card: { number: '4'+'1'*15, exp_month: 1, exp_year: 2031, cvc: 123 }
+order1 = OpCart::Order.first || OpCart::Order.new(user: User.first, shipping_address: shipping_address1, processor_token: token1.id)
+order1.line_items << OpCart::LineItem.new(sellable: plan1, quantity: 1)
+order1.line_items << OpCart::LineItem.new(sellable: plan_addon1.product, quantity: 1)
+order1.save!

data/lib/op_cart/version.rb

@@ -1,3 +1,3 @@
 module OpCart
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/dummy/log/development.log

@@ -0,0 +1,59 @@
+   (22.3ms)  CREATE TABLE "schema_migrations" ("version" character varying NOT NULL) 
+   (2.1ms)  CREATE UNIQUE INDEX  "unique_schema_migrations" ON "schema_migrations"  ("version")
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateOpCartProducts (20140829191646)
+   (0.3ms)  BEGIN
+   (30.8ms)  CREATE TABLE "op_cart_products" ("id" serial primary key, "name" character varying NOT NULL, "description" text NOT NULL, "sku" character varying, "image_url" character varying, "price" integer NOT NULL, "allow_purchases" boolean DEFAULT 'f', "charge_taxes" boolean DEFAULT 'f', "user_id" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (1.4ms)  CREATE  INDEX  "index_op_cart_products_on_user_id" ON "op_cart_products"  ("user_id")
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20140829191646"]]
+   (7.3ms)  COMMIT
+Migrating to CreateOpCartOrders (20140829200318)
+   (10.9ms)  BEGIN
+   (5.5ms)  CREATE TABLE "op_cart_orders" ("id" serial primary key, "total" integer NOT NULL, "tax_amount" integer DEFAULT 0, "status" character varying NOT NULL, "processor_response" json NOT NULL, "shipping_address_id" integer NOT NULL, "user_id" integer NOT NULL, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (1.5ms)  CREATE  INDEX  "index_op_cart_orders_on_shipping_address_id" ON "op_cart_orders"  ("shipping_address_id")
+   (1.4ms)  CREATE  INDEX  "index_op_cart_orders_on_user_id" ON "op_cart_orders"  ("user_id")
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20140829200318"]]
+   (0.5ms)  COMMIT
+Migrating to CreateOpCartLineItems (20140829201756)
+   (0.3ms)  BEGIN
+  SQL (26.9ms)  CREATE EXTENSION IF NOT EXISTS "hstore"
+   (4.8ms)  CREATE TABLE "op_cart_line_items" ("id" serial primary key, "unit_price" integer NOT NULL, "quantity" integer NOT NULL, "sellable_snapshot" hstore NOT NULL, "sellable_id" integer NOT NULL, "sellable_type" character varying NOT NULL, "order_id" integer NOT NULL, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (1.4ms)  CREATE  INDEX  "index_op_cart_line_items_on_sellable_type_and_sellable_id" ON "op_cart_line_items"  ("sellable_type", "sellable_id")
+   (1.1ms)  CREATE  INDEX  "index_op_cart_line_items_on_order_id" ON "op_cart_line_items"  ("order_id")
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20140829201756"]]
+   (1.7ms)  COMMIT
+Migrating to CreateOpCartShippingAddresses (20150125000000)
+   (0.4ms)  BEGIN
+   (4.2ms)  CREATE TABLE "op_cart_shipping_addresses" ("id" serial primary key, "full_name" character varying NOT NULL, "street" character varying NOT NULL, "street_2" character varying, "locality" character varying NOT NULL, "region" character varying NOT NULL, "postal_code" character varying NOT NULL, "user_id" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (1.2ms)  CREATE  INDEX  "index_op_cart_shipping_addresses_on_user_id" ON "op_cart_shipping_addresses"  ("user_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20150125000000"]]
+   (0.4ms)  COMMIT
+Migrating to CreateOpCartCustomers (20150131000000)
+   (0.3ms)  BEGIN
+   (5.3ms)  CREATE TABLE "op_cart_customers" ("id" serial primary key, "processor_token" character varying, "delinquent" boolean DEFAULT 'f', "default_card_id" integer, "user_id" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (0.8ms)  CREATE  INDEX  "index_op_cart_customers_on_default_card_id" ON "op_cart_customers"  ("default_card_id")
+   (1.1ms)  CREATE  INDEX  "index_op_cart_customers_on_user_id" ON "op_cart_customers"  ("user_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20150131000000"]]
+   (0.3ms)  COMMIT
+Migrating to CreateOpCartCards (20150131000001)
+   (0.3ms)  BEGIN
+   (5.1ms)  CREATE TABLE "op_cart_cards" ("id" serial primary key, "processor_token" character varying, "fingerprint" character varying, "last4" character varying, "brand" character varying, "exp_month" character varying, "exp_year" character varying, "customer_id" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (1.0ms)  CREATE  INDEX  "index_op_cart_cards_on_processor_token" ON "op_cart_cards"  ("processor_token")
+   (1.2ms)  CREATE  INDEX  "index_op_cart_cards_on_fingerprint" ON "op_cart_cards"  ("fingerprint")
+   (1.5ms)  CREATE  INDEX  "index_op_cart_cards_on_customer_id" ON "op_cart_cards"  ("customer_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ($1)  [["version", "20150131000001"]]
+   (0.5ms)  COMMIT
+Migrating to CreateOpCartPlans (20150201033629)
+   (0.4ms)  BEGIN
+   (6.2ms)  CREATE TABLE "op_cart_plans" ("id" serial primary key, "processor_token" character varying, "name" character varying NOT NULL, "description" character varying, "image_url" character varying, "price" integer, "interval_count" integer, "interval" character varying, "trial_period_days" integer, "allow_purchases" boolean DEFAULT 'f', "user_id" integer, "created_at" timestamp NOT NULL, "updated_at" timestamp NOT NULL) 
+   (1.3ms)  CREATE  INDEX  "index_op_cart_plans_on_user_id" ON "op_cart_plans"  ("user_id")
+   (7.5ms)  ALTER TABLE "op_cart_plans" ADD CONSTRAINT "fk_rails_f7712cb323"
+FOREIGN KEY ("user_id")
+  REFERENCES "users" ("id")
+
+PG::UndefinedTable: ERROR:  relation "users" does not exist
+: ALTER TABLE "op_cart_plans" ADD CONSTRAINT "fk_rails_f7712cb323"
+FOREIGN KEY ("user_id")
+  REFERENCES "users" ("id")
+
+   (0.2ms)  ROLLBACK

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: op_cart
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Eric Boehs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,6 +87,7 @@ files:
 - app/models/op_cart/plan_addon.rb
 - app/models/op_cart/product.rb
 - app/models/op_cart/shipping_address.rb
+- app/models/op_cart/subscription.rb
 - config/initializers/stripe.rb
 - config/locales/op_cart.en.yml
 - config/routes.rb
@@ -98,6 +99,7 @@ files:
 - db/migrate/20150131000001_create_op_cart_cards.rb
 - db/migrate/20150201033629_create_op_cart_plans.rb
 - db/migrate/20150203043805_create_op_cart_plan_addons.rb
+- db/migrate/20150205220423_create_op_cart_subscriptions.rb
 - db/seeds.rb
 - lib/op_cart.rb
 - lib/op_cart/engine.rb
@@ -133,6 +135,7 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
+- test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
@@ -199,6 +202,7 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
 - test/dummy/config.ru
+- test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html