tang 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bea3d8985d70c63421fda5fde41fb7319a8472598aa8545d99d9345008bff20b
-  data.tar.gz: 34579da07b32d7464b6cd2bf8cfe12ff2605c055eafeb13093277e48d615e91f
+  metadata.gz: f6c00e737bbd192088ebffd71f41793412c58ccaf3c71365c08c5e5d024346ab
+  data.tar.gz: '00954182108869f7fdbedab739d8a5ea51794279b4881bac6518e9b66c79f02c'
 SHA512:
-  metadata.gz: 8a53b31ff88b6fe827a49e6978d041af87120969e99174a8b8b5bbf7b1f68ad9d358aa9ecc764519d5bec92d17a22dc27e4ce34681a5b295b47a9d5a40a7a8df
-  data.tar.gz: 31f717a5b0a44ea6a33e7a6284c69686c3bbbc18ca425036ae43d05f3321c7380004b1c180a4efb717fc3c463b23bd6bc12fad7d1395ab5b543c17c0e206abb9
+  metadata.gz: 9616e9c1b253806fdc536fcb58f6f9f3afa3d848dca7ae945a04afc288df3cc8bb549faee196ff098d83f67942f102f5342a55da2bc04d6c045424dad9cab27f
+  data.tar.gz: 3cd81024f490c012b331131b4e6b8377714df41799883b7ace034603b2434083b35b719fb61e31404e72d2375a33d2542a81bc5a8d72292d574cdae0f23a0509

data/Rakefile

@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/tang_app/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/tang_app/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
 load 'rails/tasks/statistics.rake'
@@ -26,7 +26,7 @@ load './lib/tasks/tang_tasks.rake'
 begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
-  task :cucumber => 'app:cucumber'
+  task cucumber: 'app:cucumber'
   task default: [:spec, :cucumber]
 rescue LoadError
   puts 'rspec/core/rake_task not required'
@@ -53,5 +53,5 @@ namespace :rails do
     Dir.chdir('spec/tang_app') do
       system('rails c')
     end
-  end 
+  end
 end

data/app/controllers/tang/account/application_controller.rb

@@ -3,12 +3,10 @@ module Tang
     before_action :ensure_customer
 
     def ensure_customer
-      authenticate_user! if self.respond_to?(:authenticate_user!)
+      authenticate_user! if respond_to?(:authenticate_user!)
       @current_customer = current_user
     end
 
-    def current_customer
-      @current_customer
-    end
+    attr_reader :current_customer
   end
 end

data/app/controllers/tang/account/cards_controller.rb

@@ -1,13 +1,13 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Account::CardsController < Account::ApplicationController
     before_action :set_card, only: [:show, :destroy]
 
     def show
-      @can_delete_card = current_customer.stripe_id.present? && 
-          current_customer.subscription.nil? &&
-          @card.present?
+      @can_delete_card = current_customer.stripe_id.present? &&
+                         current_customer.subscription.nil? &&
+                         @card.present?
     end
 
     def new
@@ -44,17 +44,20 @@ module Tang
 
     def destroy
       if current_customer.subscription.nil?
-        @card.destroy 
-        redirect_to account_card_url, notice: 'Card was successfully removed.'
+        if @card.present?
+          @card.destroy
+          redirect_to account_card_url, notice: 'Card was successfully removed.'
+        else
+          redirect_to account_card_url, notice: 'We could not find a card to remove.'
+        end
       else
-        redirect_to account_card_url, notice: 'You cannot remove your card with an active subscription.'        
+        redirect_to account_card_url, notice: 'You cannot remove your card with an active subscription.'
       end
     end
 
     private
 
     def set_card
-      logger.debug "SET CARD CALLED"
       @card = current_customer.card
     end
   end

data/app/controllers/tang/account/coupons_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Account::CouponsController < Account::ApplicationController

data/app/controllers/tang/account/receipts_controller.rb

@@ -1,11 +1,17 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Account::ReceiptsController < Account::ApplicationController
     def index
-      @invoices = current_customer.invoices.
-                                   paginate(page: params[:page]).
-                                   order(date: :desc)
+      @invoices = current_customer.invoices
+                                  .paginate(page: params[:page])
+                                  .order(date: :desc)
+    end
+
+    def download
+      invoice = Invoice.find(params[:id])
+      invoice = RefreshInvoicePdf.call(invoice)
+      redirect_to invoice.invoice_pdf
     end
   end
 end

data/app/controllers/tang/account/subscriptions_controller.rb

@@ -1,20 +1,20 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Account::SubscriptionsController < Account::ApplicationController
     before_action :set_subscription, only: [:show, :edit, :update, :destroy]
 
     def show
-      if !current_customer.stripe_enabled?
-        render :not_stripe and return
-      end
+      render :not_stripe and return unless current_customer.stripe_enabled?
 
       @plans = Plan.where(interval: 'month').order(:order)
 
       if @subscription.present? && @subscription.plan.present?
-        @next_plan = @plans.where("tang_plans.order > ?", @subscription.plan.order).first
-        @previous_plan = @plans.where("tang_plans.order < ?", @subscription.plan.order).last
+        puts "subscription present and plan present"
+        @next_plan = @plans.where('tang_plans.order > ?', @subscription.plan.order).first
+        @previous_plan = @plans.where('tang_plans.order < ?', @subscription.plan.order).last
       else
+        puts "subscription not present or plan not present"
         @next_plan = @plans.first
         @previous_plan = nil
       end
@@ -31,6 +31,7 @@ module Tang
     end
 
     def create
+      # TODO: check how it's possible to get here without a stripe_token
       plan = Plan.find(subscription_params[:plan])
       @subscription = CreateSubscription.call(
         plan,
@@ -61,8 +62,9 @@ module Tang
         redirect_to account_subscription_path, notice: 'Subscription was successfully changed.'
       else
         @plans = Plan.order(:order)
-        @next_plan = @plans.where("tang_plans.order > ?", @subscription.plan.order).first
-        @previous_plan = @plans.where("tang_plans.order < ?", @subscription.plan.order).last
+        @next_plan = @plans.where('tang_plans.order > ?', @subscription.plan.order).first
+        @previous_plan = @plans.where('tang_plans.order < ?', @subscription.plan.order).last
+        @receipts = current_customer.charges.order(created: :desc).limit(5)
         render :show
       end
     end
@@ -77,6 +79,7 @@ module Tang
 
     def set_subscription
       @subscription = current_customer.subscription
+      puts "set_subscription: #{@subscription}"
     end
 
     def subscription_params

data/app/controllers/tang/admin/application_controller.rb

@@ -5,10 +5,10 @@ module Tang
     layout Tang.admin_layout
 
     def ensure_admin
-      authenticate_user! if self.respond_to?(:authenticate_user!)
-      unless current_user.present? && current_user.respond_to?(:admin?) && current_user.admin?
-        redirect_to Tang.unauthorized_url, alert: 'You do not have access to that.'
-      end
+      authenticate_user! if respond_to?(:authenticate_user!)
+      return if current_user.present? && current_user.respond_to?(:admin?) && current_user.admin?
+
+      redirect_to Tang.unauthorized_url, alert: 'You do not have access to that.'
     end
   end
 end

data/app/controllers/tang/admin/coupons_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Admin::CouponsController < Admin::ApplicationController
@@ -6,14 +6,13 @@ module Tang
 
     # GET /coupons
     def index
-      @coupons = Coupon.all.
-                        paginate(page: params[:page]).
-                        order(:stripe_id)
+      @coupons = Coupon.all
+                       .paginate(page: params[:page])
+                       .order(:stripe_id)
     end
 
     # GET /coupons/1
-    def show
-    end
+    def show; end
 
     # GET /coupons/new
     def new
@@ -38,14 +37,19 @@ module Tang
     end
 
     private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_coupon
-        @coupon = Coupon.find(params[:id])
-      end
 
-      # Only allow a trusted parameter "white list" through.
-      def coupon_params
-        params.require(:coupon).permit(:stripe_id, :duration, :amount_off, :currency, :duration_in_months, :max_redemptions, :percent_off, :redeem_by)
-      end
+    # Use callbacks to share common setup or constraints between actions.
+    def set_coupon
+      @coupon = Coupon.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def coupon_params
+      params.require(:coupon)
+            .permit(
+              :stripe_id, :duration, :amount_off, :currency,
+              :duration_in_months, :max_redemptions, :percent_off, :redeem_by
+            )
+    end
   end
 end

data/app/controllers/tang/admin/customers_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Admin::CustomersController < Admin::ApplicationController
@@ -6,18 +6,17 @@ module Tang
 
     # GET /customers
     def index
-      @customers = Tang.customer_class.where.not(stripe_id: nil).
-                        paginate(page: params[:page]).
-                        order(:email)
+      @customers = Tang.customer_class
+                       .where.not(stripe_id: nil)
+                       .paginate(page: params[:page])
+                       .order(:email)
     end
 
     # GET /customers/1
-    def show
-    end
+    def show; end
 
     # GET /customers/1/edit
-    def edit
-    end
+    def edit; end
 
     # PATCH/PUT /customers/1
     def update
@@ -53,14 +52,15 @@ module Tang
     end
 
     private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_customer
-        @customer = Tang.customer_class.find(params[:id])
-      end
 
-      # Only allow a trusted parameter "white list" through.
-      def customer_params
-        params.require(Tang.customer_class.to_s.downcase).permit(:email, :account_balance)
-      end
+    # Use callbacks to share common setup or constraints between actions.
+    def set_customer
+      @customer = Tang.customer_class.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def customer_params
+      params.require(Tang.customer_class.to_s.downcase).permit(:email, :account_balance)
+    end
   end
 end

data/app/controllers/tang/admin/dashboard_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Admin::DashboardController < Admin::ApplicationController

data/app/controllers/tang/admin/invoices_controller.rb

@@ -1,15 +1,15 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Admin::InvoicesController < Admin::ApplicationController
     before_action :set_invoice, only: [:show]
 
-    def show
-    end
+    def show; end
 
     private
-      def set_invoice
-        @invoice = Invoice.find(params[:id])
-      end
+
+    def set_invoice
+      @invoice = Invoice.find(params[:id])
+    end
   end
 end

data/app/controllers/tang/admin/payments_controller.rb

@@ -1,21 +1,21 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Admin::PaymentsController < Admin::ApplicationController
     before_action :set_payment, only: [:show]
 
     def index
-      @payments = Tang::Charge.all.
-                         paginate(page: params[:page]).
-                         order(created: :desc)
+      @payments = Tang::Charge.all
+                              .paginate(page: params[:page])
+                              .order(created: :desc)
     end
 
-    def show
-    end
+    def show; end
 
     private
-      def set_payment
-        @payment = Charge.find(params[:id])
-      end
+
+    def set_payment
+      @payment = Charge.find(params[:id])
+    end
   end
 end

data/app/controllers/tang/admin/plans_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Admin::PlansController < Admin::ApplicationController
@@ -6,14 +6,13 @@ module Tang
 
     # GET /plans
     def index
-      @plans = Plan.all.
-                    paginate(page: params[:page]).
-                    order(:name)
+      @plans = Plan.all
+                   .paginate(page: params[:page])
+                   .order(:name)
     end
 
     # GET /plans/1
-    def show
-    end
+    def show; end
 
     # GET /plans/new
     def new
@@ -21,8 +20,7 @@ module Tang
     end
 
     # GET /plans/1/edit
-    def edit
-    end
+    def edit; end
 
     # POST /plans
     def create
@@ -51,18 +49,22 @@ module Tang
     end
 
     private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_plan
-        @plan = Plan.find(params[:id])
-      end
 
-      # Only allow a trusted parameter "white list" through.
-      def plan_create_params
-        params.require(:plan).permit(:stripe_id, :amount, :currency, :interval, :interval_count, :name, :statement_descriptor, :trial_period_days, :order, :highlight, :features, :description, :group)
-      end
+    # Use callbacks to share common setup or constraints between actions.
+    def set_plan
+      @plan = Plan.find(params[:id])
+    end
 
-      def plan_update_params
-        params.require(:plan).permit(:name, :order, :highlight, :features, :description, :group)
-      end
+    # Only allow a trusted parameter "white list" through.
+    def plan_create_params
+      params.require(:plan).permit(
+        :stripe_id, :amount, :currency, :interval, :interval_count, :name,
+        :statement_descriptor, :trial_period_days, :order, :highlight, :features, :description, :group
+      )
+    end
+
+    def plan_update_params
+      params.require(:plan).permit(:name, :order, :highlight, :features, :description, :group)
+    end
   end
 end

data/app/controllers/tang/admin/search_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Admin::SearchController < Admin::ApplicationController
@@ -18,41 +18,42 @@ module Tang
     private
 
     def search_charges
-      return Charge.search(@query)
+      Charge.search(@query)
     end
 
     def search_customers
-      return Customer.search(@query)
+      Customer.search(@query)
     end
 
     def search_plans
       plans = Plan.none
       if @query.present?
         q = "%#{@query.downcase}%"
-        plans = Plan.where("lower(tang_plans.stripe_id) like ? or lower(tang_plans.name) like ?",
-                q, q).
-            distinct
+        plans = Plan.where('lower(tang_plans.stripe_id) like ? or lower(tang_plans.name) like ?',
+                           q,
+                           q)
+                    .distinct
       end
-      return plans
+      plans
     end
 
     def search_coupons
       coupons = Coupon.none
       if @query.present?
         q = "%#{@query.downcase}%"
-        coupons = Coupon.where("lower(tang_coupons.stripe_id) like ?",
-                q).
-            distinct
+        coupons = Coupon.where('lower(tang_coupons.stripe_id) like ?',
+                               q)
+                        .distinct
       end
-      return coupons
+      coupons
     end
 
     def search_invoices
-      return Invoice.search(@query)
+      Invoice.search(@query)
     end
 
     def search_invoice_items
-      return InvoiceItem.search(@query)
+      InvoiceItem.search(@query)
     end
   end
-end
+end

data/app/controllers/tang/admin/subscriptions_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class Admin::SubscriptionsController < Admin::ApplicationController
@@ -6,19 +6,17 @@ module Tang
 
     # GET /subscriptions
     def index
-      @subscriptions = Subscription.includes(:customer).
-                                    where.not(status: :canceled).
-                                    paginate(page: params[:page]).
-                                    order("#{Customer.table_name}.email")
+      @subscriptions = Subscription.includes(:customer)
+                                   .where.not(status: :canceled)
+                                   .paginate(page: params[:page])
+                                   .order("#{Customer.table_name}.email")
     end
 
     # GET /subscriptions/1
-    def show
-    end
+    def show; end
 
     # GET /subscriptions/1/edit
-    def edit
-    end
+    def edit; end
 
     # PATCH/PUT /subscriptions/1
     def update
@@ -60,14 +58,15 @@ module Tang
     end
 
     private
-      # Use callbacks to share common setup or constraints between actions.
-      def set_subscription
-        @subscription = Subscription.find(params[:id])
-      end
 
-      # Only allow a trusted parameter "white list" through.
-      def subscription_params
-        params.require(:subscription).permit(:plan_id, :quantity, :trial_end)
-      end
+    # Use callbacks to share common setup or constraints between actions.
+    def set_subscription
+      @subscription = Subscription.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def subscription_params
+      params.require(:subscription).permit(:plan_id, :quantity, :trial_end)
+    end
   end
 end

data/app/controllers/tang/plans_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "tang/application_controller"
+require_dependency 'tang/application_controller'
 
 module Tang
   class PlansController < ApplicationController

data/app/helpers/tang/application_helper.rb

@@ -2,11 +2,6 @@ require 'will_paginate/view_helpers/action_view'
 
 module Tang
   module ApplicationHelper
-
-    # def created_date(date)
-    #   date.strftime('%Y/%m/%d')
-    # end
-
     def created_datetime(date)
       date.strftime('%Y/%m/%d %H:%M')
     end
@@ -39,28 +34,24 @@ module Tang
     end
 
     def will_paginate(collection_or_options = nil, options = {})
-      if collection_or_options.is_a? Hash
-        options, collection_or_options = collection_or_options, nil
-      end
-      unless options[:renderer]
-        options = options.merge renderer: BootstrapLinkRenderer
-      end
+      options, collection_or_options = collection_or_options, nil if collection_or_options.is_a? Hash
+      options = options.merge renderer: BootstrapLinkRenderer unless options[:renderer]
       super(*[collection_or_options, options].compact)
     end
 
     class BootstrapLinkRenderer < WillPaginate::ActionView::LinkRenderer
-      ELLIPSIS = "&hellip;"
+      ELLIPSIS = '&hellip;'.freeze
 
       def to_html
         list_items = pagination.map do |item|
           case item
-            when Fixnum
-              page_number(item)
-            else
-              send(item)
+          when Integer
+            page_number(item)
+          else
+            send(item)
           end
         end.join(@options[:link_separator])
-        tag("ul", list_items, class: ul_class)
+        tag('ul', list_items, class: ul_class)
       end
 
       def container_attributes
@@ -73,41 +64,44 @@ module Tang
         link_options = @options[:link_options] || {}
 
         if page == current_page
-          tag("li", tag('span', page.to_s + ' <span class="sr-only">(current)</span>', class: 'page-link'), class: "page-item active")
+          tag(
+            'li',
+            tag('span', "#{page} <span class=\"sr-only\">(current)</span>", class: 'page-link'),
+            class: 'page-item active'
+          )
         else
-          tag("li", link(page, page, link_options.merge(rel: rel_value(page), class: 'page-link')), class: 'page-item')
+          tag('li', link(page, page, link_options.merge(rel: rel_value(page), class: 'page-link')), class: 'page-item')
         end
       end
 
       def previous_or_next_page(page, text, classname)
         link_options = @options[:link_options] || {}
         if page
-          tag("li", link(text, page, link_options.merge(class: 'page-link')), class: "%s page-item" % classname)
+          tag('li', link(text, page, link_options.merge(class: 'page-link')), class: format('%s page-item', classname))
         else
-          tag("li", tag('span', text, class: 'page-link'), class: "%s page-item disabled" % classname)
+          tag('li', tag('span', text, class: 'page-link'), class: format('%s page-item disabled', classname))
         end
       end
 
       def gap
-        tag("li", tag("span", ELLIPSIS), class: "page-item disabled")
+        tag('li', tag('span', ELLIPSIS), class: 'page-item disabled')
       end
 
       def previous_page
         @options[:previous_label] = '<span aria-hidden="true">&laquo;</span><span class="sr-only">Previous</span>'
-        num = @collection.current_page > 1 && @collection.current_page - 1
-        previous_or_next_page(num, @options[:previous_label], "prev")
+        num = @collection.current_page > 1 && (@collection.current_page - 1)
+        previous_or_next_page(num, @options[:previous_label], 'prev')
       end
 
       def next_page
         @options[:next_label] = '<span aria-hidden="true">&raquo;</span><span class="sr-only">Next</span>'
-        num = @collection.current_page < @collection.total_pages && @collection.current_page + 1
-        previous_or_next_page(num, @options[:next_label], "next")
+        num = @collection.current_page < @collection.total_pages && (@collection.current_page + 1)
+        previous_or_next_page(num, @options[:next_label], 'next')
       end
 
       def ul_class
-        [@options[:class]].compact.join(" ")
+        [@options[:class]].compact.join(' ')
       end
     end
-
   end
 end