crowdblog 0.2.0 → 0.3.0

data/.gitignore

@@ -13,3 +13,5 @@ spec/dummy/.sass-cache
 
 Gemfile.lock
 tmp
+
+.idea/

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 YOURNAME
+Copyright 2012 Crowd Interactive
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/assets/javascripts/crowdblog/models/post.js.coffee

@@ -0,0 +1,28 @@
+class Crowdblog.Models.Post extends Backbone.Model
+  paramRoot: 'post'
+
+  url: ->
+    Crowdblog.adminPostsPath + '/' + @id
+
+  publish: ->
+    @performTransition 'publish', =>
+      @trigger 'post-published'
+
+  finish: ->
+    @performTransition 'finish', =>
+      @trigger 'post-finished'
+
+  review: ->
+    @performTransition 'review', =>
+      @trigger 'post-reviewed'
+
+  draft: ->
+    @performTransition 'draft', =>
+      @trigger 'post-drafted'
+
+  performTransition: (transition, success)->
+    $.ajax
+      type: 'POST'
+      url:  "/admin/posts/#{@id}/#{transition}"
+      dataType: 'json'
+      success: success

data/app/assets/javascripts/crowdblog/views/post_view.js.coffee

@@ -1,52 +1,87 @@
 class Crowdblog.Views.PostView extends Backbone.View
   events:
-    'click a.publish' : 'publishPost'
-    'click a.review' : 'markForReview'
+    'click .publish': 'publish'
+    'click .finish' : 'finish'
+    'click .review' : 'review'
+    'click .draft'  : 'draft'
 
   initialize: ->
-    @model = new Crowdblog.Models.Post
-      ready_for_review: (@$el.attr('data-ready-for-review') == 'true')
+    @model                  = new Crowdblog.Models.Post
+    @model.id               = @postId()
+    @publishIndicator       = @$el.find '.publish-status'
+    @observePost()
+    @model.trigger "post-#{@initialState()}"
 
-    @model.id = @postId()
-    @model.bind('change:ready_for_review', @paintReviewButton)
-
-  publishPost: (e) ->
-    e.preventDefault()
-    if @postIsPublished()
-      @model.save 'transition', 'draft', { success: @paintPostRow }
-    else
-      @model.save 'transition', 'publish', { success: @paintPostRow }
+  observePost: ->
+    @model.on 'post-published', @markPublished, @
+    @model.on 'post-finished',  @markFinished,  @
+    @model.on 'post-reviewed',  @markReviewed,  @
+    @model.on 'post-drafted',   @markDrafted,   @
 
   postId: ->
-    @$el.attr('data-post-id')
-
-  paintPostRow: =>
-    if @model.get('transition') == 'publish'
-      @$el.find('a.publish').removeClass('btn-danger')
-      @$el.find('a.publish').addClass('btn-success')
-      @$el.attr('data-state', 'published')
-    else
-      @$el.find('a.publish').removeClass('btn-success')
-      @$el.find('a.publish').addClass('btn-danger')
-      @$el.attr('data-state', 'drafted')
-
-    @$el.find('td.published-at').html(@model.get('published_at'))
-
-  postIsPublished: ->
-    @$el.attr('data-state') == 'published'
-
-  markForReview: (e) ->
-    e.preventDefault()
-    ready_for_review = @model.get('ready_for_review')
-    if ready_for_review
-      ready_for_review = false
-    else
-      ready_for_review = true
-
-    @model.save 'ready_for_review', ready_for_review
-
-  paintReviewButton: (post) =>
-    if post.get('ready_for_review')
-      @$el.find('a.review').addClass('btn-warning')
-    else
-      @$el.find('a.review').removeClass('btn-warning')
+    @$el.data 'post-id'
+
+  initialState: ->
+    @$el.data 'state'
+
+  publish: (e)->
+    @model.publish()
+
+  finish: (e)->
+    @model.finish()
+
+  review: (e)->
+    @model.review()
+
+  draft: (e) ->
+    @model.draft()
+
+  markPublished: ->
+    publish_button = @$el.find '.publish-btn'
+    review_button  = @$el.find '.states .review'
+    publish_button.addClass    'btn-success'
+    publish_button.removeClass 'btn-danger'
+    publish_button.addClass    'draft'
+    publish_button.removeClass 'publish'
+    @setAsActive review_button
+    @setPublishIndicator 'published'
+
+  markFinished: ->
+    button = @$el.find '.states .finish'
+    @setAsActive button
+    @setPublishIndicator 'not_published'
+
+  markReviewed: ->
+    button = @$el.find '.states .review'
+    @setAsActive button
+    @setPublishIndicator 'reviewed'
+
+  markDrafted: ->
+    publish_button = @$el.find '.publish-btn'
+    button         = @$el.find '.states .draft'
+    publish_button.addClass    'btn-danger'
+    publish_button.removeClass 'btn-success'
+    publish_button.addClass    'publish'
+    publish_button.removeClass 'draft'
+    @setAsActive button
+    @setPublishIndicator 'not_published'
+
+  setAsActive: (button)->
+    last_active = @$el.find '.states button'
+    last_active.removeClass 'active'
+    last_active.removeClass 'btn-primary'
+    button.addClass         'active btn-primary'
+
+  setPublishIndicator: (status)->
+    @publishIndicator.removeClass  'btn-warning btn-success btn-danger'
+    switch status
+      when 'reviewed'
+        @publishIndicator.addClass 'btn-warning'
+        @publishIndicator.html     'Reviewed'
+      when 'published'
+        @publishIndicator.addClass 'btn-success'
+        @publishIndicator.html     'Published'
+      else
+        @publishIndicator.addClass 'btn-danger'
+        @publishIndicator.html      'Not Published'
+

data/app/controllers/crowdblog/admin/posts_controller.rb

@@ -51,8 +51,6 @@ module Crowdblog
           @post.save!
         end
 
-        @post.publish_if_allowed(post_params[:transition], current_user) if post_params[:transition]
-
         respond_with @post do |format|
           format.html { redirect_to crowdblog.admin_posts_path }
         end

data/app/controllers/crowdblog/admin/transitions_controller.rb

@@ -0,0 +1,21 @@
+module Crowdblog
+  module Admin
+    class TransitionsController < Crowdblog::Admin::BaseController
+      respond_to :json
+      before_filter :load_post, only: [:create]
+
+      def create
+        namespace = '_as_publisher' if current_user.is_publisher?
+        @post.send "#{params[:transition]}#{namespace}"
+        respond_with @post, location: admin_post_url(@post)
+      end
+
+      private
+
+      def load_post
+        post  = Post.scoped_for(current_user).find(params[:id])
+        @post = PostPresenter.new(post, current_user)
+      end
+    end
+  end
+end

data/app/controllers/crowdblog/application_controller.rb

@@ -1,5 +1,5 @@
 module Crowdblog
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ::ApplicationController
     def method_missing(method_name)
       if method_name == :current_user
         Rails.logger.warn("current_user in Crowdblog::ApplicationController should be overriden")

data/app/models/crowdblog/post.rb

@@ -1,7 +1,7 @@
 module  Crowdblog
   class Post < ActiveRecord::Base
-    belongs_to :author, class_name: 'User'
-    belongs_to :publisher, class_name: 'User'
+    belongs_to :author, :class_name => Crowdblog.author_user_class_name
+    belongs_to :publisher, :class_name => Crowdblog.publisher_user_class_name
     has_many :assets
 
     delegate :name, to: :author, prefix: true, allow_nil: true
@@ -17,10 +17,26 @@ module  Crowdblog
 
     state_machine initial: :drafted do
       state :drafted
+      state :finished
+      state :reviewed
+      state :published
+
+      event :finish do
+        transition drafted: :finished
+      end
+
+      event :draft do
+        transition finished: :drafted
+      end
+    end
+
+    state_machine :publisher, attribute: :state, initial: :drafted, namespace: :as_publisher do
+      state :drafted
+      state :finished
+      state :reviewed
       state :published
 
       before_transition on: :publish do |post, transition|
-        #post.update_attribute(:published_at, Time.now)
         post.published_at ||= Time.now
       end
 
@@ -32,8 +48,16 @@ module  Crowdblog
         transition published: :drafted
       end
 
+      event :finish do
+        transition drafted: :finished
+      end
+
+      event :review do
+        transition finished: :reviewed
+      end
+
       event :publish do
-        transition drafted: :published
+        transition all => :published
       end
     end
 

data/app/models/crowdblog/user.rb

@@ -1,30 +1,24 @@
 module Crowdblog
-  class User
-    attr_accessor :email
-    attr_accessor :name
-    attr_accessor :id
+  class User < ActiveRecord::Base
+    has_many :authored_posts, inverse_of: :author,
+        foreign_key: 'author_id', class_name: 'Post'
+    has_many :published_posts, inverse_of: :author,
+        foreign_key: 'author_id', class_name: 'Post',
+        conditions: ['state = ?', 'published'], order: 'published_at DESC'
+    has_one  :last_post, class_name: 'Post',
+        foreign_key: :author_id, conditions: ['state = ?', 'published'],
+        order: 'published_at DESC, created_at DESC, id DESC'
 
     def is_publisher?
       true
     end
 
-    def self.primary_key
-      "id"
+    def last_post_at
+      last_post.try(:published_at)
     end
 
-    def [](value)
-      []
-    end
-
-    def destroyed?
-      false
-    end
-
-    def new_record?
-      true
-    end
-
-    def save(*)
+    def last_published_at
+      published_posts.first ? published_posts.first.published_at : nil
     end
   end
 end

data/app/presenters/crowdblog/post_presenter.rb

@@ -0,0 +1,13 @@
+module Crowdblog
+  class PostPresenter < SimpleDelegator
+    def initialize(object, user)
+      @user = user
+      super(object)
+    end
+
+    def publish_as_publisher
+      self.publisher = @user
+      super
+    end
+  end
+end

data/app/views/crowdblog/admin/posts/_post.html.slim

@@ -4,9 +4,15 @@
   td.span2.published-at = post.published_at.try(:to_s, :crowdblog_short)
   td.span1
     - if current_user.is_publisher?
-      = link_to 'Publish', '#', :class => "btn btn-small publish #{(post.published? ? 'btn-success' : 'btn-danger')}"
+      = link_to 'Publish', '#', :class => "btn btn-small publish-btn btn-danger #{(post.published? ? 'draft' : 'publish')}"
   td.span1
-    = link_to 'Review', '#', :class => "btn btn-small review #{(post.ready_for_review ? 'btn-warning' : '')}"
+    .btn-group.states
+      button.btn.btn-small.draft Drafted
+      button.btn.btn-small.finish Finished
+      - if !current_user.is_publisher?
+        button.btn.btn-small.disabled.publish-status
+      - if current_user.is_publisher?
+        button.btn.btn-small.review Reviewed
   td.span1
     = link_to 'Delete', crowdblog.admin_post_path(post), :method => :delete, :confirm => 'Are you sure?', :class => "btn btn-small"
   td.span1

data/app/views/crowdblog/admin/posts/index.html.slim

@@ -17,8 +17,12 @@
     table.table.table-striped= render :partial => 'post', :collection => @posts
 
   - content_for :scripts do
-    coffee:
-      $ ->
-        $('tr.post').each (index, el) ->
-          new Crowdblog.Views.PostView
-            el: el
+    javascript:
+        $(function() {
+          return $('tr.post').each(function(index, el) {
+            Crowdblog.adminPostsPath = '#{crowdblog.admin_posts_path}';
+            return new Crowdblog.Views.PostView({
+              el: el
+            });
+          });
+        });

data/app/views/crowdblog/application/_navbar.html.slim

@@ -5,5 +5,4 @@
       ul.nav
         li.brand= current_user.email
         li= link_to 'Posts', crowdblog.admin_posts_path
-        li= link_to 'Authors', crowdblog.admin_authors_path
         li= link_to 'Sign out', '#'

data/app/views/layouts/crowdblog/admin/base.html.slim

@@ -7,6 +7,7 @@ html
     = javascript_include_tag "//code.jquery.com/jquery.min.js"
     = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.4.1/underscore-min.js"
     = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/backbone.js/0.9.2/backbone-min.js"
+    = javascript_include_tag "//netdna.bootstrapcdn.com/twitter-bootstrap/2.1.1/js/bootstrap.min.js"
     = javascript_include_tag :crowdblog
     meta name="viewport" content="width=device-width, initial-scale=1.0"
     = csrf_meta_tags

data/config/routes.rb

@@ -9,6 +9,11 @@ Crowdblog::Engine.routes.draw do
       :as => 'posts_by_state',
       :via => :get
 
+    match 'posts/:id/:transition', :to => 'transitions#create',
+      :constraints => { :transition => /(draft|finish|review|publish)/ },
+      :as => 'post_transitions',
+      :via => :post
+
     resources :posts do
       resources :assets
     end

data/crowdblog.gemspec

@@ -1,9 +1,7 @@
 $:.push File.expand_path('../lib', __FILE__)
 
-# Maintain your gem's version:
 require 'crowdblog/version'
 
-# Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = 'crowdblog'
   s.version     = Crowdblog::VERSION
@@ -20,8 +18,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rails', '~> 3.2'
 
-  # Added in the Gemfile, so they can be accessed in the dummy app
-  #   leave the dependencies here so our engine require those gems when added on base apps
   s.add_dependency 'carrierwave'
   s.add_dependency 'gravtastic'
   s.add_dependency 'jquery-rails'

data/db/migrate/20121016063750_create_crowdblog_users.rb

@@ -0,0 +1,8 @@
+class CreateCrowdblogUsers < ActiveRecord::Migration
+  def change
+    create_table :crowdblog_users do |t|
+      t.string :email
+      t.string :name
+    end
+  end
+end

data/lib/crowdblog.rb

@@ -9,3 +9,11 @@ require "state_machine"
 require "strong_parameters"
 
 require "generators/crowdblog/views_generator"
+
+module Crowdblog
+  @@author_user_class_name    = 'User'
+  @@publisher_user_class_name = 'User'
+
+  mattr_accessor :author_user_class_name
+  mattr_accessor :publisher_user_class_name
+end

data/lib/crowdblog/rspec/crowdblog_shared_examples.rb

@@ -1,4 +1,4 @@
-shared_examples_for "a crowdblog", :type => :integration do
+shared_examples_for "a crowdblog", :type => :feature do
 
   let(:post) do
     Crowdblog::Post.create :title => 'A post title', :body => 'A post body'
@@ -7,7 +7,7 @@ shared_examples_for "a crowdblog", :type => :integration do
   describe "Home" do
     it "shows published posts" do
       post.save!
-      post.publish
+      post.publish_as_publisher
 
       visit crowdblog.root_path
 
@@ -69,13 +69,14 @@ shared_examples_for "a crowdblog", :type => :integration do
             button = find_link 'Publish'
             button.click
 
-            page.should have_css 'a.btn-success'
+            page.should have_css '.publish-btn.btn-success'
+            page.should have_css '.review.active'
             post.reload.state.should eq 'published'
           end
         end
 
         it "draftes a post", :js => true do
-          post.publish!
+          post.publish_as_publisher!
 
           visit crowdblog.admin_posts_path
 
@@ -83,23 +84,37 @@ shared_examples_for "a crowdblog", :type => :integration do
             button = find_link 'Publish'
             button.click
 
-            page.should have_css 'a.btn-danger'
+            page.should have_css '.publish-btn.btn-danger'
+            page.should have_css '.draft.active'
             post.reload.state.should eq 'drafted'
           end
         end
 
-        it "marks the post for review", :js => true do
+        it "marks the post as reviewed", :js => true do
+          post.finish!
           visit crowdblog.admin_posts_path
 
           within "#post_#{post.id}" do
-            button = find_link 'Review'
+            button = find_button 'Reviewed'
             button.click
 
-            page.should have_css 'a.btn-warning'
-            post.reload.ready_for_review.should be_true
+            page.should have_css '.review.active'
+            post.reload.state.should eq 'reviewed'
           end
         end
-      end
+
+        it "marks the post as finished", :js => true do
+          visit crowdblog.admin_posts_path
+
+          within "#post_#{post.id}" do
+            button = find_button 'Finished'
+            button.click
+
+            page.should have_css '.finish.active'
+            post.reload.state.should eq 'finished'
+          end
+        end
+       end
     end
   end
 end

data/lib/crowdblog/version.rb

@@ -1,3 +1,3 @@
 module Crowdblog
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120219071614) do
+ActiveRecord::Schema.define(:version => 20121016063750) do
 
   create_table "crowdblog_assets", :force => true do |t|
     t.integer  "post_id"
@@ -34,4 +34,9 @@ ActiveRecord::Schema.define(:version => 20120219071614) do
     t.datetime "updated_at",           :null => false
   end
 
+  create_table "crowdblog_users", :force => true do |t|
+    t.string "email"
+    t.string "name"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crowdblog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -316,7 +316,6 @@ extra_rdoc_files: []
 files:
 - .autotest
 - .gitignore
-- .rbenv-version
 - .rspec
 - .rvmrc
 - .simplecov
@@ -327,7 +326,7 @@ files:
 - Rakefile
 - app/assets/images/crowdblog/.gitkeep
 - app/assets/javascripts/crowdblog.js
-- app/assets/javascripts/crowdblog/models/post.js.coffee.erb
+- app/assets/javascripts/crowdblog/models/post.js.coffee
 - app/assets/javascripts/crowdblog/views/attachment_view.js.coffee
 - app/assets/javascripts/crowdblog/views/post_form_view.js.coffee
 - app/assets/javascripts/crowdblog/views/post_view.js.coffee
@@ -335,18 +334,18 @@ files:
 - app/assets/stylesheets/crowdblog.css
 - app/assets/stylesheets/crowdblog/posts.css.scss
 - app/controllers/crowdblog/admin/assets_controller.rb
-- app/controllers/crowdblog/admin/authors_controller.rb
 - app/controllers/crowdblog/admin/base_controller.rb
 - app/controllers/crowdblog/admin/posts_controller.rb
+- app/controllers/crowdblog/admin/transitions_controller.rb
 - app/controllers/crowdblog/application_controller.rb
 - app/controllers/crowdblog/posts_controller.rb
 - app/helpers/crowdblog/application_helper.rb
 - app/models/crowdblog/asset.rb
 - app/models/crowdblog/post.rb
 - app/models/crowdblog/user.rb
+- app/presenters/crowdblog/post_presenter.rb
 - app/sweepers/post_sweeper.rb
 - app/uploaders/attachment_uploader.rb
-- app/views/crowdblog/admin/authors/index.html.slim
 - app/views/crowdblog/admin/posts/_form.html.slim
 - app/views/crowdblog/admin/posts/_post.html.slim
 - app/views/crowdblog/admin/posts/edit.html.slim
@@ -368,6 +367,7 @@ files:
 - crowdblog.gemspec
 - db/migrate/20120217213920_create_crowdblog_posts.rb
 - db/migrate/20120219071614_create_crowdblog_assets.rb
+- db/migrate/20121016063750_create_crowdblog_users.rb
 - lib/crowdblog.rb
 - lib/crowdblog/devise/failure_app.rb
 - lib/crowdblog/engine.rb
@@ -418,9 +418,9 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/features/crowdblog_spec.rb
 - spec/generators/crowdblog/views_generator_spec.rb
 - spec/helpers/application_helper_spec.rb
-- spec/integration/crowdblog_spec.rb
 - spec/models/post_spec.rb
 - spec/spec_helper.rb
 - vendor/assets/javascripts/backbone_rails_sync.js
@@ -442,7 +442,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4035348149856330059
+      hash: 4143603944779799739
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -451,7 +451,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4035348149856330059
+      hash: 4143603944779799739
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -498,8 +498,8 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/features/crowdblog_spec.rb
 - spec/generators/crowdblog/views_generator_spec.rb
 - spec/helpers/application_helper_spec.rb
-- spec/integration/crowdblog_spec.rb
 - spec/models/post_spec.rb
 - spec/spec_helper.rb

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p194

data/app/assets/javascripts/crowdblog/models/post.js.coffee.erb

@@ -1,8 +0,0 @@
-<% crowdblog = Crowdblog::Engine.routes.url_helpers %>
-
-class Crowdblog.Models.Post extends Backbone.Model
-  paramRoot: 'post'
-
-  url: ->
-    '<%= crowdblog.admin_posts_path %>/' + @id
-

data/app/controllers/crowdblog/admin/authors_controller.rb

@@ -1,11 +0,0 @@
-module  Crowdblog
-  module Admin
-    class AuthorsController < Crowdblog::Admin::BaseController
-
-      def index
-        @authors = User.includes(:published_posts).sort {|a,b| b.published_posts.size <=> a.published_posts.size}
-      end
-
-    end
-  end
-end

data/app/views/crowdblog/admin/authors/index.html.slim

@@ -1,18 +0,0 @@
-h1 Authors
-
-table.table.table-striped
-  thead
-    tr
-      th
-      th Name
-      th Email
-      th Posts
-      th Last Post
-  tbody
-    - @authors.each do |author|
-      tr
-        th= image_tag author.gravatar_url
-        td= author.name
-        td= author.email
-        td= author.published_posts.size
-        td= author.last_published_at