spud_core 0.9.12 → 0.9.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/lib/spud_core/belongs_to_app.rb +4 -2
  2. data/lib/spud_core/version.rb +1 -1
  3. data/spec/dummy/log/development.log +15 -37
  4. data/spec/dummy/log/test.log +120146 -28129
  5. metadata +4 -4
data/lib/spud_core/belongs_to_app.rb CHANGED
@@ -24,10 +24,11 @@ module Spud::BelongsToApp
24
24
 
25
25
  before_filter { |controller|
26
26
  @page_thumbnail = self.class.page_application[:thumbnail]
27
+ @application_name = self.class.page_application[:name]
27
28
  @page_name = self.class.page_title
28
29
 
29
30
  if current_user.super_admin == false
30
- permission = current_user_permissions.select{|perm| perm.name == @page_name}
31
+ permission = current_user_permissions.select{|perm| perm.name == @application_name}
31
32
  if permission.blank?
32
33
  flash[:error] = "You do not have access to this area."
33
34
  redirect_to spud_admin_root_url and return
@@ -48,8 +49,9 @@ module Spud::BelongsToApp
48
49
 
49
50
  end
50
51
  def page_application
51
- @page_application || self.superclass.instance_variable_get('@page_application')
52
+ @page_application || self.superclass.instance_variable_get('@page_application')
52
53
  end
54
+
53
55
  def page_title
54
56
  @page_title || self.superclass.instance_variable_get('@page_title') || page_application[:name]
55
57
  end
data/lib/spud_core/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Spud
2
2
  module Core
3
- VERSION = "0.9.12"
3
+ VERSION = "0.9.14"
4
4
  end
5
5
  end
data/spec/dummy/log/development.log CHANGED
@@ -1,39 +1,17 @@
1
1
  Connecting to database specified by database.yml
2
-  (65.4ms) CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
3
-  (144.1ms) CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
4
-  (0.3ms) SELECT `schema_migrations`.`version` FROM `schema_migrations` 
5
- Migrating to CreateSpudAdminPermissions (20111214161011)
6
-  (103.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 NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
7
-  (0.8ms) INSERT INTO `schema_migrations` (`version`) VALUES ('20111214161011')
8
- Migrating to CreateSpudUsers (20111214161146)
9
-  (113.1ms) 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) ENGINE=InnoDB
10
-  (117.7ms) CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
11
-  (111.0ms) CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
12
-  (0.8ms) INSERT INTO `schema_migrations` (`version`) VALUES ('20111214161146')
13
- Migrating to AddTimeZoneToSpudUser (20120327124229)
14
-  (149.1ms) ALTER TABLE `spud_users` ADD `time_zone` varchar(255)
15
-  (0.5ms) INSERT INTO `schema_migrations` (`version`) VALUES ('20120327124229')
16
- Migrating to AddScopeToSpudAdminPermissions (20120328235431)
17
-  (130.5ms) ALTER TABLE `spud_admin_permissions` ADD `scope` varchar(255)
18
-  (0.5ms) INSERT INTO `schema_migrations` (`version`) VALUES ('20120328235431')
19
- Migrating to CreateSpudUserSettings (20120329174000)
20
-  (105.9ms) 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
21
-  (0.8ms) INSERT INTO `schema_migrations` (`version`) VALUES ('20120329174000')
22
-  (0.3ms) SELECT `schema_migrations`.`version` FROM `schema_migrations`
23
- Connecting to database specified by database.yml
24
-  (0.3ms) SELECT `schema_migrations`.`version` FROM `schema_migrations` 
25
-  (0.5ms) DROP DATABASE IF EXISTS `spud_core_test`
2
+  (0.2ms) SELECT `schema_migrations`.`version` FROM `schema_migrations` 
3
+  (22.6ms) DROP DATABASE IF EXISTS `spud_core_test`
26
4
   (0.3ms) CREATE DATABASE `spud_core_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
27
-  (54.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 NOT NULL, `updated_at` datetime NOT NULL, `scope` varchar(255)) ENGINE=InnoDB
28
-  (177.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 NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
29
-  (191.0ms) 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
30
-  (105.0ms) CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
31
-  (100.1ms) CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
32
-  (115.5ms) CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
33
-  (127.3ms) CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
34
-  (0.3ms) SELECT version FROM `schema_migrations`
35
-  (0.6ms) INSERT INTO `schema_migrations` (version) VALUES ('20120329174000')
36
-  (0.4ms) INSERT INTO `schema_migrations` (version) VALUES ('20111214161011')
37
-  (0.4ms) INSERT INTO `schema_migrations` (version) VALUES ('20111214161146')
38
-  (0.4ms) INSERT INTO `schema_migrations` (version) VALUES ('20120327124229')
39
-  (0.3ms) INSERT INTO `schema_migrations` (version) VALUES ('20120328235431')
5
+  (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
6
+  (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
7
+  (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
8
+  (13.0ms) CREATE INDEX `index_spud_users_on_email` ON `spud_users` (`email`)
9
+  (11.9ms) CREATE INDEX `index_spud_users_on_login` ON `spud_users` (`login`)
10
+  (10.6ms) CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
11
+  (15.6ms) CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
12
+  (0.1ms) SELECT version FROM `schema_migrations`
13
+  (1.3ms) INSERT INTO `schema_migrations` (version) VALUES ('20120329174000')
14
+  (0.2ms) INSERT INTO `schema_migrations` (version) VALUES ('20111214161011')
15
+  (0.7ms) INSERT INTO `schema_migrations` (version) VALUES ('20111214161146')
16
+  (0.6ms) INSERT INTO `schema_migrations` (version) VALUES ('20120327124229')
17
+  (0.6ms) INSERT INTO `schema_migrations` (version) VALUES ('20120328235431')