saucy 0.15.2 → 0.16.0

data/features/support/engine/braintree.rb

@@ -0,0 +1,5 @@
+require 'fake_braintree'
+
+Before do |s|
+  FakeBraintree.clear!
+end

data/features/support/env.rb

@@ -1,7 +1,25 @@
+ENV["RAILS_ROOT"] = File.expand_path("../../../spec/dummy", __FILE__)
+$LOAD_PATH << ENV["RAILS_ROOT"]
+
+require 'rails/all'
+require 'formtastic'
+require 'jquery-rails'
+require 'timecop'
+require 'factory_girl'
+require 'capybara'
 require 'aruba/cucumber'
+require 'cucumber/rails'
 
 Before do
   @aruba_timeout_seconds = 140
 end
 
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
+
+Capybara.save_and_open_page_path = 'tmp'
+Capybara.javascript_driver = :selenium
+Capybara.default_selector = :css
+
+ActionController::Base.allow_rescue = false
+
+DatabaseCleaner.strategy = :truncation

data/features/support/factory_girl.rb

@@ -0,0 +1,2 @@
+require 'factory_girl'
+require "#{PROJECT_ROOT}/lib/generators/saucy/features/templates/factories"

data/features/support/paths.rb

@@ -0,0 +1,68 @@
+module NavigationHelpers
+  # Maps a name to a path. Used by the
+  #
+  #   When /^I go to (.+)$/ do |page_name|
+  #
+  # step definition in web_steps.rb
+  #
+  def path_to(page_name)
+    case page_name
+    when 'the admin page'
+      admin_path
+    when 'the list of accounts'
+      accounts_path
+    when 'the list of plans page'
+      plans_path
+    when /^the memberships page for the "([^"]+)" account$/
+      account = Account.find_by_name!($1)
+      account_memberships_path(account)
+    when /^the projects page for the "([^"]+)" account$/
+      account = Account.find_by_name!($1)
+      account_projects_path(account)
+    when /settings page for the "([^"]+)" account$/i
+      account = Account.find_by_name!($1)
+      edit_account_path(account)
+    when /settings page$/
+      edit_profile_path
+    when /dashboard page$/
+      accounts_path
+    when /sign up page for the "([^"]+)" plan$/i
+      plan = Plan.find_by_name!($1)
+      new_plan_account_path(plan)
+    when /^the billing page for the "([^"]+)" account$/
+      account = Account.find_by_name!($1)
+      account_billing_path(account)
+    when /^the upgrade plan page for the "([^"]+)" account$/
+      account = Account.find_by_name!($1)
+      edit_account_plan_path(account)
+    when /^the new project page for the newest account by "([^"]*)"$/
+      user = User.find_by_email!($1)
+      account = user.accounts.order("id desc").first
+      new_account_project_path(account)
+    when /^the "([^"]*)" project page$/
+      project = Project.find_by_name!($1)
+      account_project_path(project.account, project)
+    when /^the new project page for the "([^"]+)" account$/
+      account = Account.find_by_name!($1)
+      new_account_project_path(account)
+
+
+    # Here is an example that pulls values out of the Regexp:
+    #
+    #   when /^(.*)'s profile page$/i
+    #     user_profile_path(User.find_by_login($1))
+
+    else
+      begin
+        page_name =~ /^the (.*) page$/
+        path_components = $1.split(/\s+/)
+        self.send(path_components.push('path').join('_').to_sym)
+      rescue NoMethodError, ArgumentError
+        raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+          "Now, go and add a mapping in #{__FILE__}"
+      end
+    end
+  end
+end
+
+World(NavigationHelpers)

data/features/support/rails.rb

@@ -0,0 +1,4 @@
+Before("@generates-application") do
+  set_env "RAILS_ENV", nil
+  set_env "RAILS_ROOT", nil
+end

data/features/support/selectors.rb

@@ -0,0 +1,11 @@
+module Selectors
+  def selector_for(string)
+    if string =~ /^"(.*)"$/
+      $1
+    else
+      raise "Invalid selector: #{string}"
+    end
+  end
+end
+
+World(Selectors)

data/lib/generators/saucy/features/features_generator.rb

@@ -10,9 +10,9 @@ Description:
 DESC
 
       def copy_feature_files
-        directory "features", "features/saucy"
-        directory "step_definitions", "features/step_definitions/saucy"
-        directory "support", "features/support/saucy"
+        engine_directory "features"
+        engine_directory "features/step_definitions"
+        engine_directory "features/support"
         template "README", "features/saucy/README"
         template "README", "features/step_definitions/saucy/README"
         empty_directory "spec"
@@ -86,6 +86,10 @@ DESC
         File.open(path, "w") { |file| file.write(contents) }
       end
 
+      def engine_directory(prefix)
+        directory File.expand_path("../../../#{prefix}/engine"), "#{prefix}/saucy"
+      end
+
     end
   end
 end

data/lib/saucy/account.rb

@@ -37,79 +37,77 @@ module Saucy
       before_destroy :create_canceled_account
     end
 
-    module InstanceMethods
-      def to_param
-        keyword
-      end
+    def to_param
+      keyword
+    end
 
-      def has_member?(user)
-        memberships.exists?(:user_id => user.id)
-      end
+    def has_member?(user)
+      memberships.exists?(:user_id => user.id)
+    end
 
-      def users_by_name
-        users.by_name
-      end
+    def users_by_name
+      users.by_name
+    end
 
-      def projects_by_name
-        projects.by_name
-      end
+    def projects_by_name
+      projects.by_name
+    end
 
-      def projects_visible_to(user)
-        projects.visible_to(user)
-      end
+    def projects_visible_to(user)
+      projects.visible_to(user)
+    end
 
-      def memberships_by_name
-        memberships.by_name
-      end
+    def memberships_by_name
+      memberships.by_name
+    end
 
-      def expired?
-        trial? && past_trial?
-      end
+    def expired?
+      trial? && past_trial?
+    end
 
-      def past_trial?
-        trial_expires_at && trial_expires_at < Time.now
-      end
+    def past_trial?
+      trial_expires_at && trial_expires_at < Time.now
+    end
 
-      def admin_emails
-        admins.map(&:email)
-      end
+    def admin_emails
+      admins.map(&:email)
+    end
 
-      def set_trial_expiration
-        number_free_days = if coupon
-                             30 * coupon.free_months
-                           else
-                             Saucy::Configuration.trial_length
-                           end
-        self.trial_expires_at = number_free_days.days.from_now(created_at || Time.zone.now)
-      end
+    def set_trial_expiration
+      number_free_days = if coupon
+                            30 * coupon.free_months
+                          else
+                            Saucy::Configuration.trial_length
+                          end
+      self.trial_expires_at = number_free_days.days.from_now(created_at || Time.zone.now)
+    end
 
-      def reset_trial_expiration(length_in_days = nil)
-        new_length                       = length_in_days || Saucy::Configuration.trial_length
-        new_trial_start_date             = [trial_expires_at, Time.zone.now].max
-        self.trial_expires_at            = new_length.days.from_now(new_trial_start_date)
-        self.notified_of_completed_trial = false
-        self.notified_of_expiration      = false
-      end
+    def reset_trial_expiration(length_in_days = nil)
+      new_length                       = length_in_days || Saucy::Configuration.trial_length
+      new_trial_start_date             = [trial_expires_at, Time.zone.now].max
+      self.trial_expires_at            = new_length.days.from_now(new_trial_start_date)
+      self.notified_of_completed_trial = false
+      self.notified_of_expiration      = false
+    end
 
-      def record_new_activations
-        if activated_changed? && activated?
-          Saucy::Notifications.notify_observers("activated", :account => self)
-        end
+    def record_new_activations
+      if activated_changed? && activated?
+        Saucy::Notifications.notify_observers("activated", :account => self)
       end
+    end
 
-      def users_count
-        users.count
-      end
+    def users_count
+      users.count
+    end
 
-      def projects_count
-        projects.active.count
-      end
+    def projects_count
+      projects.active.count
+    end
 
-      private
+    private
 
-      def create_canceled_account
-        CanceledAccount.create(:account => self)
-      end
+    def create_canceled_account
+      CanceledAccount.create(:account => self)
     end
 
     module ClassMethods

data/lib/saucy/account_authorization.rb

@@ -4,63 +4,60 @@ module Saucy
 
     included do
       helper_method :current_account, :current_project, :current_account?, :current_project?
-      include InstanceMethods
     end
 
-    module InstanceMethods
-      protected
+    protected
 
-      def current_account
-        ::Account.find_by_keyword!(params[:account_id])
-      end
+    def current_account
+      ::Account.find_by_keyword!(params[:account_id])
+    end
 
-      def current_project
-        current_account.projects.find_by_keyword!(params[:project_id])
-      end
+    def current_project
+      current_account.projects.find_by_keyword!(params[:project_id])
+    end
 
-      def current_project?
-        params[:project_id].present?
-      end
+    def current_project?
+      params[:project_id].present?
+    end
 
-      def current_account?
-        params[:account_id].present?
-      end
+    def current_account?
+      params[:account_id].present?
+    end
 
-      def authorize_admin
-        unless current_user.admin_of?(current_account)
-          deny_access("You must be an admin to access that page.")
-        end
+    def authorize_admin
+      unless current_user.admin_of?(current_account)
+        deny_access("You must be an admin to access that page.")
       end
+    end
 
-      def authorize_member
-        unless current_user.member_of?(current_project)
-          deny_access("You do not have permission for this project.")
-        end
+    def authorize_member
+      unless current_user.member_of?(current_project)
+        deny_access("You do not have permission for this project.")
       end
+    end
 
-      def ensure_active_account
-        if current_account?
-          if current_account.past_due?
-            redirect_unusable_account account_billing_path(current_account),
-                                      "past_due"
-          end
-          if current_account.expired?
-            redirect_unusable_account edit_account_plan_path(current_account),
-                                      "expired"
-          end
+    def ensure_active_account
+      if current_account?
+        if current_account.past_due?
+          redirect_unusable_account account_billing_path(current_account),
+                                    "past_due"
+        end
+        if current_account.expired?
+          redirect_unusable_account edit_account_plan_path(current_account),
+                                    "expired"
         end
       end
+    end
 
-      def redirect_unusable_account(path, failure)
-        role = current_user.admin_of?(current_account) ? 'admin' : 'user'
-        flash[:alert] = t("saucy.errors.#{failure}.#{role}")
-        redirect_to path
-      end
+    def redirect_unusable_account(path, failure)
+      role = current_user.admin_of?(current_account) ? 'admin' : 'user'
+      flash[:alert] = t("saucy.errors.#{failure}.#{role}")
+      redirect_to path
+    end
 
-      def ensure_account_within_limit(limit_name)
-        if !Limit.can_add_one?(limit_name, current_account)
-          redirect_to edit_account_plan_path(current_account), :alert => t("saucy.errors.limited", :default => "You are at your limit of %{name} for your current plan.", :name => limit_name)
-        end
+    def ensure_account_within_limit(limit_name)
+      if !Limit.can_add_one?(limit_name, current_account)
+        redirect_to edit_account_plan_path(current_account), :alert => t("saucy.errors.limited", :default => "You are at your limit of %{name} for your current plan.", :name => limit_name)
       end
     end
   end

data/lib/saucy/plan.rb

@@ -29,26 +29,24 @@ module Saucy
       end
     end
 
-    module InstanceMethods
-      def free?
-        price.zero?
-      end
+    def free?
+      price.zero?
+    end
 
-      def billed?
-        !free?
-      end
+    def billed?
+      !free?
+    end
 
-      def can_add_more?(limit, amount)
-        limits.numbered.named(limit).value > amount
-      end
+    def can_add_more?(limit, amount)
+      limits.numbered.named(limit).value > amount
+    end
 
-      def allows?(limit)
-        limits.boolean.named(limit).allowed?
-      end
+    def allows?(limit)
+      limits.boolean.named(limit).allowed?
+    end
 
-      def limit(limit_name)
-        limits.named(limit_name)
-      end
+    def limit(limit_name)
+      limits.named(limit_name)
     end
   end
 end

data/lib/saucy/project.rb

@@ -65,60 +65,58 @@ module Saucy
       end
     end
 
-    module InstanceMethods
-      def to_param
-        keyword
-      end
+    def to_param
+      keyword
+    end
 
-      def has_member?(user)
-        permissions.
-          joins(:membership).
-          exists?(:memberships => { :user_id => user.id })
-      end
+    def has_member?(user)
+      permissions.
+        joins(:membership).
+        exists?(:memberships => { :user_id => user.id })
+    end
 
-      def assign_default_permissions
-        account.memberships.where(:admin => true).each do |membership|
-          self.permissions.build(:membership => membership)
-        end
-        self
+    def assign_default_permissions
+      account.memberships.where(:admin => true).each do |membership|
+        self.permissions.build(:membership => membership)
       end
+      self
+    end
 
-      private
+    private
 
-      def setup_memberships
-        @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
+    def setup_memberships
+      @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
 
-        permissions.where(:user_id => removed_user_ids).destroy_all
-        added_user_ids.each do |added_user_id|
-          membership =
-            account.memberships.where(:user_id => added_user_id).first
-          permissions.create!(:membership => membership)
-        end
+      permissions.where(:user_id => removed_user_ids).destroy_all
+      added_user_ids.each do |added_user_id|
+        membership =
+          account.memberships.where(:user_id => added_user_id).first
+        permissions.create!(:membership => membership)
       end
+    end
 
-      def update_memberships
-        setup_memberships if @new_user_ids
-      end
+    def update_memberships
+      setup_memberships if @new_user_ids
+    end
 
-      def admin_user_ids
-        account.
-          memberships.
-          where(:admin => true).
-          select(:user_id).
-          map(&:user_id)
-      end
+    def admin_user_ids
+      account.
+        memberships.
+        where(:admin => true).
+        select(:user_id).
+        map(&:user_id)
+    end
 
-      def ensure_account_within_limit
-        message = "You are at your limit of %{name} for your current plan."
-        if archived_changed? && !archived? && !Limit.can_add_one?("projects", account)
-          errors.add(:archived, I18n.t("saucy.errors.limited", :default => message, :name => 'projects'))
-        end
-        if account_id_changed? && !Limit.can_add_one?("projects", account)
-          errors.add(:account_id, I18n.t("saucy.errors.limited", :default => message, :name => 'projects'))
-        end
+    def ensure_account_within_limit
+      message = "You are at your limit of %{name} for your current plan."
+      if archived_changed? && !archived? && !Limit.can_add_one?("projects", account)
+        errors.add(:archived, I18n.t("saucy.errors.limited", :default => message, :name => 'projects'))
+      end
+      if account_id_changed? && !Limit.can_add_one?("projects", account)
+        errors.add(:account_id, I18n.t("saucy.errors.limited", :default => message, :name => 'projects'))
       end
     end
   end