saucy 0.15.2 → 0.16.0

data/lib/saucy/projects_controller.rb

@@ -13,77 +13,75 @@ module Saucy
       layout Saucy::Layouts.to_proc
     end
 
-    module InstanceMethods
-      def new
-        @project = current_account.projects.build_with_default_permissions
-        if @project.keyword.blank?
-          @project.keyword = 'keyword'
-        end
+    def new
+      @project = current_account.projects.build_with_default_permissions
+      if @project.keyword.blank?
+        @project.keyword = 'keyword'
       end
+    end
 
-      def create
-        @project = current_account.projects.build(params[:project])
-        if @project.save
-          redirect_to project_url(@project)
-        else
-          render :action => :new
-        end
+    def create
+      @project = current_account.projects.build(params[:project])
+      if @project.save
+        redirect_to account_project_url(current_account, @project)
+      else
+        render :action => :new
       end
+    end
 
-      def edit
-        @project = current_project
-        set_project_account_if_moving
-      end
+    def edit
+      @project = current_project
+      set_project_account_if_moving
+    end
 
-      def update
-        @project = current_project
-        set_project_account_if_moving
-        if @project.update_attributes params[:project]
-          redirect_to account_projects_url(@project.account), :notice => 'Project was updated.'
-        else
-          render :action => :edit
-        end
+    def update
+      @project = current_project
+      set_project_account_if_moving
+      if @project.update_attributes params[:project]
+        redirect_to account_projects_url(@project.account), :notice => 'Project was updated.'
+      else
+        render :action => :edit
       end
+    end
 
-      def show
-        current_project
-      end
+    def show
+      current_project
+    end
 
-      def destroy
-        current_project.destroy
-        redirect_to account_projects_url(current_project.account), :notice => "Project has been deleted"
-      end
+    def destroy
+      current_project.destroy
+      redirect_to account_projects_url(current_project.account), :notice => "Project has been deleted"
+    end
 
-      def index
-        @active_projects = current_account.projects.active
-        @archived_projects = current_account.projects.archived
-      end
+    def index
+      @active_projects = current_account.projects.active
+      @archived_projects = current_account.projects.archived
+    end
 
-      private
+    private
 
-      def set_project_account_if_moving
-        if params[:project] && params[:project][:account_id]
-          @project.account_id = params[:project][:account_id]
-        end
+    def set_project_account_if_moving
+      if params[:project] && params[:project][:account_id]
+        @project.account_id = params[:project][:account_id]
       end
+    end
 
-      def current_project
-        @project ||= current_account.projects.find_by_keyword!(params[:id])
-      end
+    def current_project
+      @project ||= current_account.projects.find_by_keyword!(params[:id])
+    end
 
-      def current_project?
-        params[:id].present?
-      end
+    def current_project?
+      params[:id].present?
+    end
 
-      def ensure_account_within_projects_limit
-        ensure_account_within_limit("projects")
-      end
+    def ensure_account_within_projects_limit
+      ensure_account_within_limit("projects")
+    end
 
-      def ensure_admin_for_project_account
-        if params[:project] && params[:project][:account_id]
-          if !current_user.admin_of?(::Account.find(params[:project][:account_id]))
-            redirect_to account_projects_url(current_account), :alert => t('account.permission_denied', :default => "You do not have permission to this account.")
-          end
+    def ensure_admin_for_project_account
+      if params[:project] && params[:project][:account_id]
+        if !current_user.admin_of?(::Account.find(params[:project][:account_id]))
+          redirect_to account_projects_url(current_account), :alert => t('account.permission_denied', :default => "You do not have permission to this account.")
         end
       end
     end

data/lib/saucy/subscription.rb

@@ -42,242 +42,240 @@ module Saucy
       memoize :subscription
     end
 
-    module InstanceMethods
-      def customer
-        Braintree::Customer.find(customer_token) if customer_token
-      end
+    def customer
+      Braintree::Customer.find(customer_token) if customer_token
+    end
 
-      def credit_card
-        customer.credit_cards[0] if customer && customer.credit_cards.any?
-      end
+    def credit_card
+      customer.credit_cards[0] if customer && customer.credit_cards.any?
+    end
 
-      def billing_address
-        credit_card.billing_address if credit_card
-      end
+    def billing_address
+      credit_card.billing_address if credit_card
+    end
 
-      def subscription
-        Braintree::Subscription.find(subscription_token) if subscription_token
-      end
+    def subscription
+      Braintree::Subscription.find(subscription_token) if subscription_token
+    end
 
-      def save_customer_and_subscription!(attributes)
-        successful = true
-        self.plan = ::Plan.find(attributes[:plan_id]) if changing_plan?(attributes)
-        if changing_customer_attributes?(attributes)
-          successful = update_customer(attributes)
-        end
-        if successful && past_due?
-          successful = retry_subscription_charge!
-        end
-        if successful && changing_plan?(attributes)
-          save_subscription
-          flush_cache :subscription
-        end
-        successful && save
+    def save_customer_and_subscription!(attributes)
+      successful = true
+      self.plan = ::Plan.find(attributes[:plan_id]) if changing_plan?(attributes)
+      if changing_customer_attributes?(attributes)
+        successful = update_customer(attributes)
       end
-
-      def can_change_plan_to?(new_plan)
-        within_limits_for?(new_plan) && !past_trial_for?(new_plan)
+      if successful && past_due?
+        successful = retry_subscription_charge!
       end
-
-      def past_due?
-        subscription_status == Braintree::Subscription::Status::PastDue
+      if successful && changing_plan?(attributes)
+        save_subscription
+        flush_cache :subscription
       end
+      successful && save
+    end
 
-      def most_recent_transaction
-        subscription.transactions.sort_by(&:created_at).last
-      end
+    def can_change_plan_to?(new_plan)
+      within_limits_for?(new_plan) && !past_trial_for?(new_plan)
+    end
 
-      private
+    def past_due?
+      subscription_status == Braintree::Subscription::Status::PastDue
+    end
 
-      def within_limits_for?(new_plan)
-        new_plan.limits.where(:value_type => :number).all? do |limit|
-          new_plan.limit(limit.name).value >= send(:"#{limit.name}_count")
-        end
-      end
+    def most_recent_transaction
+      subscription.transactions.sort_by(&:created_at).last
+    end
 
-      def past_trial_for?(new_plan)
-        new_plan.trial? && past_trial?
-      end
+    private
 
-      def retry_subscription_charge!
-        authorized_transaction = Braintree::Subscription.retry_charge(subscription.id).transaction
-        result = Braintree::Transaction.submit_for_settlement(authorized_transaction.id)
-        handle_errors(authorized_transaction, result.errors) if !result.success?
-        update_subscription_cache!
-        result.success?
+    def within_limits_for?(new_plan)
+      new_plan.limits.where(:value_type => :number).all? do |limit|
+        new_plan.limit(limit.name).value >= send(:"#{limit.name}_count")
       end
+    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))
-      end
+    def past_trial_for?(new_plan)
+      new_plan.trial? && past_trial?
+    end
 
-      def changing_plan?(attributes)
-        attributes[:plan_id].present?
-      end
+    def retry_subscription_charge!
+      authorized_transaction = Braintree::Subscription.retry_charge(subscription.id).transaction
+      result = Braintree::Transaction.submit_for_settlement(authorized_transaction.id)
+      handle_errors(authorized_transaction, result.errors) if !result.success?
+      update_subscription_cache!
+      result.success?
+    end
 
-      def changing_customer_attributes?(attributes)
-        CUSTOMER_ATTRIBUTES.any? { |attribute| attributes[attribute].present? }
-      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))
+    end
 
-      def set_customer_attributes(attributes)
-        CUSTOMER_ATTRIBUTES.each do |attribute|
-          send("#{attribute}=", attributes[attribute]) if attributes[attribute].present?
-        end
+    def changing_plan?(attributes)
+      attributes[:plan_id].present?
+    end
+
+    def changing_customer_attributes?(attributes)
+      CUSTOMER_ATTRIBUTES.any? { |attribute| attributes[attribute].present? }
+    end
+
+    def set_customer_attributes(attributes)
+      CUSTOMER_ATTRIBUTES.each do |attribute|
+        send("#{attribute}=", attributes[attribute]) if attributes[attribute].present?
       end
+    end
 
-      def update_customer(attributes)
-        set_customer_attributes(attributes)
-        if valid?
-          result = Braintree::Customer.update(customer_token, customer_attributes)
-          handle_customer_result(result)
-          if !result.success?
-            Airbrake.notify(nil,
-              :error_class   => "Customer update",
-              :error_message => "Customer update failed",
-              :parameters    => { :customer_token => customer_token, :customer_attributes => customer_attributes }
-            )
-          end
-          result.success?
-        else
+    def update_customer(attributes)
+      set_customer_attributes(attributes)
+      if valid?
+        result = Braintree::Customer.update(customer_token, customer_attributes)
+        handle_customer_result(result)
+        if !result.success?
           Airbrake.notify(nil,
-            :error_class   => "Subscription Validation",
-            :error_message => "Customer failed validation",
-            :parameters    => customer_attributes
+            :error_class   => "Customer update",
+            :error_message => "Customer update failed",
+            :parameters    => { :customer_token => customer_token, :customer_attributes => customer_attributes }
           )
         end
+        result.success?
+      else
+        Airbrake.notify(nil,
+          :error_class   => "Subscription Validation",
+          :error_message => "Customer failed validation",
+          :parameters    => customer_attributes
+        )
       end
+    end
 
-      def save_subscription
-        if subscription
-          Braintree::Subscription.update(subscription_token,
-                                         :plan_id => plan_id,
-                                         :price => plan.price.to_s)
-        elsif plan.billed?
-          valid? && create_subscription
-        end
+    def save_subscription
+      if subscription
+        Braintree::Subscription.update(subscription_token,
+                                        :plan_id => plan_id,
+                                        :price => plan.price.to_s)
+      elsif plan.billed?
+        valid? && create_subscription
       end
+    end
 
-      def customer_attributes
-        {
-          :email => billing_email,
-          :credit_card => credit_card_attributes
-        }
-      end
+    def customer_attributes
+      {
+        :email => billing_email,
+        :credit_card => credit_card_attributes
+      }
+    end
 
-      def credit_card_attributes
-        if plan.billed?
-          card_attributes = { :cardholder_name => cardholder_name,
-                              :number => card_number,
-                              :expiration_month => expiration_month,
-                              :expiration_year => expiration_year,
-                              :cvv => verification_code,
-                              :billing_address => {
-                                :street_address => street_address,
-                                :extended_address => extended_address,
-                                :locality => locality,
-                                :region => region,
-                                :postal_code => postal_code,
-                                :country_name => country_name
-                              }
+    def credit_card_attributes
+      if plan.billed?
+        card_attributes = { :cardholder_name => cardholder_name,
+                            :number => card_number,
+                            :expiration_month => expiration_month,
+                            :expiration_year => expiration_year,
+                            :cvv => verification_code,
+                            :billing_address => {
+                              :street_address => street_address,
+                              :extended_address => extended_address,
+                              :locality => locality,
+                              :region => region,
+                              :postal_code => postal_code,
+                              :country_name => country_name
                             }
-          if credit_card
-            card_attributes.merge!(:options => credit_card_options)
-          end
-          card_attributes
-        else
-          {}
+                          }
+        if credit_card
+          card_attributes.merge!(:options => credit_card_options)
         end
+        card_attributes
+      else
+        {}
       end
+    end
 
-      def credit_card_options
-        if customer && customer.credit_cards.any?
-          { :update_existing_token => credit_card.token }
-        else
-          {}
-        end
+    def credit_card_options
+      if customer && customer.credit_cards.any?
+        { :update_existing_token => credit_card.token }
+      else
+        {}
       end
+    end
 
-      def create_customer
-        result = Braintree::Customer.create(customer_attributes)
-        handle_customer_result(result)
-      end
+    def create_customer
+      result = Braintree::Customer.create(customer_attributes)
+      handle_customer_result(result)
+    end
 
-      def destroy_customer
-        Braintree::Customer.delete(customer_token)
-      end
+    def destroy_customer
+      Braintree::Customer.delete(customer_token)
+    end
 
-      def handle_customer_result(result)
-        if result.success?
-          self.customer_token = result.customer.id
-          flush_cache :customer
-        else
-          handle_errors(result.credit_card_verification, result.errors)
-        end
-        result.success?
+    def handle_customer_result(result)
+      if result.success?
+        self.customer_token = result.customer.id
+        flush_cache :customer
+      else
+        handle_errors(result.credit_card_verification, result.errors)
       end
+      result.success?
+    end
 
-      def handle_errors(result, remote_errors)
-        Airbrake.notify(nil,
-          :error_class   => "handle_errors",
-          :error_message => "handle_errors",
-          :parameters    => { :result => result.inspect, :remote_errors => remote_errors.inspect }
-        )
-        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"
-          errors[:verification_code] << "did not match"
-        elsif remote_errors.any?
-          remote_errors.each do |error|
-            if error.attribute == "number"
-              errors[:card_number] << error.message.gsub("Credit card number ", "")
-            elsif error.attribute == "CVV"
-              errors[:verification_code] << error.message.gsub("CVV ", "")
-            elsif error.attribute == "expiration_month"
-              errors[:expiration_month] << error.message.gsub("Expiration month ", "")
-            elsif error.attribute == "expiration_year"
-              errors[:expiration_year] << error.message.gsub("Expiration year ", "")
-            else
-              errors[:card_number] << error.message
-            end
+    def handle_errors(result, remote_errors)
+      Airbrake.notify(nil,
+        :error_class   => "handle_errors",
+        :error_message => "handle_errors",
+        :parameters    => { :result => result.inspect, :remote_errors => remote_errors.inspect }
+      )
+      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"
+        errors[:verification_code] << "did not match"
+      elsif remote_errors.any?
+        remote_errors.each do |error|
+          if error.attribute == "number"
+            errors[:card_number] << error.message.gsub("Credit card number ", "")
+          elsif error.attribute == "CVV"
+            errors[:verification_code] << error.message.gsub("CVV ", "")
+          elsif error.attribute == "expiration_month"
+            errors[:expiration_month] << error.message.gsub("Expiration month ", "")
+          elsif error.attribute == "expiration_year"
+            errors[:expiration_year] << error.message.gsub("Expiration year ", "")
+          else
+            errors[:card_number] << error.message
           end
-        else
-          errors[:card_number] << "there was an unknown status"
         end
+      else
+        errors[:card_number] << "there was an unknown status"
       end
+    end
 
-      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.subscription_status = result.subscription.status
-        else
-          Airbrake.notify(nil,
-            :error_class   => "Subscription creation",
-            :error_message => "Subscription creation failed",
-            :parameters    => subscription_attributes
-          )
-          false
-        end
+    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.subscription_status = result.subscription.status
+      else
+        Airbrake.notify(nil,
+          :error_class   => "Subscription creation",
+          :error_message => "Subscription creation failed",
+          :parameters    => subscription_attributes
+        )
+        false
       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
+    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
+    def switching_to_billed?
+      plan_id && plan.billed? && subscription_token.blank?
     end
 
     module ClassMethods