saucy 0.3.4.1 → 0.4.0

data/app/controllers/accounts_controller.rb

@@ -7,6 +7,8 @@ class AccountsController < ApplicationController
   def new
     @plan = Plan.find(params[:plan_id])
     @signup = Signup.new
+    Saucy::Configuration.notify("plan_viewed", :request => request,
+                                               :plan    => @plan)
   end
 
   def create
@@ -15,8 +17,9 @@ class AccountsController < ApplicationController
     @signup.user = current_user
     @signup.plan = @plan
     if @signup.save
+      Saucy::Configuration.notify("account_created", :request => request,
+                                                     :account => @signup.account)
       flash[:success] = "Account was created."
-      flash[:signup_plan_id] = @plan.id
       sign_in @signup.user
       redirect_to root_url
     else

data/app/controllers/plans_controller.rb

@@ -13,8 +13,9 @@ class PlansController < ApplicationController
   def update
     @plans = Plan.ordered
     @account = current_account
+    Saucy::Configuration.notify("plan_upgraded", :account => @account,
+                                                 :request => request)
     if @account.save_customer_and_subscription!(params[:account])
-      flash[:upgrade_plan_id] = @account.plan_id
       redirect_to edit_account_path(@account), :notice => t('.update.notice', :default => "Plan changed successfully")
     else
       render :edit

data/app/models/membership.rb

@@ -1,7 +1,7 @@
 class Membership < ActiveRecord::Base
   belongs_to :user
   belongs_to :account
-  has_many :permissions, :dependent => :destroy
+  has_many :permissions
   has_many :projects, :through => :permissions
 
   validates_presence_of :user_id

data/lib/saucy/configuration.rb

@@ -5,10 +5,22 @@ module Saucy
     cattr_reader   :layouts
     cattr_accessor :mailer_sender
     cattr_accessor :merchant_account_id
+    cattr_accessor :observers
 
     def initialize
       @@mailer_sender = 'donotreply@example.com'
       @@layouts       = Layouts.new
+      @@observers     = []
+    end
+
+    def self.observe(observer)
+      @@observers << observer
+    end
+
+    def self.notify(event, data)
+      @@observers.each do |observer|
+        observer.send(event, data)
+      end
     end
   end
 end

data/lib/saucy/subscription.rb

@@ -203,7 +203,6 @@ module Saucy
           self.next_billing_date = result.subscription.next_billing_date
           self.subscription_status = result.subscription.status
         else
-          p result
           false
         end
       end

data/spec/controllers/accounts_controller_spec.rb

@@ -29,11 +29,19 @@ describe AccountsController, "new" do
     Signup.should have_received(:new)
     should assign_to(:signup).with(signup)
   end
+
+  it "notifies observers" do
+    should notify_observers("plan_viewed", :plan => plan, :request => request)
+  end
 end
 
 describe AccountsController, "successful create for a confirmed user" do
   let(:user) { Factory.stub(:user) }
-  let(:signup) { stub('signup', :user => user, :user= => nil, :plan= => plan) }
+  let(:account) { Factory.stub(:account) }
+  let(:signup) { stub('signup', :user    => user,
+                                :user=   => nil,
+                                :plan=   => plan,
+                                :account => account) }
   let(:signup_attributes) { "attributes" }
   let(:plan) { Factory(:plan) }
 
@@ -61,8 +69,9 @@ describe AccountsController, "successful create for a confirmed user" do
   it { should_not set_the_flash.to(/confirm/i) }
   it { should be_signed_in.as(user) }
 
-  it "sets the plan id in the flash" do
-    flash[:signup_plan_id].should == plan.id
+  it "notifies observers" do
+    should notify_observers("account_created", :account => signup.account,
+                                               :request => request)
   end
 end
 

data/spec/controllers/plans_controller_spec.rb

@@ -7,7 +7,7 @@ describe PlansController, "successful update", :as => :account_admin do
     put :update, :account_id => account.to_param
   end
 
-  it "sets the upgraded plan id in the flash" do
-    flash[:upgrade_plan_id].should == account.plan_id
+  it "notifies observers" do
+    should notify_observers("plan_upgraded", :account => account, :request => request)
   end
 end

data/spec/models/membership_spec.rb

@@ -5,7 +5,7 @@ describe Membership do
   it { should belong_to(:user) }
   it { should validate_presence_of(:account_id) }
   it { should validate_presence_of(:user_id) }
-  it { should have_many(:permissions).dependent(:destroy) }
+  it { should have_many(:permissions) }
   it { should have_many(:projects).through(:permissions) }
 
   describe "given an existing account membership" do

data/spec/models/subscription_spec.rb

@@ -215,17 +215,21 @@ describe Account, "with a free plan" do
   end
 
   it "passes up the merchant_account_id on the subscription when it's configured" do
-    Saucy::Configuration.merchant_account_id = 'test'
-    new_plan = Factory(:paid_plan, :name => "New Plan")
-    subject.save_customer_and_subscription!(:plan_id => new_plan.id,
-                                            :cardholder_name => "Ralph Robot", 
-                                            :billing_email => "ralph@example.com", 
-                                            :card_number => "4111111111111111", 
-                                            :verification_code => "123",
-                                            :expiration_month => 5, 
-                                            :expiration_year => 2012)
-
-    FakeBraintree.subscriptions[subject.subscription_token]["merchant_account_id"].should == 'test'
+    begin
+      Saucy::Configuration.merchant_account_id = 'test'
+      new_plan = Factory(:paid_plan, :name => "New Plan")
+      subject.save_customer_and_subscription!(:plan_id => new_plan.id,
+                                              :cardholder_name => "Ralph Robot", 
+                                              :billing_email => "ralph@example.com", 
+                                              :card_number => "4111111111111111", 
+                                              :verification_code => "123",
+                                              :expiration_month => 5, 
+                                              :expiration_year => 2012)
+
+      FakeBraintree.subscriptions[subject.subscription_token]["merchant_account_id"].should == 'test'
+    ensure
+      Saucy::Configuration.merchant_account_id = nil
+    end
   end
 
   it "doesn't create a credit card, and subscription when the plan is changed to a different free plan" do

data/spec/saucy_spec.rb

@@ -13,6 +13,23 @@ describe Saucy::Configuration do
     subject.merchant_account_id.should be_nil
   end
 
+  it "can listen for events" do
+    observer = stub("an observer")
+    cleanup_observers do
+      Saucy::Configuration.observe(observer)
+      Saucy::Configuration.observers.should include(observer)
+    end
+  end
+
+  it "can notify observers" do
+    observer = stub("an observer", :some_event => nil)
+    cleanup_observers do
+      Saucy::Configuration.observe(observer)
+      Saucy::Configuration.notify("some_event", "some_data")
+      observer.should have_received("some_event").with("some_data")
+    end
+  end
+
   it "can assign a mailer sender" do
     old_sender = subject.mailer_sender
     begin
@@ -22,4 +39,10 @@ describe Saucy::Configuration do
       subject.mailer_sender = old_sender
     end
   end
+
+  def cleanup_observers
+    yield
+  ensure
+    subject.observers.clear
+  end
 end

data/spec/support/notifications.rb

@@ -0,0 +1,57 @@
+class RecordedEvent
+  attr_reader :name, :data
+
+  def initialize(name, data)
+    @name = name.to_s
+    @data = data
+  end
+
+  def inspect
+    "<Event:#{name} #{inspect_data}>"
+  end
+
+  def ==(other)
+    name == other.name && data == other.data
+  end
+
+  private
+
+  def inspect_data
+    data.inject([]) { |result, (key, value)|
+      result << "#{key.inspect} => #{value.inspect.slice(0, 20)}"
+    }.join(", ")
+  end
+end
+
+class RecordingObserver
+  attr_reader :events
+
+  def initialize
+    @events = []
+  end
+
+  def method_missing(name, data)
+    @events << RecordedEvent.new(name, data)
+  end
+end
+
+RSpec::Matchers.define :notify_observers do |event_name, data|
+  match do |ignored_subject|
+    @event = RecordedEvent.new(event_name, data)
+    recorder.events.should include(@event)
+  end
+
+  failure_message do
+    "Expected event:\n#{@event.inspect}\n\nGot events:\n#{recorder.events.map(&:inspect).join("\n")}"
+  end
+
+  def recorder
+    Saucy::Configuration.observers.last
+  end
+end
+
+RSpec.configure do |config|
+  config.before do
+    Saucy::Configuration.observers = [RecordingObserver.new]
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 69
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
   - 4
-  - 1
-  version: 0.3.4.1
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -19,12 +18,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -04:00
+date: 2011-03-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: formtastic
-  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,11 +33,11 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: railties
+  name: formtastic
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -51,11 +49,11 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: braintree
+  name: railties
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -67,11 +65,11 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sham_rack
+  name: braintree
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -83,11 +81,11 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: sham_rack
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -99,11 +97,11 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: aruba
+  name: sinatra
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -115,8 +113,9 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  type: :development
   version_requirements: *id006
+  name: aruba
+  prerelease: false
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []
@@ -265,6 +264,7 @@ files:
 - spec/support/authorization_helpers.rb
 - spec/support/braintree.rb
 - spec/support/clearance_matchers.rb
+- spec/support/notifications.rb
 - spec/views/accounts/_account.html.erb_spec.rb
 has_rdoc: true
 homepage: http://github.com/thoughtbot/saucy
@@ -296,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS