koudoku 0.0.10 → 0.0.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1d46eda181a6f5e58abc651b8ca10206c732ddf0
+  data.tar.gz: d0e19555a3872b3dd149dc828b7722bbcb44af44
+SHA512:
+  metadata.gz: 9a07862153a860e36853302ea963002511df5df50257f19795b7d838bb34e72095f4cb3b71caeaf1aed108d9eac9d16b6fb41f210e681002e6ffa75d0497536f
+  data.tar.gz: 239b6f176976989b1bacd3a51facbae0714bd6dccbfbc62800d6a225fcb396a1737f3891bb1df94e49696447e5e375ec6bd292979eb3cafce68e91cd13da9f5c

data/app/concerns/koudoku/subscription.rb

@@ -69,6 +69,7 @@ module Koudoku::Subscription
 
               customer_attributes = {
                 description: subscription_owner_description,
+                email: subscription_owner_email,
                 card: credit_card_token, # obtained with Stripe.js
                 plan: plan.stripe_id
               }
@@ -167,6 +168,10 @@ module Koudoku::Subscription
     "#{subscription_owner.id}"
   end
 
+  def subscription_owner_email
+    nil
+  end
+
   def changing_plans?
     plan_id_changed?
   end

data/app/controllers/koudoku/subscriptions_controller.rb

@@ -9,9 +9,19 @@ module Koudoku
       @plans = ::Plan.order(:price)
     end
 
+    def unauthorized
+      render status: 401, template: "koudoku/subscriptions/unauthorized"
+      false
+    end
+
     def load_owner
-      # e.g. User.find(params[:user_id])
-      @owner = Koudoku.owner_class.find(params[:owner_id]) unless params[:owner_id].nil?
+      unless params[:owner_id].nil?
+        if current_owner.try(:id) == params[:owner_id].try(:to_i)
+          @owner = current_owner
+        else
+          return unauthorized
+        end
+      end
     end
 
     def no_owner?
@@ -19,7 +29,9 @@ module Koudoku
     end
 
     def load_subscription
-      @subscription = ::Subscription.find(params[:id])
+      ownership_attribute = (Koudoku.subscriptions_owned_by.to_s + "_id").to_sym
+      @subscription = ::Subscription.where(ownership_attribute => current_owner.id).find_by_id(params[:id])
+      return @subscription.present? ? @subscription : unauthorized
     end
 
     # the following two methods allow us to show the pricing table before someone has an account.
@@ -119,7 +131,15 @@ module Koudoku
 
     private
     def subscription_params
-      params.require(:subscription).permit(:plan_id, :stripe_id, :current_price, :credit_card_token, :card_type, :last_four)
+      
+      # If strong_parameters is around, use that.
+      if defined?(ActionController::StrongParameters)
+        params.require(:subscription).permit(:plan_id, :stripe_id, :current_price, :credit_card_token, :card_type, :last_four)
+      else
+        # Otherwise, let's hope they're using attr_accessible to protect their models!
+        params[:subscription]
+      end
+
     end
   end
 end

data/app/views/koudoku/subscriptions/unauthorized.html.erb

@@ -0,0 +1 @@
+<h1>Unauthorized</h1>

data/lib/generators/koudoku/views_generator.rb

@@ -18,11 +18,11 @@ module Koudoku
 
     def install
       
-      ["_pricing_table.html.erb", "edit.html.erb", "index.html.erb", "new.html.erb", "show.html.erb"].each do |file|
+      ["_card.html.erb","_pricing_table.html.erb", "edit.html.erb", "index.html.erb", "new.html.erb", "show.html.erb", "unauthorized.html.erb"].each do |file|
         copy_file file, "app/views/koudoku/subscriptions/#{file}"
       end
 
     end
 
   end
-end
+end

data/lib/koudoku/engine.rb

@@ -9,5 +9,12 @@ module Koudoku
       g.assets false
       g.helper false
     end
+
+    initializer 'koudoku.action_controller' do |app|
+      ActiveSupport.on_load :action_controller do
+        helper Koudoku::ApplicationHelper
+      end
+    end
+
   end
 end

data/lib/koudoku/version.rb

@@ -1,3 +1,3 @@
 module Koudoku
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: koudoku
 version: !ruby/object:Gem::Version
-  version: 0.0.10
-  prerelease: 
+  version: 0.0.11
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: stripe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bluecloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -180,6 +161,7 @@ files:
 - app/views/koudoku/subscriptions/index.html.erb
 - app/views/koudoku/subscriptions/new.html.erb
 - app/views/koudoku/subscriptions/show.html.erb
+- app/views/koudoku/subscriptions/unauthorized.html.erb
 - app/views/layouts/koudoku/application.html.erb
 - config/environment.rb
 - config/routes.rb
@@ -250,6 +232,7 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/andrewculver/koudoku
 licenses: []
+metadata: {}
 post_install_message: |2+
 
   Koudoku is still in early development, so if this installation is an upgrade
@@ -262,28 +245,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3013715524796379015
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3013715524796379015
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Robust subscription support for Rails with Stripe.
 test_files:
 - spec/concerns/koudoku/plan_spec.rb