cartoonist 0.0.8 → 0.0.9

data/app/assets/stylesheets/admin.css.scss

@@ -1,3 +1,5 @@
+.message { color: red; }
+
 form.inline { display: inline-block; }
 
 table {

data/app/controllers/{accounts_controller.rb → admin/accounts_controller.rb}

@@ -1,4 +1,4 @@
-class AccountsController < CartoonistController
+class Admin::AccountsController < CartoonistController
   before_filter :ensure_ssl!
   before_filter :check_admin!
 
@@ -8,7 +8,7 @@ class AccountsController < CartoonistController
 
   def create
     user = User.create_user params
-    redirect_to "/accounts"
+    redirect_to "/admin/accounts"
   end
 
   def show
@@ -21,12 +21,12 @@ class AccountsController < CartoonistController
 
   def update
     user = User.update_user params
-    redirect_to "/accounts/#{user.id}"
+    redirect_to "/admin/accounts/#{user.id}"
   end
 
   def destroy
     raise "Cannot destroy yourself!" if current_user.id == params[:id].to_i
     User.delete_user params
-    redirect_to "/accounts"
+    redirect_to "/admin/accounts"
   end
 end

data/app/controllers/{cache_controller.rb → admin/cache_controller.rb}

@@ -1,4 +1,4 @@
-class CacheController < CartoonistController
+class Admin::CacheController < CartoonistController
   before_filter :ensure_ssl!
   before_filter :check_admin!
   layout "general_admin"
@@ -9,26 +9,26 @@ class CacheController < CartoonistController
 
   def destroy
     PageCache.find(params[:id]).expire!
-    redirect_to "/cache"
+    redirect_to "/admin/cache"
   end
 
   def expire_www
     PageCache.expire_www!
-    redirect_to "/cache"
+    redirect_to "/admin/cache"
   end
 
   def expire_m
     PageCache.expire_m!
-    redirect_to "/cache"
+    redirect_to "/admin/cache"
   end
 
   def expire_tmp
     PageCache.expire_tmp!
-    redirect_to "/cache"
+    redirect_to "/admin/cache"
   end
 
   def expire_all
     PageCache.expire_all!
-    redirect_to "/cache"
+    redirect_to "/admin/cache"
   end
 end

data/app/controllers/{settings_controller.rb → admin/settings_controller.rb}

@@ -1,9 +1,9 @@
-class SettingsController < CartoonistController
+class Admin::SettingsController < CartoonistController
   before_filter :ensure_ssl!
   before_filter :check_admin!, :except => [:initial_setup, :save_initial_setup]
 
   def index
-    redirect_to "/settings/general"
+    redirect_to "/admin/settings/general"
   end
 
   def show
@@ -13,15 +13,20 @@ class SettingsController < CartoonistController
 
   def update
     params[:included_settings].each do |setting|
-      Setting[setting] = params[setting]
+      begin
+        Setting[setting] = params[setting]
+      rescue Setting::InvalidError => e
+        flash[:update_errors] ||= []
+        flash[:update_errors] << e.message
+      end
     end
 
-    redirect_to "/settings/#{params[:id]}"
+    redirect_to "/admin/settings/#{params[:id]}"
   end
 
   def initial_setup
     return redirect_to "/admin" unless initial_setup_required?
-    render :layout => "initial_setup"
+    render :layout => "admin/initial_setup"
   end
 
   def save_initial_setup
@@ -29,7 +34,7 @@ class SettingsController < CartoonistController
 
     if params[:admin_password] != params[:admin_confirm_password]
       flash[:error] = t "settings.initial_setup.passwords_dont_match"
-      return redirect_to "/settings/initial_setup"
+      return redirect_to "/admin/settings/initial_setup"
     end
 
     Setting[:copyright_starting_year] = Date.today.strftime("%Y").to_i

data/app/controllers/{static_cache_controller.rb → admin/static_cache_controller.rb}

@@ -1,4 +1,4 @@
-class StaticCacheController < CartoonistController
+class Admin::StaticCacheController < CartoonistController
   before_filter :ensure_ssl!
   before_filter :check_admin!
   layout "general_admin"
@@ -9,11 +9,11 @@ class StaticCacheController < CartoonistController
 
   def destroy
     StaticCache.find(params[:id]).expire!
-    redirect_to "/static_cache"
+    redirect_to "/admin/static_cache"
   end
 
   def expire_all
     StaticCache.expire_all!
-    redirect_to "/static_cache"
+    redirect_to "/admin/static_cache"
   end
 end

data/app/controllers/admin_controller.rb

@@ -1,8 +1,8 @@
 class AdminController < CartoonistController
-  before_filter :ensure_ssl!, :except => [:cache_cron, :tweet_cron]
-  before_filter :check_admin!, :except => [:cache_cron, :tweet_cron]
+  before_filter :ensure_ssl!, :except => [:cron]
+  before_filter :check_admin!, :except => [:cron]
 
-  def index
+  def show
     redirect_to "/admin/main"
   end
 
@@ -32,37 +32,11 @@ class AdminController < CartoonistController
     render :layout => "general_admin"
   end
 
-  def cache_cron
-    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
-
+  def cron
+    Cartoonist::Cron.all.each &:call
     render :text => "Success.", :layout => false
-  rescue
-    render :text => "Failure.", :layout => false
-  end
-
-  def tweet_cron
-    messages = []
-
-    Comic.untweeted.each do |comic|
-      comic.tweet!
-      messages << "Comic: #{comic.tweet}"
-    end
-
-    BlogPost.untweeted.each do |post|
-      post.tweet!
-      messages << "Blog Post: #{post.tweet}"
-    end
-
-    unless Rails.env.production?
-      content = "#{messages.join "\n"}\n"
-    end
-
-    render :text => "#{content}Success.", :layout => false
-  rescue
+  rescue => e
+    logger.error "Failure running cron: #{e}\n  #{e.backtrace.join "\n  "}"
     render :text => "Failure.", :layout => false
   end
 end

data/app/controllers/cartoonist_controller.rb

@@ -15,7 +15,7 @@ class CartoonistController < ActionController::Base
 
   def check_admin!
     if initial_setup_required?
-      redirect_to "/settings/initial_setup"
+      redirect_to "/admin/settings/initial_setup"
     else
       authenticate_user!
     end

data/app/helpers/{cache_helper.rb → admin/cache_helper.rb}

@@ -1,4 +1,4 @@
-module CacheHelper
+module Admin::CacheHelper
   def td_cache_class(test)
     if test
       "cached"

data/app/helpers/admin/settings_helper.rb

@@ -0,0 +1,17 @@
+module Admin::SettingsHelper
+  def setting_select_value(option)
+    if option.kind_of? Hash
+      option[:value]
+    else
+      option
+    end
+  end
+
+  def setting_select_label(option)
+    if option.kind_of? Hash
+      t option[:label]
+    else
+      option
+    end
+  end
+end

data/app/models/entity.rb

@@ -0,0 +1,104 @@
+module Entity
+  def entity_type
+    self.class.entity_type
+  end
+
+  def entity_label
+    self.class.entity_label
+  end
+
+  def entity_localized_label
+    self.class.entity_localized_label
+  end
+
+  def entity_description
+    self.class.entity_description.call self
+  end
+
+  def entity_relative_url
+    self.class.entity_url.call self if self.class.entity_url
+  end
+
+  def entity_absolute_url
+    "http://#{Setting[:domain]}#{entity_relative_url}" if entity_relative_url
+  end
+
+  def entity_edit_url
+    self.class.entity_edit_url.call self if self.class.entity_edit_url
+  end
+
+  def self.included(base)
+    base.extend ClassMethods
+
+    base.after_save do |entity|
+      Cartoonist::Entity.hooks_with(:after_entity_save).each do |hook|
+        hook.after_entity_save entity
+      end
+    end
+  end
+
+  module ClassMethods
+    def entity_relative_url
+      entity_global_url
+    end
+
+    def entity_absolute_url
+      "http://#{Setting[:domain]}#{entity_relative_url}" if entity_relative_url
+    end
+
+    def entity_type(value = nil)
+      if value
+        @entity_type = value
+      else
+        @entity_type || raise(EntityTypeNotSpecifiedError.new("entity_type was not defined for #{self.name}"))
+      end
+    end
+
+    def entity_label(value = nil)
+      if value
+        @entity_label = value
+      else
+        @entity_label || "cartoonist.entity.#{entity_type}"
+      end
+    end
+
+    def entity_localized_label
+      I18n.t entity_label
+    end
+
+    def entity_description(&block)
+      if block
+        @entity_description = block
+      else
+        @entity_description
+      end
+    end
+
+    def entity_global_url(value = nil)
+      if value
+        @entity_global_url = value
+      else
+        @entity_global_url
+      end
+    end
+
+    def entity_url(&block)
+      if block
+        @entity_url = block
+      else
+        @entity_url
+      end
+    end
+
+    def entity_edit_url(&block)
+      if block
+        @entity_edit_url = block
+      else
+        @entity_edit_url
+      end
+    end
+  end
+
+  class EntityTypeNotSpecifiedError < StandardError
+  end
+end

data/app/models/postable.rb

@@ -0,0 +1,59 @@
+module Postable
+  def posted?
+    posted_at && posted_at <= postable_now
+  end
+
+  def postable_type
+    self.class.postable_type
+  end
+
+  def postable_now
+    self.class.postable_now
+  end
+
+  def formatted_posted_at(default_msg = "not yet posted")
+    return default_msg unless posted_at
+
+    if postable_type == :date
+      posted_at.strftime "%-m/%-d/%Y"
+    else
+      posted_at.localtime.strftime "%-m/%-d/%Y at %-l:%M %P"
+    end
+  end
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  module ClassMethods
+    def postable_now
+      if postable_type == :date
+        Date.today
+      else
+        Time.now
+      end
+    end
+
+    def postable_type
+      type = columns_hash["posted_at"].type
+      raise "Postable's posted_at column type should be :date or :datetime!" unless [:date, :datetime].include?(type)
+      type
+    end
+
+    def posted
+      where "#{quoted_table_name}.posted_at IS NOT NULL AND #{quoted_table_name}.posted_at <= ?", postable_now
+    end
+
+    def unposted
+      where "#{quoted_table_name}.posted_at IS NULL OR #{quoted_table_name}.posted_at > ?", postable_now
+    end
+
+    def chronological
+      order "#{quoted_table_name}.posted_at ASC"
+    end
+
+    def reverse_chronological
+      order "#{quoted_table_name}.posted_at DESC"
+    end
+  end
+end

data/app/models/setting.rb

@@ -4,9 +4,14 @@ class Setting < ActiveRecord::Base
   class << self
     def [](label)
       raise "Invalid label" unless label.present?
-      meta = Meta[label.to_sym]
+      meta = Setting::Meta[label.to_sym]
       raise "Missing setting definition for '#{label}'" unless meta
-      record = where(:label => label.to_s).first
+
+      begin
+        record = where(:label => label.to_s).first
+      rescue => e
+        raise unless e.to_s =~ /Could not find table/
+      end
 
       if record
         meta.convert record.value
@@ -19,8 +24,9 @@ class Setting < ActiveRecord::Base
 
     def []=(label, value)
       raise "Invalid label" unless label.present?
-      meta = Meta[label.to_sym]
+      meta = Setting::Meta[label.to_sym]
       raise "Missing setting definition for '#{label}'" unless meta
+      meta.validation.call value if meta.validation
       old_value = self[label]
       record = where(:label => label.to_s).first
       record = Setting.new :label => label.to_s unless record
@@ -31,36 +37,39 @@ class Setting < ActiveRecord::Base
     end
 
     def define(label, options = {})
-      Meta[label.to_sym] = Meta.new label, options
+      Setting::Meta[label.to_sym] = Setting::Meta.new label, options
     end
 
     def tabs
-      Tab.all.sort.map &:label
+      Setting::Tab.all.sort.map &:label
     end
   end
 
   class Meta
-    attr_reader :label, :tab, :section, :order, :type, :default, :onchange, :select_from
+    attr_reader :label, :info_label, :tab, :section, :order, :type, :default, :onchange, :validation, :select_from
     @@settings = {}
     @@by_tab_section_and_label = {}
 
     def initialize(label, options)
       @label = label.to_sym
-      @tab = (options[:tab] || Tab.default)
-      @section = (options[:section] || Section.default)
+      @label_override = options[:label]
+      @info_label = options[:info_label]
+      @tab = (options[:tab] || Setting::Tab.default)
+      @section = (options[:section] || Setting::Section.default)
       @order = (options[:order] || 0)
       @type = (options[:type] || :string).to_sym
       @onchange = options[:onchange]
+      @validation = options[:validation]
       @select_from = options[:select_from]
       raise "Invalid setting type #{@type}" unless [:string, :symbol, :boolean, :int, :float, :array, :hash].include? @type
 
       # Auto create general tab and section if it isn't created
-      if @tab == :general && !Tab[@tab]
-        Tab.define :general, :order => 0
+      if @tab == :general && !Setting::Tab[@tab]
+        Setting::Tab.define :general, :order => 0
       end
 
-      if @section == :general && !Section.by_tab_and_label[@tab][@section]
-        Section.define :general, :order => 0, :tab => @tab
+      if @section == :general && !Setting::Section.by_tab_and_label[@tab][@section]
+        Setting::Section.define :general, :order => 0, :tab => @tab
       end
 
       if options.include? :default
@@ -82,6 +91,12 @@ class Setting < ActiveRecord::Base
       end
     end
 
+    def localized
+      return @label_override.call if @label_override.respond_to? :call
+      return @label_override if @label_override
+      I18n.t @label, :scope => "settings.show.settings"
+    end
+
     def select_from_options
       if select_from.respond_to? :call
         select_from.call
@@ -160,18 +175,25 @@ class Setting < ActiveRecord::Base
 
     def initialize(label, options = {})
       @label = label.to_sym
+      @label_override = options[:label]
       @order = options[:order] || 1
-      Section.by_tab_and_label[@label] ||= {}
+      Setting::Section.by_tab_and_label[@label] ||= {}
+    end
+
+    def localized
+      return @label_override.call if @label_override.respond_to? :call
+      return @label_override if @label_override
+      I18n.t @label, :scope => "settings.show.tabs"
     end
 
     def sections
-      Section.by_tab_and_label[label] ||= {}
-      Section.by_tab_and_label[label].values.sort.map &:label
+      Setting::Section.by_tab_and_label[label] ||= {}
+      Setting::Section.by_tab_and_label[label].values.sort.map &:label
     end
 
     def [](section_label)
-      Section.by_tab_and_label[label] ||= {}
-      Section.by_tab_and_label[label][section_label.to_sym]
+      Setting::Section.by_tab_and_label[label] ||= {}
+      Setting::Section.by_tab_and_label[label][section_label.to_sym]
     end
 
     def <=>(other)
@@ -193,16 +215,25 @@ class Setting < ActiveRecord::Base
         @@default
       end
 
+      def with_default_tab(label)
+        original = @@default
+
+        begin
+          @@default = label.to_sym
+          yield
+        ensure
+          @@default = original
+        end
+      end
+
       def define(label, options = {})
         raise "Duplicate tab '#{label}' being defined" if @@by_label.include? label.to_sym
-        tab = Tab.new label, options
+        tab = Setting::Tab.new label, options
         @@all << tab
         @@by_label[label.to_sym] = tab
-        begin
-          @@default = label.to_sym
+
+        with_default_tab label do
           yield if block_given?
-        ensure
-          @@default = :general
         end
       end
     end
@@ -216,12 +247,19 @@ class Setting < ActiveRecord::Base
 
     def initialize(label, options = {})
       @label = label.to_sym
+      @label_override = options[:label]
       @order = options[:order] || 1
-      @tab = (options[:tab] || Tab.default).to_sym
+      @tab = (options[:tab] || Setting::Tab.default).to_sym
+    end
+
+    def localized
+      return @label_override.call if @label_override.respond_to? :call
+      return @label_override if @label_override
+      I18n.t @label, :scope => "settings.show.sections.#{Setting::Tab[@tab].label}"
     end
 
     def settings
-      Meta.by_tab_section_and_label[tab][label].values.sort.map &:label
+      Setting::Meta.by_tab_section_and_label[tab][label].values.sort.map &:label
     end
 
     def <=>(other)
@@ -240,13 +278,16 @@ class Setting < ActiveRecord::Base
       end
 
       def define(label, options = {})
-        section = Section.new label, options
+        section = Setting::Section.new label, options
         @@all << section
         @@by_tab_and_label[section.tab] ||= {}
         @@by_tab_and_label[section.tab][label.to_sym] = section
         begin
           @@default = label.to_sym
-          yield if block_given?
+
+          Setting::Tab.with_default_tab section.tab do
+            yield if block_given?
+          end
         ensure
           @@default = :general
         end
@@ -257,4 +298,7 @@ class Setting < ActiveRecord::Base
       end
     end
   end
+
+  class InvalidError < StandardError
+  end
 end