tb_checkout 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6855d03966c3d9e13b133132baca368f57f4ed50
-  data.tar.gz: 810740b48a84765bfc42e5be5ca3e14d95506ed1
+  metadata.gz: dc4ded5e6adfb731fce1878469f183f0258a7e82
+  data.tar.gz: 45b6793854f8d49cd4e7309c312fc3f42d090dec
 SHA512:
-  metadata.gz: 8cb3dc92f75a684adf1902102b471be4d4339c127ff7247f4467ad381e39d0c032199e5d87fc36bf03ca8e7a071ce255f375e25aae102db57476dfc3ce7a25e8
-  data.tar.gz: afaf30847266b291b4d6b6007f2f4154fadd0472e005625e0650f7a5cc8561a0bcfc3525d6433c5bd4f935f2b110be3a86391259a93bfecda4f33e25e33b5a7b
+  metadata.gz: 705fdb06fda7d99561ad6f0c2ffbb367692730d94c2e0bd3334395876d0eb2a7776a29c5f9daa1a6c8ad21e8f38b5b1fef17985d140dbdfcb4e1c51a8833fa26
+  data.tar.gz: c517cbb1f55f91e905d88f29dd6ad40b0d19c9aaa2381fcb4430c413679e5a438f94d2a803cb00eb616a0303655266f1359ac474d200321f711d2b8eefa8ebc5

data/app/controllers/tb_checkout/transactions_controller.rb

@@ -3,7 +3,12 @@ class TbCheckout::TransactionsController < TbCheckout::ApplicationController
   before_action :load_cart, :only => [:new, :create, :confirm, :capture]
 
   def index
-    @transactions = TbCheckout::Transaction.captured.for_user_or_session(current_user_id, session.id).includes(:cart => :cart_items).paginate(:page => params[:page], :per_page => 10)
+    @transactions = TbCheckout::Transaction.captured.includes(:cart => :cart_items).paginate(:page => params[:page], :per_page => 10)
+    if current_user
+      @transactions = @transactions.for_user(current_user)
+    else
+      @transactions = @transactions.for_session(session.id)
+    end
     respond_with @transactions
   end
 
@@ -20,6 +25,7 @@ class TbCheckout::TransactionsController < TbCheckout::ApplicationController
 
   def create
     @transaction = @cart.transactions.new(transaction_params)
+    @transaction.session_id = session.id
     if @transaction.save() && @transaction.authorize!
       redirect_to confirm_tb_checkout_transaction_path(@transaction)
     else

data/app/models/concerns/tb_checkout/belongs_to_user_session.rb

@@ -3,13 +3,42 @@ module TbCheckout::BelongsToUserSession
 
   included do
     belongs_to :spud_user
-    scope :for_user_or_session, ->(user_id, session_id){
-      where('(session_id = ?) OR (spud_user_id IS NOT NULL AND spud_user_id != 0 AND spud_user_id = ?)', session_id, user_id)
+    validate :spud_user_id_is_not_zero
+    validates :session_id, :presence => true
+    
+    # Return all records where the user matches
+    # Should return zero results of the passed user is nil
+    #
+    scope :for_user, ->(user){
+      if user.present?
+        where(:spud_user => user)
+      else
+        none()
+      end
+    }
+
+    # Return all records where the session_id matches
+    # Should return zero results of the passed session_id is nil
+    #
+    scope :for_session, ->(session_id){
+      if session_id.present?
+        where(:session_id => session_id)
+      else
+        none()
+      end
     }
   end
 
   def belongs_to?(user_id:nil, session_id:nil)
-    return (self.session_id == session_id) || (self.spud_user_id.present? && self.spud_user_id == user_id)
+    return (self.session_id == session_id) || (self.spud_user_id.present? && self.spud_user_id != 0 && self.spud_user_id == user_id)
+  end
+
+private
+
+  def spud_user_id_is_not_zero
+    if spud_user_id == 0
+      errors.add(:spud_user_id, 'cannot be 0')
+    end
   end
 
 end

data/app/models/tb_checkout/transaction.rb

@@ -6,13 +6,12 @@ module TbCheckout
     attr_accessor :card_number
     attr_accessor :card_ccv
     attr_reader :card_expiration
-    self.columns_hash['card_expiration'] = OpenStruct.new(type: :date, klass: Date)
-
     attr_reader :response
 
     validates_presence_of :cart, :billing_first_name, :billing_last_name, :billing_address_1,  
                           :billing_city, :billing_state, :billing_postal, :card_type
     validates_numericality_of :amount_charged, :greater_than => 0
+    validate :card_expiration_is_valid, :on => :create
     validate :credit_card_is_valid, :on => :create
     before_validation :set_amount_charged
     before_create :set_invoice_num, :set_spud_user_and_session_id
@@ -73,7 +72,7 @@ module TbCheckout
         if self.status != Status::AUTHORIZED
           raise StandardError, 'Payment must be in Authorized state before capture'
         end
-        @response = TbCheckout.gateway.capture(amount_in_cents, self.gateway_transaction_id)
+        @response = TbCheckout.gateway.capture(amount_in_cents, self.gateway_transaction_id.to_s)
         if @response.success? || @response.params['action'] == 'PRIOR_AUTH_CAPTURE'
           self.update_columns(:status => Status::CAPTURED, :response_text => @response.to_json)
         else
@@ -120,15 +119,20 @@ module TbCheckout
 
     # Check for card_expiration value in String format and convert to Date format
     #
-    def card_expiration=(date)
-      if date.is_a? String
+    def card_expiration=(input)
+      if input.is_a? Date
+        @card_expiration = input
+      elsif input.is_a?(Hash) && input.has_key?(1) && input.has_key?(2)
+        @card_expiration = Date.new(input[1], input[2])
+      elsif input.is_a? String
         begin
-          @card_expiration = Date.parse(date)
+          @card_expiration = Date.parse(input)
         rescue ArgumentError => e
+          logger.debug "Failed to parse card_expiration '#{input}' with error: #{e.message}"
           @card_expiration = nil
         end
       else
-        @card_expiration = date
+        @card_expiration = nil
       end
     end
 
@@ -139,7 +143,7 @@ private
         if self.status != Status::CAPTURED
           raise StandardError, 'Payment must be in captured state before it can be voided'
         end
-        @response = TbCheckout.gateway.void(gateway_transaction_id)
+        @response = TbCheckout.gateway.void(gateway_transaction_id.to_s)
         if @response.success?
           self.update_columns(:status => Status::VOIDED, :response_text => @response.to_json)
           return true
@@ -157,7 +161,7 @@ private
           raise StandardError, 'Payment must be in captured state before it can be voided'
         end
         cc_last_four_digits = self.card_display.chars.last(4).join()
-        @response = TbCheckout.gateway.refund(amount_in_cents, self.gateway_transaction_id, {
+        @response = TbCheckout.gateway.refund(amount_in_cents, self.gateway_transaction_id.to_s, {
           :order_id => invoice_num,
           :description => "REFUND: #{self.cart.description}",
           :card_number => cc_last_four_digits,
@@ -176,6 +180,14 @@ private
       end
     end
 
+    def card_expiration_is_valid
+      if self.card_expiration.blank?
+        errors.add(:card_expiration, 'cannot be blank')
+      elsif !card_expiration.is_a? Date
+        errors.add(:card_expiration, 'must be a date')
+      end
+    end
+
     def credit_card_is_valid
       if self.card_number.blank?
         errors.add(:card_number, 'cannot be blank')
@@ -237,8 +249,8 @@ private
     end
 
     def set_spud_user_and_session_id
-      self.spud_user_id = self.cart.spud_user_id || 0
-      self.session_id = self.cart.session_id || 0
+      self.spud_user_id = self.cart.spud_user_id
+      self.session_id = self.cart.session_id
     end
 
     def country_for_billing_state

data/app/views/tb_checkout/admin/carts/index.html.erb

@@ -5,43 +5,45 @@
     ['Complete', 'completed'],
     ['In Progress', 'in-progress'],
     ['Abandoned', 'abandoned']
-  ], params[:status]) %>
+  ], params[:status]), :class => 'form-control' %>
   <% end %>
 <% end %>
 
 <% content_for :detail do %>
-  <table class="table table-striped">
-    <thead>
-      <th>User</th>
-      <th>Description</th>
-      <th>Total Price</th>
-      <th>Status</th>
-      <th>Last Modified</th>
-      <th></th>
-    </thead>
-    <tbody>
-      <% @carts.each do |cart| %>
-        <tr>
-          <td class="no-wrap"><%= cart.user_full_name %></td>
-          <td><%= cart.description %></td>
-          <td>
-            <% if cart.is_empty? %>
-              Empty
-            <% else %>
-              <%= number_to_currency cart.total_price %>
-            <% end %>
-          </td>
-          <td>
-            <%= tb_checkout_status_label_for_cart(cart) %>
-          </td>
-          <td class="no-wrap"><%= cart.updated_at.strftime('%I:%M %p, %D') %></td>
-          <td>
-            <%= link_to 'Detail', tb_checkout_admin_cart_path(cart, :status => params[:status]), :class => 'btn btn-mini' %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+  <div class="table-responsive">
+    <table class="table table-striped table-hover">
+      <thead>
+        <th>User</th>
+        <th>Description</th>
+        <th>Total Price</th>
+        <th>Status</th>
+        <th>Last Modified</th>
+        <th></th>
+      </thead>
+      <tbody>
+        <% @carts.each do |cart| %>
+          <tr>
+            <td class="no-wrap"><%= cart.user_full_name %></td>
+            <td><%= cart.description %></td>
+            <td>
+              <% if cart.is_empty? %>
+                Empty
+              <% else %>
+                <%= number_to_currency cart.total_price %>
+              <% end %>
+            </td>
+            <td>
+              <%= tb_checkout_status_label_for_cart(cart) %>
+            </td>
+            <td class="no-wrap"><%= cart.updated_at.strftime('%I:%M %p, %D') %></td>
+            <td>
+              <%= link_to 'Detail', tb_checkout_admin_cart_path(cart, :status => params[:status]), :class => 'btn btn-sm btn-default' %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
   <%= will_paginate @carts %>
 
   <script>

data/app/views/tb_checkout/admin/carts/show.html.erb

@@ -12,28 +12,30 @@
 <% if @cart.is_empty? %>
   <p>This cart does not contain any items.</p>
 <% else %>
-  <table class="table table-striped">
-    <thead>
-      <th>Product</th>
-      <th>Quantity</th>
-      <th>Price</th>
-    </thead>
-    <tbody>
-      <% @cart.cart_items.each do |cart_item| %>
+    <div class="table-responsive">
+    <table class="table table-striped table-hover">
+      <thead>
+        <th>Product</th>
+        <th>Quantity</th>
+        <th>Price</th>
+      </thead>
+      <tbody>
+        <% @cart.cart_items.each do |cart_item| %>
+          <tr>
+            <td><%= cart_item.item_description %></td>
+            <td><%= cart_item.quantity %></td>
+            <td><%= number_to_currency cart_item.total_price %></td>
+          </tr>
+        <% end %>
+      </tbody>
+      <tfoot>
         <tr>
-          <td><%= cart_item.item_description %></td>
-          <td><%= cart_item.quantity %></td>
-          <td><%= number_to_currency cart_item.total_price %></td>
+          <td colspan="2">Total</td>
+          <td><%= number_to_currency @cart.total_price %></td>
         </tr>
-      <% end %>
-    </tbody>
-    <tfoot>
-      <tr>
-        <td colspan="2">Total</td>
-        <td><%= number_to_currency @cart.total_price %></td>
-      </tr>
-    </tfoot>
-  </table>
+      </tfoot>
+    </table>
+  </div>
 <% end %>
 
 <h3>Transactions</h3>

data/app/views/tb_checkout/admin/transactions/_table.html.erb

@@ -1,24 +1,26 @@
-<table class="table table-striped">
-  <thead>
-    <th>Invoice Number</th>
-    <th>Transaction ID</th>
-    <th>Billing Name</th>
-    <th>Card</th>
-    <th>Amount Charged</th>
-    <th>Status</th>
-    <th></th>
-  </thead>
-  <tbody>
-    <% transactions.each do |transaction| %>
-      <tr>
-        <td><%= transaction.invoice_num %></td>
-        <td><%= transaction.gateway_transaction_id %></td>
-        <td class="no-wrap"><%= transaction.billing_full_name %></td>
-        <td class="no-wrap"><%= transaction.card_display %> (<%= transaction.card_type %>)</td>
-        <td><%= number_to_currency transaction.amount_charged %></td>
-        <td><%= tb_checkout_status_label_for_transaction(transaction.status) %></td>
-        <td><%= link_to 'Detail', tb_checkout_admin_transaction_path(transaction), :class => 'btn btn-mini' %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<div class="table-responsive">
+  <table class="table table-striped table-hover">
+    <thead>
+      <th>Invoice Number</th>
+      <th>Transaction ID</th>
+      <th>Billing Name</th>
+      <th>Card</th>
+      <th>Amount Charged</th>
+      <th>Status</th>
+      <th></th>
+    </thead>
+    <tbody>
+      <% transactions.each do |transaction| %>
+        <tr>
+          <td><%= transaction.invoice_num %></td>
+          <td><%= transaction.gateway_transaction_id %></td>
+          <td class="no-wrap"><%= transaction.billing_full_name %></td>
+          <td class="no-wrap"><%= transaction.card_display %> (<%= transaction.card_type %>)</td>
+          <td><%= number_to_currency transaction.amount_charged %></td>
+          <td><%= tb_checkout_status_label_for_transaction(transaction.status) %></td>
+          <td><%= link_to 'Detail', tb_checkout_admin_transaction_path(transaction), :class => 'btn btn-sm btn-default' %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/app/views/tb_checkout/admin/transactions/show.html.erb

@@ -1,70 +1,76 @@
 <h3>Summary</h3>
-<table class="table table-bordered">
-  <thead>
-    <tr>
-      <th>User</th>
-      <th>Invoice Number</th>
-      <th>Transaction ID</th>
-      <th>Card</th>
-      <th>Amount Charged</th>
-      <th>Status</th>
-    </tr>
-  </thead>
-  <tbody>
-    <td><%= @transaction.cart.user_full_name %></td>
-    <td><%= @transaction.invoice_num %></td>
-    <td><%= @transaction.gateway_transaction_id %></td>
-    <td><%= @transaction.card_display %> (<%= @transaction.card_type %>)</td>
-    <td><%= number_to_currency @transaction.amount_charged %></td>
-    <td><%= tb_checkout_status_label_for_transaction(@transaction.status) %></td>
-  </tbody>
-</table>
+<div class="table-responsive">
+  <table class="table table-bordered">
+    <thead>
+      <tr>
+        <th>User</th>
+        <th>Invoice Number</th>
+        <th>Transaction ID</th>
+        <th>Card</th>
+        <th>Amount Charged</th>
+        <th>Status</th>
+      </tr>
+    </thead>
+    <tbody>
+      <td><%= @transaction.cart.user_full_name %></td>
+      <td><%= @transaction.invoice_num %></td>
+      <td><%= @transaction.gateway_transaction_id %></td>
+      <td><%= @transaction.card_display %> (<%= @transaction.card_type %>)</td>
+      <td><%= number_to_currency @transaction.amount_charged %></td>
+      <td><%= tb_checkout_status_label_for_transaction(@transaction.status) %></td>
+    </tbody>
+  </table>
+</div>
 
 <h3>Billing Address</h3>
-<table class="table table-bordered">
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>Address</th>
-      <th>Address 2</th>
-      <th>City</th>
-      <th>State</th>
-      <th>Postal</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td><%= @transaction.billing_full_name %></td>
-      <td><%= @transaction.billing_address_1 %></td>
-      <td><%= @transaction.billing_address_2 || "--" %></td>
-      <td><%= @transaction.billing_city %></td>
-      <td><%= @transaction.billing_state %></td>
-      <td><%= @transaction.billing_postal %></td>
-    </tr>
-</table>
+<div class="table-responsive">
+  <table class="table table-bordered">
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Address</th>
+        <th>Address 2</th>
+        <th>City</th>
+        <th>State</th>
+        <th>Postal</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td><%= @transaction.billing_full_name %></td>
+        <td><%= @transaction.billing_address_1 %></td>
+        <td><%= @transaction.billing_address_2 || "--" %></td>
+        <td><%= @transaction.billing_city %></td>
+        <td><%= @transaction.billing_state %></td>
+        <td><%= @transaction.billing_postal %></td>
+      </tr>
+  </table>
+</tbody>
 
 <h3>Line Items</h3>
-<table class="table table-bordered">
-  <thead>
-    <tr>
-      <th>Product</th>
-      <th>Quantity</th>
-      <th>Price</th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @transaction.cart.cart_items.each do |cart_item| %>
+<div class="table-responsive">
+  <table class="table table-bordered">
+    <thead>
+      <tr>
+        <th>Product</th>
+        <th>Quantity</th>
+        <th>Price</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @transaction.cart.cart_items.each do |cart_item| %>
+        <tr>
+          <td><%= cart_item.item_description %></td>
+          <td><%= cart_item.quantity %></td>
+          <td><%= number_to_currency cart_item.total_price %></td>
+        </tr>
+      <% end %>
+    </tbody>
+    <tfoot>
       <tr>
-        <td><%= cart_item.item_description %></td>
-        <td><%= cart_item.quantity %></td>
-        <td><%= number_to_currency cart_item.total_price %></td>
+        <td colspan="2">Total</td>
+        <td><%= number_to_currency @transaction.cart.total_price %></td>
       </tr>
-    <% end %>
-  </tbody>
-  <tfoot>
-    <tr>
-      <td colspan="2">Total</td>
-      <td><%= number_to_currency @transaction.cart.total_price %></td>
-    </tr>
-  </tfoot>
-</table>
+    </tfoot>
+  </table>
+</div>

data/lib/tb_checkout/engine.rb

@@ -1,5 +1,6 @@
 require "tb_core"
 require "activemerchant"
+require "active_merchant/billing/rails"
 require "tb_checkout/configuration"
 require 'tb_checkout/schema'
 

data/lib/tb_checkout/version.rb

@@ -1,3 +1,3 @@
 module TbCheckout
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/concerns/belongs_to_spud_user_session.rb

@@ -0,0 +1,21 @@
+require 'rails_helper'
+
+shared_examples_for "belongs_to_spud_user_session" do |related_model_factory|
+
+  describe '.for_user' do
+    it 'should return all records for the given user'
+    it 'should not return any records of the given user is nil'
+  end
+
+  describe '.for_session' do
+    it 'should return all records for the given session_id'
+    it 'should not return any records of the given session_id is nil'
+  end
+
+  describe '#belongs_to?' do
+    it 'should return true if the user matches'
+    it 'should return true if the session_id matches'
+    it 'should return false'
+  end
+
+end

data/spec/controllers/tb_checkout/transactions_controller_spec.rb

@@ -10,8 +10,8 @@ RSpec.describe TbCheckout::TransactionsController, :type => :controller do
     it "should list transactions for the current session" do
       iterations = 3
       iterations.times do |i|
-        cart = FactoryGirl.create(:tb_checkout_cart, :session_id => session.id)
-        transaction = FactoryGirl.create(:tb_checkout_transaction, :captured, :cart => cart)
+        cart = FactoryGirl.create(:tb_checkout_cart, :spud_user => nil, :session_id => session.id)
+        FactoryGirl.create(:tb_checkout_transaction, :captured, :cart => cart)
       end
       get :index
       expect(response).to be_success
@@ -28,7 +28,7 @@ RSpec.describe TbCheckout::TransactionsController, :type => :controller do
     it "should list transactions for the current user" do
       iterations = 3
       iterations.times do |i|
-        transaction = FactoryGirl.create(:tb_checkout_transaction, :captured, :cart => cart)
+        FactoryGirl.create(:tb_checkout_transaction, :captured, :cart => cart)
       end
       get :index
       expect(response).to be_success
@@ -90,15 +90,6 @@ RSpec.describe TbCheckout::TransactionsController, :type => :controller do
       end
     end
 
-    it "should autofill the most recent billing info" do
-      controller.tb_checkout_current_cart.add_to_cart(FactoryGirl.create(:tb_checkout_basic_product))
-      transaction = FactoryGirl.create(:tb_checkout_transaction, :captured, :cart => controller.tb_checkout_current_cart, :spud_user => user)
-
-      controller.tb_checkout_current_cart.add_to_cart(FactoryGirl.create(:tb_checkout_basic_product))
-      get :new
-      expect(assigns(:transaction).billing_first_name).to eq(transaction.billing_first_name)
-    end
-
     it "should show the transaction detail" do
       transaction = FactoryGirl.create(:tb_checkout_transaction, :captured, :cart => cart, :spud_user => user)
       get :show, :id => transaction.id

data/spec/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Rails.application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/spec/dummy/db/schema.rb

@@ -13,18 +13,18 @@
 
 ActiveRecord::Schema.define(version: 20140915234534) do
 
-  create_table "spud_permissions", force: true do |t|
-    t.string   "name",       null: false
-    t.string   "tag",        null: false
+  create_table "spud_permissions", force: :cascade do |t|
+    t.string   "name",       limit: 255, null: false
+    t.string   "tag",        limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "spud_permissions", ["tag"], name: "index_spud_permissions_on_tag", unique: true, using: :btree
 
-  create_table "spud_role_permissions", force: true do |t|
-    t.integer  "spud_role_id",        null: false
-    t.string   "spud_permission_tag", null: false
+  create_table "spud_role_permissions", force: :cascade do |t|
+    t.integer  "spud_role_id",        limit: 4,   null: false
+    t.string   "spud_permission_tag", limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -32,62 +32,62 @@ ActiveRecord::Schema.define(version: 20140915234534) do
   add_index "spud_role_permissions", ["spud_permission_tag"], name: "index_spud_role_permissions_on_spud_permission_tag", using: :btree
   add_index "spud_role_permissions", ["spud_role_id"], name: "index_spud_role_permissions_on_spud_role_id", using: :btree
 
-  create_table "spud_roles", force: true do |t|
-    t.string   "name"
+  create_table "spud_roles", force: :cascade do |t|
+    t.string   "name",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "spud_user_settings", force: true do |t|
-    t.integer  "spud_user_id"
-    t.string   "key"
-    t.string   "value"
+  create_table "spud_user_settings", force: :cascade do |t|
+    t.integer  "spud_user_id", limit: 4
+    t.string   "key",          limit: 255
+    t.string   "value",        limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "spud_users", force: true do |t|
-    t.string   "first_name"
-    t.string   "last_name"
-    t.boolean  "super_admin"
-    t.string   "login",                           null: false
-    t.string   "email",                           null: false
-    t.string   "crypted_password",                null: false
-    t.string   "password_salt",                   null: false
-    t.string   "persistence_token",               null: false
-    t.string   "single_access_token",             null: false
-    t.string   "perishable_token",                null: false
-    t.integer  "login_count",         default: 0, null: false
-    t.integer  "failed_login_count",  default: 0, null: false
+  create_table "spud_users", force: :cascade do |t|
+    t.string   "first_name",          limit: 255
+    t.string   "last_name",           limit: 255
+    t.boolean  "super_admin",         limit: 1
+    t.string   "login",               limit: 255,             null: false
+    t.string   "email",               limit: 255,             null: false
+    t.string   "crypted_password",    limit: 255,             null: false
+    t.string   "password_salt",       limit: 255,             null: false
+    t.string   "persistence_token",   limit: 255,             null: false
+    t.string   "single_access_token", limit: 255,             null: false
+    t.string   "perishable_token",    limit: 255,             null: false
+    t.integer  "login_count",         limit: 4,   default: 0, null: false
+    t.integer  "failed_login_count",  limit: 4,   default: 0, null: false
     t.datetime "last_request_at"
     t.datetime "current_login_at"
     t.datetime "last_login_at"
-    t.string   "current_login_ip"
-    t.string   "last_login_ip"
+    t.string   "current_login_ip",    limit: 255
+    t.string   "last_login_ip",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "time_zone"
-    t.integer  "spud_role_id"
+    t.string   "time_zone",           limit: 255
+    t.integer  "spud_role_id",        limit: 4
   end
 
   add_index "spud_users", ["email"], name: "index_spud_users_on_email", using: :btree
   add_index "spud_users", ["login"], name: "index_spud_users_on_login", using: :btree
   add_index "spud_users", ["spud_role_id"], name: "index_spud_users_on_spud_role_id", using: :btree
 
-  create_table "tb_checkout_basic_products", force: true do |t|
-    t.string   "description"
-    t.decimal  "price",       precision: 8, scale: 2
+  create_table "tb_checkout_basic_products", force: :cascade do |t|
+    t.string   "description", limit: 255
+    t.decimal  "price",                   precision: 8, scale: 2
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "tb_checkout_cart_items", force: true do |t|
-    t.integer  "cart_id",                                              null: false
-    t.integer  "item_id",                                              null: false
-    t.string   "item_type",                                            null: false
-    t.string   "item_description"
-    t.decimal  "item_price",       precision: 8, scale: 2
-    t.integer  "quantity",                                 default: 1
+  create_table "tb_checkout_cart_items", force: :cascade do |t|
+    t.integer  "cart_id",          limit: 4,                                       null: false
+    t.integer  "item_id",          limit: 4,                                       null: false
+    t.string   "item_type",        limit: 255,                                     null: false
+    t.string   "item_description", limit: 255
+    t.decimal  "item_price",                   precision: 8, scale: 2
+    t.integer  "quantity",         limit: 4,                           default: 1
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -95,36 +95,36 @@ ActiveRecord::Schema.define(version: 20140915234534) do
   add_index "tb_checkout_cart_items", ["cart_id"], name: "index_tb_checkout_cart_items_on_cart_id", using: :btree
   add_index "tb_checkout_cart_items", ["item_id", "item_type"], name: "index_tb_checkout_cart_items_on_item_id_and_item_type", using: :btree
 
-  create_table "tb_checkout_carts", force: true do |t|
-    t.integer  "spud_user_id"
+  create_table "tb_checkout_carts", force: :cascade do |t|
+    t.integer  "spud_user_id", limit: 4
     t.string   "session_id",   limit: 32
-    t.boolean  "is_completed",            default: false
-    t.boolean  "is_abandoned",            default: false
+    t.boolean  "is_completed", limit: 1,  default: false
+    t.boolean  "is_abandoned", limit: 1,  default: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "tb_checkout_carts", ["spud_user_id"], name: "index_tb_checkout_carts_on_spud_user_id", using: :btree
 
-  create_table "tb_checkout_transactions", force: true do |t|
-    t.integer  "cart_id"
-    t.string   "status",                                                    default: "pending"
-    t.string   "invoice_num"
+  create_table "tb_checkout_transactions", force: :cascade do |t|
+    t.integer  "cart_id",                limit: 4
+    t.string   "status",                 limit: 255,                           default: "pending"
+    t.string   "invoice_num",            limit: 255
     t.integer  "gateway_transaction_id", limit: 8
-    t.decimal  "amount_charged",                    precision: 8, scale: 2
-    t.string   "card_display"
-    t.string   "card_type"
-    t.string   "billing_first_name"
-    t.string   "billing_last_name"
-    t.string   "billing_address_1"
-    t.string   "billing_address_2"
-    t.string   "billing_city"
-    t.string   "billing_state"
-    t.string   "billing_postal"
-    t.text     "response_text"
+    t.decimal  "amount_charged",                       precision: 8, scale: 2
+    t.string   "card_display",           limit: 255
+    t.string   "card_type",              limit: 255
+    t.string   "billing_first_name",     limit: 255
+    t.string   "billing_last_name",      limit: 255
+    t.string   "billing_address_1",      limit: 255
+    t.string   "billing_address_2",      limit: 255
+    t.string   "billing_city",           limit: 255
+    t.string   "billing_state",          limit: 255
+    t.string   "billing_postal",         limit: 255
+    t.text     "response_text",          limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "spud_user_id"
+    t.integer  "spud_user_id",           limit: 4
     t.string   "session_id",             limit: 32
   end
 

data/spec/factories/tb_checkout_transactions.rb

@@ -3,9 +3,11 @@
 FactoryGirl.define do
   factory :tb_checkout_transaction, :class => 'TbCheckout::Transaction' do
     association :cart, :factory => :tb_checkout_cart
+    spud_user nil
     amount_charged 0
     card_type "visa"
     card_number "4024007152451281"
+    session_id "8f74e68687a91c13901ae8809e8fdb6b"
 
     # The following is NOT a valid cc number and should throw a basic validation error
     trait :with_invalid_card do

data/spec/models/tb_checkout/transaction_spec.rb

@@ -2,4 +2,6 @@ require 'rails_helper'
 
 RSpec.describe TbCheckout::Transaction, :type => :model do
   pending "add some examples to (or delete) #{__FILE__}"
+
+  it_behaves_like 'belongs_to_spud_user_session', :tb_checkout_transaction
 end

data/spec/rails_helper.rb

@@ -1,12 +1,12 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'spec_helper'
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
+
 require 'database_cleaner'
-require 'simplecov'
 require 'factory_girl_rails'
+require 'simplecov'
 
 # Authlogic helpers
 require "authlogic/test_case"
@@ -31,7 +31,7 @@ SimpleCov.start 'rails'
 # require only the support files necessary.
 #
 # Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+Dir[TbCheckout::Engine.root.join("spec/concerns/**/*.rb")].each { |f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: tb_checkout
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Westlake Design
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: tb_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: tb_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: 1.46.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: 1.46.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.1
 description: TB Checkout is a shopping cart and payments system designed for use with
   Twice Baked and Active Merchant
 email:
@@ -192,6 +178,7 @@ files:
 - lib/tb_checkout/engine.rb
 - lib/tb_checkout/schema.rb
 - lib/tb_checkout/version.rb
+- spec/concerns/belongs_to_spud_user_session.rb
 - spec/controllers/tb_checkout/carts_controller_spec.rb
 - spec/controllers/tb_checkout/transactions_controller_spec.rb
 - spec/dummy/README.rdoc
@@ -270,11 +257,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple shopping cart and checkout system for Twice Baked
 test_files:
+- spec/concerns/belongs_to_spud_user_session.rb
 - spec/controllers/tb_checkout/carts_controller_spec.rb
 - spec/controllers/tb_checkout/transactions_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js