saucy 0.10.10 → 0.11.2

data/CHANGELOG.md

@@ -1,14 +1,14 @@
-0.10.10
+0.11.0
 
-* Add additional Airbrake notifications on failure scenarios
+Update Saucy to be compatible with Rails 3.1 which includes:
 
-0.10.9
+* Update testing dependencies
+* Update test application path configuration
+* Update route extension to not rely on `initialize` to be called
+* Use `shoulda-matchers` instead of `shoulda`
 
-* Follow-up to 0.10.8: Actually work irrespective of system TZ
-
-0.10.8
-
-Backport merchant account TZ fixes from 0.13.1
+If you are still using Saucy with Rails 3.0.x, please still use 0.10.x version
+of saucy, which now branched to `0-10-stable` branch.
 
 0.10.7
 

data/Gemfile

@@ -6,7 +6,7 @@ gem "rspec-rails", :require => false
 gem "rails", ">= 3.0.3"
 gem "thin"
 gem "clearance", "~> 0.11.0"
-gem "shoulda", :require => false
+gem "shoulda-matchers", "~> 1.0.0.beta3", :require => false
 gem "bourne", :require => false
 gem "sqlite3", :require => false
 gem "factory_girl", :require => false
@@ -14,7 +14,6 @@ gem "sinatra"
 gem "sham_rack"
 gem "braintree"
 gem "timecop"
-gem "airbrake"
 
 # used by the rails app in cucumber
 gem "cucumber-rails", :require => false

data/Gemfile.lock

@@ -1,176 +1,189 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
-      mail (~> 2.2.15)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
-    airbrake (3.0.4)
-      activesupport
-      builder
-    arel (2.0.9)
-    aruba (0.2.6)
-      background_process
-      cucumber (~> 0.9.4)
-    background_process (1.2)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    addressable (2.2.6)
+    arel (2.2.1)
+    aruba (0.4.6)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.2.0)
+      cucumber (>= 1.0.2)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.2)
+      rack (~> 1.0)
+    bcrypt-ruby (3.0.0)
     bourne (1.0)
       mocha (= 0.9.8)
-    braintree (2.6.2)
-      builder
-    builder (2.1.2)
-    capybara (0.4.1.2)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
+    braintree (2.11.0)
+      builder (>= 2.0.0)
+    builder (3.0.0)
+    capybara (1.1.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.8)
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
-    clearance (0.11.1)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.2.2)
+      ffi (~> 1.0.6)
+    clearance (0.11.2)
       diesel (~> 0.1.4)
-      rails (~> 3.0.0)
-    configuration (1.2.0)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    cucumber-rails (0.3.2)
-      cucumber (>= 0.8.0)
-    culerity (0.2.15)
-    daemons (1.1.0)
-    database_cleaner (0.6.0)
-    diesel (0.1.4)
-      railties (~> 3.0.3)
-    diff-lcs (1.1.2)
-    dynamic_form (1.1.3)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+      rails (>= 3.0)
+    cucumber (1.0.4)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.18)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    cucumber-rails (1.0.3)
+      capybara (>= 1.1.1)
+      cucumber (~> 1.0.4)
+      nokogiri (>= 1.5.0)
+    daemons (1.1.4)
+    database_cleaner (0.6.7)
+    diesel (0.1.5)
+      railties
+    diff-lcs (1.1.3)
+    dynamic_form (1.1.4)
+    erubis (2.7.0)
     eventmachine (0.12.10)
-    factory_girl (1.3.2)
-    factory_girl_rails (1.0)
-      factory_girl (~> 1.3)
-      rails (>= 3.0.0.beta4)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    formtastic (1.2.2)
+    factory_girl (2.1.0)
+    factory_girl_rails (1.2.0)
+      factory_girl (~> 2.1.0)
+      railties (>= 3.0.0)
+    ffi (1.0.9)
+    formtastic (1.2.4)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
-      i18n (>= 0.4.0)
-    gherkin (2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    i18n (0.5.0)
-    jquery-rails (1.0)
-      rails (~> 3.0)
+      i18n (~> 0.4)
+    gherkin (2.4.18)
+      json (>= 1.4.6)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jquery-rails (1.0.14)
+      railties (~> 3.0)
       thor (~> 0.14)
-    json (1.4.6)
-    json_pure (1.5.1)
-    launchy (0.3.7)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
+    json (1.5.4)
+    json_pure (1.5.4)
+      spruz (~> 0.2.8)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     mocha (0.9.8)
       rake
-    nokogiri (1.4.4)
-    polyglot (0.3.1)
-    rack (1.2.2)
-    rack-mount (0.6.13)
+    multi_json (1.0.3)
+    nokogiri (1.5.0)
+    polyglot (0.3.2)
+    rack (1.3.2)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rdiscount (1.6.8)
+    rdoc (3.9.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.2.0)
-    rspec-rails (2.2.1)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.2.0)
+      rspec (~> 2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.3)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
+    selenium-webdriver (2.5.0)
+      childprocess (>= 0.2.1)
+      ffi (>= 1.0.7)
       json_pure
       rubyzip
     sham_rack (1.3.3)
       rack
-    shoulda (2.11.3)
-    sinatra (1.1.2)
+    shoulda-matchers (1.0.0.beta3)
+    sinatra (1.2.6)
       rack (~> 1.1)
-      tilt (~> 1.2)
-    sqlite3 (1.3.3)
-    term-ansicolor (1.0.5)
-    thin (1.2.7)
+      tilt (< 2.0, >= 1.2.2)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
+    spruz (0.2.13)
+    sqlite3 (1.3.4)
+    term-ansicolor (1.0.6)
+    thin (1.2.11)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.14.6)
-    tilt (1.2.1)
+    tilt (1.3.3)
     timecop (0.3.5)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.25)
-    xpath (0.1.3)
+    tzinfo (0.3.29)
+    xpath (0.1.4)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  airbrake
   aruba
   bourne
   braintree
@@ -189,7 +202,7 @@ DEPENDENCIES
   rake
   rspec-rails
   sham_rack
-  shoulda
+  shoulda-matchers (~> 1.0.0.beta3)
   sinatra
   sqlite3
   thin

data/README.md

@@ -21,6 +21,10 @@ In your Gemfile:
 
     gem "saucy"
 
+If you're using Rails 3.0.x, instead use the 0.10.x version of this gem:
+
+    gem "saucy", "~> 0.10.7"
+
 After you bundle, run the generator:
 
     rails generate saucy:install
@@ -53,6 +57,7 @@ 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
 -----------------------
 
@@ -82,13 +87,13 @@ To use seed data in your Cucumber, add this to features/support/seed.rb:
 Customization
 -------------
 
-By default Saucy uses and provides a `saucy.html.erb` layout. To change the 
-layout for a controller inside of saucy, add a line like this to your 
+By default Saucy uses and provides a `saucy.html.erb` layout. To change the
+layout for a controller inside of saucy, add a line like this to your
 config/application.rb:
 
     config.saucy.layouts.accounts.index = "custom"
 
-In addition to just the normal yield, your layout should yield the following 
+In addition to just the normal yield, your layout should yield the following
 items in order to get everything from saucy views:
 
 * :header
@@ -122,9 +127,3 @@ Make sure you don't do this in ApplicationController:
 
 Saucy's internal controllers don't skip any before filters.
 
-If your billing merchant account is not configured to run in the Eastern
-timezone, you can override the timezone in Saucy configuration as
-merchant_account_time_zone.  You'll want this set accurately so that the daily
-cronjob which syncs the Braintree subscription billing cycle dates runs for the
-correct accounts.  If this is set incorrectly, you will occasionally see
-duplicate receipt emails being delivered.

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'rake'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 
@@ -19,7 +19,7 @@ RSpec::Core::RakeTask.new do |t|
 end
 
 eval("$specification = begin; #{IO.read('saucy.gemspec')}; end")
-Rake::GemPackageTask.new($specification) do |package|
+Gem::PackageTask.new($specification) do |package|
   package.need_zip = true
   package.need_tar = true
 end

data/app/models/invitation.rb

@@ -109,5 +109,6 @@ class Invitation < ActiveRecord::Base
 
   def generate_code
     self.code = SecureRandom.hex(8)
+    self.code = self.code.force_encoding("UTF-8") if self.code.respond_to?(:encoding)
   end
 end

data/app/views/accounts/edit.html.erb

@@ -24,34 +24,10 @@
     <%= form.buttons do %>
       <%= form.commit_button "Update" %>
       <li>
-        <div id="account-deletion-warning">
-          <h3>Warning:</h3>
-          <p>
-            <%= t("saucy.account_deletion_effects_warning", :default => "When you cancel your Copycopter account, all of your text will be deleted from Copycopter.  All of your projects on your severs will revert to their defaults, and you will not be able to recover your customized copy that is stored in Copycopter.") %>
-          </p>
-
-          <%= link_to t("saucy.confirm_account_deletion", :default => "I understand, delete my account"),
-            @account,
-            :class => "button warning",
-            :method  => :delete,
-            :confirm => "Are you sure? All data will be irreversibly deleted." %>
-
-          <%= link_to t("saucy.cancel_account_deletion", :default => "On second thought, don't delete my account."),
-            root_path, :class => "cancel-account-deletion" %>
-        </div>
-
-        <%= link_to t(".delete", :default => "Delete my account"), "#", :class => "prompt-to-delete" %>
-
-        <% content_for :javascript do %>
-          <script type="text/javascript">
-            $(function() {
-              $("a.prompt-to-delete").click(function(event) {
-                $(event.target).hide();
-                $('#account-deletion-warning').slideDown();
-              });
-            });
-          </script>
-        <% end %>
+        <%= link_to t(".delete", :default => "Delete my account"),
+                    @account,
+                    :method  => :delete,
+                    :confirm => "Are you sure? All data will be irreversibly deleted." %>
       </li>
     <% end %>
   <% end %>

data/app/views/shared/_project_dropdown.html.erb

@@ -9,7 +9,7 @@
             <span>Projects</span>
           <% end -%>
           <% if current_user.memberships.admin.any? || current_user.projects.active.any? -%>
-            <img src="/images/arrow-down.png" alt="arrow down" />
+            <%= image_tag "arrow-down.png", :alt => "arrow down" %>
           <% end -%>
         <% end %>
       </h1>

data/config/locales/en.yml

@@ -3,9 +3,6 @@ en:
   app_url: 'http://example.com'
   support_email: support@example.com
   saucy:
-    account_deletion_effects_warning: When you cancel your account, all of your data will be deleted from %{app_name}, and you will not be able to recover your data.
-    cancel_account_deletion: On second thought, don't delete my account.
-    confirm_account_deletion: I understand, delete my account
     billing_address: Billing Address
     errors:
       past_due:

data/features/run_features.feature

@@ -2,7 +2,7 @@
 Feature: generate a saucy application and run rake
 
   Background:
-    When I successfully run "bundle exec 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:
@@ -16,23 +16,22 @@ Feature: generate a saucy application and run rake
     gem "formtastic"
     gem "rspec-rails"
     gem "bourne"
-    gem "shoulda"
+    gem "shoulda-matchers"
     gem "launchy"
     gem "timecop"
     gem "jquery-rails"
     """
     When I add the "saucy" gem from this project as a dependency
-    And I successfully run "bundle install"
-    And I successfully run "rails generate jquery:install --force"
+    And I successfully run `bundle install`
     And I bootstrap the application for clearance
     And I bootstrap the application for saucy
 
   Scenario: generate a saucy application and run rake
-    When I successfully run "rails generate saucy:install"
-    And I successfully run "rails generate saucy:specs"
-    And I successfully run "rails generate saucy:features"
-    And I successfully run "bundle exec rake db:migrate"
-    And I run "bundle exec rake"
+    When I successfully run `rails generate saucy:install`
+    And I successfully run `rails generate saucy:specs`
+    And I successfully run `rails generate saucy:features`
+    And I successfully run `bundle exec rake db:migrate`
+    And I run `bundle exec rake`
     Then it should pass with:
     """
     passed
@@ -41,13 +40,13 @@ Feature: generate a saucy application and run rake
     And the output should not contain "Could not find generator"
 
   Scenario: A new saucy app with custom views
-    When I successfully run "rails generate saucy:install"
-    And I successfully run "rails generate saucy:specs"
-    And I successfully run "rails generate saucy:features"
-    And I successfully run "rails generate saucy:views"
-    And I successfully run "bundle exec rake db:migrate"
+    When I successfully run `rails generate saucy:install`
+    And I successfully run `rails generate saucy:specs`
+    And I successfully run `rails generate saucy:features`
+    And I successfully run `rails generate saucy:views`
+    And I successfully run `bundle exec rake db:migrate`
     And I give a more detailed new account message
-    And I run "bundle exec rake"
+    And I run `bundle exec rake`
     Then it should pass with:
     """
     passed
@@ -56,12 +55,12 @@ Feature: generate a saucy application and run rake
     And the output should not contain "Could not find generator"
 
   Scenario: A new saucy app with custom layouts
-    When I successfully run "rails generate saucy:install"
-    And I successfully run "rails generate saucy:specs"
-    And I successfully run "rails generate saucy:features"
-    And I successfully run "bundle exec rake db:migrate"
+    When I successfully run `rails generate saucy:install`
+    And I successfully run `rails generate saucy:specs`
+    And I successfully run `rails generate saucy:features`
+    And I successfully run `bundle exec rake db:migrate`
     And I add a custom layout to the accounts index
-    And I run "bundle exec rake"
+    And I run `bundle exec rake`
     Then it should pass with:
     """
     passed
@@ -70,12 +69,12 @@ Feature: generate a saucy application and run rake
     And the output should not contain "Could not find generator"
 
   Scenario: run specs
-    When I successfully run "rails generate saucy:install"
-    And I successfully run "rails generate saucy:specs"
-    And I successfully run "rails generate saucy:features"
-    And I successfully run "bundle exec rake db:migrate"
+    When I successfully run `rails generate saucy:install`
+    And I successfully run `rails generate saucy:specs`
+    And I successfully run `rails generate saucy:features`
+    And I successfully run `bundle exec rake db:migrate`
     And I copy the specs for this project
-    And I run "bundle exec rake spec"
+    And I run `bundle exec rake spec`
     Then it should pass with:
     """
     0 failures

data/features/step_definitions/clearance_steps.rb

@@ -1,9 +1,9 @@
 When /^I bootstrap the application for clearance$/ do
   steps %{
     When I remove the file "public/index.html"
-    And I successfully run "rails generate cucumber:install"
-    And I successfully run "rails generate clearance:install"
-    And I successfully run "rails generate clearance:features"
+    And I successfully run `rails generate cucumber:install`
+    And I successfully run `rails generate clearance:install`
+    And I successfully run `rails generate clearance:features`
     And I configure ActionMailer to use "www.example.com" as a host
     And I add flash messages to the layout
     And I add session links to the layout

data/features/step_definitions/rails_steps.rb

@@ -28,7 +28,7 @@ When /^I give a more detailed new account message$/ do
       When I go to the sign up page for the "Free" plan
       Then I should see "Please sign up now"
   HERE
-  create_file('features/new_account_message.feature', scenario)
+  write_file('features/new_account_message.feature', scenario)
 end
 
 When /^I add a custom layout to the accounts index$/ do
@@ -44,7 +44,7 @@ When /^I add a custom layout to the accounts index$/ do
                   /(class .* < Rails::Application)/,
                   "\\1\n#{layout_config}"
 
-  create_file('features/custom_accounts_index_layout.feature', <<-SCENARIO)
+  write_file('features/custom_accounts_index_layout.feature', <<-SCENARIO)
   Feature: The accounts index should have a custom layout
     Scenario: Custom layout
       Given I am signed up as "email@person.com"

data/features/support/env.rb

@@ -1,4 +1,7 @@
-require 'aruba'
+require 'aruba/cucumber'
 
-PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
+Before do
+  @aruba_timeout_seconds = 120
+end
 
+PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))

data/lib/generators/saucy/features/templates/features/manage_account.feature

@@ -24,23 +24,12 @@ Feature: Manage account
     When I follow "Users"
     Then I should see "captain@awesome.com"
 
-  @javascript
   Scenario: Delete account
     Given an account exists with a name of "Chocolate"
     And I am signed in as an admin of the "Chocolate" account
     When I go to the settings page for the "Chocolate" account
-    And I follow "Delete my account"
-    Then I should see "Warning"
-    When I follow "I understand"
+    And I follow "Delete"
     Then I should see "Your account has been deleted"
     When I go to the dashboard page
     Then I should not see "Chocolate"
 
-  @javascript
-  Scenario: Cancel deleting account
-    Given an account exists with a name of "Chocolate"
-    And I am signed in as an admin of the "Chocolate" account
-    When I go to the settings page for the "Chocolate" account
-    And I follow "Delete my account"
-    And I follow "don't delete my account"
-    Then I should not see "Your account has been deleted"

data/lib/generators/saucy/features/templates/step_definitions/braintree_steps.rb

@@ -18,7 +18,7 @@ Given /^the following transaction exist for the "([^"]*)" account:$/ do |account
   table.hashes.each do |transaction|
     FakeBraintree.transaction = { :status => transaction["status"],
                                   :amount => transaction["amount"],
-                                  :created_at => Time.parse(transaction["created_at"]),
+                                  :created_at => DateTime.parse(transaction["created_at"]),
                                   :subscription_id => account.subscription_token }
     subscription["transactions"] << FakeBraintree.generated_transaction
   end

data/lib/generators/saucy/features/templates/step_definitions/cron_steps.rb

@@ -1,6 +1,8 @@
 require 'rake'
 
 module RakeHelpers
+  include Rake::DSL
+
   def fake_rake
     old_rake = Rake.application
     rake = Rake::Application.new
@@ -16,7 +18,7 @@ World(RakeHelpers)
 
 When /^the daily Saucy jobs are processed$/ do
   fake_rake do |rake|
-    Saucy::Engine.new.load_tasks
+    Saucy::Engine.load_tasks
     rake['saucy:daily'].invoke
   end
 end

data/lib/generators/saucy/features/templates/step_definitions/session_steps.rb

@@ -33,6 +33,6 @@ end
 When /^I authenticate as the site owner$/ do
   name, password = Saucy::Configuration.admin_username, Saucy::Configuration.admin_password
   # This is done differently in various capybara versions, you may need to change it to
-  # page.driver.browser.basic_authorize - or - page.driver.basic_auth
-  page.driver.basic_authorize name, password
+  # page.driver.basic_authorize - or - page.driver.basic_auth
+  page.driver.browser.basic_authorize name, password
 end

data/lib/saucy/configuration.rb

@@ -8,7 +8,6 @@ module Saucy
     cattr_accessor :merchant_account_id
     cattr_accessor :admin_username
     cattr_accessor :admin_password
-    cattr_accessor :merchant_account_time_zone
 
     def initialize
       @@manager_email_address = 'manager@example.com'
@@ -16,7 +15,6 @@ module Saucy
       @@layouts               = Layouts.new
       @@admin_username        = 'admin'
       @@admin_password        = 'admin'
-      @@merchant_account_time_zone = 'Eastern Time (US & Canada)'
     end
 
   end

data/lib/saucy/engine.rb

@@ -31,10 +31,7 @@ module Saucy
       ActionView::Base.send :include, CouponsHelper
     end
 
-    {
-      :short_date => "%x",
-      :braintree_date => "%Y-%m-%d"
-    }.each do |k, v|
+    {:short_date => "%x"}.each do |k, v|
       Time::DATE_FORMATS[k] = v
     end
 

data/lib/saucy/fake_braintree.rb

@@ -102,7 +102,7 @@ ShamRack.at("www.braintreegateway.com", 443).sinatra do
     subscription["transactions"] = []
     subscription["add_ons"] = []
     subscription["discounts"] = []
-    subscription["next_billing_date"] = 1.month.from_now.to_s(:braintree_date)
+    subscription["next_billing_date"] = 1.month.from_now
     subscription["status"] = Braintree::Subscription::Status::Active
     FakeBraintree.subscriptions[subscription["id"]] = subscription
     [201, { "Content-Encoding" => "gzip" }, ActiveSupport::Gzip.compress(subscription.to_xml(:root => 'subscription'))]

data/lib/saucy/routing_extensions.rb

@@ -6,13 +6,8 @@
 # project_path(@project), because the account can be inferred from the project.
 module Saucy
   module MapperExtensions
-    def initialize(*args)
-      @through_scope = []
-      super
-    end
-
     def through(parent, &block)
-      @through_scope << parent
+      (@through_scope ||= []) << parent
       resources(parent, :only => [], &block)
       @through_scope.pop
     end
@@ -82,7 +77,7 @@ end
 ActionDispatch::Routing::Mapper::Base.class_eval do
   def match_with_through(path, options=nil)
     match_without_through(path, options)
-    unless @through_scope.empty?
+    if @through_scope.present?
       route = @set.routes.last
       @set.named_routes.add_through_alias(route, @through_scope) if route.name
     end

data/lib/saucy/subscription.rb

@@ -1,5 +1,3 @@
-require 'airbrake'
-
 module Saucy
   module Subscription
     extend ActiveSupport::Concern
@@ -88,10 +86,9 @@ module Saucy
       end
 
       def update_subscription_cache!
-        zone = ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone]
         flush_cache :subscription
         update_attribute(:subscription_status, subscription.status)
-        update_attribute(:next_billing_date, zone.parse(subscription.next_billing_date))
+        update_attribute(:next_billing_date, subscription.next_billing_date)
       end
 
       def changing_plan?(attributes)
@@ -113,20 +110,7 @@ module Saucy
         if valid?
           result = Braintree::Customer.update(customer_token, customer_attributes)
           handle_customer_result(result)
-          if !result.success?
-            Airbrake.notify(
-              :error_class   => "Customer update",
-              :error_message => "Customer update failed",
-              :parameters    => { :customer_token => customer_token, :customer_attributes => customer_attributes }
-            )
-          end
           result.success?
-        else
-          Airbrake.notify(
-            :error_class   => "Subscription Validation",
-            :error_message => "Customer failed validation",
-            :parameters    => customer_attributes
-          )
         end
       end
 
@@ -191,11 +175,6 @@ module Saucy
       end
 
       def handle_errors(result, remote_errors)
-        Airbrake.notify(
-          :error_class   => "handle_errors",
-          :error_message => "handle_errors",
-          :parameters    => { :result => result, :remote_errors => remote_errors }
-        )
         if result && result.status == "processor_declined"
           errors[:card_number] << "was denied by the payment processor with the message: #{result.processor_response_text}"
         elsif result && result.status == "gateway_rejected"
@@ -218,16 +197,10 @@ module Saucy
       def create_subscription
         result = Braintree::Subscription.create(subscription_attributes)
         if result.success?
-          zone = ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone]
           self.subscription_token = result.subscription.id
-          self.next_billing_date = zone.parse(result.subscription.next_billing_date)
+          self.next_billing_date = result.subscription.next_billing_date
           self.subscription_status = result.subscription.status
         else
-          Airbrake.notify(
-            :error_class   => "Subscription creation",
-            :error_message => "Subscription creation failed",
-            :parameters    => subscription_attributes
-          )
           false
         end
       end
@@ -251,9 +224,8 @@ module Saucy
       def update_subscriptions!
         recently_billed = where("next_billing_date <= ?", Time.now)
         recently_billed.each do |account|
-          zone = ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone]
           account.subscription_status = account.subscription.status
-          account.next_billing_date = zone.parse(account.subscription.next_billing_date)
+          account.next_billing_date = account.subscription.next_billing_date
           account.save!
           if account.past_due?
             BillingMailer.problem(account, account.subscription.transactions.last).deliver!

data/public/saucy/stylesheets/screen.css

@@ -28,8 +28,4 @@ body {
 
 #container .search {
   float: right;
-}
-
-div#account-deletion-warning {
-  display: none;
-}
+}

data/spec/environment.rb

@@ -31,11 +31,11 @@ module Testapp
   class Application < Rails::Application
     config.action_mailer.default_url_options = { :host => 'localhost' }
     config.encoding = "utf-8"
-    config.paths.config.database = "spec/scaffold/config/database.yml"
-    config.paths.app.models << "lib/generators/saucy/install/templates/models"
-    config.paths.config.routes << "spec/scaffold/config/routes.rb"
-    config.paths.app.views << "spec/scaffold/views"
-    config.paths.log = "tmp/log"
+    config.paths['config/database'] = "spec/scaffold/config/database.yml"
+    config.paths['app/models'] << "lib/generators/saucy/install/templates/models"
+    config.paths['config/routes'] << "spec/scaffold/config/routes.rb"
+    config.paths['app/views'] << "spec/scaffold/views"
+    config.paths['log'] = "tmp/log"
     config.cache_classes = true
     config.whiny_nils = true
     config.consider_all_requests_local = true
@@ -48,6 +48,7 @@ module Testapp
 end
 
 Testapp::Application.initialize!
+ActionController::Base.send :include, Rails.application.routes.url_helpers
 
 require "./lib/generators/saucy/features/templates/factories"
 require "./lib/generators/saucy/install/templates/create_saucy_tables"

data/spec/models/subscription_spec.rb

@@ -122,9 +122,8 @@ describe Account, "with a paid plan" do
     subject.subscription.should_not be_nil
   end
 
-  it "has a next_billing_date in the merchant account timezone" do
-    Time.stubs(:now => Time.parse("2011-09-16 02:00 -0000"))
-    subject.next_billing_date.should == Time.parse("Sun, 16 Oct 2011 00:00:00 EDT -04:00")
+  it "has a next_billing_date" do
+    subject.next_billing_date.should_not be_nil
   end
 
   it "has an active subscription status" do
@@ -295,18 +294,15 @@ describe Account, "with a paid subscription" do
             :plan => Factory(:paid_plan))
   end
 
-  let(:merchant_time_zone) { ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone] }
-
   it "gets marked as past due and updates its next_billing_date when subscriptions are updated and it has been rejected by the gateway" do
-    next_billing_date_string = 2.months.from_now.to_s(:braintree_date)
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
-    subscription["next_billing_date"] = next_billing_date_string
+    subscription["next_billing_date"] = 2.months.from_now
 
     Timecop.travel(subject.next_billing_date + 1.day) do
       Account.update_subscriptions!
       subject.reload.subscription_status.should == Braintree::Subscription::Status::PastDue
-      subject.next_billing_date.should == merchant_time_zone.parse(next_billing_date_string)
+      subject.next_billing_date.to_s.should == subscription["next_billing_date"].to_s
       subject.past_due?.should be
     end
   end
@@ -316,7 +312,7 @@ describe Account, "with a paid subscription" do
 
     before do
       subscription["status"] = Braintree::Subscription::Status::PastDue
-      subscription["next_billing_date"] = 2.months.from_now.to_s(:braintree_date)
+      subscription["next_billing_date"] = 2.months.from_now
       FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Failed,
                                     :subscription_id => subject.subscription_token }
       subscription["transactions"] = [FakeBraintree.generated_transaction]
@@ -343,57 +339,12 @@ describe Account, "with a paid subscription" do
     end
   end
 
-  context "with a merchant account timezone different from the system timezone" do
-    def build_subscription(account)
-      subscription = FakeBraintree.subscriptions[account.subscription_token]
-      subscription["status"] = Braintree::Subscription::Status::Active
-      subscription["transactions"] = [FakeBraintree.generated_transaction]
-      subscription
-    end
-
-    before do
-      @old_env_tz = ENV['TZ']
-      ENV['TZ'] = "Europe/Paris"
-
-      Saucy::Configuration.merchant_account_time_zone = "Eastern Time (US & Canada)"
-      subject.next_billing_date = "2011-08-15"
-      subject.save!
-
-      subscription = build_subscription(subject)
-      subscription["next_billing_date"] = "2011-09-15"
-
-      Time.stubs(:now => Time.parse("2011-08-16 02:00 -0000"))
-      Account.update_subscriptions!
-      ActionMailer::Base.deliveries.clear
-
-      subject.reload.next_billing_date.should == Time.parse("2011-09-15 00:00 -0400")
-    end
-
-    after do
-      ENV['TZ'] = @old_env_tz
-    end
-
-    it "does not update accounts if their billing date hasn't elapsed from the merchant account's perspective" do
-      Time.stubs(:now => Time.parse("2011-09-15 02:00 -0000"))
-      Account.update_subscriptions!
-      ActionMailer::Base.deliveries.should be_empty
-    end
-
-    it "does update accounts if their billing date has elapsed from the merchant account's perspective" do
-      Time.stubs(:now => Time.parse("2011-09-16 02:00 -0000"))
-      Account.update_subscriptions!
-      ActionMailer::Base.deliveries.should_not be_empty
-    end
-  end
-
   context "and an active subscription due 2 months from now" do
     let(:subscription) { FakeBraintree.subscriptions[subject.subscription_token] }
-    let(:next_billing_date_string) { 2.months.from_now.to_s(:braintree_date) }
-    let(:zone) { ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone] }
 
     before do
       subscription["status"] = Braintree::Subscription::Status::Active
-      subscription["next_billing_date"] = next_billing_date_string
+      subscription["next_billing_date"] = 2.months.from_now
       FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Settled,
                                     :subscription_id => subject.subscription_token }
       subscription["transactions"] = [FakeBraintree.generated_transaction]
@@ -403,7 +354,7 @@ describe Account, "with a paid subscription" do
       Timecop.travel(subject.next_billing_date + 1.day) do
         Account.update_subscriptions!
         subject.reload.subscription_status.should == Braintree::Subscription::Status::Active
-        subject.next_billing_date.should == zone.parse(next_billing_date_string)
+        subject.next_billing_date.to_s.should == subscription["next_billing_date"].to_s
       end
     end
 
@@ -464,7 +415,7 @@ describe Account, "with a paid subscription that is past due" do
   before do
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
-    subscription["next_billing_date"] = 2.months.from_now.to_s(:braintree_date)
+    subscription["next_billing_date"] = 2.months.from_now
 
     Timecop.travel(subject.next_billing_date + 1.day) do
       Account.update_subscriptions!
@@ -472,13 +423,10 @@ describe Account, "with a paid subscription that is past due" do
     subject.reload
   end
 
-  let(:zone) { ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone] }
-
   it "retries the subscription charge and updates the subscription when the billing information is correctly updated" do
-    next_billing_date_string = 1.day.from_now.to_s(:braintree_date)
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::Active
-    subscription["next_billing_date"] = next_billing_date_string
+    subscription["next_billing_date"] = 2.months.from_now
     FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Settled,
                                   :subscription_id => subject.subscription_token }
     transaction = FakeBraintree.generated_transaction
@@ -496,14 +444,13 @@ describe Account, "with a paid subscription that is past due" do
                                             :expiration_year => 2012).should be
 
     subject.reload.subscription_status.should == Braintree::Subscription::Status::Active
-    subject.next_billing_date.should == zone.parse(next_billing_date_string)
+    subject.next_billing_date.to_s.should == subscription["next_billing_date"].to_s
   end
 
   it "retries the subscription charge and updates the subscription when the payment processing fails" do
-    next_billing_date_string = 2.months.from_now.to_s(:braintree_date)
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
-    subscription["next_billing_date"] = next_billing_date_string
+    subscription["next_billing_date"] = 1.day.from_now
     FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Failed,
                                   :subscription_id => subject.subscription_token }
     transaction = FakeBraintree.generated_transaction
@@ -522,14 +469,13 @@ describe Account, "with a paid subscription that is past due" do
 
     subject.errors[:card_number].should include("was denied by the payment processor with the message: no good")
     subject.reload.subscription_status.should == Braintree::Subscription::Status::PastDue
-    subject.next_billing_date.should == zone.parse(next_billing_date_string)
+    subject.next_billing_date.to_s.should == subscription["next_billing_date"].to_s
   end
 
   it "retries the subscription charge and updates the subscription when the settlement fails" do
-    next_billing_date_string = 1.day.from_now.to_s(:braintree_date)
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::PastDue
-    subscription["next_billing_date"] = next_billing_date_string
+    subscription["next_billing_date"] = 1.day.from_now
     FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Failed,
                                   :subscription_id => subject.subscription_token }
     transaction = FakeBraintree.generated_transaction
@@ -548,7 +494,7 @@ describe Account, "with a paid subscription that is past due" do
 
     subject.errors[:card_number].should include("no good")
     subject.reload.subscription_status.should == Braintree::Subscription::Status::PastDue
-    subject.next_billing_date.should == zone.parse(next_billing_date_string)
+    subject.next_billing_date.to_s.should == subscription["next_billing_date"].to_s
   end
 end
 

data/spec/saucy/configuration_spec.rb

@@ -36,18 +36,4 @@ describe Saucy::Configuration do
       subject.support_email_address = old_address
     end
   end
-
-  it "can assign a merchant_account_time_zone" do
-    old_merchant_account_time_zone = subject.merchant_account_time_zone
-    begin
-      subject.merchant_account_time_zone = "International Date Line West"
-      subject.merchant_account_time_zone.should == "International Date Line West"
-    ensure
-      subject.merchant_account_time_zone = old_merchant_account_time_zone
-    end
-  end
-
-  it "defaults merchant_account_time_zone to 'Eastern Time (US & Canada)'" do
-    subject.merchant_account_time_zone.should == "Eastern Time (US & Canada)"
-  end
 end

data/spec/spec_helper.rb

@@ -2,13 +2,13 @@
 ENV["RAILS_ENV"] ||= 'test'
 
 if File.exist?("config/environment.rb")
-  require "config/environment"
+  require "./config/environment"
 else
   require File.expand_path("../environment", __FILE__)
 end
 
 require 'rspec/rails'
-require 'shoulda'
+require 'shoulda/matchers'
 require 'timecop'
 
 # Requires supporting ruby files with custom matchers and macros, etc,

data/spec/support/clearance_matchers.rb

@@ -1,6 +1,6 @@
 module ClearanceMatchers
   class DenyAccessMatcher
-    include Shoulda::ActionController::Matchers
+    include Shoulda::Matchers::ActionController
 
     def initialize(context)
       @context = context

data/spec/support/notifications.rb

@@ -46,7 +46,7 @@ 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)
+    recorder.events.include? @event
   end
 
   failure_message do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 10
-  - 10
-  version: 0.10.10
+  - 11
+  - 2
+  version: 0.11.2
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 Z
+date: 2011-09-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clearance
@@ -117,26 +117,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: airbrake
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 0
-        - 4
-        version: 3.0.4
-  type: :runtime
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -148,7 +132,7 @@ dependencies:
         - 6
         version: 0.2.6
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []
@@ -358,7 +342,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS