blogit 0.8.0 → 1.0.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 284698e6cf80971f9da206a03066356e5d290bae
+  data.tar.gz: 87263f108741571411bb221b9c670997ea1bbaa6
+SHA512:
+  metadata.gz: 2367ee69877ce6372bbc302ba3a80f4cd7b42882a33007cb1e43b48628de4c0b63b77809dd4724128eca87a44162aa86e61f90aa7b3a5b2a02819e4ba707a48c
+  data.tar.gz: ced761eb3174ff8af85d7abcedfd12ae10ea661c315e11e5cca5fe96ffd90f5d58e27cb72e5d14b6c303e2d60201d0e8a709eefc91eb01c9d75b346032f00a99

data/README.md

@@ -1,6 +1,8 @@
 [![Gem Version](https://badge.fury.io/rb/blogit.png)](http://badge.fury.io/rb/blogit)
 [![Code Climate](https://codeclimate.com/github/KatanaCode/blogit.png)](http://codeclimate.com/github/KatanaCode/blogit/)
 [![Blogit](https://gemnasium.com/KatanaCode/blogit.png)](https://gemnasium.com/KatanaCode/blogit)
+[![Travis CI](https://travis-ci.org/KatanaCode/blogit.png)](https://travis-ci.org/KatanaCode/blogit.png)
+
 
 
 # Blogit (beta)
@@ -105,4 +107,4 @@ with generous contributions from:
 
 ## About Katana Code
 
-Katana Code are [Ruby on Rails Developers Based in Edinburgh, Scotland](http://katanacode.com/ "Katana Code").
+Katana Code are [iPhone app and Ruby on Rails Developers in Edinburgh, Scotland](http://katanacode.com/ "Katana Code").

data/Rakefile

@@ -4,36 +4,20 @@ begin
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Blog'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
 
+load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+desc "Run all specs in spec directory (excluding plugin specs)"
 
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-task :default => :test
+task :default => :spec

data/app/controllers/blogit/application_controller.rb

@@ -19,22 +19,6 @@ module Blogit
       Blogit::configuration
     end
 
-    # Turns on page caching for the given actions if
-    # Blogit.configuration.cache_pages is true
-    def self.blogit_cacher(*args)
-      if blogit_conf.cache_pages
-        caches_page *args
-      end
-    end
-
-    # Sets a cache sweeper to observe changes if
-    # Blogit.configuration.cache_pages is true
-    def self.blogit_sweeper(*args)
-      if blogit_conf.cache_pages
-        cache_sweeper Blogit::BlogitSweeper, only: args
-      end
-    end
-
     # A helper method to access the Blogit::configuration
     # at the controller instance level
     def blogit_conf
@@ -47,6 +31,11 @@ module Blogit
       send blogit_conf.current_blogger_method
     end
 
+    # Returns true or false if current_blogger is present
+    def is_blogger_logged_in?
+      !!current_blogger 
+    end
+
     # Returns true if the current_blogger is the owner of the post
     # @param post An instance of Blogit::Post
     def this_blogger?(post)

data/app/controllers/blogit/comments_controller.rb

@@ -3,11 +3,9 @@ module Blogit
 
     blogit_authenticate except: [:create]
 
-    blogit_sweeper(:create, :update, :destroy)
-
-
     def create
-      @comment = post.comments.new(params[:comment])
+      @comment = post.comments.new(comment_params)
+
       respond_to do |format|
         format.js {
           # the rest is dealt with in the view
@@ -37,9 +35,13 @@ module Blogit
 
     private
 
+    def comment_params
+      params.require(:comment).permit(:name, :nickname, :email, :body, :website)
+    end
+
     def post
       @post ||= Blogit::Post.find(params[:post_id])
     end
-
+    
   end
 end

data/app/controllers/blogit/posts_controller.rb

@@ -4,34 +4,37 @@ module Blogit
   # the main_app
   class PostsController < ::Blogit::ApplicationController
 
-  
+    # If a layout is specified, use that. Otherwise, fall back to the default
+    layout Blogit.configuration.layout if Blogit.configuration.layout
+
     # If using Blogit's Create, Update and Destroy actions AND ping_search_engines is
     # set, call ping_search_engines after these requests
     if Blogit.configuration.include_admin_actions
       after_filter :ping_search_engines, only: [:create, :update, :destroy], :if => lambda { Blogit.configuration.ping_search_engines }
     end
-    
+
     # Raise a 404 error if the admin actions aren't to be included
     # We can't use blogit_conf here because it sometimes raises NoMethodError in main app's routes
     unless Blogit.configuration.include_admin_actions
-      before_filter :raise_404, except: [:index, :show, :tagged]
+      before_filter :raise_404, except: [:index, :show]
     end
 
     blogit_authenticate(except: [:index, :show, :tagged])
 
-    blogit_cacher(:index, :show, :tagged)
-    blogit_sweeper(:create, :update, :destroy)
-
     def index
       respond_to do |format|
         format.xml {
-          @posts = Post.order('created_at DESC')
+          @posts = Post.active.order('created_at DESC')
         }
         format.html {
-          @posts = Post.for_index(params[:page])
+          @posts = if is_blogger_logged_in?
+                    Post.for_index(params[Kaminari.config.param_name])
+                  else
+                    Post.active.for_index(params[Kaminari.config.param_name])
+                  end
         }
         format.rss {
-          @posts = Post.order('created_at DESC')
+          @posts = Post.active.order('created_at DESC')
         }
       end
     end
@@ -41,12 +44,13 @@ module Blogit
     end
 
     def tagged
-      @posts = Post.for_index(params[:page]).tagged_with(params[:tag])
+      param_name = params[Kaminari.config.param_name]
+      @posts = Post.for_index(param_name).tagged_with(params[:tag])
       render :index
     end
 
     def new
-      @post = current_blogger.blog_posts.new(params[:post])
+      @post = current_blogger.blog_posts.new(post_paramters)
     end
 
     def edit
@@ -54,7 +58,7 @@ module Blogit
     end
 
     def create
-      @post = current_blogger.blog_posts.new(params[:post])
+      @post = current_blogger.blog_posts.new(post_paramters)
       if @post.save
         redirect_to @post, notice: t(:blog_post_was_successfully_created, scope: 'blogit.posts')
       else
@@ -64,8 +68,9 @@ module Blogit
 
     def update
       @post = current_blogger.blog_posts.find(params[:id])
-      if @post.update_attributes(params[:post])
-        redirect_to @post, notice: t(:blog_post_was_successfully_updated, scope: 'blogit.posts')
+      if @post.update_attributes(post_paramters)
+        redirect_to @post, notice: t(:blog_post_was_successfully_updated, 
+          scope: 'blogit.posts')
       else
         render action: "edit"
       end
@@ -77,14 +82,22 @@ module Blogit
       redirect_to posts_url, notice: t(:blog_post_was_successfully_destroyed, scope: 'blogit.posts')
     end
 
+    def post_paramters
+      if params[:post]
+        params.require(:post).permit(:title, :body, :tag_list, :state)
+      else
+        {}
+      end
+    end
+
     private
 
     def raise_404
       # Don't include admin actions if include_admin_actions is false
       render file: "#{Rails.root}/public/404.html", status: :not_found, layout: false
     end
-    
-    
+
+
     # @See the Pingr gem for more info https://github.com/KatanaCode/pingr
     def ping_search_engines
       case blogit_conf.ping_search_engines
@@ -100,4 +113,4 @@ module Blogit
 
   end
 
-end
+end

data/app/helpers/blogit/posts_helper.rb

@@ -31,7 +31,7 @@ module Blogit
         posts_by_month.each do |month, posts|
           result << "<li><a data-blogit-click-to-toggle-children>#{CGI.escape_html(month)}</a><ul class=\"#{post_css}\">"
           posts.each do |post|
-            result << "<li>#{yield post}</li>"
+            result << "<li>#{link_to(post.title, blogit.post_path(post))}</li>"
           end
           result << "</ul></li>"
         end

data/app/models/blogit/comment.rb

@@ -1,66 +1,62 @@
 module Blogit
   class Comment < ActiveRecord::Base
-    
+
     # require custom validators
     require "validators"
     include Validators
-    
-    self.table_name = "blog_comments"
-    
+
     # ================
     # = Associations =
     # ================
-    
-    belongs_to :post, class_name: "Blogit::Post", 
+
+    belongs_to :post, class_name: "Blogit::Post",
       foreign_key: "post_id", counter_cache: true, touch: true
-    
+
     # TODO: Check if this is optimal
-    URL_REGEX   = /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix
+    URL_REGEX   = /\A(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?\Z/ix
 
-    # TODO: Check if this is optimal    
-    EMAIL_REGEX = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
-    
-    # ============
+    # TODO: Check if this is optimal
+    EMAIL_REGEX = /\A[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\Z/i
+
+    # =============
     # = Callbacks =
-    # ============
-    
+    # =============
+
     before_validation :format_website
-    
+
     # ==============
     # = Attributes =
     # ==============
-    
-    attr_accessible :name, :nickname, :email, :body, :website
-    
+
     # nickname acts as a "honeypot" to catch spam
-    # the form field should be hidden using CSS and so 
+    # the form field should be hidden using CSS and so
     # if present, must be spam.
-    # 
+    #
     # @attribute
     attr_accessor :nickname
-    
-    
+
+
     # ===============
     # = Validations =
     # ===============
 
     # nickname acts as a "honeypot" to catch spam
-    # the form field should be hidden using CSS and so 
+    # the form field should be hidden using CSS and so
     # if present, must be spam.
     validates :nickname, absence: true
     validates :name, presence: true
     validates :email, presence: true, format: {with: EMAIL_REGEX, allow_blank: true }
     validates :body, presence: true, length: { minimum: 4, allow_blank: true}
     validates :website, format: {with: URL_REGEX, allow_blank: true}
-        
+
   private
-    
+
     # Prepend http to the url before the validation check
     def format_website
       if self.website.present? and self.website !~ /^http/i
         self.website = "http://#{self.website}"
       end
     end
-    
+
   end
-end
+end

data/app/models/blogit/post.rb

@@ -1,25 +1,17 @@
 module Blogit
   class Post < ActiveRecord::Base
 
-    require "acts-as-taggable-on"
+    require 'acts-as-taggable-on'
     require "kaminari"
 
     include ::ActionView::Helpers::TextHelper
 
     acts_as_taggable
 
-    self.table_name = "blog_posts"
-
     self.paginates_per Blogit.configuration.posts_per_page
 
-    # ==============
-    # = Attributes =
-    # ==============
-    attr_accessible :title, :body, :tag_list, :blogger_type, :blogger_id
+    AVAILABLE_STATUS = (Blogit.configuration.hidden_states + Blogit.configuration.active_states)
 
-    def short_body
-      truncate(body, length: 400, separator: "\n")
-    end
 
     # ===============
     # = Validations =
@@ -28,24 +20,16 @@ module Blogit
     validates :title, presence: true, length: { minimum: 10, maximum: 66 }
     validates :body,  presence: true, length: { minimum: 10 }
     validates :blogger_id, presence: true
+    validates :state, presence: true
 
-    # =================
-    # = Assosciations =
-    # =================
+    # ================
+    # = Associations =
+    # ================
 
     belongs_to :blogger, :polymorphic => true
 
     has_many :comments, :class_name => "Blogit::Comment"
 
-    def comments
-      check_comments_config
-      super()
-    end
-    def comments=(value)
-      check_comments_config
-      super(value)
-    end
-
     # ==========
     # = Scopes =
     # ==========
@@ -53,6 +37,7 @@ module Blogit
     # Returns the blog posts paginated for the index page
     # @scope class
     scope :for_index, lambda { |page_no = 1| order("created_at DESC").page(page_no) }
+    scope :active, lambda { where(state:  Blogit.configuration.active_states ) }
 
     # ====================
     # = Instance Methods =
@@ -61,6 +46,21 @@ module Blogit
     def to_param
       "#{id}-#{title.parameterize}"
     end
+    
+    def short_body
+      truncate(body, length: 400, separator: "\n")
+    end
+    
+    def comments
+      check_comments_config
+      super()
+    end
+    
+    def comments=(value)
+      check_comments_config
+      super(value)
+    end
+    
 
     # If there's a current blogger and the display name method is set, returns the blogger's display name
     # Otherwise, returns an empty string
@@ -80,5 +80,6 @@ module Blogit
     def check_comments_config
       raise RuntimeError.new("Posts only allow active record comments (check blogit configuration)") unless Blogit.configuration.include_comments == :active_record
     end
+    
   end
-end
+end

data/app/views/blogit/comments/_admin_links.html.erb

@@ -1,3 +1,3 @@
 <%= login_required(class: "actions") do %>
-  <%= link_to(t(:delete, scope: 'blogit.comments'), [@post, comment], method: :delete, confirm: t(:are_you_sure_you_want_to_remove_this_comment, scope: 'blogit.comments')) %>
-<% end %>
+  <%= link_to(t(:delete, scope: 'blogit.comments'), [@post, comment], method: :delete, data: { confirm: t(:are_you_sure_you_want_to_remove_this_comment, scope: 'blogit.comments') }) %>
+<% end %>

data/app/views/blogit/comments/create.js.erb

@@ -3,5 +3,5 @@ var $form = $("form#new_blog_comment");
   $("#comments").append("<%= escape_javascript(render(@comment)) %>");
   $form.get(0).reset();
 <% else %>
-  $form.html("<%= escape_javascript(render('form')) %>");
-<% end %>
+  $form.html("<%= escape_javascript(render(partial:'form', locals: { post: @comment.post, comment: @comment })) %>");
+<% end %>

data/app/views/blogit/posts/_empty.html.erb

@@ -1,3 +0,0 @@
-<div class="blogit_empty_message">
-  <%=t :there_are_no_posts_about, scope: 'blogit.posts', tag: params[:tag] %>
-</div>

data/app/views/blogit/posts/_form.html.erb

@@ -20,6 +20,11 @@
     <%= field do %>
       <%= f.text_area :body, placeholder: t(:write_something_here, scope: 'blogit.posts') %>
     <% end %>
+
+    <p class="blog_post_tip">
+      <%=t :tip_you_can_style_your_post_using, scope: 'blogit.posts', parser: blogit_conf.default_parser %>
+    </p>
+
   </fieldset>
 
   <fieldset>
@@ -29,9 +34,10 @@
       <%= f.text_field :tag_list, placeholder: t(:tag_placeholder, scope: 'blogit.posts') %>
     <% end %>
 
-    <p class="blog_post_tip">
-      <%=t :tip_you_can_style_your_post_using, scope: 'blogit.posts', parser: blogit_conf.default_parser %>
-    </p>
+    <%= field id: "new_blog_post_state_field" do %>
+      <%= f.label :state, t(:state, scope: 'blogit.posts') %>
+      <%= f.collection_select(:state, Blogit::Post::AVAILABLE_STATUS, :to_s, :to_s) %>
+    <% end %>
 
   </fieldset>
 

data/app/views/blogit/posts/_post_links.html.erb

@@ -1,5 +1,6 @@
 <%= login_required do  %>
   <%= actions do %>
-    <%= link_to(t(:edit, scope: 'blogit.posts'), edit_post_path(post)) %> | <%= link_to(t(:delete, scope: 'blogit.posts'), post, method: :delete, confirm: t(:are_you_sure_you_want_to_remove_this_post, scope: 'blogit.posts')) %>
+    <%= link_to(t(:edit, scope: 'blogit.posts'), edit_post_path(post)) %> | <%= link_to(t(:delete, scope: 'blogit.posts'), post,
+      method: :delete, data: { confirm: t(:are_you_sure_you_want_to_remove_this_post, scope: 'blogit.posts')}) %>
   <% end %>
-<% end unless blogit_conf.author_edits_only and not this_blogger?(post) %>
+<% end unless blogit_conf.author_edits_only and not this_blogger?(post) %>

data/app/views/blogit/posts/_related.html.erb

@@ -15,4 +15,4 @@
       <% end %>
     </ul>
   </div>
-</div>
+</div>

data/config/locales/de.yml

@@ -0,0 +1,50 @@
+# encoding: utf-8
+de:
+  blogit:
+    comments:
+      leave_a_comment: "Schreibe einen Kommentar"
+      name: "Name *"
+      email_never_displayed: "E-Mail * (nicht öffentlich)"
+      your_website: "Deine Webseite"
+      your_comment: "Dein Kommentar *"
+      add_comment: "Kommentar hinzufügen"
+      adding_comment: "Kommentar wird hinzugefügt..."
+      wrote: "schrieb:"
+      posted_on: "Geschrieben am"
+      delete: "löschen"
+      are_you_sure_you_want_to_remove_this_comment: "Bist Du sicher, dass Du den Kommentar löschen möchtest?"
+      successfully_added_comment: "Kommentar wurde hinzugefügt!"
+      successfully_removed_comment: "Kommentar wurde gelöscht."
+    posts:
+      written_by: "Verfasst von %{author} am"
+      there_are_no_posts_about: "Es gibt leider keine Beiträge zum Thema \"%{tag}\"."
+      prohibited_this_post_from_being_saved:
+        one: "Der Beitrag konnte nicht gespeichert werden, da ein Fehler aufgetreten ist:"
+        other: "Der Beitrag konnte nicht gespeichert werden, da %{count} Fehler aufgetreten sind:"
+      give_your_post_a_title: "Gib dem Beitrag einen Titel"
+      write_something_here: "Schreibe den Text hier..."
+      tags: "Kategorien"
+      tag_placeholder: "Kategorie eins, Kategorie zwei, usw."
+      tip_you_can_style_your_post_using: "Tipp: der Beitrag kann mit '%{parser}' formatiert werden"
+      or: "oder"
+      cancel: "abbrechen"
+      edit: "bearbeiten"
+      delete: "löschen"
+      are_you_sure_you_want_to_remove_this_post: "Bist Du sicher, dass Du den Beitrag löschen möchtest?"
+      comment:
+        one: "ein Kommentar"
+        other: "%{count} Kommentare"
+      edit_blog_post: "Beitrag #%{id} bearbeiten"
+      new_blog_post: "Neuer Beitrag"
+      write_a_new_blog_post: "Verfasse einen neuen Beitrag"
+      blog_post_was_successfully_created: "Beitrag wurde erfolgreich erstellt."
+      blog_post_was_successfully_updated: "Beitrag wurde erfolgreich aktualisiert."
+      blog_post_was_successfully_destroyed: "Beitrag wurde erfolgreich entfernt."
+      tags: "Kategorien"
+      related_posts: "Verwandte Beiträge"
+    share_bar:
+      facebook: "de_DE"
+
+  time:
+    formats:
+      plain_month_only: "%B"

data/config/locales/en.yml

@@ -16,14 +16,11 @@ en:
       successfully_removed_comment: "Successfully removed comment."
     posts:
       written_by: "Written by %{author} on"
-      there_are_no_posts_about: "Sorry, there are no posts about \"%{tag}\"."
       prohibited_this_post_from_being_saved:
         one: "One error prohibited this post form being saved:"
         other: "%{count} errors prohibited this post form being saved:"
       give_your_post_a_title: "Give your post a title"
       write_something_here: "Write something here..."
-      tags: "Tags"
-      tag_placeholder: "tag one, tag two, etc..."
       tip_you_can_style_your_post_using: "Tip: you can style your post using %{parser}"
       or: "or"
       cancel: "cancel"
@@ -39,12 +36,12 @@ en:
       blog_post_was_successfully_created: "Blog post was successfully created."
       blog_post_was_successfully_updated: "Blog post was successfully updated."
       blog_post_was_successfully_destroyed: "Blog post was successfully destroyed."
-      tags: "Tags"
       related_posts: "Related posts"
+      tag_placeholder: "Add tags to your post"
+      
     share_bar:
       facebook: "en_US"
 
   time:
     formats:
       plain_month_only: "%B"
-

data/config/locales/fr.yml

@@ -16,14 +16,11 @@ fr:
       successfully_removed_comment: "Commentaire supprimé avec succès."
     posts:
       written_by: "Ecrit par %{author} le"
-      there_are_no_posts_about: "Désolé, il n'y a pas d'article à propos de \"%{tag}\"."
       prohibited_this_post_from_being_saved:
         one: "Une erreur a empêché cet article d'être enregistré :"
         other: "%{count} erreurs ont empêché cet article d'être enregistré :"
       give_your_post_a_title: "Donnez un nom à votre article"
       write_something_here: "Ecrivez quelque chose ici ..."
-      tags: "Libellés"
-      tag_placeholder: "Libellé 1, Libellé 2 ..."
       tip_you_can_style_your_post_using: "Astuce : vous pouvez styler votre article en utilisant %{parser}"
       or: "ou"
       cancel: "annuler"
@@ -40,7 +37,6 @@ fr:
       blog_post_was_successfully_created: "Article ajouté avec succès."
       blog_post_was_successfully_updated: "Article modifié avec succès."
       blog_post_was_successfully_destroyed: "Article supprimé avec succès."
-      tags: "Catégories"
       related_posts: "Articles similaires"
     share_bar:
       facebook: "fr_FR"

data/config/routes.rb

@@ -1,12 +1,12 @@
 Blogit::Engine.routes.draw do
 
   # Keep these above the posts resources block
-  match "posts/page/:page" => "posts#index"
-  match "posts/tagged/:tag" => 'posts#tagged', as: :tagged_blog_posts
+  get "posts/page/:page" => "posts#index"
+  get "posts/tagged/:tag" => 'posts#tagged', as: :tagged_blog_posts
 
   resources :posts do
     resources :comments, only: [:create, :destroy]
   end
 
-  match "/" => "posts#index", as: :blog_root
+  get "/" => "posts#index", as: :blog_root
 end

data/db/migrate/20110814091434_create_blogit_posts.rb

@@ -0,0 +1,15 @@
+class CreateBlogitPosts < ActiveRecord::Migration
+  def change
+    create_table :blogit_posts do |t|
+      t.with_options(null: false) do |r|
+        r.string :title
+        r.text :body
+        r.string :state, default: Blogit::configuration.hidden_states.first.to_s
+        r.integer :comments_count, default: 0
+      end
+      t.references :blogger, polymorphic: true
+      t.timestamps
+    end
+    add_index :blogit_posts, [:blogger_type, :blogger_id]
+  end
+end

data/db/migrate/{20110814093229_create_blog_comments.rb → 20110814093229_create_blogit_comments.rb}

@@ -1,6 +1,6 @@
-class CreateBlogComments < ActiveRecord::Migration
+class CreateBlogitComments < ActiveRecord::Migration
   def change
-    create_table :blog_comments do |t|
+    create_table :blogit_comments do |t|
       t.string :name, null: false
       t.string :email, null: false
       t.string :website
@@ -10,6 +10,6 @@ class CreateBlogComments < ActiveRecord::Migration
 
       t.timestamps
     end
-    add_index :blog_comments, :post_id
+    add_index :blogit_comments, :post_id
   end
 end