arcadex 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a2df497f9616e60ada9748c4d8b4f830b73f4bc
-  data.tar.gz: bdc79db0a5ead6e7cb6792d58a99edfa60269ab3
+  metadata.gz: fde8998af5dc3ef8826484cbe4816ed4fafe18d5
+  data.tar.gz: 0c62bb5bdbc74436a0a12fc2a887a03faef3df90
 SHA512:
-  metadata.gz: cc85b652cf9a5c4c5f1569d5f1ccc807d5d265ad40969f44b9e9425e7f91d56b03e3a964fbd7ff088fc3aa5c67c084f0b9fb30aa6577a7706eb8c3e36cc58e6e
-  data.tar.gz: a8502e28f49ff40a92913acf12fe8fb11e46eed2d6f07f1d0ce1b41b0e03670989cfc107bfa08f8cd4f339a1c1c0074ff2d8808aa1d4651dab01609bb6ec3a86
+  metadata.gz: 14c9ff35b7efea9e0bb45e7b613f70e00f52828ec1c3332bef3a6823c2aff418d38daa80969d9a08dd91260b06904e89a2f2f6229ceac015a73b28676bf6f884
+  data.tar.gz: aee13593e96f145daa19114b8c975ece82d22bc32d8036dbe0857eb8de243834580f512d0379b78f5940d543fa8e43d59d3dbd640e1a652b27d4301acee60712

data/app/assets/javascripts/arcadex/tokens.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/arcadex/tokens.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/assets/stylesheets/scaffold.css

@@ -0,0 +1,56 @@
+body { background-color: #fff; color: #333; }
+
+body, p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size:   13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a { color: #000; }
+a:visited { color: #666; }
+a:hover { color: #fff; background-color:#000; }
+
+div.field, div.actions {
+  margin-bottom: 10px;
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+}
+
+#error_explanation h2 {
+  text-align: left;
+  font-weight: bold;
+  padding: 5px 5px 5px 15px;
+  font-size: 12px;
+  margin: -7px;
+  margin-bottom: 0px;
+  background-color: #c00;
+  color: #fff;
+}
+
+#error_explanation ul li {
+  font-size: 12px;
+  list-style: square;
+}

data/app/controllers/arcadex/tokens_controller.rb

@@ -29,7 +29,7 @@ module Arcadex
       if @token.save
         redirect_to @token, notice: 'Token was successfully created.'
       else
-        render action: 'new'
+        render :new
       end
     end
 
@@ -38,7 +38,7 @@ module Arcadex
       if @token.update(token_params)
         redirect_to @token, notice: 'Token was successfully updated.'
       else
-        render action: 'edit'
+        render :edit
       end
     end
 
@@ -56,7 +56,7 @@ module Arcadex
 
       # Only allow a trusted parameter "white list" through.
       def token_params
-        params.require(:token).permit(:imageable_id, :imageable_type, :auth_token)
+        params.require(:token).permit(:imageable_id, :imageable_type, :auth_token, :first_ip_address, :current_ip_address, :times_used, :expiration_minutes)
       end
   end
 end

data/app/helpers/arcadex/tokens_helper.rb

@@ -0,0 +1,4 @@
+module Arcadex
+  module TokensHelper
+  end
+end

data/app/models/arcadex/token.rb

@@ -11,7 +11,7 @@ module Arcadex
     validates :auth_token, uniqueness: true
 
     def generate_hash
-    	self.auth_token = ::Arcadex.generate_auth_token
+    	self.auth_token = ::Arcadex::Create.generate_auth_token
     end	
   end
 end

data/app/views/arcadex/tokens/_form.html.erb

@@ -4,8 +4,8 @@
       <h2><%= pluralize(@token.errors.count, "error") %> prohibited this token from being saved:</h2>
 
       <ul>
-      <% @token.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
+      <% @token.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
       <% end %>
       </ul>
     </div>
@@ -13,7 +13,7 @@
 
   <div class="field">
     <%= f.label :imageable_id %><br>
-    <%= f.text_field :imageable_id %>
+    <%= f.number_field :imageable_id %>
   </div>
   <div class="field">
     <%= f.label :imageable_type %><br>
@@ -23,6 +23,22 @@
     <%= f.label :auth_token %><br>
     <%= f.text_field :auth_token %>
   </div>
+  <div class="field">
+    <%= f.label :first_ip_address %><br>
+    <%= f.text_field :first_ip_address %>
+  </div>
+  <div class="field">
+    <%= f.label :current_ip_address %><br>
+    <%= f.text_field :current_ip_address %>
+  </div>
+  <div class="field">
+    <%= f.label :times_used %><br>
+    <%= f.number_field :times_used %>
+  </div>
+  <div class="field">
+    <%= f.label :expiration_minutes %><br>
+    <%= f.number_field :expiration_minutes %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>

data/app/views/arcadex/tokens/index.html.erb

@@ -3,12 +3,14 @@
 <table>
   <thead>
     <tr>
-      <th>Imageable_id</th>
-      <th>Imageable_type</th>
-      <th>Auth_token</th>
-      <th></th>
-      <th></th>
-      <th></th>
+      <th>Imageable</th>
+      <th>Imageable type</th>
+      <th>Auth token</th>
+      <th>First ip address</th>
+      <th>Current ip address</th>
+      <th>Times used</th>
+      <th>Expiration minutes</th>
+      <th colspan="3"></th>
     </tr>
   </thead>
 
@@ -18,6 +20,10 @@
         <td><%= token.imageable_id %></td>
         <td><%= token.imageable_type %></td>
         <td><%= token.auth_token %></td>
+        <td><%= token.first_ip_address %></td>
+        <td><%= token.current_ip_address %></td>
+        <td><%= token.times_used %></td>
+        <td><%= token.expiration_minutes %></td>
         <td><%= link_to 'Show', token %></td>
         <td><%= link_to 'Edit', edit_token_path(token) %></td>
         <td><%= link_to 'Destroy', token, method: :delete, data: { confirm: 'Are you sure?' } %></td>

data/app/views/arcadex/tokens/show.html.erb

@@ -1,19 +1,39 @@
 <p id="notice"><%= notice %></p>
 
 <p>
-  <strong>Imageable_id:</strong>
+  <strong>Imageable:</strong>
   <%= @token.imageable_id %>
 </p>
 
 <p>
-  <strong>Imageable_type:</strong>
+  <strong>Imageable type:</strong>
   <%= @token.imageable_type %>
 </p>
 
 <p>
-  <strong>Auth_token:</strong>
+  <strong>Auth token:</strong>
   <%= @token.auth_token %>
 </p>
 
+<p>
+  <strong>First ip address:</strong>
+  <%= @token.first_ip_address %>
+</p>
+
+<p>
+  <strong>Current ip address:</strong>
+  <%= @token.current_ip_address %>
+</p>
+
+<p>
+  <strong>Times used:</strong>
+  <%= @token.times_used %>
+</p>
+
+<p>
+  <strong>Expiration minutes:</strong>
+  <%= @token.expiration_minutes %>
+</p>
+
 <%= link_to 'Edit', edit_token_path(@token) %> |
 <%= link_to 'Back', tokens_path %>

data/config/routes.rb

@@ -1,7 +1,5 @@
 Arcadex::Engine.routes.draw do
+	
 	root to: "tokens#index"
-
-  scope 'admin' do
-	  resources :tokens
-	end
+	resources :tokens
 end

data/db/migrate/20140910215044_add_first_ip_address_to_arcadex_tokens.rb

@@ -0,0 +1,5 @@
+class AddFirstIpAddressToArcadexTokens < ActiveRecord::Migration
+  def change
+    add_column :arcadex_tokens, :first_ip_address, :string
+  end
+end

data/db/migrate/20140910215118_add_current_ip_address_to_arcadex_tokens.rb

@@ -0,0 +1,5 @@
+class AddCurrentIpAddressToArcadexTokens < ActiveRecord::Migration
+  def change
+    add_column :arcadex_tokens, :current_ip_address, :string
+  end
+end

data/db/migrate/20140910215136_add_times_used_to_arcadex_tokens.rb

@@ -0,0 +1,5 @@
+class AddTimesUsedToArcadexTokens < ActiveRecord::Migration
+  def change
+    add_column :arcadex_tokens, :times_used, :integer
+  end
+end

data/db/migrate/20140910215147_add_expiration_minutes_to_arcadex_tokens.rb

@@ -0,0 +1,5 @@
+class AddExpirationMinutesToArcadexTokens < ActiveRecord::Migration
+  def change
+    add_column :arcadex_tokens, :expiration_minutes, :integer
+  end
+end

data/lib/arcadex.rb

@@ -1,168 +1,10 @@
 require "arcadex/engine"
+require "arcadex/authentication"
+require "arcadex/header"
+require "arcadex/find"
+require "arcadex/destroy"
+require "arcadex/create"
 
 module Arcadex
 
-################Below are authentication methods###########################
-############This should be called by the user##############################
-	def self.full_authentication(params,request,should_use_email)
-		auth_token = grab_token(params,request)
-		email = grab_email(params,request)
-		if should_use_email
-			return authenticate_with_email_token(auth_token,email)
-		else
-			return authenticate_with_only_token(auth_token)
-		end
-	end
-
-##########Below are authentication helper methods##########################
-#########These dont normally need to be called by the user#################
-#authenticate_with methods return nil if not authenticated and make a hash
-#if things go fine.     
-#current_owner = @instance_hash["current_user"]
-#current_token = @instance_hash["current_token"]
-
-  #Gets the auth_token from either the url or header
-  def self.grab_token(params,request)
-    #Header token has preference
-    if !params["auth_token"].blank?
-      auth_token = params["auth_token"]
-    end
-    if !request.headers["Auth-Token"].blank?
-      auth_token = request.headers["Auth-Token"]
-    end
-    return auth_token
-  end
-  #Gets the email from either the url or header
-  def self.grab_email(params,request)
-    #Header email has preference
-    if !params["email"].blank?
-      email = params["email"]
-    end
-    if !request.headers["Email"].blank?
-      email = request.headers["Email"]
-    end
-    return email
-  end
-	#This should be used in the application_controller before all actions
-	def self.authenticate_with_email_token(auth_token,email)
-    #Find token from auth_token and owner from token
-    token = ::Arcadex.find_token_by_auth_token(auth_token)
-    owner = ::Arcadex.find_owner_by_token(token)
-    #This assumes that the owner of the token is indeed a user
-    if !token.nil?
-    	user = Object.const_get(token.imageable_type).find_by(email: email)
-    	#user = ::People::User.find_by(email: email)
-    end
-		#This is to mitigate timing attacks
-    ::Devise.secure_compare(auth_token,auth_token)
-    if owner.nil? || user.nil? || user.id != owner.id
-      return nil
-    else
-      #These are the variables available to every controller that inherits
-     	instance_hash = {"current_user" => owner, "current_token" => token}
-      return instance_hash
-    end
-	end
-	#This should be used in the application_controller before all actions
-	def self.authenticate_with_only_token(auth_token)
-    #Find token from auth_token and owner from token
-    token = ::Arcadex.find_token_by_auth_token(auth_token)
-    owner = ::Arcadex.find_owner_by_token(token)
-    #This is to mitigate timing attacks
-    ::Devise.secure_compare(auth_token,auth_token)
-    if owner.nil?
-      return nil
-    else
-      #These are the variables available to every controller that inherits
-      instance_hash = {"current_user" => owner, "current_token" => token}
-      return instance_hash
-    end
-	end
-
-####################Below are helper methods###############################
-############These dont need to be called by the user#######################
-
-	#This is now called by the token when it's first saved
-	#token = instance.tokens.new
-	#token.auth_token = Arcadex.generate_auth_token
-	#token.save
-	def self.generate_auth_token
-		token = ::Devise.friendly_token
-		while Token.exists?(token)
-			token = ::Devise.friendly_token
-		end
-		return token
-	end
-	#Arcadex.create_token(instance.id,instance.class.to_s)
-	def self.create_token(id,type)
-		token = Token.new
-		token.imageable_id = id
-		token.imageable_type = type
-		#token.auth_token = generate_auth_token
-		token.save
-		return token
-	end
-
-
-	#Arcadex.find_token_by_auth_token(token.auth_token)
-	def self.find_token_by_auth_token(auth_token_string)
-		token = Token.find_by(auth_token: auth_token_string)
-		if token.nil?
-			return nil
-		end
-		if token_expired?(token)
-			destroy_token(token)
-			return nil
-		else
-			return token
-		end
-	end
-
-
-	#Arcadex.destroy_token(token.auth_token)
-	def self.destroy_auth_token(auth_token)
-		token = find_token_by_auth_token(auth_token)
-		destroy_token(token)
-	end
-	def self.destroy_token(token)
-		if token.nil?
-			return nil
-		end
-		token.destroy
-	end
-	#Arcadex.destroy_all_tokens(instance.id,instance.class.to_s)
-	def self.destroy_all_tokens(id,type)
-		if Object.const_get(type).exists?(id)
-			instance = Object.const_get(type).find(id)
-			instance.tokens.destroy_all
-		end
-	end
-
-
-	#Arcadex.find_owner_by_auth_token(auth_token)
-	def self.find_owner_by_auth_token(auth_token)
-		token = Arcadex.find_token_by_auth_token(auth_token)
-		return Arcadex.find_owner_by_token(token)
-	end
-	#Arcadex.find_owner_by_token(token)
-	def self.find_owner_by_token(token)
-		if token.nil?
-			return nil
-		end
-		if token_expired?(token)
-			destroy_token(token)
-			return nil
-		else
-			instance = Object.const_get(token.imageable_type).find(token.imageable_id)
-			return instance
-		end
-	end
-
-
-	#Arcadex.token_expired?(token)
-	#How long should tokens last? A day if not rememberable
-	#And a month if you are?
-	def self.token_expired?(token)
-		return false
-	end
 end

data/lib/arcadex/authentication.rb

@@ -0,0 +1,70 @@
+module Arcadex
+	module Authentication
+
+		################Below are authentication methods###########################
+		############This should be called by the user##############################
+		def self.full_authentication(params,request,should_use_email)
+			auth_token = ::Arcadex::Header.grab_token(params,request)
+			email = ::Arcadex::Header.grab_email(params,request)
+			instance_hash = nil;
+			if should_use_email
+				instance_hash = ::Arcadex::Authentication.authenticate_with_email_token(auth_token,email)
+			else
+				instance_hash = ::Arcadex::Authentication.authenticate_with_only_token(auth_token)
+			end
+			if instance_hash.nil?
+				return nil
+			else
+				token = instance_hash["current_token"]
+				if token.first_ip_address.nil?
+					token.first_ip_address = request.remote_ip
+				end
+				token.current_ip_address = request.remote_ip
+				if token.times_used.nil?
+					token.times_used = 0;
+				end
+				token.times_used = token.times_used + 1
+				token.save
+				return instance_hash
+			end
+		end
+
+		#This should be used in the application_controller before all actions
+		def self.authenticate_with_email_token(auth_token,email)
+	    #Find token from auth_token and owner from token
+	    token = ::Arcadex::Find.find_token_by_auth_token(auth_token)
+	    owner = ::Arcadex::Find.find_owner_by_token(token)
+	    #This assumes that the owner of the token is indeed a user
+	    if !token.nil?
+	    	user = ::Object.const_get(token.imageable_type).find_by(email: email)
+	    	#user = ::People::User.find_by(email: email)
+	    end
+			#This is to mitigate timing attacks
+	    ::Devise.secure_compare(auth_token,auth_token)
+	    if owner.nil? || user.nil? || user.id != owner.id
+	      return nil
+	    else
+	      #These are the variables available to every controller that inherits
+	     	instance_hash = {"current_user" => owner, "current_token" => token}
+	      return instance_hash
+	    end
+		end
+
+		#This should be used in the application_controller before all actions
+		def self.authenticate_with_only_token(auth_token)
+	    #Find token from auth_token and owner from token
+	    token = ::Arcadex::Find.find_token_by_auth_token(auth_token)
+	    owner = ::Arcadex::Find.find_owner_by_token(token)
+	    #This is to mitigate timing attacks
+	    ::Devise.secure_compare(auth_token,auth_token)
+	    if owner.nil?
+	      return nil
+	    else
+	      #These are the variables available to every controller that inherits
+	      instance_hash = {"current_user" => owner, "current_token" => token}
+	      return instance_hash
+	    end
+		end
+
+	end
+end

data/lib/arcadex/create.rb

@@ -0,0 +1,24 @@
+module Arcadex
+	module Create
+		#This is now called by the token when it's first saved
+		def self.generate_auth_token
+			token = ::Devise.friendly_token
+			while ::Arcadex::Token.exists?(token)
+				token = ::Devise.friendly_token
+			end
+			return token
+		end
+		
+		#Arcadex.create_token(instance.tokens.new,exp_minutes,request)
+		#Put any token in here to  set it's values. Usually when its first created
+		def self.set_token(token,exp_minutes,request)
+			token.first_ip_address = request.remote_ip
+			token.current_ip_address = request.remote_ip
+			token.times_used = 0
+			token.expiration_minutes = exp_minutes
+			token.save
+			return token
+		end
+		
+	end
+end

data/lib/arcadex/destroy.rb

@@ -0,0 +1,39 @@
+module Arcadex
+	module Destroy
+
+		#Arcadex.destroy_token(token.auth_token)
+		def self.destroy_auth_token(auth_token)
+			token = ::Arcadex::Find.find_token_by_auth_token(auth_token)
+			::Arcadex::Destroy.destroy_token(token)
+		end
+		def self.destroy_token(token)
+			if token.nil?
+				return nil
+			end
+			token.destroy
+		end
+		#Arcadex.destroy_all_tokens(instance.id,instance.class.to_s)
+		def self.destroy_all_tokens(id,type)
+			if ::Object.const_get(type).exists?(id)
+				instance = ::Object.const_get(type).find(id)
+				instance.tokens.destroy_all
+			end
+		end
+		#Arcadex.token_expired?(token)
+		#How long should tokens last? A day if not rememberable
+		#And a month if you are?
+		def self.token_expired?(token)
+			if !token.expiration_minutes.nil?
+				date = token.expiration_minutes.minutes + token.created_at
+				if date > DateTime.now
+					return true
+				else
+					return false
+				end
+			else
+				return false
+			end
+		end
+
+	end
+end

data/lib/arcadex/find.rb

@@ -0,0 +1,39 @@
+module Arcadex
+	module Find
+
+		#Arcadex.find_owner_by_auth_token(auth_token)
+		def self.find_owner_by_auth_token(auth_token)
+			token = ::Arcadex::Find.find_token_by_auth_token(auth_token)
+			return ::Arcadex::Find.find_owner_by_token(token)
+		end
+
+		#Arcadex.find_owner_by_token(token)
+		def self.find_owner_by_token(token)
+			if token.nil?
+				return nil
+			end
+			if ::Arcadex::Destroy.token_expired?(token)
+				::Arcadex::Destroy.destroy_token(token)
+				return nil
+			else
+				instance = ::Object.const_get(token.imageable_type).find(token.imageable_id)
+				return instance
+			end
+		end
+
+		#Arcadex.find_token_by_auth_token(token.auth_token)
+		def self.find_token_by_auth_token(auth_token_string)
+			token = ::Arcadex::Token.find_by(auth_token: auth_token_string)
+			if token.nil?
+				return nil
+			end
+			if ::Arcadex::Destroy.token_expired?(token)
+				::Arcardex::Destroy.destroy_token(token)
+				return nil
+			else
+				return token
+			end
+		end
+
+	end
+end

data/lib/arcadex/header.rb

@@ -0,0 +1,29 @@
+module Arcadex
+	module Header
+
+	  #Gets the auth_token from either the url or header
+	  def self.grab_token(params,request)
+	    #Header token has preference
+	    if !params["auth_token"].blank?
+	      auth_token = params["auth_token"]
+	    end
+	    if !request.headers["Auth-Token"].blank?
+	      auth_token = request.headers["Auth-Token"]
+	    end
+	    return auth_token
+	  end
+	  
+	  #Gets the email from either the url or header
+	  def self.grab_email(params,request)
+	    #Header email has preference
+	    if !params["email"].blank?
+	      email = params["email"]
+	    end
+	    if !request.headers["Email"].blank?
+	      email = request.headers["Email"]
+	    end
+	    return email
+	  end
+
+	end
+end

data/lib/arcadex/version.rb

@@ -1,3 +1,3 @@
 module Arcadex
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/test/controllers/arcadex/tokens_controller_test.rb

@@ -0,0 +1,51 @@
+require 'test_helper'
+
+module Arcadex
+  class TokensControllerTest < ActionController::TestCase
+    setup do
+      @token = tokens(:one)
+    end
+
+    test "should get index" do
+      get :index
+      assert_response :success
+      assert_not_nil assigns(:tokens)
+    end
+
+    test "should get new" do
+      get :new
+      assert_response :success
+    end
+
+    test "should create token" do
+      assert_difference('Token.count') do
+        post :create, token: { auth_token: @token.auth_token, current_ip_address: @token.current_ip_address, expiration_minutes: @token.expiration_minutes, first_ip_address: @token.first_ip_address, imageable_id: @token.imageable_id, imageable_type: @token.imageable_type, times_used: @token.times_used }
+      end
+
+      assert_redirected_to token_path(assigns(:token))
+    end
+
+    test "should show token" do
+      get :show, id: @token
+      assert_response :success
+    end
+
+    test "should get edit" do
+      get :edit, id: @token
+      assert_response :success
+    end
+
+    test "should update token" do
+      patch :update, id: @token, token: { auth_token: @token.auth_token, current_ip_address: @token.current_ip_address, expiration_minutes: @token.expiration_minutes, first_ip_address: @token.first_ip_address, imageable_id: @token.imageable_id, imageable_type: @token.imageable_type, times_used: @token.times_used }
+      assert_redirected_to token_path(assigns(:token))
+    end
+
+    test "should destroy token" do
+      assert_difference('Token.count', -1) do
+        delete :destroy, id: @token
+      end
+
+      assert_redirected_to tokens_path
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140806202340) do
+ActiveRecord::Schema.define(version: 20140910215147) do
 
   create_table "arcadex_tokens", force: true do |t|
     t.integer  "imageable_id"
@@ -19,6 +19,10 @@ ActiveRecord::Schema.define(version: 20140806202340) do
     t.string   "auth_token"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "first_ip_address"
+    t.string   "current_ip_address"
+    t.integer  "times_used"
+    t.integer  "expiration_minutes"
   end
 
   add_index "arcadex_tokens", ["auth_token"], name: "index_arcadex_tokens_on_auth_token", unique: true

data/test/dummy/log/development.log

@@ -14,3 +14,33 @@ Migrating to AddIndexToToken (20140806202340)
   SQL (0.6ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140806202340"]]
    (100.2ms)  commit transaction
   ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddFirstIpAddressToArcadexTokens (20140910215044)
+   (0.1ms)  begin transaction
+   (0.6ms)  ALTER TABLE "arcadex_tokens" ADD "first_ip_address" varchar(255)
+  SQL (0.5ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140910215044"]]
+   (226.8ms)  commit transaction
+Migrating to AddCurrentIpAddressToArcadexTokens (20140910215118)
+   (0.1ms)  begin transaction
+   (1.7ms)  ALTER TABLE "arcadex_tokens" ADD "current_ip_address" varchar(255)
+  SQL (1.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140910215118"]]
+   (146.8ms)  commit transaction
+Migrating to AddTimesUsedToArcadexTokens (20140910215136)
+   (0.1ms)  begin transaction
+   (0.6ms)  ALTER TABLE "arcadex_tokens" ADD "times_used" integer
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140910215136"]]
+   (141.6ms)  commit transaction
+Migrating to AddExpirationMinutesToArcadexTokens (20140910215147)
+   (0.2ms)  begin transaction
+   (1.5ms)  ALTER TABLE "arcadex_tokens" ADD "expiration_minutes" integer
+  SQL (1.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140910215147"]]
+   (169.5ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_arcadex_tokens_on_auth_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_arcadex_tokens_on_auth_token' AND type='index'
+

data/test/fixtures/arcadex/tokens.yml

@@ -4,8 +4,16 @@ one:
   imageable_id: 1
   imageable_type: MyString
   auth_token: MyString
+  first_ip_address: MyString
+  current_ip_address: MyString
+  times_used: 1
+  expiration_minutes: 1
 
 two:
   imageable_id: 1
   imageable_type: MyString
   auth_token: MyString
+  first_ip_address: MyString
+  current_ip_address: MyString
+  times_used: 1
+  expiration_minutes: 1

data/test/helpers/arcadex/tokens_helper_test.rb

@@ -0,0 +1,6 @@
+require 'test_helper'
+
+module Arcadex
+  class TokensHelperTest < ActionView::TestCase
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arcadex
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Cleophus Robinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -65,10 +65,14 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/assets/javascripts/arcadex/application.js
+- app/assets/javascripts/arcadex/tokens.js
 - app/assets/stylesheets/arcadex/application.css
+- app/assets/stylesheets/arcadex/tokens.css
+- app/assets/stylesheets/scaffold.css
 - app/controllers/arcadex/application_controller.rb
 - app/controllers/arcadex/tokens_controller.rb
 - app/helpers/arcadex/application_helper.rb
+- app/helpers/arcadex/tokens_helper.rb
 - app/models/arcadex/token.rb
 - app/views/arcadex/tokens/_form.html.erb
 - app/views/arcadex/tokens/edit.html.erb
@@ -79,11 +83,21 @@ files:
 - config/routes.rb
 - db/migrate/20140806194834_create_arcadex_tokens.rb
 - db/migrate/20140806202340_add_index_to_token.rb
+- db/migrate/20140910215044_add_first_ip_address_to_arcadex_tokens.rb
+- db/migrate/20140910215118_add_current_ip_address_to_arcadex_tokens.rb
+- db/migrate/20140910215136_add_times_used_to_arcadex_tokens.rb
+- db/migrate/20140910215147_add_expiration_minutes_to_arcadex_tokens.rb
 - lib/arcadex.rb
+- lib/arcadex/authentication.rb
+- lib/arcadex/create.rb
+- lib/arcadex/destroy.rb
 - lib/arcadex/engine.rb
+- lib/arcadex/find.rb
+- lib/arcadex/header.rb
 - lib/arcadex/version.rb
 - lib/tasks/arcadex_tasks.rake
 - test/arcadex_test.rb
+- test/controllers/arcadex/tokens_controller_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
@@ -121,6 +135,7 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/fixtures/arcadex/tokens.yml
+- test/helpers/arcadex/tokens_helper_test.rb
 - test/integration/navigation_test.rb
 - test/models/arcadex/token_test.rb
 - test/test_helper.rb
@@ -151,6 +166,7 @@ test_files:
 - test/fixtures/arcadex/tokens.yml
 - test/integration/navigation_test.rb
 - test/models/arcadex/token_test.rb
+- test/controllers/arcadex/tokens_controller_test.rb
 - test/dummy/bin/rake
 - test/dummy/bin/rails
 - test/dummy/bin/bundle
@@ -188,4 +204,5 @@ test_files:
 - test/dummy/log/development.log
 - test/dummy/log/test.log
 - test/test_helper.rb
+- test/helpers/arcadex/tokens_helper_test.rb
 - test/arcadex_test.rb