koudoku 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10af897228d773743369bb52e611aaf35a87d78a
-  data.tar.gz: c1a69b4002c5c9f9fe0b3f7abc5bf5285ec4c254
+  metadata.gz: 014fa4c5942241aa28303b621413ebca94c1debc
+  data.tar.gz: a36a27fc806f8dbaf0d5ce563a9cd8bc7a18f1fe
 SHA512:
-  metadata.gz: fb521446bc4f2260d7a852ceab41e1015fef4aa8f930062ae3feb0b5f96dec8381b254399caf3ec6aa398a1aff26a754a3deca3194a23d8a52179514c9db8d8e
-  data.tar.gz: 69c13f1387242587f98833ce381822ab7eba2c977dca48e60a9e648757739bb359ec10b0c9bc6c9d6d4ade947d897722e0d125c3977e2495b0f976efced9db8e
+  metadata.gz: e077820743b976d6b261807db7b01492450033861806900e601822982a2811717c2325e912fa71b2d3ef03204eb8e86102f3c352283aefc4bdb135dc13f1925e
+  data.tar.gz: 656010d4338ffea9add5f0682dbdd263261eac84fc553ef29a36a971a57b5ca8881786c2be1409bcc53ebd77cf53b12b7a634ede638fc0cb53def7fa17fb71a9

data/Rakefile

@@ -1,10 +1,10 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
-
-task default: :spec
+# APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+# load 'rails/tasks/engine.rake'
+# 
+# require 'rspec/core/rake_task'
+# RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
+# 
+# task default: :spec

data/app/concerns/koudoku/subscription.rb

@@ -54,7 +54,7 @@ module Koudoku::Subscription
 
           end
 
-        # otherwise
+        # when customer DOES NOT exist in stripe ..
         else
           # if a new plan has been selected
           if self.plan.present?

data/app/controllers/koudoku/application_controller.rb

@@ -1,6 +1,10 @@
 module Koudoku
   class ApplicationController < ::ApplicationController
-    layout 'application'
+    layout Koudoku.layout
     helper :application
+    
+    # stolen from http://stackoverflow.com/questions/9232175/access-main-app-helpers-when-overridings-a-rails-engine-view-layout#comment44856124_19453140
+    # to solve the problem of having to reference "main_app.$some_model_path" in layouts
+    helper Rails.application.routes.url_helpers 
   end
 end

data/app/helpers/koudoku/application_helper.rb

@@ -22,5 +22,11 @@ module Koudoku
       end
     end
     
+    # returns TRUE if the controller belongs to Koudoku
+    # false in all other cases, for convenience when executing filters 
+    # in the main application
+    def koudoku_controller? 
+      is_a? Koudoku::ApplicationController
+    end
   end
 end

data/lib/generators/koudoku/templates/config/initializers/koudoku.rb

@@ -6,6 +6,9 @@ Koudoku.setup do |config|
   Stripe.api_version = '2015-01-11' #Making sure the API version used is compatible.
   # config.prorate = false # Default is true, set to false to disable prorating subscriptions
   # config.free_trial_length = 30
+
+  # Specify layout you want to use for the subscription pages, default is application
+  config.layout = 'application'
   
   # you can subscribe to additional webhooks here
   # we use stripe_event under the hood and you can subscribe using the 

data/lib/koudoku.rb

@@ -19,6 +19,9 @@ module Koudoku
   mattr_accessor :prorate
   @@prorate = true
 
+  mattr_accessor :layout
+  @@layout = nil
+
   def self.webhooks_api_key=(key)
     raise "Koudoku no longer uses an API key to secure webhooks, please delete the line from \"config/initializers/koudoku.rb\""
   end

data/lib/koudoku/version.rb

@@ -1,3 +1,3 @@
 module Koudoku
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koudoku
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails