tang 0.2.2 → 0.2.4

data/app/services/tang/update_coupon.rb

@@ -1,9 +1,7 @@
 module Tang
   class UpdateCoupon
     def self.call(coupon)
-      if !coupon.valid?
-        return coupon
-      end
+      return coupon unless coupon.valid?
 
       begin
         c = Stripe::Coupon.retrieve(coupon.stripe_id)
@@ -13,7 +11,7 @@ module Tang
         coupon.errors.add(:base, :invalid, message: e.message)
       end
 
-      return coupon
+      coupon
     end
   end
-end
+end

data/app/services/tang/update_customer.rb

@@ -1,7 +1,7 @@
 module Tang
   class UpdateCustomer
     def self.call(customer)
-      return customer if !customer.valid?
+      return customer unless customer.valid?
 
       if customer.stripe_id.present?
         begin
@@ -13,7 +13,7 @@ module Tang
         end
       end
 
-      return customer
+      customer
     end
 
     def self.populate_customer(stripe_customer, customer)
@@ -22,7 +22,7 @@ module Tang
       stripe_customer.business_vat_id = customer.business_vat_id if customer.business_vat_id.present?
       stripe_customer.description = customer.description
       stripe_customer.coupon = customer.coupon.stripe_id if customer.coupon.present?
-      return stripe_customer
+      stripe_customer
     end
   end
-end
+end

data/app/services/tang/update_plan.rb

@@ -1,9 +1,7 @@
 module Tang
   class UpdatePlan
     def self.call(plan)
-      if !plan.valid?
-        return plan
-      end
+      return plan unless plan.valid?
 
       begin
         p = Stripe::Plan.retrieve(plan.stripe_id)
@@ -13,7 +11,7 @@ module Tang
         plan.errors.add(:base, :invalid, message: e.message)
       end
 
-      return plan
+      plan
     end
   end
-end
+end

data/app/services/tang/update_subscription.rb

@@ -1,9 +1,7 @@
 module Tang
   class UpdateSubscription
     def self.call(subscription)
-      if !subscription.valid?
-        return subscription
-      end
+      return subscription unless subscription.valid?
 
       begin
         s = Stripe::Subscription.retrieve(subscription.stripe_id)
@@ -17,7 +15,7 @@ module Tang
         subscription.errors.add(:base, :invalid, message: e.message)
       end
 
-      return subscription
+      subscription
     end
   end
-end
+end

data/app/validators/future_validator.rb

@@ -1,7 +1,7 @@
 class FutureValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, _value)
-    if record[attribute] < Time.now
-      record.errors.add(attribute, :invalid, message: (options[:message] || "must be in the future."))
-    end
+    return unless record[attribute] < Time.now
+
+    record.errors.add(attribute, :invalid, message: (options[:message] || 'must be in the future.'))
   end
-end
+end

data/app/views/tang/account/cards/show.html.erb

@@ -15,6 +15,6 @@
 
 <%= link_to 'Use a new card', new_account_card_path, class: 'btn btn-secondary' %>
 <% if @can_delete_card %>
-  <%= link_to 'Remove card', account_card_path, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger' %>
+  <%= link_to 'Remove card', account_card_path, method: :delete, data: { confirm: 'Are you sure?', turbo_confirm: 'Are you sure?', turbo_method: :delete }, class: 'btn btn-danger' %>
 <% end %>
 <%= link_to 'Cancel', account_subscription_path, class: 'btn btn-secondary' %>

data/app/views/tang/account/receipts/_receipt.html.erb

@@ -1,6 +1,6 @@
 <li class="list-group-item">
   <div class="float-xs-right">
-    <%= link_to 'Download PDF', invoice.invoice_pdf, class: 'btn btn-secondary', target: '_blank' %>
+    <%= link_to 'Download PDF', download_account_receipt_path(invoice) %>
   </div>
   <h5 class="list-group-item-heading"><%= number_to_currency(invoice.total.to_f / 100.0) %></h5>
   <p class="list-group-item-text">Date <%= invoice.date.strftime('%b %d, %Y') %></p>

data/app/views/tang/account/subscriptions/show.html.erb

@@ -3,6 +3,17 @@
 
 <% if @subscription.present? %>
 
+  <% if @subscription.errors.any? %>
+    <div id="error_explanation" class="alert alert-danger">
+      <h4 class="alert-heading"><%= pluralize(@subscription.errors.count, "error") %> prohibited this subscription from being saved:</h4>
+      <ul class="mb-0">
+        <% @subscription.errors.full_messages.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
   <% if @next_plan.present? %>
     <div class="alert alert-info">
       <h4 class="alert-heading">Upgrade to the <%= @next_plan.name %> Plan</h4>
@@ -34,7 +45,7 @@
       <%= link_to 'Downgrade', account_subscription_path(plan: @previous_plan), method: :patch, class: 'btn btn-secondary' %>
     <% end %>
 
-    <%= link_to 'Cancel Plan', account_subscription_path, method: :delete, data: { confirm: 'Are you sure you want to cancel your current plan?' }, class: 'btn btn-secondary' %>
+    <%= link_to 'Cancel Plan', account_subscription_path, method: :delete, data: { confirm: 'Are you sure you want to cancel your current plan?', turbo_confirm: 'Are you sure you want to cancel your current plan?', turbo_method: :delete }, class: 'btn btn-secondary' %>
   </div>
 
   <br>
@@ -95,7 +106,7 @@
   <% if current_customer.subscription.coupon.present? %>
     <h4>Discount</h4>
     <p><%= "#{current_customer.subscription.coupon.stripe_id} - #{coupon_off(current_customer.subscription.coupon)} #{current_customer.subscription.coupon.formatted_duration}" %></p>
-    <%= link_to 'Remove discount', account_coupon_path, method: :delete, class: 'btn btn-danger' %>
+    <%= link_to 'Remove discount', account_coupon_path, data: { turbo_method: :delete }, method: :delete, class: 'btn btn-danger' %>
   <% else %>
     <h4>Redeem coupon</h4>
     <%= form_for current_customer.subscription.build_coupon, url: tang.account_coupon_path, html: { class: 'form-inline' } do |f| %>
@@ -110,7 +121,7 @@
   <% if current_customer.subscription_coupon.present? %>
     <h4>Discount</h4>
     <p><%= "#{current_customer.subscription_coupon.stripe_id} - #{coupon_off(current_customer.subscription_coupon)} #{current_customer.subscription_coupon.formatted_duration}" %></p>
-    <%= link_to 'Remove discount', account_coupon_path, method: :delete, class: 'btn btn-danger' %>
+    <%= link_to 'Remove discount', account_coupon_path, data: { turbo_method: :delete }, method: :delete, class: 'btn btn-danger' %>
   <% else %>
     <h4>Redeem coupon</h4>
     <%= form_for current_customer.build_subscription_coupon, url: tang.account_coupon_path, html: { class: 'form-inline' } do |f| %>

data/app/views/tang/admin/coupons/show.html.erb

@@ -60,6 +60,6 @@
 </div>
 
 <hr>
-<%= link_to 'Delete Coupon', tang.admin_coupon_path(@coupon), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger float-md-right' %>
+<%= link_to 'Delete Coupon', tang.admin_coupon_path(@coupon), method: :delete, data: { confirm: 'Are you sure?', turbo_confirm: 'Are you sure?', turbo_method: :delete }, class: 'btn btn-danger float-md-right' %>
 
 <%= render 'footer' %>

data/app/views/tang/admin/customers/show.html.erb

@@ -130,7 +130,7 @@
         <%= link_to 'Change Coupon', tang.admin_customer_coupon_path(@customer), class: 'nav-link' %>
       </li>
       <li class="nav-item">
-        <%= link_to 'Remove Coupon', tang.admin_customer_coupon_path(@customer), method: :delete, data: { confirm: 'Are you sure?' }, class: 'nav-link' %>
+        <%= link_to 'Remove Coupon', tang.admin_customer_coupon_path(@customer), method: :delete, data: { confirm: 'Are you sure?', turbo_confirm: 'Are you sure?', turbo_method: :delete }, class: 'nav-link' %>
       </li>
     <% else %>
       <li class="nav-item">
@@ -152,6 +152,6 @@
 
 <hr>
 
-<p><%= link_to 'Delete Customer', tang.admin_customer_path(@customer), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger float-md-right' %></p>
+<p><%= link_to 'Delete Customer', tang.admin_customer_path(@customer), method: :delete, data: { confirm: 'Are you sure?', turbo_confirm: 'Are you sure?', turbo_method: :delete }, class: 'btn btn-danger float-md-right' %></p>
 
 <%= render 'footer' %>

data/app/views/tang/admin/plans/show.html.erb

@@ -58,6 +58,6 @@
 </div>
 
 <hr>
-<%= link_to 'Delete Plan', tang.admin_plan_path(@plan), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger float-md-right' %>
+<%= link_to 'Delete Plan', tang.admin_plan_path(@plan), method: :delete, data: { confirm: 'Are you sure?', turbo_confirm: 'Are you sure?', turbo_method: :delete }, class: 'btn btn-danger float-md-right' %>
 
 <%= render 'footer' %>

data/app/views/tang/admin/subscriptions/show.html.erb

@@ -48,7 +48,7 @@
         <%= link_to 'Change Coupon', tang.admin_subscription_coupon_path(@subscription), class: 'nav-link' %>
       </li>
       <li class="nav-item">
-        <%= link_to 'Remove Coupon', tang.admin_subscription_coupon_path(@subscription), method: :delete, data: { confirm: 'Are you sure?' }, class: 'nav-link' %>
+        <%= link_to 'Remove Coupon', tang.admin_subscription_coupon_path(@subscription), method: :delete, data: { confirm: 'Are you sure?', turbo_confirm: 'Are you sure?', turbo_method: :delete }, class: 'nav-link' %>
       </li>
     <% else %>
       <li class="nav-item">
@@ -69,6 +69,6 @@
 </div>
 
 <hr>
-<p><%= link_to 'Cancel Subscription', tang.admin_subscription_path(@subscription), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger float-md-right' %></p>
+<p><%= link_to 'Cancel Subscription', tang.admin_subscription_path(@subscription), method: :delete, data: { confirm: 'Are you sure?', turbo_confirm: 'Are you sure?', turbo_method: :delete }, class: 'btn btn-danger float-md-right' %></p>
 
 <%= render 'footer' %>

data/app/views/tang/plans/index.html.erb

@@ -11,7 +11,7 @@
     <% if user_signed_in? %>
       <% if current_user.subscription.present? %>
         <% # downgrade to free %>
-        <%= link_to 'Choose Plan', account_subscription_path, method: :delete, data: { confirm: 'Are you sure you want to cancel your current plan?' }, class: 'pricing__action' %>
+        <%= link_to 'Choose Plan', account_subscription_path, method: :delete, data: { confirm: 'Are you sure you want to cancel your current plan?', turbo_confirm: 'Are you sure you want to cancel your current plan?', turbo_method: :delete }, class: 'pricing__action' %>
       <% else %>
         <% # already on free plan %>
         <%= button_tag 'Selected', class: 'pricing__action', disabled: 'disabled' %>

data/config/initializers/stripe.rb

@@ -1,2 +1,2 @@
-Stripe.api_key = ENV['STRIPE_SECRET_KEY']
-StripeEvent.signing_secret = ENV['STRIPE_SIGNING_SECRET']
+Stripe.api_key = ENV.fetch('STRIPE_SECRET_KEY', nil)
+StripeEvent.signing_secret = ENV.fetch('STRIPE_SIGNING_SECRET', nil)

data/config/initializers/stripe_event.rb

@@ -1,14 +1,11 @@
 StripeEvent.event_filter = lambda do |params|
-  # return nil if Rails.env.production? && !params[:livemode]
   return nil if Tang::StripeWebhook.exists?(stripe_id: params[:id])
+
   Tang::StripeWebhook.create!(stripe_id: params[:id])
   Stripe::Event.retrieve(params[:id])
 end
 
 StripeEvent.configure do |events|
-  events.all do |event|
-  end
-
   # Disputes
 
   events.subscribe 'charge.dispute.created' do |event|
@@ -22,36 +19,38 @@ StripeEvent.configure do |events|
     end
   end
 
-  events.subscribe 'charge.dispute.updated' do |event|
-    dispute = event.data.object
-  end
+  # events.subscribe 'charge.dispute.updated' do |event|
+  #   dispute = event.data.object
+  # end
 
-  events.subscribe 'charge.dispute.closed' do |event|
-    dispute = event.data.object
-  end
+  # events.subscribe 'charge.dispute.closed' do |event|
+  #   dispute = event.data.object
+  # end
 
   # Subscription lifecycle
 
   events.subscribe 'invoice.created' do |event|
-    invoice = Tang::CreateInvoice.call(event)
+    Tang::CreateInvoice.call(event)
   end
 
-  # events.subscribe 'charge.succeeded' do |event|
-  #   charge = event.data.object
-  #   StripeMailer.receipt(charge).deliver
-  #   StripeMailer.admin_charge_succeeded(charge).deliver
-  # end
-
   events.subscribe('invoice.payment_succeeded') do |event|
     invoice = event.data.object
     charge = Tang::PayInvoice.call(invoice)
     if charge.present?
-      if Tang.delayed_email
-        Tang::StripeMailer.customer_payment_succeeded(charge).deliver_later
-        Tang::StripeMailer.admin_payment_succeeded(charge).deliver_later
-      else
-        Tang::StripeMailer.customer_payment_succeeded(charge).deliver_now
-        Tang::StripeMailer.admin_payment_succeeded(charge).deliver_now
+      if charge.customer.present? && charge.customer.customer_payment_success_emails_enabled
+        if Tang.delayed_email
+          Tang::StripeMailer.customer_payment_succeeded(charge).deliver_later
+        else
+          Tang::StripeMailer.customer_payment_succeeded(charge).deliver_now
+        end
+      end
+
+      if Tang.admin_payment_succeeded_enabled
+        if Tang.delayed_email
+          Tang::StripeMailer.admin_payment_succeeded(charge).deliver_later
+        else
+          Tang::StripeMailer.admin_payment_succeeded(charge).deliver_now
+        end
       end
     end
   end
@@ -62,12 +61,20 @@ StripeEvent.configure do |events|
     invoice = event.data.object
     charge = Tang::FailInvoice.call(invoice)
     if charge.present?
-      if Tang.delayed_email
-        Tang::StripeMailer.customer_payment_failed(charge).deliver_later
-        Tang::StripeMailer.admin_payment_failed(charge).deliver_later
-      else
-        Tang::StripeMailer.customer_payment_failed(charge).deliver_now
-        Tang::StripeMailer.admin_payment_failed(charge).deliver_now
+      if charge.customer.present? && charge.customer.customer_payment_failed_emails_enabled
+        if Tang.delayed_email
+          Tang::StripeMailer.customer_payment_failed(charge).deliver_later
+        else
+          Tang::StripeMailer.customer_payment_failed(charge).deliver_now
+        end
+      end
+
+      if Tang.admin_payment_failed_enabled
+        if Tang.delayed_email
+          Tang::StripeMailer.admin_payment_failed(charge).deliver_later
+        else
+          Tang::StripeMailer.admin_payment_failed(charge).deliver_now
+        end
       end
     end
   end
@@ -78,8 +85,6 @@ StripeEvent.configure do |events|
   events.subscribe('customer.subscription.deleted') do |event|
     stripe_subscription = event.data.object
     subscription = Tang::Subscription.find_by(stripe_id: stripe_subscription.id)
-    if subscription.present?
-      subscription.cancel! if !subscription.canceled?
-    end
+    subscription.cancel! if subscription.present? && !subscription.canceled?
   end
-end
+end

data/config/routes.rb

@@ -26,7 +26,9 @@ Tang::Engine.routes.draw do
     resource :subscription
     resource :card, only: [:show, :new, :create, :update, :destroy]
     resource :coupon, only: [:create, :destroy]
-    resources :receipts, only: [:index]
+    resources :receipts, only: [:index] do
+      get :download, on: :member
+    end
   end
 
   # get 'pricing', to: 'plans#index'

data/db/migrate/20160928154410_create_versions.rb

@@ -1,12 +1,12 @@
 # This migration creates the `versions` table, the only schema PT requires.
 # All other migrations PT provides are optional.
-class CreateVersions < ActiveRecord::Migration
+class CreateVersions < ActiveRecord::Migration[4.2]
   # Class names of MySQL adapters.
   # - `MysqlAdapter` - Used by gems: `mysql`, `activerecord-jdbcmysql-adapter`.
   # - `Mysql2Adapter` - Used by `mysql2` gem.
   MYSQL_ADAPTERS = [
-    "ActiveRecord::ConnectionAdapters::MysqlAdapter",
-    "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
+    'ActiveRecord::ConnectionAdapters::MysqlAdapter',
+    'ActiveRecord::ConnectionAdapters::Mysql2Adapter'
   ].freeze
 
   # The largest text column available in all supported RDBMS is
@@ -72,7 +72,7 @@ class CreateVersions < ActiveRecord::Migration
   #
   def versions_table_options
     if mysql?
-      { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci" }
+      { options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci' }
     else
       {}
     end

data/db/migrate/20160928161623_create_tang_stripe_webhooks.rb

@@ -1,4 +1,4 @@
-class CreateTangStripeWebhooks < ActiveRecord::Migration
+class CreateTangStripeWebhooks < ActiveRecord::Migration[4.2]
   def change
     create_table :tang_stripe_webhooks do |t|
       t.string :stripe_id

data/db/migrate/20160928173328_create_tang_plans.rb

@@ -1,4 +1,4 @@
-class CreateTangPlans < ActiveRecord::Migration
+class CreateTangPlans < ActiveRecord::Migration[4.2]
   def change
     create_table :tang_plans do |t|
       t.string :stripe_id

data/db/migrate/20160929152510_create_tang_coupons.rb

@@ -1,4 +1,4 @@
-class CreateTangCoupons < ActiveRecord::Migration
+class CreateTangCoupons < ActiveRecord::Migration[4.2]
   def change
     create_table :tang_coupons do |t|
       t.string :stripe_id

data/db/migrate/20160929152541_add_customer_fields.rb

@@ -1,4 +1,4 @@
-class AddCustomerFields < ActiveRecord::Migration
+class AddCustomerFields < ActiveRecord::Migration[4.2]
   def change
     add_column Tang.customer_class.to_s.downcase.pluralize, :stripe_id, :string
     add_column Tang.customer_class.to_s.downcase.pluralize, :account_balance, :integer

data/db/migrate/20160929171640_create_tang_subscriptions.rb

@@ -1,4 +1,4 @@
-class CreateTangSubscriptions < ActiveRecord::Migration
+class CreateTangSubscriptions < ActiveRecord::Migration[4.2]
   def change
     create_table :tang_subscriptions do |t|
       t.string :stripe_id
@@ -14,7 +14,7 @@ class CreateTangSubscriptions < ActiveRecord::Migration
       t.timestamp :coupon_start
 
       t.string :status
-      
+
       t.timestamps null: false
     end
   end

data/db/migrate/20160929174251_create_tang_cards.rb

@@ -1,4 +1,4 @@
-class CreateTangCards < ActiveRecord::Migration
+class CreateTangCards < ActiveRecord::Migration[4.2]
   def change
     create_table :tang_cards do |t|
       t.integer :customer_id, index: true

data/db/migrate/20161003035434_create_tang_invoices.rb

@@ -1,4 +1,4 @@
-class CreateTangInvoices < ActiveRecord::Migration
+class CreateTangInvoices < ActiveRecord::Migration[4.2]
   def change
     create_table :tang_invoices do |t|
       t.string :stripe_id

data/db/migrate/20161114181651_create_tang_invoice_items.rb

@@ -1,4 +1,4 @@
-class CreateTangInvoiceItems < ActiveRecord::Migration
+class CreateTangInvoiceItems < ActiveRecord::Migration[4.2]
   def change
     create_table :tang_invoice_items do |t|
       t.string :stripe_id

data/db/migrate/20161115201106_create_tang_charges.rb

@@ -1,4 +1,4 @@
-class CreateTangCharges < ActiveRecord::Migration
+class CreateTangCharges < ActiveRecord::Migration[4.2]
   def change
     create_table :tang_charges do |t|
       t.string :stripe_id

data/db/migrate/20170523122759_add_group_to_plans.rb

@@ -1,4 +1,4 @@
-class AddGroupToPlans < ActiveRecord::Migration
+class AddGroupToPlans < ActiveRecord::Migration[4.2]
   def change
     add_column :tang_plans, :group, :integer
   end

data/db/migrate/20170701162853_add_stripe_indexes.rb

@@ -1,4 +1,4 @@
-class AddStripeIndexes < ActiveRecord::Migration
+class AddStripeIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index Tang.customer_class.to_s.downcase.pluralize, :stripe_id, unique: true
     add_index :tang_cards, :stripe_id, unique: true

data/db/migrate/20170731010913_add_subscription_indexes.rb

@@ -1,4 +1,4 @@
-class AddSubscriptionIndexes < ActiveRecord::Migration
+class AddSubscriptionIndexes < ActiveRecord::Migration[4.2]
   def change
     add_index :tang_subscriptions, [:customer_id, :created_at], where: "status != 'canceled'", name: 'index_tang_subscriptions_on_customer_and_created_at_and_status'
   end

data/db/migrate/20200827001523_add_invoice_pdf_to_invoices.rb

@@ -1,4 +1,4 @@
-class AddInvoicePdfToInvoices < ActiveRecord::Migration
+class AddInvoicePdfToInvoices < ActiveRecord::Migration[4.2]
   def change
     add_column :tang_invoices, :invoice_pdf, :string
   end

data/db/migrate/20230530172604_add_enable_customer_emails.rb

@@ -0,0 +1,6 @@
+class AddEnableCustomerEmails < ActiveRecord::Migration[6.1]
+  def change
+    add_column Tang.customer_class.to_s.downcase.pluralize, :customer_payment_success_emails_enabled, :boolean, null: false, default: true
+    add_column Tang.customer_class.to_s.downcase.pluralize, :customer_payment_failed_emails_enabled, :boolean, null: false, default: true
+  end
+end

data/lib/generators/tang/install_generator.rb

@@ -19,4 +19,4 @@ module Tang
       end
     end
   end
-end
+end

data/lib/generators/templates/create_tang.rb

@@ -81,7 +81,7 @@ class CreateTang < ActiveRecord::Migration
       t.timestamp :coupon_start
 
       t.string :status
-      
+
       t.timestamps null: false
     end
   end
@@ -192,4 +192,4 @@ class CreateTang < ActiveRecord::Migration
       t.timestamps null: false
     end
   end
-end
+end

data/lib/tang/engine.rb

@@ -13,7 +13,7 @@ module Tang
     end
 
     config.to_prepare do
-      Rails.application.config.assets.precompile += %w( tang/pdf.css )
+      Rails.application.config.assets.precompile += %w[tang/pdf.css]
     end
   end
 end

data/lib/tang/version.rb

@@ -1,3 +1,3 @@
 module Tang
-  VERSION = "0.2.2"
+  VERSION = '0.2.4'.freeze
 end

data/lib/tang.rb

@@ -1,9 +1,5 @@
-require "tang/engine"
-# require 'jquery-rails'
-# require 'bootstrap'
-# require 'rails-assets-tether'
+require 'tang/engine'
 require 'will_paginate'
-# require 'paranoia'
 
 module Tang
   @@customer_class = 'User'
@@ -17,6 +13,8 @@ module Tang
   mattr_accessor :admin_layout
   mattr_accessor :pricing_layout
   mattr_accessor :delayed_email
+  mattr_accessor :admin_payment_succeeded_enabled
+  mattr_accessor :admin_payment_failed_enabled
 
   class << self
     Tang.default_currency = 'usd'
@@ -28,9 +26,11 @@ module Tang
     Tang.admin_layout = 'application'
     Tang.pricing_layout = 'application'
     Tang.delayed_email = false
+    Tang.admin_payment_succeeded_enabled = true
+    Tang.admin_payment_failed_enabled = true
   end
 
-  def self.setup #(&block)
+  def self.setup
     yield self
   end