stripe_saas 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f78175401e2d4cef14fddb9cd43fa524f4bb6fcb
-  data.tar.gz: 2848356cfaa6d9d1ad457b7acf2174094d0f6a35
+  metadata.gz: bf4021227c337b34c71aefdfe939c64b19d4d9ca
+  data.tar.gz: 3034aa654da34ed9aea889dce314a6fe5d2ebc55
 SHA512:
-  metadata.gz: 1f01a1b81fe8e9b988ce7ddb7e1fb8cc27a8eabc0d09209adc232de58014f7fc68f3626a1da36f632c8b6a22df564d8d620de5e2af96221e0111eb517f9780b6
-  data.tar.gz: d626465c96fde60a7c32fd33cb3defa24364a31c3e6ee2534f56f4fec30e75b7f68ee3c3f3e3d43254af651d06f30cd538fd7e44d9d19b91dee31b389ca9c7e7
+  metadata.gz: c77bd85fd0842b18e3bd335924fdbd66ee2ffc888db6baa837e70686d3763dd5d7cfced580130e7da1c9ee551b3d35883f775fb08f01b78f3b9f5601660950a1
+  data.tar.gz: 18a6f2dbff9003d8ae9759d4afff37281c2ea53afe760427d550c42b57a1d2ed7e0f992cff8c24c35a1bb56a283434674a62b5a717d08c736dcc7fe67502c885

data/app/controllers/stripe_saas/subscriptions_controller.rb

@@ -78,9 +78,22 @@ module StripeSaas
     def redirect_to_sign_up
       # this is a Devise default variable and thus should not change its name
       # when we change subscription owners from :user to :company
-      session["user_return_to"] = new_subscription_path(plan: params[:plan])
-      devise_scope = (StripeSaas.devise_scope || StripeSaas.subscriptions_owned_by).to_s
-      redirect_to new_registration_path(devise_scope)
+      begin
+        plan = ::Plan.find(params[:plan])
+      rescue ActiveRecord::RecordNotFound
+        plan = ::Plan.by_stripe_id(params[:plan])
+      end
+
+      if plan
+        unless plan.free?
+          session["user_return_to"] = new_subscription_path(plan: plan)
+        end
+
+        devise_scope = (StripeSaas.devise_scope || StripeSaas.subscriptions_owned_by).to_s
+        redirect_to new_registration_path(devise_scope, plan: plan)
+      else
+        redirect_to new_registration_path
+      end
     end
 
     def index

data/lib/stripe_saas/version.rb

@@ -1,3 +1,3 @@
 module StripeSaas
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/dummy/log/test.log

@@ -3634,3 +3634,29 @@ Migrating to CreatePlanFeatures (20151220161817)
    (3.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150102001930')
    (1.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151220161809')
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (1.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (3.3ms)  CREATE TABLE "features" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "description" varchar, "feature_type" varchar, "unit" varchar, "display_order" integer, "use_unit" boolean, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.7ms)  CREATE TABLE "plan_features" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "value" varchar, "display_value" varchar, "plan_id" integer, "feature_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.8ms)  CREATE TABLE "plans" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "stripe_id" varchar, "name" varchar, "price_cents" integer, "interval" varchar, "interval_count" integer, "trial_period_days" integer, "metadata_as_json" text, "statement_descriptor" text, "highlight" boolean, "display_order" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.7ms)  CREATE TABLE "subscriptions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "stripe_id" varchar, "plan_id" integer, "last_four" varchar, "card_type" varchar, "current_price_cents" integer, "user_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.9ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "email" varchar DEFAULT '' NOT NULL, "encrypted_password" varchar DEFAULT '' NOT NULL, "reset_password_token" varchar, "reset_password_sent_at" datetime, "remember_created_at" datetime, "sign_in_count" integer DEFAULT 0 NOT NULL, "current_sign_in_at" datetime, "last_sign_in_at" datetime, "current_sign_in_ip" varchar, "last_sign_in_ip" varchar, "created_at" datetime, "updated_at" datetime) 
+   (1.6ms)  select sqlite_version(*)
+   (1.9ms)  CREATE UNIQUE INDEX "index_users_on_email" ON "users" ("email")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_users_on_email' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_users_on_email' AND type='index'
+
+   (1.9ms)  CREATE UNIQUE INDEX "index_users_on_reset_password_token" ON "users" ("reset_password_token")
+   (1.8ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (1.3ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151220161817')
+   (1.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150101233243')
+   (0.6ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150102001921')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150102001930')
+   (1.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151220161809')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe_saas
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Brian Sam-Bodden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails