cartoonist 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb529e2b4ff66b21d80a22172a26f3898d27d460
-  data.tar.gz: 04b4b4f22d5f9885b933542cbdfa1c21fb548902
+  metadata.gz: 2bb9fd86c97df55571e625a98fc8922e44a3339c
+  data.tar.gz: 576c5902bb5a1d1eb3379045871855277963fad6
 SHA512:
-  metadata.gz: 0da7d89aeb9db0d9fe7b17c27832591cbd48b7f2be0adb05c4deee29a1cb42d91d0136c56dce89c51a5371be56113351b372a6b6661c0eb42dfb9b8457725a08
-  data.tar.gz: 4e9b1285503bb4624b82e9f38451de02bfa71d80333cf4115ae125cec4161cfb1af9f4bd0a954f865923085ba6c50547b9c4adaf7bd3340bb5b876ed57ee6a92
+  metadata.gz: 7fcfd49c48767c5c21d2f6a67ec2d2beac9ce016c45d61065d6a4e777c442168f1f9aa10c868b70e9f8c0388e22350354f140bed545af8335ad9ef89e2fe7325
+  data.tar.gz: 64e43dc9b00272c249fdcda75e5fccd71c45f4d3f01008885292fdfdbe6096c49589087b69570ecc7991cd072cda0b19c0b06d9a66814e70e3be47e475ce7aaf

data/app/controllers/admin/accounts_controller.rb

@@ -1,6 +1,6 @@
 class Admin::AccountsController < AdminCartoonistController
   def index
-    @users = User.order(:name).all
+    @users = User.order(:name).to_a
   end
 
   def new

data/app/controllers/admin/settings_controller.rb

@@ -40,6 +40,7 @@ class Admin::SettingsController < AdminCartoonistController
     Setting[:domain] = params[:domain]
     Setting[:site_name] = params[:site_name]
     Setting[:secret_token] = SecureRandom.hex 30
+    Setting[:secret_key_base] = SecureRandom.hex 64
     Setting[:devise_pepper] = SecureRandom.hex 64
     # This MUST go AFTER we set the pepper
     User.create! :email => params[:admin_email], :password => params[:admin_password], :password_confirmation => params[:admin_confirm_password], :name => params[:admin_name]

data/app/models/database_file.rb

@@ -1,6 +1,4 @@
 class DatabaseFile < ActiveRecord::Base
-  attr_accessible :filename, :extension, :content
-
   def to_backup_entries
     if filename
       meta_name = "#{filename}.meta"

data/app/models/setting.rb

@@ -1,6 +1,4 @@
 class Setting < ActiveRecord::Base
-  attr_accessible :label, :value, :locked
-
   def zip_title
     label
   end

data/app/models/user.rb

@@ -1,9 +1,6 @@
 class User < ActiveRecord::Base
   devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable, :omniauthable
 
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :name
-
   def zip_title
     name
   end

data/cartoonist.gemspec

@@ -11,11 +11,12 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
   s.homepage      = "http://reasonnumber.com/cartoonist"
-  s.add_dependency "devise", "~> 2.2"
+  s.add_dependency "actionpack-page_caching", "~> 1.0"
+  s.add_dependency "devise", "~> 3.0"
   s.add_dependency "jquery-rails", "~> 3.0"
   s.add_dependency "omniauth-openid", "~> 1.0"
-  s.add_dependency "railties", "~> 3.2"
-  s.add_dependency "redcarpet", "~> 2.3"
+  s.add_dependency "railties", "~> 4.0"
+  s.add_dependency "redcarpet", "~> 3.0"
   s.add_dependency "rubyzip", "~> 0.9"
   s.add_dependency "minitar", "~> 0.5"
 end

data/config/locales/en.yml

@@ -119,6 +119,7 @@ en:
         disqus_comic_category: "Disqus Comic Category: "
         disqus_blog_post_category: "Disqus Blog Post Category: "
         disqus_page_category: "Disqus Page Category: "
+        secret_key_base: "Secret Key Base: "
         secret_token: "Secret Token: "
         devise_pepper: "Devise Pepper: "
       tabs:

data/db/migrate/20130724085513_create_secret_key_base.rb

@@ -0,0 +1,5 @@
+class CreateSecretKeyBase < ActiveRecord::Migration
+  def change
+    Setting[:secret_key_base] = SecureRandom.hex 64
+  end
+end

data/lib/cartoonist/engine.rb

@@ -1,3 +1,5 @@
+require "actionpack/page_caching"
+
 module Cartoonist
   class Engine < ::Rails::Engine
     # Use this hook to configure devise mailer, warden hooks and so forth.
@@ -225,7 +227,12 @@ module Cartoonist
       # Add in various configuration from plugins
       Rails.application.config.assets.precompile += ["admin.css", "cartoonist.js"]
       Rails.application.config.assets.precompile += Cartoonist::Asset.all
-      Rails.application.config.paths["db/migrate"] += Cartoonist::Migration.all
+      Rails.application.config.action_controller.page_cache_directory = File.join Rails.root, "public"
+
+      Cartoonist::Migration.all.flatten.each do |path|
+        Rails.application.config.paths["db/migrate"] << path
+      end
+
       Rails.application.config.action_controller.include_all_helpers = false
 
       if File.directory? File.join(Rails.root, "public/errors")
@@ -249,6 +256,14 @@ module Cartoonist
         Rails.application.config.secret_token = Setting[:secret_token]
       end
 
+      secret_key_base_changed = lambda do
+        # Your secret key for verifying the integrity of signed cookies.
+        # If you change this key, all old signed cookies will become invalid!
+        # Make sure the secret is at least 64 characters and all random,
+        # no regular words or you'll be exposed to dictionary attacks.
+        Rails.application.config.secret_key_base = Setting[:secret_key_base]
+      end
+
       devise_pepper_changed = lambda do
         Devise.setup do |devise_config|
           devise_config.mailer_sender = "no-reply@#{Setting[:domain]}"
@@ -283,10 +298,12 @@ module Cartoonist
 
       Setting::Tab.define :advanced, :order => 2 do
         Setting.define :secret_token, :default => "ThisTokenMustBeRegenerated....", :onchange => secret_token_changed
+        Setting.define :secret_key_base, :default => "ThisTokenMustBeRegenerated....", :onchange => secret_key_base_changed
         Setting.define :devise_pepper, :default => "ThisTokenMustBeRegenerated....", :onchange => devise_pepper_changed
       end
 
       secret_token_changed.call
+      secret_key_base_changed.call
       devise_pepper_changed.call
     end
 
@@ -317,9 +334,9 @@ module Cartoonist
     end
 
     Cartoonist::Routes.add do
-      match "favicon" => "site#favicon", :defaults => { :format => "ico" }
-      match "sitemap" => "site#sitemap", :defaults => { :format => "xml" }
-      match "robots" => "site#robots", :defaults => { :format => "text" }
+      get "favicon" => "site#favicon", :defaults => { :format => "ico" }
+      get "sitemap" => "site#sitemap", :defaults => { :format => "xml" }
+      get "robots" => "site#robots", :defaults => { :format => "text" }
 
       resource :admin, :controller => :admin, :only => [:show] do
         collection do

data/lib/cartoonist/version.rb

@@ -2,7 +2,7 @@ module Cartoonist
   class Version
     class << self
       def to_s
-        "0.0.18"
+        "0.0.19"
       end
     end
   end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionpack-page_caching
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +72,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +190,7 @@ files:
 - db/migrate/20120417075756_devise_create_users.rb
 - db/migrate/20120524032959_add_extension_to_database_files.rb
 - db/migrate/20121205091909_add_omniautable_to_users.rb
+- db/migrate/20130724085513_create_secret_key_base.rb
 - lib/cartoonist.rb
 - lib/cartoonist/engine.rb
 - lib/cartoonist/nginxtra.rb