cartoonist 0.0.16 → 0.0.17

data/app/assets/javascripts/admin/search.js.coffee

@@ -0,0 +1,3 @@
+//= require jquery
+$ ->
+    $("input[name='q']").focus()

data/app/controllers/admin/accounts_controller.rb

@@ -3,6 +3,9 @@ class Admin::AccountsController < AdminCartoonistController
     @users = User.order(:name).all
   end
 
+  def new
+  end
+
   def create
     user = User.create_user params
     redirect_to "/admin/accounts"

data/app/controllers/cartoonist_controller.rb

@@ -1,21 +1,12 @@
 class CartoonistController < ActionController::Base
   helper :cartoonist
   protect_from_forgery
-  before_filter :check_mobile
 
   private
   def handle_unverified_request
     raise ActionController::InvalidAuthenticityToken.new
   end
 
-  def check_mobile
-    @mobile = (request.subdomain == "m") || params[:mobile]
-  end
-
-  def mobile?
-    @mobile
-  end
-
   def cache_type
     "www"
   end

data/app/helpers/cartoonist_helper.rb

@@ -1,4 +1,13 @@
 module CartoonistHelper
+  def partial(name, locals = {}, &block)
+    if block
+      raise "Cannot have a 'body' local when a block is given!" if locals.include?(:body)
+      locals[:body] = capture &block
+    end
+
+    render :partial => name, :locals => locals
+  end
+
   def selected(a, b = true)
     if a == b
       'selected="selected"'.html_safe
@@ -11,6 +20,12 @@ module CartoonistHelper
     end
   end
 
+  def format_time(time, fmt)
+    if time
+      time.localtime.strftime fmt
+    end
+  end
+
   def markdown(text)
     Markdown.render text
   end
@@ -40,10 +55,6 @@ module CartoonistHelper
     @rss_title
   end
 
-  def mobile?
-    @mobile
-  end
-
   def enable_disqus!(options)
     @disqus_enabled = true
     @disqus_options = options

data/app/models/expirable.rb

@@ -0,0 +1,40 @@
+module Expirable
+  def expired?
+    expired_at && (expired_at < DateTime.now)
+  end
+
+  def expire_from(params)
+    if params[:expire_now].present? && !expired?
+      self.expired_at = Time.now
+    elsif params[:expire_in_hour].present? && !expired?
+      self.expired_at = 1.hour.from_now
+    elsif params[:expire_day_after].present? && !expired?
+      self.expired_at = posted_at + 1.day
+    elsif params[:expire_3_days_after].present? && !expired?
+      self.expired_at = posted_at + 3.days
+    elsif params[:expired].present? && params[:expired_at_date].present?
+      time = "#{params[:expired_at_date]} #{params[:expired_at_hour]}:#{params[:expired_at_minute]} #{params[:expired_at_meridiem]}"
+      time = DateTime.parse time
+      time = Time.local time.year, time.month, time.day, time.hour, time.min
+      self.expired_at = time
+    elsif params[:expired].present?
+      self.expired_at = 1.hour.from_now
+    else
+      self.expired_at = nil
+    end
+  end
+
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  module ClassMethods
+    def expired
+      where "#{quoted_table_name}.expired_at IS NOT NULL AND #{quoted_table_name}.expired_at < ?", DateTime.now
+    end
+
+    def unexpired
+      where "#{quoted_table_name}.expired_at IS NULL OR #{quoted_table_name}.expired_at >= ?", DateTime.now
+    end
+  end
+end

data/app/models/lockable.rb

@@ -0,0 +1,33 @@
+module Lockable
+  def locked?
+    locked
+  end
+
+  def toggle_lock_target
+    if locked?
+      "unlock"
+    else
+      "lock"
+    end
+  end
+
+  def lock_disabled_html
+    if locked?
+      'disabled="disabled"'.html_safe
+    end
+  end
+
+  def lock!
+    self.locked = true
+    save!
+  end
+
+  def unlock!
+    self.locked = false
+    save!
+  end
+
+  def ensure_unlocked!
+    raise "Cannot update this when it is locked!" if locked?
+  end
+end

data/app/models/page_cache.rb

@@ -2,6 +2,7 @@ class PageCache
   attr_reader :name
 
   CACHE_PATH = File.join Rails.root, "public/cache"
+  EXTENSIONS = ["html", "json", "rss"]
 
   def initialize(name)
     @name = name
@@ -25,17 +26,21 @@ class PageCache
 
   def www?
     return @www_exists unless @www_exists.nil?
-    @www_exists = File.exists? File.join(CACHE_PATH, "#{name}.www.html")
+    @www_exists = EXTENSIONS.any? do |extension|
+      File.exists? File.join(CACHE_PATH, "#{name}.www.#{extension}")
+    end
   end
 
   def www_tmp?
     return @www_tmp_exists unless @www_tmp_exists.nil?
-    @www_tmp_exists = File.exists? File.join(CACHE_PATH, "#{name}.www.tmp.html")
+    @www_tmp_exists = EXTENSIONS.any? do |extension|
+      File.exists? File.join(CACHE_PATH, "#{name}.www.tmp.#{extension}")
+    end
   end
 
   def expire!
     PageCache.cache_files(:with_gz => true).select do |file|
-      extracted_name = file.sub /\.(?:www)(?:\.tmp)?\.html(?:.gz)?$/, ""
+      extracted_name = file.sub /\.(?:www)(?:\.tmp)?\.(?:#{EXTENSIONS.join "|"})(?:.gz)?$/, ""
       extracted_name == name
     end.each do |file|
       File.delete File.join(CACHE_PATH, file)
@@ -57,31 +62,40 @@ class PageCache
     end
 
     def cache_files(options = {})
-      globber = "**/*.html"
-      globber += "*" if options[:with_gz]
+      globs = EXTENSIONS.map do |extension|
+        globber = "**/*.#{extension}"
+        globber += "*" if options[:with_gz]
+        File.join CACHE_PATH, globber
+      end
 
-      Dir.glob(File.join(CACHE_PATH, globber), File::FNM_DOTMATCH).map do |file|
+      Dir.glob(globs, File::FNM_DOTMATCH).map do |file|
         file.sub "#{CACHE_PATH}/", ""
       end
     end
 
     def cache_names
       cache_files.map do |file|
-        file.sub /\.(?:www)(?:\.tmp)?\.html$/, ""
+        file.sub /\.(?:www)(?:\.tmp)?\.(?:#{EXTENSIONS.join "|"})$/, ""
       end.sort.uniq
     end
 
     def expire_www!
-      File.delete *Dir.glob(File.join(CACHE_PATH, "**/*.www.html*"), File::FNM_DOTMATCH)
-      File.delete *Dir.glob(File.join(CACHE_PATH, "**/*.www.tmp.html*"), File::FNM_DOTMATCH)
+      EXTENSIONS.each do |extension|
+        File.delete *Dir.glob(File.join(CACHE_PATH, "**/*.www.#{extension}*"), File::FNM_DOTMATCH)
+        File.delete *Dir.glob(File.join(CACHE_PATH, "**/*.www.tmp.#{extension}*"), File::FNM_DOTMATCH)
+      end
     end
 
     def expire_tmp!
-      File.delete *Dir.glob(File.join(CACHE_PATH, "**/*.tmp.html*"), File::FNM_DOTMATCH)
+      EXTENSIONS.each do |extension|
+        File.delete *Dir.glob(File.join(CACHE_PATH, "**/*.tmp.#{extension}*"), File::FNM_DOTMATCH)
+      end
     end
 
     def expire_all!
-      File.delete *Dir.glob(File.join(CACHE_PATH, "**/*.html*"), File::FNM_DOTMATCH)
+      EXTENSIONS.each do |extension|
+        File.delete *Dir.glob(File.join(CACHE_PATH, "**/*.#{extension}*"), File::FNM_DOTMATCH)
+      end
     end
   end
 end

data/app/models/postable.rb

@@ -23,6 +23,23 @@ module Postable
     end
   end
 
+  def post_from(params)
+    if params[:post_now].present? && !posted?
+      self.posted_at = Time.now
+    elsif params[:post_in_hour].present? && !posted?
+      self.posted_at = 1.hour.from_now
+    elsif params[:posted].present? && params[:posted_at_date].present?
+      time = "#{params[:posted_at_date]} #{params[:posted_at_hour]}:#{params[:posted_at_minute]} #{params[:posted_at_meridiem]}"
+      time = DateTime.parse time
+      time = Time.local time.year, time.month, time.day, time.hour, time.min
+      self.posted_at = time
+    elsif params[:posted].present?
+      self.posted_at = 1.hour.from_now
+    else
+      self.posted_at = nil
+    end
+  end
+
   def self.included(base)
     base.extend ClassMethods
   end

data/app/models/setting.rb

@@ -65,7 +65,7 @@ class Setting < ActiveRecord::Base
       @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
+      raise "Invalid setting type #{@type}" unless [:text, :string, :symbol, :boolean, :int, :float, :array, :hash].include? @type
 
       # Auto create general tab and section if it isn't created
       if @tab == :general && !Setting::Tab[@tab]
@@ -80,6 +80,8 @@ class Setting < ActiveRecord::Base
         @default = options[:default]
       elsif @type == :string
         @default = ""
+      elsif @type == :text
+        @default = ""
       elsif @type == :symbol
         @default = :""
       elsif @type == :boolean
@@ -118,6 +120,8 @@ class Setting < ActiveRecord::Base
       case type
       when :string
         value
+      when :text
+        value
       when :symbol
         value.to_sym
       when :boolean

data/app/views/admin/settings/show.html.erb

@@ -19,7 +19,7 @@
 
       <% @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) %>
+        <% next unless Setting::Meta[setting].select_from || [:text, :string, :boolean, :int].include?(Setting::Meta[setting].type) %>
         <p class="setting">
           <input type="hidden" name="included_settings[]" value="<%= setting %>" />
           <label>
@@ -30,6 +30,9 @@
                   <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 == :text %>
+              <br />
+              <textarea name="<%= setting %>" cols="75" rows="15"><%= Setting[setting] %></textarea>
             <% elsif Setting::Meta[setting].type == :string %>
               <input type="text" name="<%= setting %>" value="<%= Setting[setting] %>" size="60" />
             <% elsif [:int, :float].include?(Setting::Meta[setting].type) %>

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

@@ -9,6 +9,7 @@
     <link rel="shortcut icon" href="http://<%= Setting[:domain] %><%= asset_path Cartoonist::Theme.favicon %>" type="image/x-icon" />
     <%= javascript_include_tag controller_path if Rails.application.assets.find_asset("#{controller_path}.js").present? %>
   </head>
+
   <body>
     <%= form_tag "/users/sign_out", :method => :delete do %>
       <p class="tabs">

data/app/views/shared/_date_time_entry.html.erb

@@ -0,0 +1,28 @@
+<% body = "" if body.nil? %>
+<% name_prefix = name.downcase %>
+<% disabled_attr = 'disabled="disabled"'.html_safe if disabled %>
+
+<label>
+  <input type="checkbox" name="<%= name_prefix %>" value="true" <%= checked !!time %> <%= disabled_attr %> /><%= name.capitalize %> at
+</label>
+
+<input type="text" name="<%= name_prefix %>_at_date" value="<%= format_time time, "%Y-%m-%d" %>" <%= disabled_attr %> />
+
+<select name="<%= name_prefix %>_at_hour" <%= disabled_attr %>>
+  <% 1.upto 12 do |h| %>
+    <option value="<%= h %>" <%= selected h, format_time(time, "%-l").to_i %>><%= h %></option>
+  <% end %>
+</select>
+
+<select name="<%= name_prefix %>_at_minute" <%= disabled_attr %>>
+  <% 0.upto 60 do |m| %>
+    <option value="<%= m %>" <%= selected m, format_time(time, "%-M").to_i %>><%= m %></option>
+  <% end %>
+</select>
+
+<select name="<%= name_prefix %>_at_meridiem" <%= disabled_attr %>>
+  <option value="am" <%= selected "am", format_time(time, "%P") %>>am</option>
+  <option value="pm" <%= selected "pm", format_time(time, "%P") %>>pm</option>
+</select>
+
+<%= body %>

data/app/views/shared/_expire_date_time.html.erb

@@ -0,0 +1,23 @@
+<%
+
+  if expirable && expirable.kind_of?(Postable)
+    posted = expirable.posted?
+  else
+    posted = true
+  end
+
+  submit_disabled_attr = 'disabled="disabled"'.html_safe if expirable && (expirable.locked? || expirable.expired? || !posted)
+
+%>
+<%= partial "shared/date_time_entry", :time => (expirable.expired_at if expirable),
+                                      :disabled => (expirable && expirable.locked?),
+                                      :name => "expired" do %>
+  <input type="submit" name="expire_now" value="Expire Now" <%= submit_disabled_attr %> />
+
+  <% if expirable && expirable.kind_of?(Postable) %>
+    <input type="submit" name="expire_day_after" value="Expire Day After" <%= submit_disabled_attr %> />
+    <input type="submit" name="expire_3_days_after" value="Expire 3 Days After" <%= submit_disabled_attr %> />
+  <% else %>
+    <input type="submit" name="expire_in_hour" value="Expire in an Hour" <%= submit_disabled_attr %> />
+  <% end %>
+<% end %>

data/app/views/shared/_post_date_time.html.erb

@@ -0,0 +1,7 @@
+<% submit_disabled_attr = 'disabled="disabled"'.html_safe if postable && (postable.locked? || postable.posted?) %>
+<%= partial "shared/date_time_entry", :time => (postable.posted_at if postable),
+                                      :disabled => (postable && postable.locked?),
+                                      :name => "posted" do %>
+  <input type="submit" name="post_now" value="Post Now" <%= submit_disabled_attr %> />
+  <input type="submit" name="post_in_hour" value="Post in an Hour" <%= submit_disabled_attr %> />
+<% end %>

data/lib/cartoonist/engine.rb

@@ -293,6 +293,7 @@ module Cartoonist
     Mime::Type.register "image/x-icon", :ico
     Mime::Type.register "application/octet-stream", :tgz
     Cartoonist::Admin::Tab.add :general, :url => "/admin", :order => 3
+    Cartoonist::Asset.add "admin/search.js"
     Cartoonist::Migration.add_for self
 
     Cartoonist::Backup.for :files do
@@ -336,7 +337,7 @@ module Cartoonist
       devise_for :users, :controllers => { :omniauth_callbacks => "admin/omniauth_callbacks" }
 
       namespace :admin do
-        resources :accounts, :only => [:create, :destroy, :edit, :index, :show, :update]
+        resources :accounts
 
         resources :cache, :constraints => { :id => /.*/ }, :only => [:destroy, :index] do
           collection do

data/lib/cartoonist/nginxtra.rb

@@ -0,0 +1,100 @@
+Nginxtra::Config::Extension.partial "nginx.conf", "cartoonist_rails" do |args, block|
+  rails_server = args[:server] || :passenger
+  ssl_details = args[:ssl]
+
+  if ssl_details
+    default_port = 443
+  else
+    default_port = 80
+  end
+
+  if rails_server == :passenger && !@passenger_requirements_done
+    @config.require_passenger!
+    passenger_root!
+    passenger_ruby!
+    @passenger_requirements_done = true
+  end
+
+  server do
+    listen(args[:port] || default_port)
+    server_name(args[:server_name] || "localhost")
+    root File.join(File.absolute_path(File.expand_path(args[:root] || ".")), "public")
+    gzip_static "on"
+    passenger_on! if rails_server == :passenger
+    rails_env(args[:environment] || "production")
+
+    if ssl_details
+      ssl "on"
+      ssl_certificate ssl_details[:ssl_cert]
+      ssl_certificate_key ssl_details[:ssl_key]
+      @config.compile_option "--with-http_ssl_module"
+    end
+
+    block.call
+  end
+end
+
+Nginxtra::Config::Extension.partial "nginx.conf", "cartoonist" do |args, block|
+  if !@passenger_requirements_done
+    @config.require_passenger!
+    passenger_root!
+    passenger_ruby!
+    @passenger_requirements_done = true
+  end
+
+  cartoonist_type = args[:type] || "www"
+  server_name = args[:server_name]
+  root_path = args[:root]
+  ssl_details = args[:ssl]
+  ssl_details = { :ssl => ssl_details } if ssl_details
+  short_expiration = args[:short_expiration] || "2h"
+  long_expiration = args[:long_expiration] || "7d"
+
+  [{}, ssl_details].compact.each do |additional_options|
+    options = { :server => :custom, :server_name => server_name, :root => root_path }.merge additional_options
+
+    cartoonist_rails options do
+      location "~*", "^/_long_expiration_/#{cartoonist_type}(/.*?)(?:\\.html)?$" do
+        expires long_expiration
+        add_header "Cache-Control", "public"
+        try_files "$1", "$1.html", "/cache/static$1", "@passenger"
+      end
+
+      ["/cache/static$uri", "$uri", "$uri.html"].each do |condition|
+        _if "-f #{root_path}/public#{condition}" do
+          rewrite "^(.*)$", "/_long_expiration_/#{cartoonist_type}$1", "last"
+        end
+      end
+
+      ["html", "json", "rss"].each do |extension|
+        location "~*", "^/_short_#{extension}_expiration_/#{cartoonist_type}(/.*?)(?:\\.#{extension})?$" do
+          expires short_expiration
+          add_header "Cache-Control", "public"
+          try_files "/cache$1.#{cartoonist_type}.tmp.#{extension}", "@passenger"
+        end
+
+        location "~*", "^/_long_#{extension}_expiration_/#{cartoonist_type}(/.*?)(?:\\.#{extension})?$" do
+          expires long_expiration
+          add_header "Cache-Control", "public"
+          try_files "/cache$1.#{cartoonist_type}.#{extension}", "@passenger"
+        end
+
+        _if "-f #{root_path}/public/cache$uri.#{cartoonist_type}.tmp.#{extension}" do
+          rewrite "^(.*)$", "/_short_#{extension}_expiration_/#{cartoonist_type}$1", "last"
+        end
+
+        _if "-f #{root_path}/public/cache$uri.#{cartoonist_type}.#{extension}" do
+          rewrite "^(.*)$", "/_long_#{extension}_expiration_/#{cartoonist_type}$1", "last"
+        end
+      end
+
+      location "/" do
+        try_files "/_jump_to_passenger_", "@passenger"
+      end
+
+      location "@passenger" do
+        passenger_on!
+      end
+    end
+  end
+end

data/lib/cartoonist/version.rb

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

metadata

@@ -1,103 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cartoonist
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.17
   prerelease: 
-  version: 0.0.16
 platform: ruby
-authors: 
+authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: devise
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jquery-rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.1.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: omniauth-openid
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.4
+- !ruby/object:Gem::Dependency
+  name: omniauth-openid
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: railties
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 3.2.9
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 3.2.9
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.2.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rubyzip
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.9.9
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: minitar
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.5.4
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 description: This provides the main functionality and plugin api for Cartoonist.
 email: reasonnumber@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- app/assets/javascripts/admin/search.js.coffee
 - app/assets/javascripts/cartoonist.js.erb
 - app/assets/stylesheets/admin.css.scss
 - app/controllers/admin/accounts_controller.rb
@@ -117,6 +149,8 @@ files:
 - app/models/belongs_to_entity.rb
 - app/models/database_file.rb
 - app/models/entity.rb
+- app/models/expirable.rb
+- app/models/lockable.rb
 - app/models/markdown.rb
 - app/models/page_cache.rb
 - app/models/postable.rb
@@ -144,6 +178,9 @@ files:
 - app/views/layouts/cartoonist.xml.erb
 - app/views/layouts/general_admin.html.erb
 - app/views/layouts/users.html.erb
+- app/views/shared/_date_time_entry.html.erb
+- app/views/shared/_expire_date_time.html.erb
+- app/views/shared/_post_date_time.html.erb
 - app/views/site/robots.text.erb
 - app/views/site/sitemap.xml.erb
 - cartoonist.gemspec
@@ -156,36 +193,33 @@ files:
 - db/migrate/20121205091909_add_omniautable_to_users.rb
 - lib/cartoonist.rb
 - lib/cartoonist/engine.rb
+- lib/cartoonist/nginxtra.rb
 - lib/cartoonist/version.rb
 - public/errors/404.html
 - public/errors/422.html
 - public/errors/500.html
 homepage: http://reasonnumber.com/cartoonist
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Cartoonist Core
 test_files: []
-