cartoonist 0.0.5 → 0.0.6

data/app/controllers/site_controller.rb

@@ -4,9 +4,8 @@ class SiteController < ApplicationController
       format.html { redirect_to "/" }
 
       format.ico do
-        path = ActionController::Base.helpers.asset_path Cartoonist::Theme.favicon
-        path = File.join Rails.root, "public", path
-        send_data File.read(path), :filename => "favicon.ico", :type => "image/x-icon", :disposition => "inline"
+        data = ActionController::Base.helpers.asset_paths.asset_environment[Cartoonist::Theme.favicon].to_s
+        send_data data, :filename => "favicon.ico", :type => "image/x-icon", :disposition => "inline"
         cache_page_as "static/favicon.ico"
       end
     end

data/app/models/database_file.rb

@@ -1,2 +1,3 @@
 class DatabaseFile < ActiveRecord::Base
+  attr_accessible :filename, :content
 end

data/app/models/setting.rb

@@ -1,4 +1,6 @@
 class Setting < ActiveRecord::Base
+  attr_accessible :label, :value, :locked
+
   class << self
     def [](label)
       raise "Invalid label" unless label.present?

data/lib/cartoonist/engine.rb

@@ -229,6 +229,7 @@ module Cartoonist
       Rails.application.config.assets.precompile += ["admin.css"]
       Rails.application.config.assets.precompile += Cartoonist::Asset.all
       Rails.application.config.paths["db/migrate"] += Cartoonist::Migration.all
+      Rails.application.config.action_controller.include_all_helpers = false
 
       if File.directory? File.join(Rails.root, "public/errors")
         Rails.application.config.exceptions_app = ActionDispatch::PublicExceptions.new(File.join Rails.root, "public/errors")
@@ -246,7 +247,7 @@ module Cartoonist
           # If you change this key, all old signed cookies will become invalid!
           # Make sure the secret is at least 30 characters and all random,
           # no regular words or you'll be exposed to dictionary attacks.
-          Cartoonist::Application.config.secret_token = Setting[:secret_token]
+          Rails.application.config.secret_token = Setting[:secret_token]
         end
 
         twitter_auth_changed = lambda do
@@ -312,6 +313,7 @@ module Cartoonist
       end
     end
 
+    Mime::Type.register "image/x-icon", :ico
     Cartoonist::Admin::Tab.add :general, :url => "/admin", :order => 3
     Cartoonist::Navigation::Link.add :url => (lambda { "https://twitter.com/#{Setting[:twitter_handle]}" }), :class => "follow-us", :label => "application.layout.navigation.follow_on_twitter", :title => "application.layout.navigation.follow_on_twitter_title", :order => 2
     Cartoonist::Migration.add_for self
@@ -329,7 +331,9 @@ module Cartoonist
     end
 
     Cartoonist::Routes.add_begin do
-      root :to => Cartoonist::RootPath.current
+      if Setting.table_exists?
+        root :to => Cartoonist::RootPath.current
+      end
     end
 
     Cartoonist::Routes.add do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &16995580 !ruby/object:Gem::Requirement
+  requirement: &17891860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *16995580
+  version_requirements: *17891860
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &16993360 !ruby/object:Gem::Requirement
+  requirement: &17890900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *16993360
+  version_requirements: *17890900
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &16988280 !ruby/object:Gem::Requirement
+  requirement: &17890160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *16988280
+  version_requirements: *17890160
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &16987660 !ruby/object:Gem::Requirement
+  requirement: &17889400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *16987660
+  version_requirements: *17889400
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &16986940 !ruby/object:Gem::Requirement
+  requirement: &17888660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *16986940
+  version_requirements: *17888660
 description: This provides the main functionality and plugin api for Cartoonist.
 email: reasonnumber@gmail.com
 executables: []