saucy 0.2.36 → 0.2.38

data/README.md

@@ -28,13 +28,15 @@ 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 custom the from email address on billing emails:
+You will want to customize the from email address on billing emails:
 
 Saucy::Configuration.mailer_sender = "billingemail@example.com"
 
 In addition, there are a number of strings such as application name, support url, etc. that are provided and customized with i18n translations.  You can customize these in your app, and you can see what they are by looking at config/locales/en.yml in saucy.
 
-There is a `saucy:update_subscriptions` rake task which should be run on a regular basis to send receipts and payment processing problem emails.
+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.
 
 Development environment
 -----------------------
@@ -83,3 +85,11 @@ To extend the ProjectsController:
       end
     end
 
+## Gotchas
+
+Make sure you don't do this in ApplicationController:
+
+    before_filter :authenticate
+
+Saucy's internal controllers don't skip any before filters.
+

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

@@ -32,5 +32,6 @@ Feature: edit permissions for a project
     When I follow "Stocknames" within "ul.projects"
     Then the "Bill" checkbox should not be checked
     And the "Jane" checkbox should be checked
+    And the "Hank" checkbox should be checked
     And I should not see "Jeff"
 

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

@@ -1,4 +1,23 @@
+require 'rake'
+
+module RakeHelpers
+  def fake_rake
+    old_rake = Rake.application
+    rake = Rake::Application.new
+    Rake.application = rake
+    task :environment
+    yield(rake)
+  ensure
+    Rake.application = old_rake
+  end
+end
+
+World(RakeHelpers)
+
 When /^the daily Saucy jobs are processed$/ do
-  Saucy::Cron.run_daily
+  fake_rake do |rake|
+    Saucy::Engine.new.load_tasks
+    rake['saucy:daily'].invoke
+  end
 end
 

data/lib/saucy.rb

@@ -7,5 +7,4 @@ require 'saucy/account_authorization'
 require 'saucy/configuration'
 require 'saucy/engine'
 require 'saucy/projects_controller'
-require 'saucy/cron'
 

data/lib/saucy/project.rb

@@ -73,6 +73,7 @@ module Saucy
 
       def update_memberships
         if @new_user_ids
+          @new_user_ids += admin_user_ids
           removed_user_ids = self.user_ids - @new_user_ids
           added_user_ids = @new_user_ids - self.user_ids
 
@@ -84,6 +85,14 @@ module Saucy
           end
         end
       end
+
+      def admin_user_ids
+        account.
+          memberships.
+          where(:admin => true).
+          select(:user_id).
+          map(&:user_id)
+      end
     end
   end
 end

data/lib/saucy/railties/tasks.rake

@@ -1,6 +1,22 @@
 namespace :saucy do
-  desc "Completes the current iteration for each project"
+  desc "Updates subscription status and delivers receipt/problem notices"
   task :update_subscriptions => :environment do
     Account.update_subscriptions!
   end
+
+  desc "Deliver notifications for users that have signed up and aren't activated"
+  task :ask_users_to_activate => :environment do
+    Account.deliver_new_unactivated_notifications
+  end
+
+  desc "Deliver notifications to users with expiring trial accounts"
+  task :deliver_expiring_trial_notifications => :environment do
+    Account.deliver_expiring_trial_notifications
+  end
+
+  desc "Run all daily tasks"
+  task :daily => [:update_subscriptions,
+                  :ask_users_to_activate,
+                  :deliver_expiring_trial_notifications]
 end
+

data/spec/models/project_spec.rb

@@ -120,14 +120,17 @@ describe Project, "assigning a new user list" do
   let(:account) { subject.account }
   let!(:member) { Factory(:user) }
   let!(:non_member) { Factory(:user) }
+  let!(:admin) { Factory(:user) }
 
   before do
     member_membership =
       Factory(:membership, :account => account, :user => member)
     non_member_membership =
       Factory(:membership, :account => account, :user => non_member)
+    admin_membership =
+      Factory(:membership, :account => account, :user => admin, :admin => true)
     Factory(:permission, :membership => member_membership,
-                                 :project            => subject)
+                         :project    => subject)
 
     subject.reload.update_attributes!(:user_ids => [non_member.id, ""])
   end
@@ -139,4 +142,8 @@ describe Project, "assigning a new user list" do
   it "removes a removed user" do
     non_member.should be_member_of(subject)
   end
+
+  it "keeps an admin" do
+    admin.should be_member_of(subject)
+  end
 end

metadata

@@ -1,23 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 91
   prerelease: 
   segments: 
   - 0
   - 2
-  - 36
-  version: 0.2.36
+  - 38
+  version: 0.2.38
 platform: ruby
 authors: 
 - thoughtbot, inc.
 - Joe Ferris
 - Mike Burns
+- Chad Pytel
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -05:00
+date: 2011-03-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -202,7 +203,6 @@ files:
 - lib/saucy/account.rb
 - lib/saucy/account_authorization.rb
 - lib/saucy/configuration.rb
-- lib/saucy/cron.rb
 - lib/saucy/engine.rb
 - lib/saucy/fake_braintree.rb
 - lib/saucy/layouts.rb

data/lib/saucy/cron.rb

@@ -1,9 +0,0 @@
-module Saucy
-  module Cron
-    def self.run_daily
-      ::Account.deliver_new_unactivated_notifications
-      ::Account.deliver_expiring_trial_notifications
-    end
-  end
-end
-