cartoonist-blog 0.0.12 → 0.0.13

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

@@ -0,0 +1,20 @@
+//= require jquery
+//= require jquery.ui.datepicker
+$ ->
+  $("input[name='posted_at_date']").datepicker dateFormat: "yy-mm-dd"
+  $(".preview-content").click ->
+    $this = $(@).attr "disabled", "disabled"
+    $.ajax
+      url: "/admin/blog/preview_content"
+      type: "post"
+      data:
+        authenticity_token: $("form input[name='authenticity_token']").val()
+        content: $("textarea[name='content']").val()
+      dataType: "text"
+      success: (text) ->
+        $(".preview-content").html text
+        $this.removeAttr "disabled"
+      error: ->
+        $(".preview-content").html '<div style="color: red;">There was an error.</div>'
+        $this.removeAttr "disabled"
+    false

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

@@ -0,0 +1,3 @@
+/*
+ *= require jquery.ui.datepicker
+ */

data/app/controllers/admin/blog_controller.rb

@@ -1,8 +1,6 @@
-class Admin::BlogController < CartoonistController
+class Admin::BlogController < AdminCartoonistController
   helper :blog
   before_filter :preview!, :only => [:preview, :archives]
-  before_filter :ensure_ssl!
-  before_filter :check_admin!
 
   def archives
     @posts = BlogPost.archives true

data/app/models/blog_post.rb

@@ -114,6 +114,10 @@ class BlogPost < ActiveRecord::Base
   end
 
   class << self
+    def search(query)
+      reverse_chronological.where "LOWER(title) LIKE :query OR LOWER(url_title) LIKE :query OR LOWER(content) LIKE :query OR LOWER(author) LIKE :query", :query => "%#{query.downcase}%"
+    end
+
     def create_post(current_user, params)
       url_title = url_titlize params[:title]
       create :title => params[:title], :url_title => url_title, :content => params[:content], :author => current_user.name, :locked => true

data/app/views/admin/blog/edit.html.erb

@@ -70,36 +70,6 @@
 <div class="preview-content">
 </div>
 
-<%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" %>
-<%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.min.js" %>
-<%= stylesheet_link_tag "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.17/themes/base/jquery-ui.css" %>
-<%= javascript_tag do %>
-  $(function() {
-    $("input[name='posted_at_date']").datepicker({ dateFormat: "yy-mm-dd" });
-    $(".preview-content").click(function() {
-      var $this = $(this).attr("disabled", "disabled");
-      $.ajax({
-        url: "/admin/blog/preview_content",
-        type: "post",
-        data: {
-          authenticity_token: $("form input[name='authenticity_token']").val(),
-          content: $("textarea[name='content']").val()
-        },
-        dataType: "text",
-        success: function(text) {
-          $(".preview-content").html(text);
-          $this.removeAttr("disabled");
-        },
-        error: function() {
-          $(".preview-content").html('<div style="color: red;">There was an error.</div>');
-          $this.removeAttr("disabled");
-        }
-      });
-      return false;
-    });
-  });
-<% end %>
-
 <% Cartoonist::Entity.hooks_with(:edit_entity_after_partial).each do |hook| %>
   <hr />
   <%= render :partial => hook.edit_entity_after_partial, :locals => { :entity => @post } %>

data/app/views/admin/blog/new.html.erb

@@ -18,30 +18,3 @@
 
 <div class="preview-content">
 </div>
-
-<%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" %>
-<%= javascript_tag do %>
-  $(function() {
-    $(".preview-content").click(function() {
-      var $this = $(this).attr("disabled", "disabled");
-      $.ajax({
-        url: "/admin/blog/preview_content",
-        type: "post",
-        data: {
-          authenticity_token: $("form input[name='authenticity_token']").val(),
-          content: $("textarea[name='content']").val()
-        },
-        dataType: "text",
-        success: function(text) {
-          $(".preview-content").html(text);
-          $this.removeAttr("disabled");
-        },
-        error: function() {
-          $(".preview-content").html('<div style="color: red;">There was an error.</div>');
-          $this.removeAttr("disabled");
-        }
-      });
-      return false;
-    });
-  });
-<% end %>

data/cartoonist-blog.gemspec

@@ -11,5 +11,7 @@ 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 "jquery-rails", "~> 2.1.3"
+  s.add_dependency "jquery-ui-rails", "~> 2.0.2"
   s.add_dependency "cartoonist", cartoonist_version
 end

data/lib/cartoonist-blog/engine.rb

@@ -1,5 +1,7 @@
 module CartoonistBlog
   class Engine < ::Rails::Engine
+    Cartoonist::Asset.add "admin/blog.css"
+    Cartoonist::Asset.add "admin/blog.js"
     Cartoonist::Entity.add :blog, "BlogPost"
     Cartoonist::Admin::Tab.add :blog, :url => "/admin/blog", :order => 1
     Cartoonist::RootPath.add :blog, "blog#index"
@@ -26,7 +28,7 @@ module CartoonistBlog
     end
 
     Cartoonist::Routes.add do
-      resources :blog do
+      resources :blog, :only => [:index, :show] do
         collection do
           get "archives"
           get "feed", :defaults => { :format => "rss" }
@@ -34,7 +36,7 @@ module CartoonistBlog
       end
 
       namespace :admin do
-        resources :blog do
+        resources :blog, :only => [:create, :edit, :index, :new, :update] do
           member do
             post "lock"
             get "preview"

data/lib/cartoonist-blog/version.rb

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

data/lib/cartoonist-blog.rb

@@ -1,3 +1,4 @@
 module CartoonistBlog
   require "cartoonist-blog/engine"
+  require "cartoonist-blog/version"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoonist-blog
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,25 +9,49 @@ 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: jquery-rails
+  requirement: &20397060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *20397060
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: &20778840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *20778840
 - !ruby/object:Gem::Dependency
   name: cartoonist
-  requirement: &21845680 !ruby/object:Gem::Requirement
+  requirement: &20777460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
   type: :runtime
   prerelease: false
-  version_requirements: *21845680
+  version_requirements: *20777460
 description: This core plugin for Cartoonist adds a simple blog.
 email: reasonnumber@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/javascripts/admin/blog.js.coffee
+- app/assets/stylesheets/admin/blog.css.scss
 - app/controllers/admin/blog_controller.rb
 - app/controllers/blog_controller.rb
 - app/helpers/admin/blog_helper.rb
@@ -48,6 +72,7 @@ files:
 - db/migrate/20120308064117_create_blog_posts.rb
 - lib/cartoonist-blog.rb
 - lib/cartoonist-blog/engine.rb
+- lib/cartoonist-blog/version.rb
 homepage: http://reasonnumber.com/cartoonist
 licenses: []
 post_install_message: