crowdblog 0.0.1 → 0.0.2

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - "bundle exec rake db:migrate > /dev/null 2>&1"
+  - "RAILS_ENV=test bundle exec rake db:migrate > /dev/null 2>&1"

data/Gemfile

@@ -12,8 +12,7 @@ gem 'carrierwave'
 gem 'devise'
 gem 'gravtastic'
 gem 'less-rails-bootstrap'
-gem 'omniauth-google-apps'
-gem 'omniauth-google-oauth2'
+gem 'redcarpet'
 gem 'state_machine'
 gem 'slim_assets'
 gem 'slim-rails'
@@ -25,6 +24,10 @@ group :assets do
   gem 'uglifier'
 end
 
+group :development, :test do
+  gem 'rake' # needed for Travis CI: http://bit.ly/xEgH8j
+end
+
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    crowdblog (0.0.1)
+    crowdblog (0.0.2)
       backbone-rails
       carrierwave
       devise
@@ -17,9 +17,8 @@ PATH
       gravtastic
       jquery-rails
       less-rails-bootstrap
-      omniauth-google-apps
-      omniauth-google-oauth2
       rails (~> 3.2)
+      redcarpet
       slim-rails
       slim_assets
       state_machine
@@ -54,7 +53,6 @@ GEM
     activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.7)
     arel (3.0.2)
     backbone-rails (0.9.0)
       rails (>= 3.0.0)
@@ -67,6 +65,9 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
+    capybara-webkit (0.10.0)
+      capybara (>= 1.0.0, < 1.2)
+      json
     carrierwave (0.5.8)
       activesupport (~> 3.0)
     childprocess (0.3.1)
@@ -105,19 +106,21 @@ GEM
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
-      multipart-post (~> 1.1)
-      rack (~> 1.1)
+    fabrication (1.3.1)
+    faker (1.0.1)
+      i18n (~> 0.4)
     ffi (1.0.11)
     fuubar (1.0.0)
       rspec (~> 2.0)
       rspec-instafail (~> 0.2.0)
       ruby-progressbar (~> 0.0.10)
+    fuubar-cucumber (0.0.15)
+      cucumber (>= 1.0.2)
+      ruby-progressbar (~> 0.0.10)
     gherkin (2.9.0)
       json (>= 1.4.6)
     gravtastic (3.2.6)
-    hashie (1.2.0)
+    headless (0.2.2)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.2)
@@ -141,35 +144,12 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.17.2)
     multi_json (1.1.0)
-    multipart-post (1.1.5)
     nokogiri (1.5.0)
-    oauth2 (0.5.2)
-      faraday (~> 0.7)
-      multi_json (~> 1.0)
-    omniauth (1.0.2)
-      hashie (~> 1.2)
-      rack
-    omniauth-google-apps (0.0.1)
-      omniauth (~> 1.0)
-      omniauth-openid (~> 1.0)
-      ruby-openid-apps-discovery (~> 1.2.0)
-    omniauth-google-oauth2 (0.1.9)
-      omniauth (~> 1.0)
-      omniauth-oauth2
-    omniauth-oauth2 (1.0.0)
-      oauth2 (~> 0.5.0)
-      omniauth (~> 1.0)
-    omniauth-openid (1.0.1)
-      omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
     orm_adapter (0.0.6)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
-    rack-openid (1.3.1)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
@@ -192,6 +172,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    redcarpet (2.1.0)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -206,9 +187,6 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    ruby-openid (2.1.8)
-    ruby-openid-apps-discovery (1.2.0)
-      ruby-openid (>= 2.1.7)
     ruby-progressbar (0.0.10)
     rubyzip (0.9.6.1)
     sass (3.1.15)
@@ -266,6 +244,7 @@ PLATFORMS
 
 DEPENDENCIES
   backbone-rails
+  capybara-webkit
   carrierwave
   coffee-rails
   crowdblog!
@@ -273,12 +252,16 @@ DEPENDENCIES
   database_cleaner
   devise
   eco
+  fabrication
+  faker
   fuubar
+  fuubar-cucumber
   gravtastic
+  headless
   jquery-rails
   less-rails-bootstrap
-  omniauth-google-apps
-  omniauth-google-oauth2
+  rake
+  redcarpet
   rspec-rails
   sass-rails
   simplecov

data/README.md

@@ -0,0 +1,7 @@
+CrowdBlog
+=======
+
+CI:
+[![Build Status](https://secure.travis-ci.org/crowdint/crowdblog.png?branch=master)](http://travis-ci.org/crowdint/crowdblog)
+
+**This project rocks!**

data/Rakefile

@@ -28,5 +28,8 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-# RSpec as default
-task :default => :spec
+# Alias for Cucumber
+task :cucumber => 'app:cucumber'
+
+# RSpec and Cucumber by default
+task :default => [:spec, :cucumber]

data/app/assets/javascripts/crowdblog/templates/posts/edit.jst.eco

@@ -1,4 +1,4 @@
-<h2><%= @isNew ? 'New' : 'Edit' %> Post</h2>
+<h2><%= if @isNew then 'New' else 'Edit' %> Post</h2>
 
 <form accept-charset="UTF-8" action="/" class="form-horizontal" method="post">
   <fieldset>

data/app/controllers/crowdblog/application_controller.rb

@@ -1,16 +1,6 @@
 module Crowdblog
   class ApplicationController < ActionController::Base
+    include Crowdblog::Devise::Auth
     before_filter :authenticate!
-
-    def authenticate!
-      unless user_signed_in?
-        current_user = User.find_by_email('foo@crowdint.com') || User.create!(email: 'foo@crowdint.com', is_publisher: true)
-        sign_in current_user
-      end
-
-      #TODO: fix OAuth
-      #redirect_to user_omniauth_authorize_path(:google_apps) unless current_user
-    end
-
   end
 end

data/app/controllers/crowdblog/sessions_controller.rb

@@ -1,25 +1,5 @@
 module  Crowdblog
   class SessionsController < ApplicationController
-
-    def authenticate_user
-      auth_hash = request.env['omniauth.auth']
-
-      if allowed?
-        Rails.logger.info auth_hash.info
-        email = auth_hash.info['email']
-        user = User.find_by_email(email)
-        user ||= User.create!(email: email, name: auth_hash.info['name'])
-        sign_in user
-
-        redirect_to root_url
-      else
-        render :text => '401 Unauthorized', :status => 401
-      end
-    end
-
-    def allowed?
-      true
-    end
-
+    include Crowdblog::Devise::Sessions
   end
 end

data/app/models/crowdblog/post.rb

@@ -28,59 +28,66 @@ module  Crowdblog
         post.published_at ||= Time.now
       end
 
-      event :publish do
-        transition drafted: :published
-      end
-
       event :draft do
         transition published: :drafted
       end
-    end
 
-    def self.all_posts_json
-      order('published_at desc, created_at desc').to_json only: [:id, :title, :state, :published_at],
-          methods: [:author_email, :published?]
+      event :publish do
+        transition drafted: :published
+      end
     end
 
-    def self.scoped_for(user)
-      user.is_publisher? ? Post : user.authored_posts
-    end
+    # CLASS METHODS
+    class << self
+      def all_posts_json
+        order_by_publish_date.to_json only: [:id, :title, :state, :published_at],
+                                      methods: [:author_email, :published?]
+      end
 
+      def last_published(number)
+        published_and_ordered.limit(number)
+      end
 
-    def self.all_for_feed
-      Post.published_and_ordered.limit(15)
-    end
+      def order_by_publish_date
+        order('published_at DESC, created_at DESC, id DESC')
+      end
 
-    def self.for_index
-      Post.published_and_ordered.limit(3)
-    end
+      def published
+        where(state: 'published')
+      end
 
-    def self.for_history
-      Post.published_and_ordered.limit(13)
-    end
+      def published_and_ordered
+        published.order_by_publish_date.includes(:author)
+      end
 
-    def self.published_and_ordered
-      Post.where(state: 'published').order('published_at DESC').includes(:author)
+      def scoped_for(user)
+        user.is_publisher? ? Post : user.authored_posts
+      end
     end
 
-    def regenerate_permalink
-      self.permalink = title.parameterize
-    end
+    # Must be after Class methods (otherwise a missing method error will raise)
+    scope :for_index,     last_published(3)
+    scope :for_history,   last_published(13)
+    scope :all_for_feed,  last_published(15)
+
 
+    # INSTANCE METHODS
     def allowed_to_update_permalink?
       !self.published?
     end
 
-    def formatted_published_date
-      published_at.strftime("%b %d, %Y")
+    def day
+      "%02d" % published_at.day
     end
 
-    def month
-      "%02d" % published_at.month
+    def formatted_published_date
+      published_at.strftime("%b %d, %Y")
     end
 
-    def day
-      "%02d" % published_at.day
+    def html_body
+      @@renderer ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML,
+                                             :autolink => true, :space_after_headers => true)
+      @@renderer.render(self.body).html_safe
     end
 
     def legacy(string, email)
@@ -93,6 +100,21 @@ module  Crowdblog
       self.update_attribute(:permalink, results[2])
     end
 
+    def month
+      "%02d" % published_at.month
+    end
+
+    def publish_if_allowed(transition, user)
+      if user.is_publisher?
+        self.publisher = user
+        self.send(transition)
+      end
+    end
+
+    def regenerate_permalink
+      self.permalink = title.parameterize
+    end
+
     #
     # Use this methods to generate the post url
     # always use with the splat
@@ -104,18 +126,5 @@ module  Crowdblog
     def url_params
       [self.year, self.month, self.day, self.permalink, 'html']
     end
-
-    def html_body
-      @@renderer ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML,
-          :autolink => true, :space_after_headers => true)
-      @@renderer.render(self.body).html_safe
-    end
-
-    def publish_if_allowed(transition, user)
-      if user.is_publisher?
-        self.publisher = user
-        self.send(transition)
-      end
-    end
   end
 end

data/app/models/crowdblog/user.rb

@@ -4,28 +4,24 @@ module  Crowdblog
     include Gravtastic
 
     has_many :authored_posts, inverse_of: :author, foreign_key: 'author_id', class_name: 'Post'
+    has_one  :last_post, class_name: 'Post', foreign_key: :author_id, conditions: ['state = ?', 'published'], order: 'published_at DESC, created_at DESC, id DESC'
 
-    # Include default devise modules. Others available are:
-    # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-    devise :database_authenticatable, :token_authenticatable, :trackable, :omniauthable
-
-    # Setup accessible (or protected) attributes for your model
-    attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :is_publisher
+    devise :database_authenticatable, :token_authenticatable
 
     gravtastic :gravatar_email
 
-    validate :email, uniqueness: true
-
-    def publisher!
-      update_attribute(:is_publisher, true)
-    end
 
+    # INSTANCE METHODS
     def gravatar_email
-      (gravatar_alias || email)
+      gravatar_alias || email
     end
 
     def last_post_at
-      authored_posts.published_and_ordered.first.try(:published_at)
+      last_post.try(:published_at)
+    end
+
+    def publisher!
+      update_attribute(:is_publisher, true)
     end
   end
 end

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

@@ -18,6 +18,7 @@ html
               = image_tag 'crowdblog/logo.png'
             .span3
               ul.nav
+                li.brand= current_user.email
                 li= link_to 'Posts', posts_path
                 li= link_to 'Authors', authors_path
                 li= link_to 'Sign out', destroy_user_session_path

data/config/cucumber.yml

@@ -1,8 +1,9 @@
 <%
+require 'fuubar-cucumber'
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --color --strict --tags ~@wip"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'fuubar'} --color --strict --tags ~@wip -r features/"
 %>
 default: <%= std_opts %> features
-wip: --color --tags @wip:3 --wip features
-rerun: <%= rerun_opts %> --color --format rerun --out rerun.txt --strict --tags ~@wip
+wip: --color -r features/ --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --color -r features/ --format rerun --out rerun.txt --strict --tags ~@wip

data/config/routes.rb

@@ -1,7 +1,6 @@
 Crowdblog::Engine.routes.draw do
 
-  devise_for :users, class_name: 'Crowdblog::User',
-             controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }
+  devise_for :users, class_name: 'Crowdblog::User'
 
   resources :authors, only: :index
 

data/crowdblog.gemspec

@@ -29,15 +29,19 @@ Gem::Specification.new do |s|
   s.add_dependency 'eco'
   s.add_dependency 'gravtastic'
   s.add_dependency 'less-rails-bootstrap'
-  s.add_dependency 'omniauth-google-apps'
-  s.add_dependency 'omniauth-google-oauth2'
+  s.add_dependency 'redcarpet'
   s.add_dependency 'slim_assets'
   s.add_dependency 'slim-rails'
   s.add_dependency 'state_machine'
 
+  s.add_development_dependency 'capybara-webkit'
   s.add_development_dependency 'cucumber-rails'
   s.add_development_dependency 'database_cleaner'
+  s.add_development_dependency 'fabrication'
+  s.add_development_dependency 'faker'
   s.add_development_dependency 'fuubar'
+  s.add_development_dependency 'fuubar-cucumber'
+  s.add_development_dependency 'headless'
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'simplecov-rcov-text'

data/features/posts/listing.feature

@@ -0,0 +1,16 @@
+@javascript
+Feature: Posts Listing
+  As a User
+  I should only see my own posts
+
+  Background:
+    Given the Test Post exists
+      And a Post from other User exists
+
+  Scenario: Show only User Posts
+    When I am signed in as Test User
+    Then I should only see my Posts
+
+  Scenario: Publishers can see all Posts
+    When I am signed in as Publisher User
+    Then I should see Posts for all Users

data/features/posts/manage.feature

@@ -0,0 +1,31 @@
+@javascript
+Feature: Manage Posts
+  As a User
+  I want to be able to manage Posts (CRUD)
+
+  Background:
+    Given the Test User exists
+      And the Test Post exists
+      And I am signed in as Test User
+
+  Scenario: New Post
+    Given I am on the New Post page
+    When I write a Post
+    Then I should see my New Post
+
+  Scenario: Edit Post
+    Given I am on the Edit Post page
+    When I edit the Test Post
+    Then I should see the Test Post changed
+
+  Scenario: Delete Posts
+    When I delete the Test Post
+    Then I should not see the Test Post
+
+  Scenario: Navigate to New Post
+    When I navigate to New Post
+    Then I should see the New Post page
+
+  Scenario: Navigate to Edit Post
+    When I navigate to Edit Post
+    Then I should see the Edit Post page

data/features/posts/publish.feature

@@ -0,0 +1,17 @@
+@javascript
+Feature: Posts Publication
+  As a Publisher
+  I want to be able to publish drafted Posts
+
+  Background:
+    Given the Test Post exists
+      And the Published Post exists
+      And I am signed in as Publisher User
+
+  Scenario: Publish a Post
+    When I Publish a drafted Post
+    Then I should see the Post as Published
+
+  Scenario: Un-Publish a Post
+    When I Draft a published Post
+    Then I should see the Post as Drafted

data/features/step_definitions/global_steps.rb

@@ -0,0 +1,19 @@
+Given /^(?:|I )am signed in as (Test|Publisher) User$/ do |user_type|
+  step "#{user_type} User exists"
+
+  @current_user.authentication_token.should be_present
+  visit crowdblog_path + "?auth_token=#{@current_user.authentication_token}"
+end
+
+Given /^(?:|the )Test User exists$/ do
+  @current_user = Crowdblog::User.find_by_email('test@crowdint.com')
+
+  @current_user = Fabricate(:user_test) unless @current_user
+end
+
+Given /^(?:|the )Publisher User exists$/ do
+  @current_user = Crowdblog::User.find_by_email('publisher@crowdint.com')
+
+  @current_user = Fabricate(:user_publisher) unless @current_user
+  @publisher_user = @current_user
+end

data/features/step_definitions/navigation_steps.rb

@@ -0,0 +1,45 @@
+#*****************
+#   GIVEN steps
+#-----------------
+Given /^(?:|I )(?:go to|am on) the posts page$/ do
+  visit posts_path
+end
+
+Given /^(?:|I )am on the Edit Post page$/ do
+  @post.should_not be_nil
+  visit posts_path + "#edit/#{@post.id}"
+end
+
+Given /^(?:|I )am on the New Post page$/ do
+  visit posts_path + '#new'
+end
+
+
+#*****************
+#   WHEN steps
+#-----------------
+When /^(?:|I )confirm the popup dialog$/ do
+  if Capybara.javascript_driver == :selenium
+    page.driver.browser.switch_to.alert.accept
+  else
+    page.execute_script 'window.confirm = function() { return true }'
+  end
+end
+
+When /^(?:|I )navigate to Edit Post$/ do
+  post = page.find('#posts table tr', text: 'This is a Test Post')
+
+  post.click_link 'Edit'
+end
+
+When /^(?:|I )navigate to New Post$/ do
+  click_link 'New Post'
+end
+
+
+#*****************
+#   THEN steps
+#-----------------
+#Then /^show me the page$/ do
+#  save_and_open_page
+#end