saucy 0.4.4 → 0.4.5

data/README.md

@@ -28,7 +28,7 @@ After you bundle, run the generators:
 
 You will want to include the `ensure_active_account` `before_filter` in any controller actions that you want to protect if the user is using an past due paid account.
 
-You will want to customize the from email address on billing emails:
+You will want to customize the from email address on billing and invite emails:
 
 Saucy::Configuration.mailer_sender = "billingemail@example.com"
 
@@ -40,7 +40,7 @@ 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 "active" 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 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.
 
 Development environment
 -----------------------

data/features/run_features.feature

@@ -2,7 +2,7 @@
 Feature: generate a saucy application and run rake
 
   Background:
-    When I successfully run "rails new testapp"
+    When I successfully run "bundle exec rails new testapp"
     And I cd to "testapp"
     And I copy the locked Gemfile from this project
     And I append to "Gemfile" with:

data/lib/saucy/subscription.rb

@@ -193,11 +193,7 @@ module Saucy
       end
 
       def create_subscription
-        result = Braintree::Subscription.create(
-          :payment_method_token => credit_card.token,
-          :plan_id              => plan_id,
-          :merchant_account_id  => Saucy::Configuration.merchant_account_id
-        )
+        result = Braintree::Subscription.create(subscription_attributes)
         if result.success?
           self.subscription_token = result.subscription.id
           self.next_billing_date = result.subscription.next_billing_date
@@ -207,6 +203,16 @@ module Saucy
         end
       end
 
+      def subscription_attributes
+        {
+          :payment_method_token => credit_card.token,
+          :plan_id              => plan_id,
+          :merchant_account_id  => Saucy::Configuration.merchant_account_id
+        }.tap do |attributes|
+          attributes.reject! { |key, value| value.nil? }
+        end
+      end
+
       def switching_to_billed?
         plan_id && plan.billed? && subscription_token.blank?
       end

data/spec/models/subscription_spec.rb

@@ -232,6 +232,20 @@ describe Account, "with a free plan" do
     end
   end
 
+  it "doesn't pass up the merchant_account_id on the subscription when it's not configured" do
+    Saucy::Configuration.merchant_account_id = nil
+    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].keys.should_not include("merchant_account_id")
+  end
+
   it "doesn't create a credit card, and subscription when the plan is changed to a different free plan" do
     new_plan = Factory(:plan, :name => "New Plan")
     subject.save_customer_and_subscription!(:plan_id => new_plan.id)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,12 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -04:00
+date: 2011-04-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,12 +33,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  requirement: *id001
-  prerelease: false
+  version_requirements: *id001
   name: formtastic
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +49,12 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  requirement: *id002
-  prerelease: false
+  version_requirements: *id002
   name: railties
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,12 +65,12 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  requirement: *id003
-  prerelease: false
+  version_requirements: *id003
   name: braintree
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -81,12 +81,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  requirement: *id004
-  prerelease: false
+  version_requirements: *id004
   name: sham_rack
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,12 +97,12 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  requirement: *id005
-  prerelease: false
+  version_requirements: *id005
   name: sinatra
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -113,9 +113,9 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  requirement: *id006
-  prerelease: false
+  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: []
@@ -296,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS