defcon 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be9f1fc08009487f9d55a03da06f24c9cb147aa2
-  data.tar.gz: 78a08aadf0131031805615ce7f282c5bc2aaf68f
+  metadata.gz: 20bc5842476a4eb7364aed19bfe432bfd889455b
+  data.tar.gz: c929ad5de421b8f9e03417aefc9ebb554b982bb4
 SHA512:
-  metadata.gz: f73052a1a1300c3dc740d81262203bec013a475fa49675637eae8f3f1095a5c04680f4443535898a04937d2d5ebbbd9d7f97ef8403cd1a930ca02370d019838e
-  data.tar.gz: b4025258d8137fdc14fbefc06f86b95b8e9599faa40385b7032fc713f144bd31529054bee17ea812cc710bfeee970e842cbaf478d97335661941931e6cc99479
+  metadata.gz: 579bf1bb18acc501f4bbccd0b7bd6280f0fc35618435222e005003c9ee84b4661077637d121bfeebac782f6e42c999e3157048c30858b2bdf8d21c5474a8cc32
+  data.tar.gz: 37b7174e4e21af37756a12bea39327822b55ff58f08d2ddfa6b3dd87b1c954ae9aec51ea46eae35cfbe2a9ae32116033a555960207de0a819c6f295256c4e31a

data/app/controllers/defcon/sessions_controller.rb

@@ -17,27 +17,29 @@ module Defcon
 	      session[:admin_username] = admin.username
 	      redirect_to admin_root_path, notice: "Welcome back!"
 	    else
-	    	admin.attempts = admin.attempts + 1
-	    	admin.save
+	    	if !admin.nil?
+	    		admin.attempts = admin.attempts + 1
+	    		admin.save
+	    	end
 	    	message = "Are you sure you belong here?"
-	    	if admin.locked_out?
+	    	if !admin.nil? && admin.locked_out?
 	    		message = "Locked out!"
 	    	end
-	    	redirect_to login_path, alert: message
+	    	redirect_to defcon_login_path, alert: message
 	    end
 	  end
 
 	  def destroy
 	    session[:admin_id] = nil
 	    session[:admin_username] = nil
-	    redirect_to login_path, notice: "Until next time!"
+	    redirect_to defcon_login_path, notice: "Until next time!"
 	  end
 
 	  private
 
 	    def logged_in_check
 	      if !logged_in?
-	        redirect_to login_path, alert: "You are not logged in."
+	        redirect_to defcon_login_path, alert: "You are not logged in."
 	        return false
 	      else
 	        return true

data/app/views/defcon/sessions/new.html.erb

@@ -1,4 +1,6 @@
-<h1>Admin</h1>
+<div class="text-center">
+	<h1>Admin</h1>
+</div>
 
 <div class="text-center">
 <% flash.each do |name, msg| -%>
@@ -28,5 +30,6 @@
 	<br>
 	<div class="actions"><%= submit_tag("Login", class: "btn btn-large btn-primary") %></div>
 	</div>
-<% end %>
-</div>
+</div>
+
+<% end %>

data/config/routes.rb

@@ -1,11 +1,10 @@
 Defcon::Engine.routes.draw do
-
-	get 'admin/login' => "sessions#new", as: 'login'
+	root to: "sessions#new"
+	get 'admin/login' => "sessions#new", as: 'defcon_login'
   post 'sessions/create'
   post 'sessions/destroy'
-  post 'admin/logout' => "sessions#destroy", as: 'logout'
+  post 'admin/logout' => "sessions#destroy", as: 'defcon_logout'
   #This get is only here for convenience
   #get 'admin/logout' => "sessions#destroy"
   #Need to define an admin_root_path if not using active admin
-
 end

data/db/migrate/20141008214632_add_index_to_defcon_admin_users.rb

@@ -0,0 +1,5 @@
+class AddIndexToDefconAdminUsers < ActiveRecord::Migration
+  def change
+    add_index :defcon_admin_users, :username
+  end
+end

data/lib/defcon/version.rb

@@ -1,3 +1,3 @@
 module Defcon
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 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: 20141008173352) do
+ActiveRecord::Schema.define(version: 20141008214632) do
 
   create_table "defcon_admin_users", force: true do |t|
     t.string   "username"
@@ -25,4 +25,6 @@ ActiveRecord::Schema.define(version: 20141008173352) do
     t.datetime "updated_at"
   end
 
+  add_index "defcon_admin_users", ["username"], name: "index_defcon_admin_users_on_username"
+
 end

data/test/dummy/log/development.log

@@ -8,3 +8,19 @@ Migrating to CreateDefconAdminUsers (20141008173352)
   SQL (0.5ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141008173352"]]
    (140.4ms)  commit transaction
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to AddIndexToDefconAdminUsers (20141008214632)
+   (0.1ms)  begin transaction
+   (0.1ms)  select sqlite_version(*)
+   (23.7ms)  CREATE  INDEX "index_defcon_admin_users_on_username" ON "defcon_admin_users" ("username")
+  SQL (0.6ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20141008214632"]]
+   (510.7ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_defcon_admin_users_on_username' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_defcon_admin_users_on_username' AND type='index'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: defcon
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Cleophus Robinson
@@ -61,6 +61,7 @@ files:
 - app/views/layouts/defcon/default/application.html.erb
 - config/routes.rb
 - db/migrate/20141008173352_create_defcon_admin_users.rb
+- db/migrate/20141008214632_add_index_to_defcon_admin_users.rb
 - lib/defcon.rb
 - lib/defcon/engine.rb
 - lib/defcon/version.rb