cartoonist 0.0.8 → 0.0.9

data/app/models/simple_template.rb

@@ -11,6 +11,8 @@ class SimpleTemplate
           value = variables[key]
           value = value.call if value.respond_to? :call
           value
+        elsif variables.include?(:self) && variables[:self].respond_to?(key)
+          variables[:self].send key
         else
           ""
         end

data/app/views/{accounts → admin/accounts}/edit.html.erb

@@ -1,6 +1,6 @@
 <h2><%= t "accounts.edit.subtitle" %></h2>
 
-<%= form_tag "/accounts/#{@user.id}", :method => :put do %>
+<%= form_tag "/admin/accounts/#{@user.id}", :method => :put do %>
   <p>
     <%= t "accounts.edit.email" %> <input type="text" name="email" value="<%= @user.email %>" />
   </p>

data/app/views/{accounts → admin/accounts}/index.html.erb

@@ -1,4 +1,4 @@
-<a href="/accounts/new"><%= t "accounts.index.new_user" %></a>
+<a href="/admin/accounts/new"><%= t "accounts.index.new_user" %></a>
 
 <table>
   <thead>
@@ -15,10 +15,10 @@
       <tr>
         <td><%= user.name %></td>
         <td><%= user.email %></td>
-        <td><a href="/accounts/<%= user.id %>/edit"><%= t "accounts.index.edit_button" %></a></td>
+        <td><a href="/admin/accounts/<%= user.id %>/edit"><%= t "accounts.index.edit_button" %></a></td>
         <td>
           <% if current_user.id != user.id %>
-            <%= form_tag "/accounts/#{user.id}", :method => :delete do %>
+            <%= form_tag "/admin/accounts/#{user.id}", :method => :delete do %>
               <input type="submit" value="<%= t "accounts.index.delete_button" %>" />
             <% end %>
           <% end %>

data/app/views/{accounts → admin/accounts}/new.html.erb

@@ -1,6 +1,6 @@
 <h2><%= t "accounts.new.subtitle" %></h2>
 
-<%= form_tag "/accounts", :method => :post do %>
+<%= form_tag "/admin/accounts", :method => :post do %>
   <p>
     <%= t "accounts.new.email" %> <input type="text" name="email" value="" />
   </p>

data/app/views/{accounts → admin/accounts}/show.html.erb

@@ -1,5 +1,5 @@
 <p>
-  <a href="/accounts/<%= @user.id %>/edit"><%= t "accounts.show.edit" %></a>
+  <a href="/admin/accounts/<%= @user.id %>/edit"><%= t "accounts.show.edit" %></a>
 </p>
 
 <p>

data/app/views/{cache → admin/cache}/index.html.erb

@@ -1,17 +1,17 @@
 <p>
-  <%= form_tag "/cache/expire_www", :method => :post, :class => "inline" do %>
+  <%= form_tag "/admin/cache/expire_www", :method => :post, :class => "inline" do %>
     <input type="submit" value="<%= t "cache.index.expire_www" %>" />
   <% end %>
 
-  <%= form_tag "/cache/expire_m", :method => :post, :class => "inline" do %>
+  <%= form_tag "/admin/cache/expire_m", :method => :post, :class => "inline" do %>
     <input type="submit" value="<%= t "cache.index.expire_m" %>" />
   <% end %>
 
-  <%= form_tag "/cache/expire_tmp", :method => :post, :class => "inline" do %>
+  <%= form_tag "/admin/cache/expire_tmp", :method => :post, :class => "inline" do %>
     <input type="submit" value="<%= t "cache.index.expire_tmp" %>" />
   <% end %>
 
-  <%= form_tag "/cache/expire_all", :method => :post, :class => "inline" do %>
+  <%= form_tag "/admin/cache/expire_all", :method => :post, :class => "inline" do %>
     <input type="submit" value="<%= t "cache.index.expire_all" %>" />
   <% end %>
 </p>
@@ -50,7 +50,7 @@
           </td>
 
           <td>
-            <%= form_tag "/cache/#{u cache.delete_name}", :method => :delete do %>
+            <%= form_tag "/admin/cache/#{u cache.delete_name}", :method => :delete do %>
               <input type="submit" value="<%= t "cache.index.expire" %>" />
             <% end %>
           </td>

data/app/views/{settings → admin/settings}/initial_setup.html.erb

@@ -4,7 +4,7 @@
   </div>
 <% end %>
 
-<%= form_tag "/settings/save_initial_setup", :method => :post do %>
+<%= form_tag "/admin/settings/save_initial_setup", :method => :post do %>
   <p>
     <%= t "settings.initial_setup.email" %><input type="text" name="admin_email" value="<%= t "settings.initial_setup.default_email" %>" autofocus="autofocus" />
   </p>

data/app/views/{settings → admin/settings}/show.html.erb

@@ -1,25 +1,33 @@
 <div class="tabs">
   <% Setting.tabs.each do |tab| %>
-    <a href="/settings/<%= tab %>" class="tab <%= "selected_tab" if tab == params[:id].to_sym %>"><%= t tab, :scope => "settings.show.tabs" %></a>
+    <a href="/admin/settings/<%= tab %>" class="tab <%= "selected_tab" if tab == params[:id].to_sym %>"><%= Setting::Tab[tab].localized %></a>
   <% end %>
 </div>
 
-<%= form_tag "/settings/#{@tab.label}", :method => :put do %>
+<% if flash[:update_errors] %>
+  <% flash[:update_errors].each do |message| %>
+    <p class="message">
+      <%= message %>
+    </p>
+  <% end %>
+<% end %>
+
+<%= form_tag "/admin/settings/#{@tab.label}", :method => :put do %>
   <% @tab.sections.each do |section| %>
     <div class="section">
-      <h2><%= t section, :scope => "settings.show.sections.#{@tab.label}" %></h2>
+      <h2><%= @tab[section].localized %></h2>
 
       <% @tab[section].settings.each do |setting| %>
         <%# Other setting types to come later %>
         <% next unless Setting::Meta[setting].select_from || [:string, :boolean, :int].include?(Setting::Meta[setting].type) %>
-        <p>
+        <p class="setting">
           <input type="hidden" name="included_settings[]" value="<%= setting %>" />
           <label>
-            <%= t setting, :scope => "settings.show.settings" %>
+            <%= Setting::Meta[setting].localized %>
             <% if Setting::Meta[setting].select_from %>
               <select name="<%= setting %>">
                 <% Setting::Meta[setting].select_from_options.each do |option| %>
-                  <option value="<%= option %>" <%= selected option, Setting[setting] %>><%= option %></option>
+                  <option value="<%= setting_select_value option %>" <%= selected setting_select_value(option), Setting[setting] %>><%= setting_select_label option %></option>
                 <% end %>
               <select name="<%= setting %>" value="<%= Setting[setting] %>">
             <% elsif Setting::Meta[setting].type == :string %>
@@ -30,6 +38,10 @@
               <input type="checkbox" name="<%= setting %>" value="true" <%= checked Setting[setting] %> />
             <% end %>
           </label>
+
+          <% if Setting::Meta[setting].info_label %>
+            <em class="info"><%= t Setting::Meta[setting].info_label %></em>
+          <% end %>
         </p>
       <% end %>
     </div>

data/app/views/{static_cache → admin/static_cache}/index.html.erb

@@ -1,5 +1,5 @@
 <p>
-  <%= form_tag "/static_cache/expire_all", :method => :post, :class => "inline" do %>
+  <%= form_tag "/admin/static_cache/expire_all", :method => :post, :class => "inline" do %>
     <input type="submit" value="<%= t "static_cache.index.expire_all" %>" />
   <% end %>
 </p>
@@ -18,7 +18,7 @@
           <td><%= cache.name %></td>
 
           <td>
-            <%= form_tag "/static_cache/#{u cache.name}", :method => :delete do %>
+            <%= form_tag "/admin/static_cache/#{u cache.name}", :method => :delete do %>
               <input type="submit" value="<%= t "static_cache.index.expire" %>" />
             <% end %>
           </td>

data/app/views/layouts/admin.html.erb

@@ -14,7 +14,7 @@
           <a class="tab" href="<%= Cartoonist::Admin::Tab[tab] %>"><%= t tab, :scope => "admin.layout.tab" %></a>
         <% end %>
         | <%= t "admin.layout.user_heading", :user => current_user.name %>
-        <a href="/accounts/<%= current_user.id %>"><%= t "admin.layout.account" %></a>
+        <a href="/admin/accounts/<%= current_user.id %>"><%= t "admin.layout.account" %></a>
         <input type="submit" value="<%= t "admin.layout.logout" %>" />
       </p>
     <% end %>
@@ -36,7 +36,7 @@
     <% end %>
 
     <% if flash[:message] %>
-      <p style="color: red;">
+      <p class="message">
         <%= flash[:message] %>
       </p>
     <% end %>

data/app/views/layouts/admin/accounts.html.erb

@@ -0,0 +1,8 @@
+<% content_for :subtabs do %>
+  <a class="subtab" href="/admin/accounts/<%= current_user.id %>"><%= t "admin.accounts.layout.my_account" %></a>
+  <a class="subtab" href="/admin/accounts"><%= t "admin.accounts.layout.users" %></a>
+<% end %>
+
+<% content_for :page_title, t("admin.accounts.layout.section") %>
+<% content_for(:content) { yield } %>
+<%= render :template => "layouts/admin" %>

data/app/views/layouts/general_admin.html.erb

@@ -1,8 +1,8 @@
 <% content_for :subtabs do %>
   <a class="subtab" href="/admin"><%= t "admin.general.layout.actions" %></a>
-  <a class="subtab" href="/settings"><%= t "admin.general.layout.settings" %></a>
-  <a class="subtab" href="/cache"><%= t "admin.general.layout.cache" %></a>
-  <a class="subtab" href="/static_cache"><%= t "admin.general.layout.static_cache" %></a>
+  <a class="subtab" href="/admin/settings"><%= t "admin.general.layout.settings" %></a>
+  <a class="subtab" href="/admin/cache"><%= t "admin.general.layout.cache" %></a>
+  <a class="subtab" href="/admin/static_cache"><%= t "admin.general.layout.static_cache" %></a>
 <% end %>
 
 <% content_for :page_title, t("admin.general.layout.section") %>

data/cartoonist.gemspec

@@ -14,5 +14,4 @@ Gem::Specification.new do |s|
   s.add_dependency "jquery-rails", "~> 2.0.0"
   s.add_dependency "railties", "~> 3.2.0"
   s.add_dependency "redcarpet", "~> 2.1.0"
-  s.add_dependency "twitter", "~> 2.2.0"
 end

data/config/locales/en.yml

@@ -57,9 +57,6 @@ en:
         noscript_link: Disqus comments.
         noscript_post_link:
       logo: Logo
-      navigation:
-        follow_on_twitter: Follow us on Twitter
-        follow_on_twitter_title: Follow us on Twitter
   cache:
     index:
       cached: cached
@@ -97,7 +94,6 @@ en:
         social_and_analytics:
           disqus: Disqus
           google_analytics: Google Analytics
-          twitter: Twitter
       settings:
         domain: "Domain: "
         site_name: "Site Name: "
@@ -109,13 +105,6 @@ en:
         copyright_starting_year: "Copyright Starting Year: "
         copyright_owners: "Copyright Owners: "
         default_title: "Default Title: "
-        default_tweet: "Default Tweet: "
-        twitter_enabled: "Twitter Enabled: "
-        twitter_handle: "Twitter Handle: "
-        twitter_consumer_key: "Twitter Consumer Key: "
-        twitter_consumer_secret: "Twitter Consumer Secret: "
-        twitter_oauth_token: "Twitter Oauth Token: "
-        twitter_oauth_token_secret: "Twitter Oauth Token Secret: "
         google_analytics_enabled: "Google Analytics Enabled: "
         google_analytics_account: "Google Analytics Account: "
         disqus_enabled: "Disqus Enabled: "

data/lib/cartoonist.rb

@@ -1,7 +1,6 @@
 require "devise"
 require "jquery-rails"
 require "redcarpet"
-require "twitter"
 
 module Cartoonist
   module Admin
@@ -90,6 +89,53 @@ module Cartoonist
     end
   end
 
+  class Cron
+    @@all = []
+
+    class << self
+      def all
+        @@all
+      end
+
+      def add(&block)
+        @@all << block
+      end
+    end
+  end
+
+  class Entity
+    @@all = {}
+    @@cached_order = []
+    @@hooks = []
+
+    class << self
+      def all
+        @@cached_order.map &:constantize
+      end
+
+      def [](key)
+        @@all[key].constantize
+      end
+
+      def add(key, model_name)
+        @@all[key] = model_name
+        @@cached_order = @@all.keys.sort.map { |key| @@all[key] }
+      end
+
+      def register_hooks(hooks)
+        @@hooks << hooks unless @@hooks.include? hooks
+      end
+
+      def hooks
+        @@hooks
+      end
+
+      def hooks_with(method)
+        @@hooks.select { |x| x.respond_to? method }
+      end
+    end
+  end
+
   class Migration
     @@all = []
 

data/lib/cartoonist/engine.rb

@@ -243,81 +243,58 @@ module Cartoonist
     config.to_prepare do
       Devise::SessionsController.layout "users"
 
-      if Setting.table_exists?
-        secret_token_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 30 characters and all random,
-          # no regular words or you'll be exposed to dictionary attacks.
-          Rails.application.config.secret_token = Setting[:secret_token]
-        end
-
-        twitter_auth_changed = lambda do
-          Twitter.configure do |twitter_config|
-            twitter_config.consumer_key = Setting[:twitter_consumer_key]
-            twitter_config.consumer_secret = Setting[:twitter_consumer_secret]
-            twitter_config.oauth_token = Setting[:twitter_oauth_token]
-            twitter_config.oauth_token_secret = Setting[:twitter_oauth_token_secret]
-          end
-        end
+      secret_token_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 30 characters and all random,
+        # no regular words or you'll be exposed to dictionary attacks.
+        Rails.application.config.secret_token = Setting[:secret_token]
+      end
 
-        devise_pepper_changed = lambda do
-          Devise.setup do |devise_config|
-            devise_config.mailer_sender = "no-reply@#{Setting[:domain]}"
-            devise_config.pepper = Setting[:devise_pepper]
-          end
+      devise_pepper_changed = lambda do
+        Devise.setup do |devise_config|
+          devise_config.mailer_sender = "no-reply@#{Setting[:domain]}"
+          devise_config.pepper = Setting[:devise_pepper]
         end
+      end
 
-        Setting.define :domain, :order => 1
-        Setting.define :site_name, :order => 2
-        Setting.define :site_heading, :order => 3
-        Setting.define :site_update_description, :order => 4
-        Setting.define :root_path, :type => :symbol, :default => Cartoonist::RootPath.all.first, :order => 5, :select_from => lambda { Cartoonist::RootPath.all }, :onchange => lambda { Rails.application.reload_routes! }
-        Setting.define :theme, :type => :symbol, :default => :cartoonist_default_theme, :order => 6, :select_from => lambda { Cartoonist::Theme.all }
-        Setting.define :schedule, :type => :array, :default => [:monday, :wednesday, :friday], :order => 7
-        Setting.define :copyright_starting_year, :type => :int, :order => 8
-        Setting.define :copyright_owners, :order => 9
-        Setting.define :default_title, :order => 10
-
-        Setting::Tab.define :social_and_analytics, :order => 1 do
-          Setting::Section.define :google_analytics, :order => 1 do
-            Setting.define :google_analytics_enabled, :type => :boolean, :order => 1
-            Setting.define :google_analytics_account, :order => 2
-          end
-
-          Setting::Section.define :twitter, :order => 2 do
-            Setting.define :twitter_enabled, :type => :boolean, :order => 1
-            Setting.define :default_tweet, :order => 2
-            Setting.define :twitter_handle, :order => 3
-            Setting.define :twitter_consumer_key, :onchange => twitter_auth_changed, :order => 4
-            Setting.define :twitter_consumer_secret, :onchange => twitter_auth_changed, :order => 5
-            Setting.define :twitter_oauth_token, :onchange => twitter_auth_changed, :order => 6
-            Setting.define :twitter_oauth_token_secret, :onchange => twitter_auth_changed, :order => 7
-          end
-
-          Setting::Section.define :disqus, :order => 3 do
-            Setting.define :disqus_enabled, :type => :boolean, :order => 1
-            Setting.define :disqus_shortname, :order => 2
-            Setting.define :disqus_comic_category, :order => 3
-            Setting.define :disqus_blog_post_category, :order => 4
-            Setting.define :disqus_page_category, :order => 5
-          end
+      Setting.define :domain, :order => 1
+      Setting.define :site_name, :order => 2
+      Setting.define :site_heading, :order => 3
+      Setting.define :site_update_description, :order => 4
+      Setting.define :root_path, :type => :symbol, :default => Cartoonist::RootPath.all.first, :order => 5, :select_from => lambda { Cartoonist::RootPath.all }, :onchange => lambda { Rails.application.reload_routes! }
+      Setting.define :theme, :type => :symbol, :default => :cartoonist_default_theme, :order => 6, :select_from => lambda { Cartoonist::Theme.all }
+      Setting.define :schedule, :type => :array, :default => [:monday, :wednesday, :friday], :order => 7
+      Setting.define :copyright_starting_year, :type => :int, :order => 8
+      Setting.define :copyright_owners, :order => 9
+      Setting.define :default_title, :order => 10
+
+      Setting::Tab.define :social_and_analytics, :order => 1 do
+        Setting::Section.define :google_analytics, :order => 1 do
+          Setting.define :google_analytics_enabled, :type => :boolean, :order => 1
+          Setting.define :google_analytics_account, :order => 2
         end
 
-        Setting::Tab.define :advanced, :order => 2 do
-          Setting.define :secret_token, :default => "ThisTokenMustBeRegenerated....", :onchange => secret_token_changed
-          Setting.define :devise_pepper, :default => "ThisTokenMustBeRegenerated....", :onchange => devise_pepper_changed
+        Setting::Section.define :disqus, :order => 3 do
+          Setting.define :disqus_enabled, :type => :boolean, :order => 1
+          Setting.define :disqus_shortname, :order => 2
+          Setting.define :disqus_comic_category, :order => 3
+          Setting.define :disqus_blog_post_category, :order => 4
+          Setting.define :disqus_page_category, :order => 5
         end
+      end
 
-        secret_token_changed.call
-        twitter_auth_changed.call
-        devise_pepper_changed.call
+      Setting::Tab.define :advanced, :order => 2 do
+        Setting.define :secret_token, :default => "ThisTokenMustBeRegenerated....", :onchange => secret_token_changed
+        Setting.define :devise_pepper, :default => "ThisTokenMustBeRegenerated....", :onchange => devise_pepper_changed
       end
+
+      secret_token_changed.call
+      devise_pepper_changed.call
     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 => "cartoonist.layout.navigation.follow_on_twitter", :title => "cartoonist.layout.navigation.follow_on_twitter_title", :order => 2
     Cartoonist::Migration.add_for self
 
     Cartoonist::Backup.for :files do
@@ -332,50 +309,57 @@ module Cartoonist
       User.order(:id).all
     end
 
-    Cartoonist::Routes.add_begin do
-      if Setting.table_exists?
-        root :to => Cartoonist::RootPath.current
+    Cartoonist::Cron.add do
+      Dir.glob(File.join(Rails.root, "public/cache/**/*.tmp.html*"), File::FNM_DOTMATCH).each do |file|
+        if 2.hours.ago > File.mtime(file)
+          File.delete file
+        end
       end
     end
 
+    Cartoonist::Routes.add_begin do
+      root :to => Cartoonist::RootPath.current
+    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" }
 
-      devise_for :users
-
-      resources :cache do
+      resource :admin, :controller => :admin do
         collection do
-          post "expire_www"
-          post "expire_m"
-          post "expire_tmp"
-          post "expire_all"
+          get "cron"
+          get "backup"
+          get "main"
+          get "reload"
         end
       end
 
-      resources :static_cache, :constraints => { :id => /.*/ } do
-        collection do
-          post "expire_all"
-        end
-      end
+      devise_for :users
 
-      resources :accounts
+      namespace :admin do
+        resources :accounts
 
-      resources :admin do
-        collection do
-          get "cache_cron"
-          get "backup"
-          get "main"
-          get "reload"
-          get "tweet_cron"
+        resources :cache, :constraints => { :id => /.*/ } do
+          collection do
+            post "expire_www"
+            post "expire_m"
+            post "expire_tmp"
+            post "expire_all"
+          end
         end
-      end
 
-      resources :settings do
-        collection do
-          get "initial_setup"
-          post "save_initial_setup"
+        resources :static_cache, :constraints => { :id => /.*/ } do
+          collection do
+            post "expire_all"
+          end
+        end
+
+        resources :settings do
+          collection do
+            get "initial_setup"
+            post "save_initial_setup"
+          end
         end
       end
     end