spud_core 1.0.0.rc1.1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1096b5f64c240350c7b084f05f2ef7f15d1611dd
-  data.tar.gz: f82658ddc3c0b78ea41c92f2d193369cf8fe6912
+  metadata.gz: b7435afd5d18b2fab9a122e572872216224c4947
+  data.tar.gz: 78deb1e17aa6843c3780c23fe8f74efba5daffec
 SHA512:
-  metadata.gz: 149f6e15b3c198b782d76c64f1e7d339357e9e020c7c04265f81aec6699642eb1456d0facb3b85f668308fc8ae8874a62a2892a4484c48f7babbda14dee49efd
-  data.tar.gz: 1f726825a30c49fbdd1aa2650c006470f9b9e5fad1b84afbecb42d48c776b63b1707a64485728aa13e9c22b0c4057543aa6ec240d0106996c4eb1e3240de82b7
+  metadata.gz: 1d7c921373bc11113dcad3a78195b1bbbe884f769ca7318952194c3c1a54e0f4490bbc53f08b3d212f3f8b33d228070366d53a2d836ea3398eec0b7c22d907a1
+  data.tar.gz: 2a940d619e03a726e183bf552dffccc63f29a2302850db7641881fb5bbbacd1198728171e2faeee684dbf7784b7d546f69092980f8a1d019a305b7226b8f80a0

data/app/controllers/spud/application_controller.rb

@@ -28,7 +28,7 @@ class Spud::ApplicationController < ActionController::Base
 
     def current_user_permissions
       return @current_user_permissions if defined?(@current_user_permissions)
-      @current_user_permissions = current_user.spud_admin_permissions.where(:access => true).all
+      @current_user_permissions = current_user.spud_admin_permissions.where(:access => true).load
     end
 
     def require_user

data/app/models/concerns/spud_authentication.rb

@@ -1,10 +1,11 @@
 module Concerns
-  module SpudAuthentication
-    extend ActiveSupport::Concern
-    included do
-      acts_as_authentic do |c|
-        # c.my_config_option = my_value # for available options see documentation in: Authlogic::ActsAsAuthentic
-      end # block optional
+    module SpudAuthentication
+        extend ActiveSupport::Concern
+        included do
+            acts_as_authentic do |c|
+                c.crypto_provider = Authlogic::CryptoProviders::Sha512
+                # c.my_config_option = my_value # for available options see documentation in: Authlogic::ActsAsAuthentic
+            end # block optional
+        end
     end
-  end
-end
+end

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Core
-	  VERSION = "1.0.0.rc1.1"
+	  VERSION = "1.0.0.rc2"
 	end
 end

data/spec/dummy/db/schema.rb

@@ -9,51 +9,51 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120329174000) do
+ActiveRecord::Schema.define(version: 20120329174000) do
 
-  create_table "spud_admin_permissions", :force => true do |t|
+  create_table "spud_admin_permissions", force: true do |t|
     t.integer  "user_id"
     t.string   "name"
     t.boolean  "access"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "scope"
   end
 
-  create_table "spud_user_settings", :force => true do |t|
+  create_table "spud_user_settings", force: true do |t|
     t.integer  "spud_user_id"
     t.string   "key"
     t.string   "value"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "spud_users", :force => true do |t|
+  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
+    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
     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.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "time_zone"
   end
 
-  add_index "spud_users", ["email"], :name => "index_spud_users_on_email"
-  add_index "spud_users", ["login"], :name => "index_spud_users_on_login"
+  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
 
 end

data/spec/dummy/log/development.log

@@ -1,17 +1,46 @@
-Connecting to database specified by database.yml
-   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
-   (22.6ms)  DROP DATABASE IF EXISTS `spud_core_test`
-   (0.3ms)  CREATE DATABASE `spud_core_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
-   (23.9ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `scope` varchar(255)) ENGINE=InnoDB
-   (20.2ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
-   (9.2ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `time_zone` varchar(255)) ENGINE=InnoDB
-   (13.0ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
-   (11.9ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
-   (10.6ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
-   (15.6ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
-   (0.1ms)  SELECT version FROM `schema_migrations`
-   (1.3ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329174000')
-   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161011')
-   (0.7ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161146')
-   (0.6ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120327124229')
-   (0.6ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120328235431')
+   (9.0ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (13.1ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`) 
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+Migrating to CreateSpudAdminPermissions (20111214161011)
+   (8.8ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (0.1ms)  BEGIN
+  SQL (0.1ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20111214161011')
+   (0.3ms)  COMMIT
+Migrating to CreateSpudUsers (20111214161146)
+   (8.2ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (9.5ms)  CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`) 
+   (8.4ms)  CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`) 
+   (0.1ms)  BEGIN
+  SQL (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20111214161146')
+   (0.2ms)  COMMIT
+Migrating to AddTimeZoneToSpudUser (20120327124229)
+   (13.2ms)  ALTER TABLE `spud_users` ADD `time_zone` varchar(255)
+   (0.1ms)  BEGIN
+  SQL (0.1ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120327124229')
+   (0.5ms)  COMMIT
+Migrating to AddScopeToSpudAdminPermissions (20120328235431)
+   (10.5ms)  ALTER TABLE `spud_admin_permissions` ADD `scope` varchar(255)
+   (0.1ms)  BEGIN
+  SQL (0.1ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120328235431')
+   (0.2ms)  COMMIT
+Migrating to CreateSpudUserSettings (20120329174000)
+   (8.3ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (0.1ms)  BEGIN
+  SQL (0.1ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120329174000')
+   (0.2ms)  COMMIT
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+   (6.6ms)  DROP DATABASE IF EXISTS `spud_core_test`
+   (0.4ms)  CREATE DATABASE `spud_core_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (8.2ms)  CREATE TABLE `spud_admin_permissions` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `user_id` int(11), `name` varchar(255), `access` tinyint(1), `created_at` datetime, `updated_at` datetime, `scope` varchar(255)) ENGINE=InnoDB
+   (8.5ms)  CREATE TABLE `spud_user_settings` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `spud_user_id` int(11), `key` varchar(255), `value` varchar(255), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (6.7ms)  CREATE TABLE `spud_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `first_name` varchar(255), `last_name` varchar(255), `super_admin` tinyint(1), `login` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, `crypted_password` varchar(255) NOT NULL, `password_salt` varchar(255) NOT NULL, `persistence_token` varchar(255) NOT NULL, `single_access_token` varchar(255) NOT NULL, `perishable_token` varchar(255) NOT NULL, `login_count` int(11) DEFAULT 0 NOT NULL, `failed_login_count` int(11) DEFAULT 0 NOT NULL, `last_request_at` datetime, `current_login_at` datetime, `last_login_at` datetime, `current_login_ip` varchar(255), `last_login_ip` varchar(255), `created_at` datetime, `updated_at` datetime, `time_zone` varchar(255)) ENGINE=InnoDB
+   (8.7ms)  CREATE INDEX `index_spud_users_on_email` USING btree ON `spud_users` (`email`) 
+   (9.7ms)  CREATE INDEX `index_spud_users_on_login` USING btree ON `spud_users` (`login`) 
+   (8.3ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (10.6ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`) 
+   (0.2ms)  SELECT version FROM `schema_migrations`
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120329174000')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161011')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20111214161146')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120327124229')
+   (0.2ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120328235431')