cartoonist 0.0.12 → 0.0.13

data/app/controllers/admin/accounts_controller.rb

@@ -1,7 +1,4 @@
-class Admin::AccountsController < CartoonistController
-  before_filter :ensure_ssl!
-  before_filter :check_admin!
-
+class Admin::AccountsController < AdminCartoonistController
   def index
     @users = User.order(:name).all
   end

data/app/controllers/admin/cache_controller.rb

@@ -1,6 +1,4 @@
-class Admin::CacheController < CartoonistController
-  before_filter :ensure_ssl!
-  before_filter :check_admin!
+class Admin::CacheController < AdminCartoonistController
   layout "general_admin"
 
   def index

data/app/controllers/admin/search_controller.rb

@@ -0,0 +1,7 @@
+class Admin::SearchController < AdminCartoonistController
+  layout "general_admin"
+
+  def index
+    @search = Search.query params
+  end
+end

data/app/controllers/admin/settings_controller.rb

@@ -1,6 +1,5 @@
-class Admin::SettingsController < CartoonistController
-  before_filter :ensure_ssl!
-  before_filter :check_admin!, :except => [:initial_setup, :save_initial_setup]
+class Admin::SettingsController < AdminCartoonistController
+  skip_before_filter :check_admin!, :only => [:initial_setup, :save_initial_setup]
 
   def index
     redirect_to "/admin/settings/general"

data/app/controllers/admin/static_cache_controller.rb

@@ -1,6 +1,4 @@
-class Admin::StaticCacheController < CartoonistController
-  before_filter :ensure_ssl!
-  before_filter :check_admin!
+class Admin::StaticCacheController < AdminCartoonistController
   layout "general_admin"
 
   def index

data/app/controllers/admin_cartoonist_controller.rb

@@ -0,0 +1,34 @@
+class AdminCartoonistController < CartoonistController
+  before_filter :ensure_ssl!
+  before_filter :check_admin!
+
+  private
+  def ensure_ssl!
+    return unless Rails.env.production?
+    redirect_to "https://#{request.host_with_port}#{request.fullpath}" unless request.ssl?
+  end
+
+  def check_admin!
+    if initial_setup_required?
+      redirect_to "/admin/settings/initial_setup"
+    else
+      authenticate_user!
+    end
+  end
+
+  def initial_setup_required?
+    User.count == 0
+  end
+
+  def after_sign_out_path_for(resource_or_scope)
+    "/admin"
+  end
+
+  def after_sign_in_path_for(resource_or_scope)
+    "/admin"
+  end
+
+  def preview!
+    @for_preview = true
+  end
+end

data/app/controllers/admin_controller.rb

@@ -1,6 +1,6 @@
-class AdminController < CartoonistController
-  before_filter :ensure_ssl!, :except => [:cron]
-  before_filter :check_admin!, :except => [:cron]
+class AdminController < AdminCartoonistController
+  skip_before_filter :ensure_ssl!, :only => [:cron]
+  skip_before_filter :check_admin!, :only => [:cron]
 
   def show
     redirect_to "/admin/main"

data/app/controllers/cartoonist_controller.rb

@@ -4,39 +4,14 @@ class CartoonistController < ActionController::Base
   before_filter :check_mobile
 
   private
-  def initial_setup_required?
-    User.count == 0
-  end
-
-  def ensure_ssl!
-    return unless Rails.env.production?
-    redirect_to "https://#{request.host_with_port}#{request.fullpath}" unless request.ssl?
-  end
-
-  def check_admin!
-    if initial_setup_required?
-      redirect_to "/admin/settings/initial_setup"
-    else
-      authenticate_user!
-    end
-  end
-
-  def after_sign_out_path_for(resource_or_scope)
-    "/admin"
-  end
-
-  def after_sign_in_path_for(resource_or_scope)
-    "/admin"
+  def handle_unverified_request
+    raise ActionController::InvalidAuthenticityToken.new
   end
 
   def check_mobile
     @mobile = (request.subdomain == "m") || params[:mobile]
   end
 
-  def preview!
-    @for_preview = true
-  end
-
   def cache_type
     if @mobile
       "m"

data/app/models/entity.rb

@@ -43,6 +43,10 @@ module Entity
     self.class.entity_edit_url.call self if self.class.entity_edit_url
   end
 
+  def search_url
+    entity_relative_preview_url
+  end
+
   def self.included(base)
     base.extend ClassMethods
 

data/app/models/search.rb

@@ -0,0 +1,63 @@
+class Search
+  attr_reader :query
+
+  def initialize(query)
+    @query = query
+  end
+
+  def results
+    return [] if @query.blank?
+    @results ||= entity_results + searchable_results
+  end
+
+  private
+  def entity_results
+    Cartoonist::Entity.all.map do |entity|
+      if entity.respond_to? :search
+        entity.search(@query).map { |x| Search::EntityResult.new x }
+      else
+        []
+      end
+    end.flatten
+  end
+
+  def searchable_results
+    Cartoonist::Searchable.all.map do |searchable|
+      searchable.search(@query).map { |x| Search::SearchableResult.new x }
+    end.flatten
+  end
+
+  class << self
+    def query(params)
+      new params[:q]
+    end
+  end
+
+  class EntityResult
+    include BelongsToEntity
+
+    def initialize(entity)
+      @entity = entity
+    end
+
+    def url
+      entity.search_url
+    end
+  end
+
+  class SearchableResult
+    attr_reader :searchable
+
+    def initialize(searchable)
+      @searchable = searchable
+    end
+
+    def description
+      searchable.description
+    end
+
+    def url
+      searchable.search_url
+    end
+  end
+end

data/app/views/admin/search/index.html.erb

@@ -0,0 +1,16 @@
+<form>
+  <input type="text" name="q" value="<%= params[:q] %>" />
+  <input type="submit" value="<%= t "search.index.submit" %>" />
+</form>
+
+<% if @search.query.present? %>
+  <h2>Search results for '<em><%= @search.query %></em>'</h2>
+
+  <ul>
+    <% @search.results.each do |result| %>
+      <li>
+        <a href="<%= result.url %>"><%= result.description %><a/>
+      </li>
+    <% end %>
+  </ul>
+<% end %>

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

@@ -3,9 +3,11 @@
   <head>
     <title><%= yield(:title) || Setting[:site_name] %></title>
     <%= stylesheet_link_tag "admin.css" %>
+    <%= stylesheet_link_tag controller_path if Rails.application.assets.find_asset("#{controller_path}.css").present? %>
     <%= csrf_meta_tags %>
     <link rel="icon" href="http://<%= Setting[:domain] %><%= asset_path Cartoonist::Theme.favicon %>" type="image/x-icon" />
     <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 %>

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

@@ -61,9 +61,6 @@
       <% if @disqus_enabled %>
         <div class="comments-container">
           <div id="disqus_thread">
-            <% if @disqus_options[:count_link] %>
-              <a id="disqus_comments" href="#disqus_thread" data-disqus-identifier="/<%= @disqus_options[:path] %>"></a>
-            <% end %>
           </div>
           <noscript>
             <%= t "cartoonist.layout.disqus.noscript_pre_link" %><a href="http://disqus.com/?ref_noscript"><%= t "cartoonist.layout.disqus.noscript_link" %></a><%= t "cartoonist.layout.disqus.noscript_post_link" %>
@@ -102,29 +99,11 @@
         var disqus_category_id = "<%= j @disqus_options[:category].to_s %>";
         var disqus_identifier = "/<%= j @disqus_options[:path] %>";
         var disqus_url = "http://<%= j Setting[:domain] %>/<%= j @disqus_options[:path] %>";
-        <% if @disqus_options[:count_link] %>
-          (function () {
-            var s = document.createElement('script'); s.async = true;
-            s.type = 'text/javascript';
-            s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(s);
-          }());
-
-          var comments = document.getElementById("disqus_comments");
-          comments.onclick = function() {
-            document.getElementById("disqus_thread").removeChild(comments);
-            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-            dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-            return false;
-          };
-        <% else %>
-          (function() {
-            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-            dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
-            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-          })();
-        <% end %>
+        (function() {
+          var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+          dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+          (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+        })();
       </script>
     <% end %>
     <% if Cartoonist::Asset.included_js? %>

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

@@ -3,6 +3,7 @@
   <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>
+  <a class="subtab" href="/admin/search"><%= t "admin.general.layout.search" %></a>
 <% end %>
 
 <% content_for :page_title, t("admin.general.layout.section") %>

data/cartoonist.gemspec

@@ -10,10 +10,10 @@ 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.0.0"
-  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 "rubyzip", "~> 0.9.0"
-  s.add_dependency "minitar", "~> 0.5.0"
+  s.add_dependency "devise", "~> 2.1.2"
+  s.add_dependency "jquery-rails", "~> 2.1.3"
+  s.add_dependency "railties", "~> 3.2.8"
+  s.add_dependency "redcarpet", "~> 2.2.2"
+  s.add_dependency "rubyzip", "~> 0.9.9"
+  s.add_dependency "minitar", "~> 0.5.3"
 end

data/config/locales/en.yml

@@ -40,6 +40,7 @@ en:
       layout:
         actions: Actions
         cache: Cache
+        search: Search
         section: General
         settings: Settings
         static_cache: Static Cache
@@ -72,6 +73,9 @@ en:
       page: Page
       www: www
       www_tmp: www tmp
+  search:
+    index:
+      submit: Search
   settings:
     initial_setup:
       confirm_password: "Confirmation: "

data/lib/cartoonist/engine.rb

@@ -13,9 +13,6 @@ module Cartoonist
       # Configure the class responsible to send e-mails.
       # devise_config.mailer = "Devise::Mailer"
 
-      # Automatically apply schema changes in tableless databases
-      devise_config.apply_schema = false
-
       # ==> ORM configuration
       # Load and configure the ORM. Supports :active_record (default) and
       # :mongoid (bson_ext recommended) by default. Other ORMs may be
@@ -115,10 +112,6 @@ module Cartoonist
       # If true, extends the user's remember period when remembered via cookie.
       # devise_config.extend_remember_period = false
 
-      # If true, uses the password salt as remember token. This should be turned
-      # to false if you are not using database authenticatable.
-      devise_config.use_salt_as_remember_token = true
-
       # Options to be passed to the created cookie. For instance, you can set
       # :secure => true in order to force SSL only cookies.
       # devise_config.cookie_options = {}
@@ -326,7 +319,7 @@ module Cartoonist
       match "sitemap" => "site#sitemap", :defaults => { :format => "xml" }
       match "robots" => "site#robots", :defaults => { :format => "text" }
 
-      resource :admin, :controller => :admin do
+      resource :admin, :controller => :admin, :only => [:show] do
         collection do
           get "cron"
           get "backup"
@@ -338,9 +331,9 @@ module Cartoonist
       devise_for :users
 
       namespace :admin do
-        resources :accounts
+        resources :accounts, :only => [:create, :destroy, :edit, :index, :show, :update]
 
-        resources :cache, :constraints => { :id => /.*/ } do
+        resources :cache, :constraints => { :id => /.*/ }, :only => [:destroy, :index] do
           collection do
             post "expire_www"
             post "expire_m"
@@ -349,18 +342,20 @@ module Cartoonist
           end
         end
 
-        resources :static_cache, :constraints => { :id => /.*/ } do
+        resources :static_cache, :constraints => { :id => /.*/ }, :only => [:destroy, :index] do
           collection do
             post "expire_all"
           end
         end
 
-        resources :settings do
+        resources :settings, :only => [:index, :show, :update] do
           collection do
             get "initial_setup"
             post "save_initial_setup"
           end
         end
+
+        resources :search, :only => [:index]
       end
     end
   end

data/lib/cartoonist/version.rb

@@ -0,0 +1,9 @@
+module Cartoonist
+  class Version
+    class << self
+      def to_s
+        "0.0.13"
+      end
+    end
+  end
+end

data/lib/cartoonist.rb

@@ -263,6 +263,20 @@ module Cartoonist
     end
   end
 
+  class Searchable
+    @@all = []
+
+    class << self
+      def all
+        @@all.map &:constantize
+      end
+
+      def add(model_name)
+        @@all << model_name
+      end
+    end
+  end
+
   class Sitemap
     @@all = []
 
@@ -318,4 +332,5 @@ module Cartoonist
   end
 
   require "cartoonist/engine"
+  require "cartoonist/version"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,74 +9,74 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &19441520 !ruby/object:Gem::Requirement
+  requirement: &14316380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *19441520
+  version_requirements: *14316380
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &19440720 !ruby/object:Gem::Requirement
+  requirement: &14315100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *19440720
+  version_requirements: *14315100
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &19439640 !ruby/object:Gem::Requirement
+  requirement: &14313640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *19439640
+  version_requirements: *14313640
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &19438680 !ruby/object:Gem::Requirement
+  requirement: &14311140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *19438680
+  version_requirements: *14311140
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &19437180 !ruby/object:Gem::Requirement
+  requirement: &14310300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *19437180
+  version_requirements: *14310300
 - !ruby/object:Gem::Dependency
   name: minitar
-  requirement: &19436380 !ruby/object:Gem::Requirement
+  requirement: &14309620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *19436380
+  version_requirements: *14309620
 description: This provides the main functionality and plugin api for Cartoonist.
 email: reasonnumber@gmail.com
 executables: []
@@ -87,8 +87,10 @@ files:
 - app/assets/stylesheets/admin.css.scss
 - app/controllers/admin/accounts_controller.rb
 - app/controllers/admin/cache_controller.rb
+- app/controllers/admin/search_controller.rb
 - app/controllers/admin/settings_controller.rb
 - app/controllers/admin/static_cache_controller.rb
+- app/controllers/admin_cartoonist_controller.rb
 - app/controllers/admin_controller.rb
 - app/controllers/cartoonist_controller.rb
 - app/controllers/site_controller.rb
@@ -102,6 +104,7 @@ files:
 - app/models/markdown.rb
 - app/models/page_cache.rb
 - app/models/postable.rb
+- app/models/search.rb
 - app/models/setting.rb
 - app/models/simple_template.rb
 - app/models/sitemap_entry.rb
@@ -113,6 +116,7 @@ files:
 - app/views/admin/accounts/show.html.erb
 - app/views/admin/cache/index.html.erb
 - app/views/admin/main.html.erb
+- app/views/admin/search/index.html.erb
 - app/views/admin/settings/initial_setup.html.erb
 - app/views/admin/settings/show.html.erb
 - app/views/admin/static_cache/index.html.erb
@@ -135,6 +139,7 @@ files:
 - db/migrate/20120524032959_add_extension_to_database_files.rb
 - lib/cartoonist.rb
 - lib/cartoonist/engine.rb
+- lib/cartoonist/version.rb
 - public/errors/404.html
 - public/errors/422.html
 - public/errors/500.html