atreides 2.0.1 → 2.0.2

data/app/assets/stylesheets/atreides/admin_base.css.erb

@@ -835,79 +835,10 @@ td.items_field a {
   line-height:30px;
 }
 
-/*
- * Comments
- *
- */
-
-#comments_list {
-  border-top:1px solid #ccc;
-}
-
-#comments_list .comment {
-  clear:left;
-  border-bottom:1px solid #eee;
-  padding: 1em 0;
-}
-
-#comments_list .comment:hover {
-  background:#f5f5f5;
-}
-
-#comments_list .comment-avatar {
-  float:left;
-}
-
-#comments_list .comment-name {
-  font-weight:bold;
-}
-
-#comments_list .comment-avatar img {
-  margin-right:0.5em;
-  margin-bottom:0.5em;
-}
-
-#comments_list .comment-excerpt p {
-  margin-bottom:0.5em;
-}
-
-.comment-time {
-  clear:left;
-}
-
-.comment-actions-left ul {
-  margin:0;
-  padding:0;
-  list-style:none;
-}
-
-.comment-actions-left li {
-  float:left;
-  margin-right:0.5em;
-}
-
-fieldset#comment_buttons {
-  border:none;
-  width:100%;
-  margin-top:1em;
-}
-
-#comment_buttons ol {
-  list-style:none;
-  margin:0;
-  padding:0;
-}
-
 #sidebar #filter-list ul {
   padding:0;
 }
 
-.comments-panel-wrapper li.machine_tag {
-  float:none;
-  width:100%;
-  margin-bottom:0.5em;
-}
-
 /*
  * Features
  *

data/app/models/atreides/content_part.rb

@@ -19,7 +19,6 @@ class Atreides::ContentPart < Atreides::Base
   # Behaviours
   #
 
-  #XXX acts_as_commentable
   accepts_nested_attributes_for :photos, :allow_destroy => true
   accepts_nested_attributes_for :videos, :allow_destroy => true
 

data/app/models/atreides/post.rb

@@ -62,9 +62,9 @@ class Atreides::Post < Atreides::Base
   scope :popular_photos, lambda {
     now = Time.zone.now
     joins("INNER JOIN photos ON photos.photoable_type = 'Atreides::Post' AND photos.photoable_id = posts.id").
-    select("posts.*, ((comments_count*2)+likes_count) as final_count").
+    select("posts.*, likes_count").
     where("posts.state = 'published' AND posts.published_at < ? AND posts.published_at < ?", now-1.week, now).
-    order("final_count desc, published_at desc").
+    order("likes_count desc, published_at desc").
     group("posts.id").
     limit(6)
   }

data/app/models/atreides/user.rb

@@ -21,7 +21,7 @@ class Atreides::User < Atreides::Base
   #
   # Associatons
   #
-  has_many :comments
+
   has_many :line_items
   has_many :cart_items, :class_name => "LineItem", :conditions => "order_id is null"
   has_many :orders

data/app/views/admin/common/_archive_sidebar.html.haml

@@ -17,7 +17,6 @@
     %li.divider
     %li= ttt(:'.sort_by')
     %li= link_to_function ttt(:'.sort_by_date'), ""
-    %li= link_to_function ttt(:'.sort_by_comments'), ""
     %li= link_to_function ttt(:'.sort_by_likes'), ""
     %li.divider
     %li #{ttt :'.filter'}

data/app/views/atreides/admin/_content_nav.html.haml

@@ -5,4 +5,3 @@
     %li.features= link_to ttt(:features), admin_features_path
     %li.archives= link_to ttt(:archives), admin_posts_path
     %li.pages= link_to ttt(:pages), admin_pages_path
-    %li.comments= link_to ttt(:comments), admin_comments_path

data/app/views/atreides/posts/show.html.haml

@@ -5,19 +5,4 @@
 
 #page_nav
   = link_to tt(".arrow_previous"), previous_post_path(resource), :class => "left" if resource.previous
-  = link_to tt(".arrow_next"), next_post_path(resource), :class => "right" if resource.next
-
-.clear
-
-#disqus_thread
-:javascript
-  var disqus_shortname = 'testatreides';
-  var disqus_developer = 1;
-  (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);
-  })();
-%noscript Please enable JavaScript to view the #{link_to 'http://disqus.com/?ref_noscript', 'comments powered by Disqus.' }
-= link_to 'http://disqus.com', :class => 'dsq-brlink' do
-  blog comments powered by <span class="logo-disqus">Disqus</span>
+  = link_to tt(".arrow_next"), next_post_path(resource), :class => "right" if resource.next

data/config/locales/en.yml

@@ -69,36 +69,6 @@ en:
           reset: reset
 
       atreides:
-        comments:
-          index:
-            comments: comments
-            approve: approve
-            'mark as spam': mark as spam
-            delete: delete
-          line:
-            'mark spam': mark as spam
-            'show comments only from this thread': show comments only from this thread
-            'this comment is': this comment is
-            'add commenter to': "add commenter to %{list}"
-            'all comments from': "all comments from"
-            'this thread': this thread
-            see_also: See other comments from
-            approved: approved
-            approve: approve
-            context: context
-            delete: delete
-            reply: reply
-            edit: edit
-            find: find
-          sidebar:
-            filter: filter
-            approved: approved
-            unapproved: unapproved
-            flagged: flagged
-            spam: spam
-            deleted: deleted
-            submit: submit
-
         features:
           index:
             drafted: Drafted

data/config/routes.rb

@@ -50,10 +50,6 @@ Rails.application.routes.draw do
       end
       resource :photos, :controller => "atreides/photos"
     end
-    resources :comments, :controller => "atreides/comments" do
-      put :update_many, :on => :collection
-      delete :delete_many, :on => :collection
-    end
     resources :videos, :only => [:index, :destroy], :controller => "atreides/videos" do
       post :reorder, :on => :collection
     end

data/lib/atreides.rb

@@ -3,7 +3,6 @@ require 'haml'
 require 'formtastic'
 require 'settingslogic'
 require 'will_paginate'
-require 'acts_as_commentable'
 require 'validates_email_format_of'
 require 'dropbox_sdk'
 require 'analytical'

data/lib/atreides/version.rb

@@ -1,4 +1,4 @@
 # Version string of the Atreides engine
 module Atreides
-  VERSION = "2.0.1".freeze
+  VERSION = "2.0.2".freeze
 end

data/lib/generators/atreides/atreides_generator.rb

@@ -28,7 +28,7 @@ module Atreides
         generate('devise:install')
 
         %w(create_videos create_photos create_orders create_posts
-           create_pages create_likes create_comments create_messages
+           create_pages create_likes create_messages
            create_features create_products create_line_items create_links
            create_votes create_tweets create_sessions create_sites
            create_content_parts add_userid_to_resources devise_create_users
@@ -47,7 +47,6 @@ module Atreides
         copy_file 'settings.yml', 'config/settings.yml'
         copy_file 'oembed.yml', 'config/oembed.yml'
         copy_file 'delayed_job.rb', 'config/initializers/delayed_job.rb'
-        copy_file 'disqussion.rb', 'config/initializers/disqussion.rb'
         copy_file 'Procfile', 'Procfile'
         gsub_file 'config/application.rb', 'config.active_record.whitelist_attributes = true', 'config.active_record.whitelist_attributes = false'
         remove_file 'public/index.html'

data/lib/generators/templates/create_pages.rb

@@ -9,7 +9,6 @@ class CreatePages < ActiveRecord::Migration
       t.timestamps
 
       t.integer :likes_count, :default => 0
-      t.integer :comments_count, :default => 0
       t.integer :votes_count, :default => 0
 
       t.integer :parent_id
@@ -19,7 +18,6 @@ class CreatePages < ActiveRecord::Migration
     end
     add_index :pages, :slug
     add_index :pages, :likes_count
-    add_index :pages, :comments_count
     add_index :pages, :votes_count
     add_index :pages, :parent_id
     add_index :pages, :post_id

data/lib/generators/templates/create_posts.rb

@@ -10,7 +10,6 @@ class CreatePosts < ActiveRecord::Migration
       t.timestamps
       t.integer :tumblr_id, :limit => 8 # BigInt because new tumblr ids are longer
       t.integer :likes_count, :default => 0
-      t.integer :comments_count, :default => 0
       t.integer :votes_count, :default => 0
       t.integer :twitter_id
       t.integer :facebook_id
@@ -25,7 +24,6 @@ class CreatePosts < ActiveRecord::Migration
     end
     add_index :posts, :slug
     add_index :posts, :likes_count
-    add_index :posts, :comments_count
     add_index :posts, :votes_count
     add_index :posts, :twitter_id
     add_index :posts, :linkable_id

data/lib/generators/templates/create_products.rb

@@ -8,12 +8,10 @@ class CreateProducts < ActiveRecord::Migration
       t.string :price_currency
       t.string :state
       t.datetime :published_at
-      t.integer  :comments_count, :default => 0
       t.integer  :likes_count, :default => 0
       t.integer  :votes_count, :default => 0
       t.timestamps
     end
-    add_index :products, :comments_count
     add_index :products, :likes_count
     add_index :products, :votes_count
   end

data/lib/generators/templates/settings.yml

@@ -11,10 +11,6 @@ common: &common
     password:
     profile_id:
   domain: atreides.dev
-  disqus:
-    key:
-    secret:
-    forum:
   tumblr:
     blog:
     email:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atreides
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -16,35 +16,19 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.3
-- !ruby/object:Gem::Dependency
-  name: acts_as_commentable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -205,22 +189,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-- !ruby/object:Gem::Dependency
-  name: disqussion
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -320,17 +288,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: grackle
   requirement: !ruby/object:Gem::Requirement
@@ -512,17 +480,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -640,33 +608,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -1222,7 +1190,6 @@ files:
 - lib/generators/atreides/USAGE
 - lib/generators/templates/add_role_to_users.rb
 - lib/generators/templates/add_userid_to_resources.rb
-- lib/generators/templates/create_comments.rb
 - lib/generators/templates/create_content_parts.rb
 - lib/generators/templates/create_features.rb
 - lib/generators/templates/create_likes.rb
@@ -1243,7 +1210,6 @@ files:
 - lib/generators/templates/create_votes.rb
 - lib/generators/templates/delayed_job.rb
 - lib/generators/templates/devise_create_users.rb
-- lib/generators/templates/disqussion.rb
 - lib/generators/templates/em-net-http_override.rb
 - lib/generators/templates/initializer.rb
 - lib/generators/templates/new_relic.rb
@@ -1261,7 +1227,6 @@ files:
 - app/assets/javascripts/atreides/admin_base.js.erb
 - app/assets/javascripts/atreides/admin_edit.js
 - app/assets/javascripts/atreides/application.js
-- app/assets/javascripts/atreides/comments.coffee
 - app/assets/javascripts/atreides/public.js
 - app/assets/javascripts/atreides/public_base.js.erb
 - app/assets/javascripts/atreides/terryblr.js
@@ -1274,7 +1239,6 @@ files:
 - app/assets/stylesheets/atreides/public.css
 - app/assets/stylesheets/atreides/public_base.css
 - app/assets/stylesheets/atreides/swfupload.css.erb
-- app/controllers/admin/atreides/comments_controller.rb
 - app/controllers/admin/atreides/content_parts_controller.rb
 - app/controllers/admin/atreides/dropbox_controller.rb
 - app/controllers/admin/atreides/facebook_controller.rb
@@ -1295,13 +1259,11 @@ files:
 - app/controllers/atreides/admin_controller.rb
 - app/controllers/atreides/admin_home_controller.rb
 - app/controllers/atreides/application_controller.rb
-- app/controllers/atreides/comments_controller.rb
 - app/controllers/atreides/home_controller.rb
 - app/controllers/atreides/likes_controller.rb
 - app/controllers/atreides/pages_controller.rb
 - app/controllers/atreides/posts_controller.rb
 - app/controllers/atreides/public_controller.rb
-- app/helpers/admin/atreides/comments_helper.rb
 - app/helpers/admin/atreides/dropbox_helper.rb
 - app/helpers/admin/atreides/features_helper.rb
 - app/helpers/admin/atreides/github_helper.rb
@@ -1325,7 +1287,6 @@ files:
 - app/inputs/price_input.rb
 - app/inputs/underline_input.rb
 - app/models/atreides/ability.rb
-- app/models/atreides/comment.rb
 - app/models/atreides/content_part.rb
 - app/models/atreides/facebook_user.rb
 - app/models/atreides/feature.rb
@@ -1352,10 +1313,6 @@ files:
 - app/models/tumblr_post_publisher_job.rb
 - app/models/tw_post_publisher_job.rb
 - app/views/admin/_edit_head_content.html.haml
-- app/views/admin/atreides/comments/_line.html.haml
-- app/views/admin/atreides/comments/_sidebar.html.haml
-- app/views/admin/atreides/comments/create.js.haml
-- app/views/admin/atreides/comments/index.html.haml
 - app/views/admin/atreides/content_parts/_form.html.haml
 - app/views/admin/atreides/content_parts/_photos.html.haml
 - app/views/admin/atreides/content_parts/_text.html.haml

data/app/assets/javascripts/atreides/comments.coffee

@@ -1,50 +0,0 @@
-$('#filter-list').change () ->
-  console.log 'go..'
-  self = $(this)
-  setTimeout () ->
-    self.submit()
-  , 30
-
-# set up comment expand/collapse links.
-$('.comment').each (index, comment) ->
-  # Don't create a new event for comments that have already been loaded.
-  return true if comment._loaded
-  comment._loaded = true;
-
-  $(this).click (event) ->
-    comment = $(this)
-
-    # Allow any user interact-able object (links, inputs, etc.) to function normally.
-    if ($(event.target).is('a,:input') || $(event.target).closest('a,:input').length > 0)
-      return true
-
-    if (comment.hasClass('expanded'))
-      comment.removeClass('expanded')
-    else
-      comment.addClass('expanded').removeClass('unread')
-    return false
-
-if $('#expandall').hasClass('collapseall')
-  for post in posts
-    $('#comment-' + post.id).find('.comment-excerpt-block').click()
-
-# $('.comment').live 'click', () ->
-#   $(this).toggleClass "expanded"
-
-$('.actions form input[type=button]').click () ->
-  unless _.isEmpty getSelectedCommentId()
-    els = createInputCommentIds()
-    $(this).parent('form').append(els).submit()
-  else
-    console.log "Please select at least one comment."
-    return false
-
-createInputCommentIds = () ->
-  els = ''
-  _.each getSelectedCommentId(), (cid) ->
-    els += "<input type='hidden' name='comment_ids[]' value='" + cid + "'>"
-  return els
-
-getSelectedCommentId = () ->
-  _.map $('.comment-select input[type=checkbox]:checked'), (el) ->
-    $(el).attr("id").split("-")[1]

data/app/controllers/admin/atreides/comments_controller.rb

@@ -1,47 +0,0 @@
-require 'disqussion'
-class Admin::Atreides::CommentsController < Atreides::AdminController
-
-  def index
-    super
-  end
-
-  def update_many
-    posts = Disqussion::Posts.new
-    case params[:comment_action]
-    when 'approve'
-      posts.approve params[:comment_ids] if params[:comment_ids]
-    when 'mark-spam'
-      posts.spam params[:comment_ids] if params[:comment_ids]
-    end if params[:comment_action]
-    redirect_to admin_comments_path
-  end
-
-  def delete_many
-    Disqussion::Posts.new.remove params[:comment_ids] if params[:comment_ids]
-    redirect_to admin_comments_path
-  end
-
-  private
-
-  # Query options are passed this way:
-  # from:username
-  # email:joe@bar.com
-  # ip:127.0.0.1
-  # thread:29372
-  def extract_options
-    @options ||= begin
-      opts = {}
-      opts[:query]   = params[:query]  if params.has_key?(:query) && %w(from email ip thread).include?(params[:query].split(':').first)
-      opts[:include] = params[:filter] if params.has_key?(:filter)
-      opts[:cursor]  = params[:cursor] if params.has_key?(:cursor)
-      opts[:limit]   = params[:limit]  if params.has_key?(:limit)
-      opts
-    end
-  end
-
-  def collection
-    @collection ||= Disqussion::Forums.new.listPosts(Settings.disqus.forum, extract_options)
-  end
-
-  include Atreides::Extendable
-end

data/app/controllers/atreides/comments_controller.rb

@@ -1,43 +0,0 @@
-class Atreides::CommentsController < Atreides::PublicController
-  helper "Atreides::Posts"
-  before_filter :require_user, :only => [:create, :update]
-
-  def index
-    super do |wants|
-      wants.html { head :not_found }
-      wants.json { render :json => collection.to_json }
-      wants.xml { render :xml => collection.to_xml }
-    end
-  end
-
-  def create
-    build_resource.request = request
-    super do |success, failure|
-      success.html { head :ok, :location => post_path(parent) }
-      success.js
-      failure.wants.html { head :error, :message => resource.errors.full_messages.to_sentence }
-      failure.wants.js
-    end
-  end
-
-  private
-
-  def resource
-    @comment ||= parent.comments.find params[:id]
-  end
-
-  def build_resource
-    @comment ||= Comment.new params[:comment].update(:user => current_user, :commentable => parent)
-  end
-
-  def collection
-    @comments ||= parent.comments.approved.paginate :page => params[:page]
-  end
-
-  def parent
-    @parent ||= Atreides::Post.find_by_slug!(params[:post_id]) ||
-                Atreides::Post.find(params[:post_id])
-  end
-
-  include Atreides::Extendable
-end

data/app/helpers/admin/atreides/comments_helper.rb

@@ -1,8 +0,0 @@
-module Admin::Atreides::CommentsHelper
-
-  def author_column(comment)
-    comment.user ? comment.user.full_name : "Anonymous"
-  end
-
-  include Atreides::Extendable
-end

data/app/models/atreides/comment.rb

@@ -1,93 +0,0 @@
-class Atreides::Comment < Atreides::Base
-
-  acts_as_commentable
-
-  #
-  # Constants
-  #
-
-  #
-  # Associatons
-  #
-  belongs_to :commentable, :polymorphic => true, :counter_cache => true
-  belongs_to :user
-
-  #
-  # Validations
-  #
-  validates_presence_of :comment
-  validate :spam_filter, :on => :create
-
-  def spam_filter
-    errors.add(:base, "Unfortunately this comment is considered spam by Akismet. It will show up once it has been approved by the administrator.") if spam?
-  end
-
-  #
-  # Scopes
-  #
-  default_scope order('created_at ASC')
-  scope :moderated, where("moderated_at is not null")
-  scope :approved,  where("moderated_at is null")
-
-  #
-  # Callbacks
-  #
-
-  #
-  # Class Methods
-  #
-  class << self
-    def base_class
-      self
-    end
-  end
-
-  #
-  # Instance Methods
-  #
-  def moderated?
-    moderated_at?
-  end
-
-  def moderate!
-    update_attributes!(:moderated_at => Time.zone.now)
-  end
-
-  def request=(request)
-    @user_ip    = request.remote_ip
-    @user_agent = request.env['HTTP_USER_AGENT']
-    @referrer   = request.env['HTTP_REFERER']
-    @has_request = true
-  end
-
-  def spam?
-    result = @has_request ? Akismetor.spam?(akismet_attributes) : false
-    moderate! if result
-    result
-  end
-
-  def akismet_attributes
-    {
-      :key                  => 'abc123',
-      :blog                 => "http://#{Settings.domain}",
-      :user_ip              => @user_ip,
-      :user_agent           => @user_agent,
-      :comment_author       => user.full_name,
-      :comment_author_email => user.email,
-      # :comment_author_url   => site_url,
-      :comment_content      => comment
-    }
-  end
-
-  def mark_as_spam!
-    moderate!
-    Akismetor.submit_spam(akismet_attributes)
-  end
-
-  def mark_as_ham!
-    update_attribute(:moderated_at, nil)
-    Akismetor.submit_ham(akismet_attributes)
-  end
-
-  include Atreides::Extendable
-end

data/app/views/admin/atreides/comments/_line.html.haml

@@ -1,60 +0,0 @@
-.comment.span-17{:id => "comment-#{comment.id}", :class => "#{'approved' if comment.isApproved}"}
-  %label.span-1.comment-select.approved{:for => "check-#{comment.id}"}
-    = check_box_tag "", nil, false, :id => "check-#{comment.id}"
-    = hidden_field_tag "", comment.id
-  / Excerpt block. This is shown by default and hidden when the parent is given the class "expanded"
-  .comment-excerpt-block.span-16.last
-    .comment-avatar
-      = image_tag comment.author.avatar.cache, :class => "comment-avatar", :size => "32x32"
-    .comment-excerpt
-      %p
-        %span.comment-name
-          = comment.author.name
-          %span
-            = "(#{comment.author.email}):" unless comment.author.email.blank?
-        %span.comment-body= comment.raw_message
-    .comment-time
-      Posted
-      = distance_of_time_in_words seconds_from_now(Time.parse(comment.createdAt))
-      ago.
-    .clear
-  / End excerpt block
-  / hidden by default, shown by javascript when expanded.
-  .comment-header{:style => "display:none"}
-    .comment-user
-      %a{:href => "#", :rel => "userlist"}
-        = image_tag comment.author.avatar.cache, :class => "comment-avatar", :size => "32x32"
-      .comment-name
-        = link_to comment.author.name, comment.author.url, :class => "profile-launcher", "data-profile-username" => comment.author.username, :target => "_blank"
-        %span
-          != "(#{mail_to(comment.author.email)})" unless comment.author.email.blank?
-        / %small
-        /   = link_to "#{comment.ipAddress}.", "?query=ip:#{comment.ipAddress}"
-        /   = link_to comment.author.url, comment.author.url, :target => "_blank"
-    .comment-time
-      Posted
-      = distance_of_time_in_words seconds_from_now(Time.parse(comment.createdAt))
-      ago.
-    .clear
-  / hidden by default, shown by javascript when expanded.
-  .comment-body{:style => "display:none"}
-    .content
-      .content-wrapper
-        %p= comment.raw_message
-    .media
-  / hidden by default, shown by javascript when expanded.
-  .comment-footer.clear
-    .comment-actions-left.span-12.prepend-1
-      = ttc(".see_also")
-      \:
-      = link_to comment.author.email, "?query=email:#{comment.author.email}"
-      = link_to comment.ipAddress, "?query=ip:#{comment.ipAddress}"
-      = link_to tt(".this thread"), "?query=thread:#{comment.thread}"
-
-  .comment-actions-left.span-4.last
-    = ttc ".this comment is"
-    %span.txt-approved= comment.isApproved ? tt('.approved') : tt('.not yet approved')
-    %a.add-userlist.blacklist{:href => "#", :style => "display: none; "}
-      = ttc ".add commenter to", :list => content_tag(:strong, "Blacklist")
-    %a.add-userlist.whitelist{:href => "#", :style => "display: none; "}
-      = ttc ".add commenter to", :list => content_tag(:strong, "Whitelist")

data/app/views/admin/atreides/comments/_sidebar.html.haml

@@ -1,52 +0,0 @@
-- content_for :sidebar do
-  #filters.comments-panel-wrapper
-    %ul.summary
-      %li.new-content
-        = link_to "Disqus.com", "http://#{Settings.disqus.forum}.disqus.com/admin/moderate/"
-
-      %li.divider
-      %li
-        %h3= ttt '.filter'
-        = form_tag '', :method => :get, :id => "filter-list", :class => 'formtastic' do
-          %ul
-            %li.machine_tag
-              %label#filter-approved{:for => "show_approved"}
-                / Filter's default to "approved"
-                - if !params.has_key?(:filter) || params.has_key?(:filter) && params[:filter].include?("approved")
-                  %input#show_approved{:checked => "checked", :type => "checkbox", :name => "filter[]", :value => "approved"}/
-                - else
-                  %input#show_approved{:type => "checkbox", :name => "filter[]", :value => "approved"}/
-                = ttt ".approved"
-
-            %li.machine_tag
-              %label#filter-unapproved{:for => "show_unapproved"}
-                - if params.has_key?(:filter) && params[:filter].include?("unapproved")
-                  %input#show_unapproved{:checked => "checked", :type => "checkbox", :name => "filter[]", :value => "unapproved"}/
-                - else
-                  %input#show_unapproved{:type => "checkbox", :name => "filter[]", :value => "unapproved"}/
-                = ttt ".unapproved"
-            %li.machine_tag
-              %label#filter-flagged{:for => "show_flagged"}
-                - if params.has_key?(:filter) && params[:filter].include?("flagged")
-                  %input#show_flagged{:checked => "checked", :type => "checkbox", :name => "filter[]", :value => "flagged"}/
-                - else
-                  %input#show_flagged{:type => "checkbox", :name => "filter[]", :value => "flagged"}/
-                = ttt ".flagged"
-            %li.machine_tag
-              %label#filter-spam.hidden{:for => "show_spam"}
-                - if params.has_key?(:filter) && params[:filter].include?("spam")
-                  %input#show_spam{:checked => "checked", :type => "checkbox", :type => "checkbox", :name => "filter[]", :value => "spam"}/
-                - else
-                  %input#show_spam{:type => "checkbox", :type => "checkbox", :name => "filter[]", :value => "spam"}/
-                = ttt ".spam"
-            %li.machine_tag
-              %label#filter-deleted.hidden{:for => "show_deleted"}
-                - if params.has_key?(:filter) && params[:filter].include?("deleted")
-                  %input#show_spam{:checked => "checked", :type => "checkbox", :type => "checkbox", :name => "filter[]", :value => "deleted"}/
-                - else
-                  %input#show_spam{:type => "checkbox", :type => "checkbox", :name => "filter[]", :value => "deleted"}/
-                = ttt ".deleted"
-            %li.machine_tag
-              %label#filter-button.hidden{:for => "submit_button", :style => "display:none"}
-                %input#submit_button{:type => "submit"}
-                = ttt ".submit"

data/app/views/admin/atreides/comments/create.js.haml

@@ -1 +0,0 @@
-$("##{parent_object.dom_id('comments')}").html("#{escape_javascript(comment_item(resource))}")

data/app/views/admin/atreides/comments/index.html.haml

@@ -1,34 +0,0 @@
-= render :partial => 'sidebar'
-
-%h2 #{ttt :'.comments'}
-
-.clear
-
-#comments_list
-  - @collection.response.each do |comment|
-    = render :partial => 'line', :locals => { :comment => comment}
-
-.clear
-
-%fieldset#comment_buttons.buttons.actions
-  %ol
-    %li.commit
-      = form_tag '/admin/comments/update_many', :method => :put do
-        = hidden_field_tag "comment_action", "approve"
-        %input#approve-selected.create{:type => "button", :value => ttc(".approve")}
-    %li.delete
-      = form_tag '/admin/comments/delete_many', :method => :delete do
-        %input#delete-selected.cancel{:type => "button", :value => ttc(".delete")}
-    %li.cancel
-      = form_tag '/admin/comments/update_many', :method => :put do
-        = hidden_field_tag "comment_action", "mark-spam"
-        %input#mark-as-spam-selected.cancel{:type => "button", :value => ttc(".mark as spam")}
-
-#pagination.pagination.clear
-  - if @collection.cursor.hasPrev
-    .previous= link_to tt("Previous"), admin_comments_path(params.merge(:cursor => @collection.cursor.prev))
-  - if @collection.cursor.hasNext
-    .next= link_to tt("Next"), admin_comments_path(params.merge(:cursor => @collection.cursor.next))
-
-- content_for :js do
-  = javascript_include_tag 'atreides/comments'

data/lib/generators/templates/create_comments.rb

@@ -1,19 +0,0 @@
-class CreateComments < ActiveRecord::Migration
-  def self.up
-    create_table :comments, :force => true do |t|
-      t.string      :title, :limit => 50, :default => ""
-      t.text        :comment, :default => ""
-      t.references  :commentable, :polymorphic => true
-      t.integer     :user_id
-      t.datetime    :moderated_at
-      t.timestamps
-    end
-    add_index :comments, :commentable_type
-    add_index :comments, :commentable_id
-    add_index :comments, :user_id
-  end
-
-  def self.down
-    drop_table :comments
-  end
-end

data/lib/generators/templates/disqussion.rb

@@ -1,30 +0,0 @@
-require 'disqussion'
-
-Disqussion.configure do |config|
-  config.api_key = Settings.disqus.key
-  config.api_secret = Settings.disqus.secret
-  # config.adapter = :em_synchrony
-end
-
-Disqussion::Posts.class_eval %Q{
-  class << self
-    def columns_hash
-      a = {}
-      self.column_names.each do |key|
-        a.merge! key.to_sym => String
-      end
-      a
-    end
-
-    def column_names
-      ["isJuliaFlagged","isFlagged","forum","parent","media","isApproved","dislikes","raw_message","isSpam","thread","points","createdAt","message","isHighlighted","ipAddress","id","isDeleted","likes","author"]
-    end
-  end
-}
-
-require 'hashie/rash'
-Hashie::Rash.class_eval %Q{
-  def dom_id(prefix)
-    prefix + "_" + self.id
-  end
-}