comfy_blog 0.1.1 → 0.1.2

data/README.md

@@ -59,6 +59,10 @@ Posted comments will be sitting in the queue waiting to be published. You can au
 by setting this to `true`:
 
     config.auto_publish_comments = true
+    
+You can use Disqus to manage comments by setting the following config:
+
+    config.disqus_shortname = 'forum_shortname'
 
 
 ComfyBlog is released under the [MIT license](https://github.com/comfy/comfy-blog/raw/master/LICENSE) 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/views/admin/blog/posts/_post.html.erb

@@ -1,7 +1,9 @@
 <li>
   <div class='item'>
     <div class='action_links'>
-      <%= link_to pluralize(post.comments.count, 'comment'), admin_blog_post_comments_path(post) %>
+      <% unless ComfyBlog.disqus_enabled? %>
+        <%= link_to pluralize(post.comments.count, 'comment'), admin_blog_post_comments_path(post) %>
+      <% end %>
       <%= link_to 'Edit', edit_admin_blog_post_path(post) %>
       <%= link_to 'Delete', admin_blog_post_path(post), :method => :delete, :confirm => 'Are you sure?' %>
     </div>
@@ -14,8 +16,7 @@
         <% post.tags.each do |tag| %>
           <span class="tag"><%= tag.name %></span>
         <% end %>
-        
-      </div>  
+      </div>
     </div>
   </div>
 </li>

data/app/views/blog/comments/_disqus.html.erb

@@ -0,0 +1,14 @@
+<div id="disqus_thread"></div>
+<script type="text/javascript">
+    /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+    var disqus_shortname = '<%= ComfyBlog.config.disqus_shortname %>'; // required: replace example with your forum shortname
+
+    /* * * DON'T EDIT BELOW THIS LINE * * */
+    (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>
+<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>

data/app/views/blog/posts/show.html.erb

@@ -1,9 +1,13 @@
 <%= render :partial => 'blog/posts/post', :object => @post %>
 
-<div id='comments'>
-  <% @post.comments.each do |comment| %>
-    <%= render :partial => 'blog/comments/comment', :object => comment %>
-  <% end %>
-</div>
-
-<%= render :partial => 'blog/comments/form' %>
+<% if ComfyBlog.disqus_enabled? %>
+  <%= render :partial => 'blog/comments/disqus' %>
+  
+<% else %>
+  <div id='comments'>
+    <% @post.comments.each do |comment| %>
+      <%= render :partial => 'blog/comments/comment', :object => comment %>
+    <% end %>
+  </div>
+  <%= render :partial => 'blog/comments/form' %>
+<% end %>

data/comfy_blog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfy_blog"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc."]
-  s.date = "2012-01-30"
+  s.date = "2012-01-31"
   s.description = ""
   s.email = "oleg@twg.ca"
   s.extra_rdoc_files = [
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
     "app/views/admin/blog/tags/index.html.erb",
     "app/views/admin/blog/tags/new.html.erb",
     "app/views/blog/comments/_comment.html.erb",
+    "app/views/blog/comments/_disqus.html.erb",
     "app/views/blog/comments/_form.html.erb",
     "app/views/blog/comments/create.js.erb",
     "app/views/blog/posts/_post.html.erb",

data/config/routes.rb

@@ -3,10 +3,14 @@ Rails.application.routes.draw do
   namespace :admin, :path => ComfyBlog.config.admin_route_prefix do
     namespace :blog do
       resources :posts, :except => [:show] do
-        resources :comments, :only => [:index]
+        unless ComfyBlog.disqus_enabled?
+          resources :comments, :only => [:index]
+        end
       end
-      resources :comments, :only => [:index, :destroy] do
-        put :publish, :on => :member
+      unless ComfyBlog.disqus_enabled?
+        resources :comments, :only => [:index, :destroy] do
+          put :publish, :on => :member
+        end
       end
       resources :tags, :except => [:show]
     end
@@ -23,7 +27,9 @@ Rails.application.routes.draw do
       o.get ':year/:month/:slug'  => 'posts#show',  :as => :dated_blog_post
     end
     
-    post ':post_id/comments' => 'comments#create', :as => :blog_post_comments
+    unless ComfyBlog.disqus_enabled?
+      post ':post_id/comments' => 'comments#create', :as => :blog_post_comments
+    end
     
     get ':id' => 'posts#show', :as => :blog_post
   end

data/lib/comfy_blog.rb

@@ -22,5 +22,9 @@ module ComfyBlog
     end
     alias :config :configuration
     
+    def disqus_enabled?
+      self.config.disqus_shortname.present?
+    end
+    
   end
 end

data/lib/comfy_blog/configuration.rb

@@ -31,6 +31,9 @@ module ComfyBlog
     # Default is false.
     attr_accessor :auto_publish_comments
     
+    # Comments can be fully handled by Disqus. Set this config to use it.
+    attr_accessor :disqus_shortname
+    
     # Configuration defaults
     def initialize
       @title                  = 'ComfyBlog'
@@ -42,6 +45,8 @@ module ComfyBlog
       @public_layout          = 'application'
       @posts_per_page         = 10
       @auto_publish_comments  = false
+      @disqus_shortname       = nil
     end
+    
   end
 end

data/test/functional/blog/posts_controller_test.rb

@@ -100,4 +100,11 @@ class Blog::PostsControllerTest < ActionController::TestCase
     assert_response 404
   end
   
+  def test_get_show_with_disqus
+    ComfyBlog.config.disqus_shortname = 'test'
+    post = blog_posts(:default)
+    get :show, :year => post.year, :month => post.month, :slug => blog_posts(:default).slug
+    assert_response :success
+  end
+  
 end

data/test/test_helper.rb

@@ -22,7 +22,8 @@ class ActiveSupport::TestCase
       config.form_builder           = 'ComfyBlog::FormBuilder'
       config.public_layout          = 'application'
       config.posts_per_page         = 10
-      config.auto_publish_comments  =  false
+      config.auto_publish_comments  = false
+      config.disqus_shortname       = nil
     end
   end
   

data/test/unit/configuration_test.rb

@@ -12,6 +12,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 'ComfyBlog::FormBuilder',  config.form_builder
     assert_equal 10,                        config.posts_per_page
     assert_equal false,                     config.auto_publish_comments
+    assert_equal nil,                       config.disqus_shortname
   end
   
   def test_initialization_overrides
@@ -19,4 +20,10 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 'new-admin', ComfyBlog.config.admin_route_prefix
   end
   
+  def test_disqus_enabled?
+    assert !ComfyBlog.disqus_enabled?
+    ComfyBlog.config.disqus_shortname = 'test'
+    assert ComfyBlog.disqus_enabled?
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfy_blog
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70142022204480 !ruby/object:Gem::Requirement
+  requirement: &70337561190460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70142022204480
+  version_requirements: *70337561190460
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &70142022203220 !ruby/object:Gem::Requirement
+  requirement: &70337561188860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70142022203220
+  version_requirements: *70337561188860
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70142022201680 !ruby/object:Gem::Requirement
+  requirement: &70337561187720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70142022201680
+  version_requirements: *70337561187720
 description: ''
 email: oleg@twg.ca
 executables: []
@@ -93,6 +93,7 @@ files:
 - app/views/admin/blog/tags/index.html.erb
 - app/views/admin/blog/tags/new.html.erb
 - app/views/blog/comments/_comment.html.erb
+- app/views/blog/comments/_disqus.html.erb
 - app/views/blog/comments/_form.html.erb
 - app/views/blog/comments/create.js.erb
 - app/views/blog/posts/_post.html.erb
@@ -160,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3227396926195768290
+      hash: 4147721177865210323
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: