crowdblog 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    crowdblog (0.0.3)
+    crowdblog (0.0.4)
       backbone-rails
       carrierwave
       devise
@@ -87,6 +87,8 @@ GEM
       gherkin (~> 2.9.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
+    cucumber-ajaxer (0.0.4)
+      cucumber
     cucumber-rails (1.3.0)
       capybara (>= 1.1.2)
       cucumber (>= 1.1.8)
@@ -248,6 +250,7 @@ DEPENDENCIES
   carrierwave
   coffee-rails
   crowdblog!
+  cucumber-ajaxer
   cucumber-rails
   database_cleaner
   devise

data/app/controllers/crowdblog/controller.rb

@@ -1,7 +1,10 @@
 module Crowdblog
   class Controller < ActionController::Base
-    include Crowdblog::Devise::Auth
     layout 'crowdblog/crowdblog'
-    before_filter :authenticate!
+    before_filter :authorize!
+
+    def authorize!
+      redirect_to main_app.new_user_session_url unless current_user
+    end
   end
 end

data/app/models/crowdblog/user.rb

@@ -6,8 +6,6 @@ module  Crowdblog
     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'
 
-    devise :database_authenticatable, :token_authenticatable
-
     gravtastic :gravatar_email
 
 

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

@@ -21,6 +21,6 @@ html
                 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
+                li= link_to 'Sign out', main_app.destroy_user_session_path
 
     .container= yield

data/config/routes.rb

@@ -1,7 +1,5 @@
 Crowdblog::Engine.routes.draw do
 
-  devise_for :users, class_name: 'Crowdblog::User'
-
   resources :authors, only: :index
 
   resources :posts do

data/crowdblog.gemspec

@@ -7,8 +7,8 @@ require 'crowdblog/version'
 Gem::Specification.new do |s|
   s.name        = 'crowdblog'
   s.version     = Crowdblog::VERSION
-  s.authors     = ['Crowd Interactive', 'David Padilla','Chalo Fernandez']
-  s.email       = %w(opensource@crowdint.com david@crowdint.com chalofa@crowdint.com)
+  s.authors     = ['Crowd Interactive', 'David Padilla', 'Chalo Fernandez', 'Ignacio Galindo']
+  s.email       = %w(opensource@crowdint.com david@crowdint.com chalofa@crowdint.com ignacio@crowdint.com)
   s.homepage    = 'http://github.com/crowdint/crowdblog'
   s.summary     = 'CrowdBlog base functionality and backend'
   s.description = 'This mountable engine has the basic functionality to manage Posts'
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'state_machine'
 
   s.add_development_dependency 'capybara-webkit'
+  s.add_development_dependency 'cucumber-ajaxer'
   s.add_development_dependency 'cucumber-rails'
   s.add_development_dependency 'database_cleaner'
   s.add_development_dependency 'fabrication'

data/features/support/env.rb

@@ -11,6 +11,9 @@ ENV["RAILS_ROOT"] ||= File.dirname(__FILE__) + "../../../spec/dummy"
 
 require 'cucumber/rails'
 
+# Wait for AJAX calls in Scenarios with JS
+require 'cucumber/ajaxer'
+
 # Headless tests: http://bit.ly/xve9YJ
 require 'capybara/webkit'
 Capybara.javascript_driver = ENV['DEBUG'] ? :selenium : :webkit
@@ -71,17 +74,3 @@ module EngineRoutesHelper
   include Crowdblog::Engine.routes.url_helpers
 end
 World(EngineRoutesHelper)
-
-# Wait for AJAX requests when using @javascript tags: http://bit.ly/zige8p
-AfterStep('@javascript') do
-  begin
-    unless page.evaluate_script('typeof(jQuery)') == 'undefined' # only when JQuery is loaded
-      start_time = Time.now
-      until page.evaluate_script('jQuery.isReady&&jQuery.active==0') or (start_time + 5.seconds) < Time.now
-        page.evaluate_script('jQuery.isReady&&jQuery.active==0').class.should_not eql(String)
-        sleep 1
-      end
-    end
-  rescue
-  end
-end

data/lib/crowdblog/version.rb

@@ -1,3 +1,3 @@
 module Crowdblog
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,20 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  # Overwriting the sign_out redirect path method
+  def after_sign_in_path_for(resource_or_scope)
+    crowdblog_url
+  end
+
+  def authenticate!
+    # sign out the user if trying to sign another user
+    sign_out current_user if params['auth_token'] && current_user
+
+    # if no one signed in, use the default user
+    unless user_signed_in?
+      user = Crowdblog::User.find_by_email('foo@crowdint.com') || Crowdblog::User.create!(email: 'foo@crowdint.com', is_publisher: true)
+      sign_in user
+    end
+  end
+
 end

data/spec/dummy/app/controllers/home_controller.rb

@@ -0,0 +1,4 @@
+class HomeController < ApplicationController
+  def show
+  end
+end

data/spec/dummy/app/controllers/sessions_controller.rb

@@ -0,0 +1,2 @@
+class SessionsController < Devise::SessionsController
+end

data/spec/dummy/app/models/user.rb

@@ -9,4 +9,8 @@ class User < Crowdblog::User
 
   validate :email, uniqueness: true
 
+  def valid_password?(password)
+    true
+  end
+
 end

data/spec/dummy/app/views/home/show.html.slim

@@ -0,0 +1,4 @@
+h2 Your blog!
+
+= link_to 'Admin', crowdblog_path
+= link_to 'Sign in', new_user_session_path

data/spec/dummy/config/initializers/crowdblog.rb

@@ -1,24 +1,10 @@
 module Crowdblog::Devise
 
-  module Sessions
-    def destroy
-      sign_out current_user
-      redirect_to root_url
-    end
-  end
-
-  module Auth
-    def authenticate!
-      # sign out the user if trying to sign another user
-      sign_out current_user if params['auth_token'] && current_user
-
-      # if no one signed in, use the default user
-      unless user_signed_in?
-        user = Crowdblog::User.find_by_email('foo@crowdint.com') || Crowdblog::User.create!(email: 'foo@crowdint.com', is_publisher: true)
-        sign_in user
-      end
-
-    end
-  end
+  #module Sessions
+  #  def destroy
+  #    sign_out current_user
+  #    redirect_to root_url
+  #  end
+  #end
 
 end

data/spec/dummy/config/routes.rb

@@ -1,7 +1,11 @@
 Rails.application.routes.draw do
 
+  resource :home, only: :show, controller: :home
+
   mount Crowdblog::Engine => '/admin'
 
-  root to: 'crowdblog/posts#index'
+  devise_for :users
+
+  root to: 'home#show'
 
 end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: crowdblog
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
 - Crowd Interactive
 - David Padilla
 - Chalo Fernandez
+- Ignacio Galindo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
+date: 2012-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70300394233940 !ruby/object:Gem::Requirement
+  requirement: &70203556776320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +24,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394233940
+  version_requirements: *70203556776320
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70300394233240 !ruby/object:Gem::Requirement
+  requirement: &70203556775900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394233240
+  version_requirements: *70203556775900
 - !ruby/object:Gem::Dependency
   name: backbone-rails
-  requirement: &70300394232620 !ruby/object:Gem::Requirement
+  requirement: &70203556775440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394232620
+  version_requirements: *70203556775440
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70300394231960 !ruby/object:Gem::Requirement
+  requirement: &70203556775020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394231960
+  version_requirements: *70203556775020
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70300394246940 !ruby/object:Gem::Requirement
+  requirement: &70203556774600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +68,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394246940
+  version_requirements: *70203556774600
 - !ruby/object:Gem::Dependency
   name: eco
-  requirement: &70300394245540 !ruby/object:Gem::Requirement
+  requirement: &70203556774180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +79,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394245540
+  version_requirements: *70203556774180
 - !ruby/object:Gem::Dependency
   name: gravtastic
-  requirement: &70300394244900 !ruby/object:Gem::Requirement
+  requirement: &70203556773760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +90,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394244900
+  version_requirements: *70203556773760
 - !ruby/object:Gem::Dependency
   name: less-rails-bootstrap
-  requirement: &70300394244460 !ruby/object:Gem::Requirement
+  requirement: &70203556773340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +101,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394244460
+  version_requirements: *70203556773340
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70300394243940 !ruby/object:Gem::Requirement
+  requirement: &70203556772920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +112,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394243940
+  version_requirements: *70203556772920
 - !ruby/object:Gem::Dependency
   name: slim_assets
-  requirement: &70300394243340 !ruby/object:Gem::Requirement
+  requirement: &70203556772500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +123,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394243340
+  version_requirements: *70203556772500
 - !ruby/object:Gem::Dependency
   name: slim-rails
-  requirement: &70300394242760 !ruby/object:Gem::Requirement
+  requirement: &70203556772080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +134,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394242760
+  version_requirements: *70203556772080
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70300394242300 !ruby/object:Gem::Requirement
+  requirement: &70203556771660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +145,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70300394242300
+  version_requirements: *70203556771660
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &70300394241840 !ruby/object:Gem::Requirement
+  requirement: &70203556771220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +156,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300394241840
+  version_requirements: *70203556771220
+- !ruby/object:Gem::Dependency
+  name: cucumber-ajaxer
+  requirement: &70203556770800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70203556770800
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &70300394241340 !ruby/object:Gem::Requirement
+  requirement: &70203556770380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +178,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300394241340
+  version_requirements: *70203556770380
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70300394240800 !ruby/object:Gem::Requirement
+  requirement: &70203556769960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +189,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300394240800
+  version_requirements: *70203556769960
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &70300394239760 !ruby/object:Gem::Requirement
+  requirement: &70203556769540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +200,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300394239760
+  version_requirements: *70203556769540
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70300402835620 !ruby/object:Gem::Requirement
+  requirement: &70203556769120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,10 +211,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300402835620
+  version_requirements: *70203556769120
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70300402832520 !ruby/object:Gem::Requirement
+  requirement: &70203556768700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -210,10 +222,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300402832520
+  version_requirements: *70203556768700
 - !ruby/object:Gem::Dependency
   name: fuubar-cucumber
-  requirement: &70300402829060 !ruby/object:Gem::Requirement
+  requirement: &70203556768280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -221,10 +233,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300402829060
+  version_requirements: *70203556768280
 - !ruby/object:Gem::Dependency
   name: headless
-  requirement: &70300402589760 !ruby/object:Gem::Requirement
+  requirement: &70203556767860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -232,10 +244,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300402589760
+  version_requirements: *70203556767860
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70300402588340 !ruby/object:Gem::Requirement
+  requirement: &70203556767440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -243,10 +255,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300402588340
+  version_requirements: *70203556767440
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70300402586420 !ruby/object:Gem::Requirement
+  requirement: &70203556767020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -254,10 +266,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300402586420
+  version_requirements: *70203556767020
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov-text
-  requirement: &70300402585500 !ruby/object:Gem::Requirement
+  requirement: &70203556766600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -265,10 +277,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300402585500
+  version_requirements: *70203556766600
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70300402584160 !ruby/object:Gem::Requirement
+  requirement: &70203556766180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -276,12 +288,13 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70300402584160
+  version_requirements: *70203556766180
 description: This mountable engine has the basic functionality to manage Posts
 email:
 - opensource@crowdint.com
 - david@crowdint.com
 - chalofa@crowdint.com
+- ignacio@crowdint.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -316,7 +329,6 @@ files:
 - app/controllers/crowdblog/authors_controller.rb
 - app/controllers/crowdblog/controller.rb
 - app/controllers/crowdblog/posts_controller.rb
-- app/controllers/crowdblog/sessions_controller.rb
 - app/helpers/crowdblog/application_helper.rb
 - app/models/crowdblog/asset.rb
 - app/models/crowdblog/post.rb
@@ -356,11 +368,15 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/admin_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/home_controller.rb
+- spec/dummy/app/controllers/sessions_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/user.rb
+- spec/dummy/app/views/home/show.html.slim
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -413,7 +429,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3191860748385203932
+      hash: 1045675916197906458
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -422,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3191860748385203932
+      hash: 1045675916197906458
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -442,11 +458,15 @@ test_files:
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/admin_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/home_controller.rb
+- spec/dummy/app/controllers/sessions_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/user.rb
+- spec/dummy/app/views/home/show.html.slim
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb

data/app/controllers/crowdblog/sessions_controller.rb

@@ -1,5 +0,0 @@
-module  Crowdblog
-  class SessionsController < Controller
-    include Crowdblog::Devise::Sessions
-  end
-end