saucy 0.10.6 → 0.10.7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.10.7
+
+Fix for daylight savings time issue with coupons
+
 0.10.6
 
 Fix for price not being sent to Braintree when the plan changes

data/README.md

@@ -45,7 +45,14 @@ In addition, there are a number of strings such as application name, support url
 
 There is a `saucy:daily` rake task which should be run on a regular basis to send receipts and payment processing problem emails.
 
-Saucy accounts become "activated" once an initial setup step is complete. This could be creating the first bug for a bug tracker, or setting up a client gem for a server API. Once the application detects that the account is activate, it should set "activated" to true on the account. This will prevent followup emails being sent to users that have already set up their accounts.
+Saucy accounts become "activated" once an initial setup step is complete.
+This could be creating the first bug for a bug tracker, or setting up a client
+gem for a server API. Once the application detects that the account is
+activated, it should set "activated" to true on the account. This will prevent
+followup emails being sent to users that have already set up their accounts.
+It will also send an "Activated" event to Kissmetrics through Saucy-kiss, if
+Saucy-kiss is installed.
+
 
 Development environment
 -----------------------

data/app/controllers/plans_controller.rb

@@ -3,6 +3,7 @@ class PlansController < ApplicationController
 
   def index
     @plans = Plan.ordered
+    notify_observers_of_plan_list_view
   end
 
   def edit
@@ -31,6 +32,11 @@ class PlansController < ApplicationController
     notify_observers("plan_downgraded", from_plan, to_plan) if from_plan.price > to_plan.price
   end
 
+  def notify_observers_of_plan_list_view
+    Saucy::Notifications.notify_observers("plan_list_viewed",
+                                          :request => request)
+  end
+
   def notify_observers(event_name, from_plan, to_plan)
     Saucy::Notifications.notify_observers(event_name,
                                           :account   => @account,

data/lib/saucy/account.rb

@@ -30,6 +30,7 @@ module Saucy
                           :message => "must be only lower case letters and underscores."
 
       before_create :set_trial_expiration
+      after_save :record_new_activations
     end
 
     module InstanceMethods
@@ -75,7 +76,13 @@ module Saucy
                            else
                              30
                            end
-        self.trial_expires_at = number_free_days.days.from_now(created_at || Time.now)
+        self.trial_expires_at = number_free_days.days.from_now(created_at || Time.zone.now)
+      end
+
+      def record_new_activations
+        if activated_changed? && activated?
+          Saucy::Notifications.notify_observers("activated", :account => self)
+        end
       end
 
       def users_count

data/spec/controllers/plans_controller_spec.rb

@@ -69,3 +69,13 @@ describe PlansController, "successful update that does not change the plan", :as
     should_not notify_observers("plan_downgraded", :account => account, :request => request, :from_plan => original_plan, :to_plan => original_plan)
   end
 end
+
+describe PlansController, "viewing plan list" do
+  before do
+    get :index
+  end
+
+  it "notifies observers" do
+    should notify_observers("plan_list_viewed", :request => request)
+  end
+end

data/spec/models/subscription_spec.rb

@@ -497,3 +497,30 @@ describe Account, "with a paid subscription that is past due" do
     subject.next_billing_date.to_s.should == subscription["next_billing_date"].to_s
   end
 end
+
+describe Account, "that is activated" do
+  subject do
+    Factory(:account,
+            :cardholder_name => "Ralph Robot",
+            :billing_email => "ralph@example.com",
+            :card_number => "4111111111111111",
+            :verification_code => "123",
+            :expiration_month => 5,
+            :expiration_year => 2012,
+            :plan => Factory(:paid_plan))
+  end
+
+  it "notifies observers of activations" do
+    subject.activated = true
+    subject.save!
+    should notify_observers("activated", :account => subject)
+  end
+
+  it "notifies observers of activation only once" do
+    2.times do
+      subject.activated = true
+      subject.save!
+    end
+    should notify_observers_once("activated", :account => subject)
+  end
+end

data/spec/support/notifications.rb

@@ -58,6 +58,22 @@ RSpec::Matchers.define :notify_observers do |event_name, data|
   end
 end
 
+RSpec::Matchers.define :notify_observers_once do |event_name, data|
+  match do |ignored_subject|
+    @event = RecordedEvent.new(event_name, data)
+    recorder.events.select{|ev| ev == @event }.size.should == 1
+  end
+
+  failure_message do
+    times_notified = recorder.events.select{|ev| ev == @event }.size
+    "Expected event 1 time:\n#{@event.inspect}\n\nGot event #{times_notified} times"
+  end
+
+  def recorder
+    RecordingObserver.instance
+  end
+end
+
 RSpec.configure do |config|
   config.before do
     Saucy::Notifications.clear_observers

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 57
+  prerelease: 
   segments: 
   - 0
   - 10
-  - 6
-  version: 0.10.6
+  - 7
+  version: 0.10.7
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -19,105 +20,119 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 -04:00
+date: 2011-08-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clearance
   prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 55
         segments: 
         - 0
         - 11
         - 2
         version: 0.11.2
-  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: formtastic
   prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 2
         version: "1.2"
-  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: railties
   prerelease: false
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 3
         - 0
         - 3
         version: 3.0.3
-  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: braintree
   prerelease: false
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 6
         - 2
         version: 2.6.2
-  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sham_rack
   prerelease: false
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 3
         - 3
         version: 1.3.3
-  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 1
         - 2
         version: 1.1.2
-  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 2
         - 6
         version: 0.2.6
-  type: :development
   version_requirements: *id007
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
@@ -309,23 +324,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS