kublog 0.0.1.1 → 0.9.0

data/Rakefile

@@ -20,20 +20,15 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+require 'rspec/core/rake_task'
 
+RSpec::Core::RakeTask.new('spec')
 
-task :default => :test
+# If you want to make this the default task
+task :default => :spec

data/app/assets/javascripts/kublog/email.js.coffee

@@ -1,22 +1,37 @@
 $(document).ready ->
   
+  ### Special Optional fields are not shown on check, but only enabled ###
+  $('#kublog .email_checkbox').change ->
+    $optional = $(this).siblings('.optional')
+    $optional_lightbox = $(this).siblings('.optional_lightbox')
+    if $(this).attr('checked')?
+      $optional.show().find('[disabled]').attr('disabled', false)
+      $optional.find('input[type=checkbox]').attr('checked',true)
+      $optional_lightbox.find('[disabled]').attr('disabled', false)
+    else
+      $optional.find('input[type=checkbox]').attr('checked',false)
+      $optional.hide().find('textarea, input').attr('disabled', true)
+      $optional_lightbox.find('textarea, input').attr('disabled', true)
+  
   ## Notification Preview
   $('#kublog .submit_fancybox').fancybox
 	  showCloseButton: false
 	  hideOnOverlayClick: false
 	  onComplete: ->
-	    textarea_html = $('#post_email_body').parent().html()
-	    $('#post_email_body').data('prewysiwyg', textarea_html)
-	    $('#post_email_body').wysiwyg(wysiwyg.email_controls)
+	    textarea_html = $('.email_content').parent().html()
+	    $('.email_content').data('prewysiwyg', textarea_html)
+	    $('.email_content').wysiwyg(wysiwyg.email_controls)
 	  onClosed: -> 
-	    $('form.post_form').submit() if $('#post_email_body').data('ready')?
-	    textarea_html = $('#post_email_body').data('prewysiwyg')
-	    $('#post_email_body').parent().html(textarea_html)
+	    $('form.post_form').submit() if $('.email_content').data('ready')?
+	    textarea_html = $('.email_content').data('prewysiwyg')
+	    $('.email_content').parent().html(textarea_html)
       
   ## Calls Lightbox if User still decides to notify via E-mail
   $('#kublog .post_form').submit ->
-    if $('#post_email_notify').attr('checked')? && not $('#post_email_body').data('ready')
-      $('#post_email_body').val($(this).data('post').email_body)
+    $email_checkbox = $('.email_checkbox')
+    $email_content = $('.email_content')
+    if $email_checkbox.attr('checked')? && not $email_content.data('ready')
+      $email_content.val($(this).data('post'))
       $('#link-to-email-template').click()
       return false
     else
@@ -24,7 +39,7 @@ $(document).ready ->
 
   ## Confirms Notification text and readies for submission
   $('#kublog #email_submit').click ->
-    $('#post_email_body').data('ready', true)
+    $('.email_content').data('ready', true)
     $.fancybox.close()
 
   ## Aborts notification Submission

data/app/assets/javascripts/kublog/posts.js.coffee

@@ -1,15 +1,41 @@
-$(document).ready ->
+## Starts to make js object-oriented
+class KublogPost
+  constructor: ->
+    @title = $('#post_title')
+    @body = $('#post_body')
+    
+  validateTitle: ->
+    return if @title.val() isnt ""
+    @addError('title',"can't be blank")
+    
+  validateBody: ->
+    return if $(@body.val()).text().trim() isnt "" 
+    @addError('body',"can't be blank")
   
-  ## Editor for Post Body
+  validate: ->
+    @errors = undefined
+    @validateTitle()
+    @validateBody()
+    @errors is undefined
+    
+  addError: (attr, error)->
+    @errors ?= {}
+    @errors[attr] = [error]
+
+window.KublogPost = KublogPost
+
+$(document).ready ->
+  # Jquery Wysiwyg editor with default configuration
   $('#kublog .editor').wysiwyg(wysiwyg.default_controls)
          
-  ### Twitter Char Counter Event ###
+  # Counts twitter chars as a limit of 139
+  # limit is given to include a shortened version of the link to post
   $('#kublog textarea[maxlength]').keyup(charCounter).keyup()
   
-  ### Twitter and Facebook Post Cloning Event ###
+  # Clones title content into twitter and facebook messages
   $('#kublog .original').keyup(mimicTitle).keyup()
   
-  ### Optional Hidden Fields (Currently E-mail notifications, Twitter and Facebook) ###
+  # Server optional Hidden Fields (Currently Twitter and Facebook)
   $('#kublog .trigger-optional').change ->
     $optional = $(this).siblings('.optional')
     if $(this).attr('checked')?
@@ -17,22 +43,23 @@ $(document).ready ->
     else
       $optional.hide().find('textarea, input').attr('disabled', true)
   
-  ### Validates the form through AJAX on server Side ###
-  # check doesn't care if editing or creating new post
+  # Gets the E-mail preview of the post
+  # ready for editing using a liquid template
   $('#kublog #create_post_button').click ->
-    resetErrors()
-    post_data = $(this).closest('form').first().serialize()
-    $.post "#{kublogPath}posts/check.json", post_data, (data) ->
-      $form = $('#kublog .post_form')
-      $form.data('post', data)
-      $form.submit()
-      return true
-    .error (response)->
-      errors =  JSON.parse(response.responseText)
-      setErrors('post', errors)
+    post = new KublogPost()
+    window.resetErrors()
+    if post.validate()
+      getEmailPreview()
+    else
+      window.setErrors('post', post.errors)
     return false
-    
-# Handle on Event
+
+getEmailPreview = ->
+  post = { post: {title: $('#post_title').val(), body: $('#post_body').val() } }
+  $.post "#{kublogPath}notifications/preview.json", post, (data) ->
+    $form = $('#kublog .post_form')
+    $form.data('post', data.preview)
+    $form.submit()
 
 charCounter = ->
   $chars_left_display = $(this).siblings('.chars_left')

data/app/assets/javascripts/kublog/shared.js.coffee.erb

@@ -2,7 +2,7 @@
 window.setErrors = (model, errors) ->
   for attribute, error of errors
     $label = $("label[for=#{model}_#{attribute}]")
-    $field = $("##{model}_#{attribute}}")
+    $field = $("##{model}_#{attribute}")
     unless $label.size() is 0
       $label.addClass('error')
       $(errorTemplate(error[0])).insertAfter($label)

data/app/assets/javascripts/kublog/wysiwyg.controls.js.coffee

@@ -1,5 +1,4 @@
 window.wysiwyg = { }
-
 window.wysiwyg.default_controls =
 	controls:
 		bold : { visible : true }

data/app/assets/plugins/kublog/ajaxyupload/javascripts/jquery.ajaxyupload.js

@@ -76,7 +76,7 @@
             contentType : "application/octet-stream",
             dataType    : "json",
             processData : false,
-            data        : file, 
+            data        : file
           });
         });
       });

data/app/assets/stylesheets/kublog/posts.css

@@ -3,8 +3,8 @@
   They will automatically be included in application.css.
 */
 
-#kublog textarea#post_body{
-  width:550px;
+#kublog textarea#post_body, #kublog textarea.email_content{
+  width:500px;
 }
 
 #kublog div.optional{

data/app/controllers/kublog/application_controller.rb

@@ -1,12 +1,28 @@
 module Kublog
   class ApplicationController < ActionController::Base
-    include UserIntegration::Common
-    
     before_filter :require_admin
     
+    helper_method :is_admin?
+    helper_method :current_user #TODO: Delete me if you're using Devise
+    
     def require_admin
       redirect_to root_path unless is_admin?
     end
     
+    ## TODO: Fill in this method
+    ## This method should return the logged in user or nil
+    ## Define this whether or not you have it on your application controller
+    ## Apps using Devise can skip this
+    def current_user
+
+    end
+    
+    ## TODO: Fill in this method
+    ## Returns if the current user has admin privileges for the blog
+    ## Define this whether or not you have the method on your application controller
+    def is_admin?
+
+    end
+    
   end
 end

data/app/controllers/kublog/categories_controller.rb

@@ -7,8 +7,8 @@ module Kublog
       @category = Category.find(params[:id])
       @presenter = PostsPresenter.new(@category)
       respond_to do |format|
-        format.atom { render "/kublog/posts/index", :layout => false }
-        format.rss  { redirect_to category_path(@category, :format => :atom), :status => :moved_permanently }
+        format.atom { render "/kublog/posts/index", :layout => false, :content_type => 'text/xml' }
+        format.rss  { render "/kublog/posts/index", :layout => false, :content_type => 'text/xml' }
         format.html { render "/kublog/posts/index" }
       end
     end

data/app/controllers/kublog/notifications_controller.rb

@@ -0,0 +1,13 @@
+module Kublog
+  class NotificationsController < ApplicationController
+    
+    def preview
+      @post = Post.new(params[:post])
+      @preview = Notification.email_template(@post)
+      respond_to do |format|
+        format.json { render :json => {:preview => @preview }}
+      end
+    end
+    
+  end
+end

data/app/controllers/kublog/posts_controller.rb

@@ -1,19 +1,19 @@
 module Kublog
   class PostsController < ApplicationController
     
-    skip_filter :require_admin, :only => [:index, :show]
+    skip_filter   :require_admin, :only => [:index, :show]
     
     def index
       @presenter = PostsPresenter.new
       respond_to do |format|
-        format.atom { render :layout => false }
-        format.rss  { redirect_to posts_path(:format => :atom), :status => :moved_permanently }
         format.html { }
+        format.atom { render :layout => false, :content_type => 'text/xml' }
+        format.rss  { render :layout => false, :content_type => 'text/xml' }
       end
     end
     
     def new
-      @post = Post.new
+      @presenter = PostFormPresenter.new(Post.new)
     end
     
     def show
@@ -21,18 +21,18 @@ module Kublog
       @presenter = PostPresenter.new(post)
     end
     
-    #TODO: Figure out a proxy method to access User
     def create
       @post = current_user.posts.build(params[:post])
       if @post.save
         redirect_to @post
       else
+        @presenter = PostFormPresenter.new(@post)
         render 'new'
       end
     end
     
     def edit
-      @post = Post.find(params[:id])
+      @presenter = PostFormPresenter.new(Post.find(params[:id]))
     end
     
     def update
@@ -40,6 +40,7 @@ module Kublog
       if @post.update_attributes(params[:post])
         redirect_to @post
       else
+        @presenter = PostFormPresenter.new(@post)
         render 'edit'
       end
     end
@@ -50,17 +51,5 @@ module Kublog
       redirect_to posts_path
     end
     
-    def check
-      @post = current_user.posts.build(params[:post])
-      respond_to do |format|
-        if @post.valid?
-          format.json { render :json => @post }
-        else
-          format.json { render :json => @post.errors.messages, :status => :unprocessable_entity }
-        end
-      end
-        
-    end
-    
   end
 end

data/app/helpers/kublog/application_helper.rb

@@ -1,4 +1,19 @@
 module Kublog
   module ApplicationHelper
+    
+    ## Nifty generators errors helper code
+    def error_messages_for(*objects)
+      options = objects.extract_options!
+      options[:header_message] ||= I18n.t(:"activerecord.errors.header", :default => "Invalid Fields")
+      options[:message] ||= I18n.t(:"activerecord.errors.message", :default => "Correct the following errors and try again.")
+      messages = objects.compact.map { |o| o.errors.full_messages }.flatten
+      unless messages.empty?
+        content_tag(:div, :class => "error_messages") do
+          list_items = messages.map { |msg| content_tag(:li, msg) }
+          content_tag(:h2, options[:header_message]) + content_tag(:p, options[:message]) + content_tag(:ul, list_items.join.html_safe)
+        end
+      end
+    end
+    
   end
 end

data/app/helpers/kublog/notifications_helper.rb

@@ -0,0 +1,4 @@
+module Kublog
+  module NotificationsHelper
+  end
+end

data/app/helpers/kublog/posts_helper.rb

@@ -34,5 +34,9 @@ module Kublog
       comment.admin? ? 'admin' : ''
     end
     
+    def atom_url(presenter)
+      presenter.category.nil? ? posts_url(:format => :atom) : category_url(presenter.category, :format => :atom)
+    end
+    
   end
 end

data/app/jobs/kublog/deliver_comment.rb

@@ -0,0 +1,14 @@
+module Kublog
+  class DeliverComment
+  
+    def initialize(comment_id)
+      @comment_id = comment_id
+    end
+  
+    def perform
+      comment = Comment.find(@comment_id)
+      CommentMailer.new_comment(comment).deliver
+    end
+  
+  end
+end

data/app/mailers/kublog/comment_mailer.rb

@@ -0,0 +1,11 @@
+module Kublog
+  class CommentMailer < ActionMailer::Base
+    
+    def new_comment(comment)
+      @comment, @post = comment, comment.post
+      subject = I18n.t('kublog.comment_mailer.new_comment.subject', :post => @post.title)
+      mail(:to => @post.user.email, :subject => subject, :from => @comment.email)
+    end
+
+  end
+end

data/app/mailers/kublog/post_mailer.rb

@@ -1,10 +1,9 @@
 module Kublog
   class PostMailer < ActionMailer::Base
-    default from: "test@kublog.com"
-    
-    def new_post(post, user)
-      @post, @user = post, user
-      mail(:to => user.email, :subject => post.title.titleize)
+        
+    def new_post(email, post, user)
+      @email, @post, @user = email, post, user
+      mail(:to => @user.email, :subject => @email.subject, :from => Kublog.email_from(@email.post))
     end
     
   end

data/app/models/kublog/category.rb

@@ -1,3 +1,6 @@
+# Non mandatory single category for a post
+# implements friendly_id search and json defaults
+# for ajax editing
 module Kublog
   class Category < ActiveRecord::Base
     extend FriendlyId
@@ -13,13 +16,18 @@ module Kublog
       self.name.titleize
     end
     
-    # Site access to the category
-    def path
-      Engine.routes.url_helpers.category_path(self)
+    # Includes a path to the category by default
+    # helps reference back to edited categories in
+    # json requests
+    def as_json(params={})
+      params||={}
+      super(params.merge!({:methods => [:path]}))
     end
     
-    def as_json(params={})
-      super params.merge({:methods => [:path]})
+    protected
+    
+    def path
+      Engine.routes.url_helpers.category_path(self)
     end
     
   end

data/app/models/kublog/comment.rb

@@ -7,29 +7,40 @@ module Kublog
     validate              :has_user_details
     
     default_scope   order('kublog_comments.created_at ASC')
+    delegate        :admin?, :to => :user, :allow_nil => true
     
-    delegate  :admin?, :to => :user, :allow_nil => true
+    after_create    :notify_author
     
     def author
       return self.author_name if self.user.nil?
       return self.user.to_s
     end
     
-    # Site access to the category
-    def path
-      Engine.routes.url_helpers.post_comment_path(self.post, self)
+    def as_json(args={})
+      args ||={}
+      super(args.merge!({:methods => [:path, :author, :ftime, :admin?]}))
     end
     
-    def as_json(options={})
-      super(options.merge({:methods => [:path, :author, :ftime, :admin?]}))
+    def path
+      Engine.routes.url_helpers.post_comment_path(self.post, self)
     end
     
     def ftime
       I18n.l(self.created_at, :format => :short)
     end
     
+    def email
+      author_email || user.email
+    end
+    
     private
     
+    def notify_author
+      unless self.user == self.post.user
+        Processor.work(DeliverComment.new(self.id))
+      end
+    end
+    
     def has_user_details
       if self.user.nil?
         errors.add(:author_name,  :blank) if author_name.blank?