jabe 0.5.3 → 0.5.4

data/Gemfile

@@ -19,15 +19,14 @@ group :development, :test do
   gem 'cucumber'
   gem 'cucumber-rails'
   gem 'database_cleaner', '>= 0.6.0'
-  gem 'faker'
   gem 'jeweler'
   gem 'launchy'
   gem 'machinist', '>= 2.0.0.beta2'
-  gem 'mysql'
   gem 'pickle'
   gem 'rcov'
   gem 'redgreen'
   gem 'rspec-rails', '2.0.1'
   gem 'ruby-debug'
+  gem 'sqlite3-ruby'
   gem 'wirble'
 end

data/Gemfile.lock

@@ -69,8 +69,6 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faker (0.9.2)
-      i18n (~> 0.4)
     ffi (0.6.3)
       rake (>= 0.8.7)
     formtastic (1.2.3.beta)
@@ -79,9 +77,8 @@ GEM
       i18n (>= 0.4.0)
     friendly_id (3.1.8)
       babosa (~> 0.2.0)
-    gherkin (2.3.2)
+    gherkin (2.3.3)
       json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
     git (1.2.5)
     haml (3.0.25)
     haml-rails (0.3.4)
@@ -104,13 +101,12 @@ GEM
       rake (>= 0.8.1)
     linecache (0.43)
     machinist (2.0.0.beta2)
-    mail (2.2.12)
+    mail (2.2.13)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mysql (2.8.1)
     nokogiri (1.4.4)
     pickle (0.4.4)
       cucumber (>= 0.8)
@@ -157,12 +153,13 @@ GEM
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
     rubyzip (0.9.4)
-    sass (3.1.0.alpha.206)
+    sass (3.1.0.alpha.210)
     selenium-webdriver (0.1.2)
       childprocess (~> 0.1.5)
       ffi (~> 0.6.3)
       json_pure
       rubyzip
+    sqlite3-ruby (1.3.2)
     sys-uname (0.8.5)
     term-ansicolor (1.0.5)
     thor (0.14.6)
@@ -190,7 +187,6 @@ DEPENDENCIES
   cucumber-rails
   database_cleaner (>= 0.6.0)
   devise
-  faker
   formtastic (>= 1.2.3.beta)
   friendly_id (= 3.1.8)
   haml (>= 3.0.23)
@@ -199,7 +195,6 @@ DEPENDENCIES
   jquery-rails
   launchy
   machinist (>= 2.0.0.beta2)
-  mysql
   pickle
   rails (~> 3.0.3)
   rcov
@@ -207,5 +202,6 @@ DEPENDENCIES
   rspec-rails (= 2.0.1)
   ruby-debug
   sass (>= 3.1.0.alpha.206)
+  sqlite3-ruby
   will_paginate (>= 3.0.pre2)
   wirble

data/README.textile

@@ -12,28 +12,41 @@ h2. Basic TODOs
 h2. Installing
 
 Edit your Gemfile and add the required gems
-  gem 'rails', '~> 3.0.3'
-  gem 'devise'
-  gem 'friendly_id', '3.1.8'
-  gem 'formtastic', '>= 1.2.3.beta'
-  gem 'haml', '>= 3.0.23'
-  gem 'haml-rails'
-  gem 'jquery-rails'
-  gem 'RedCloth'
-  gem 'sass', '>= 3.1.0.alpha.206'
-  gem 'will_paginate', '>= 3.0.pre2'
+
+<pre><code>gem 'devise'
+gem 'friendly_id', '3.1.8'
+gem 'formtastic', '>= 1.2.3.beta'
+gem 'haml', '>= 3.0.23'
+gem 'haml-rails'
+gem 'jabe'
+gem 'jquery-rails'
+gem 'RedCloth'
+gem 'sass', '>= 3.1.0.alpha.206'
+gem 'will_paginate', '>= 3.0.pre2'
+</code></pre>
 
 From your rails root
 
-  * bundle install
-  * rails plugin install http://github.com/defunkt/acts_as_textiled.git
-  * rails g devise:install
-  * rails g jabe:migrations
-  * rake db:migrate
-  * rm app/views/layouts/*
-  * rm public/index.html
-  * rails c
-  * >> Admin.create!(:email => 'you@example.com', :password => 'password', :password_confirmation => 'password')
-  * rails s
-  * login
-  * edit settings
+<pre><code>bundle install
+rails plugin install http://github.com/defunkt/acts_as_textiled.git
+rails g devise:install
+rails g jabe:migrations
+rake db:migrate
+rm app/views/layouts/*
+rm public/index.html
+rails c
+>> Admin.create!(:email => 'you@example.com', :password => 'password', :password_confirmation => 'password')
+rails s
+login
+edit settings
+</code></pre>
+
+h2. Deploying on Heroku
+
+There are a couple changes you need to make to deploy on Heroku.
+
+  * In produciton.rb set <code>config.serve_static_assets = true</code>
+  * Add an initializer for Sass config/initializers/zz-sass.rb
+    <code>Sass::Plugin.options[:never_update] = true</code>
+  * Generate the stylesheets
+    <code>rails g jabe:stylesheets</code>

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/app/controllers/feed_controller.rb

@@ -0,0 +1,8 @@
+class FeedController < ApplicationController
+  def index
+    @entries = Entry.published.paginate(
+      :page => (params[:page] || 1),
+      :per_page => (SETTINGS.entries_per_page || 5)
+    )
+  end
+end

data/app/views/feed/index.xml.builder

@@ -0,0 +1,12 @@
+atom_feed do |feed|
+  feed.title(SETTINGS.site_name)
+
+  feed.updated @entries.first.try(:published_at)
+
+  @entries.each do |post|
+    feed.entry(post) do |entry|
+      entry.title h post.title
+      entry.body strip_tags post.body
+    end
+  end
+end

data/config/routes.rb

@@ -1,7 +1,10 @@
-Rails::Application.routes.draw do
+Rails.application.routes.draw do
 
   root :to => "entries#index"
 
+  match 'feed' => 'feed#index', :format => :xml, :as => 'feed'
+  match 'feed/atom.xml' => 'feed#index'
+
   resources :entries do
     resources :comments
   end

data/test/dummy/config/application.rb

@@ -41,5 +41,12 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    config.generators do |g|
+      g.template_engine :haml
+      g.test_framework :rspec, :fixture => false, :views => false, :view_specs => false
+      g.fixture_replacement :machinist
+    end
+
   end
 end

data/{features → test/dummy/features}/step_definitions/entry_steps.rb

@@ -2,6 +2,12 @@ Given /^a published entry$/ do
   Entry.make!(:published)
 end
 
+Given /^(\d+) entries$/ do |count|
+  count.to_i.times do
+    Entry.make!
+  end
+end
+
 Then /^the entry should be a draft$/ do
   entry = @entry || Entry.last
   entry.draft.should be_true
@@ -33,3 +39,16 @@ Then /^the entry should have (\d+) comments?$/ do |count|
   entry = @entry || Entry.last
   entry.comments.count.should eql(count.to_i)
 end
+
+Then /^I should see the entries in the feed$/ do
+  doc = Nokogiri::XML(page.body)
+  entries = doc.css('entry')
+
+  Entry.published.paginate(
+    :page => 1,
+    :per_page => (SETTINGS.entries_per_page || 5)
+  ).each_with_index do |entry, idx|
+    entries[idx].css('title').text.should eql(entry.title)
+    entries[idx].css('body').text.should eql(entry.body(:source))
+  end
+end

data/{features → test/dummy/features}/support/blueprints.rb

@@ -17,9 +17,10 @@ Settings.blueprint do
 end
 
 Entry.blueprint do
-  title { Faker::Lorem.words.to_s }
-  body { Faker::Lorem.paragraph }
+  title { 'My awesome blog entry' }
+  body { 'This is the body of my awesome blog entry' }
   published_at { Time.now }
+  draft { false }
 end
 
 Entry.blueprint(:published) do

data/{features → test/dummy/features}/support/paths.rb

@@ -14,6 +14,8 @@ module NavigationHelpers
       admin_root_path
     when 'the entry page'
       entry_path(Entry.last)
+    when 'the feed url'
+      feed_path
 
     # Add more mappings here.
     # Here is an example that pulls values out of the Regexp:

data/test/dummy/spec/support/blueprints.rb

@@ -0,0 +1,9 @@
+require 'machinist/active_record'
+
+# Add your blueprints here.
+#
+# e.g.
+#   Post.blueprint do
+#     title { "Post #{sn}" }
+#     body  { "Lorem ipsum..." }
+#   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jabe
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Michael Moen a.k.a. UnderpantsGnome
@@ -277,7 +277,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: faker
+  name: jeweler
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -291,7 +291,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: jeweler
+  name: launchy
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -305,38 +305,38 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: launchy
+  name: machinist
   version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: -1848230038
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        - beta2
+        version: 2.0.0.beta2
   requirement: *id020
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: machinist
+  name: pickle
   version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230038
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 0
-        - beta2
-        version: 2.0.0.beta2
+        version: "0"
   requirement: *id021
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: mysql
+  name: rcov
   version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -350,7 +350,7 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: pickle
+  name: redgreen
   version_requirements: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -364,21 +364,23 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: rcov
+  name: rspec-rails
   version_requirements: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 1
+        version: 2.0.1
   requirement: *id024
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: redgreen
+  name: ruby-debug
   version_requirements: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -392,24 +394,8 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  name: rspec-rails
+  name: sqlite3-ruby
   version_requirements: &id026 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 0
-        - 1
-        version: 2.0.1
-  requirement: *id026
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
-  name: ruby-debug
-  version_requirements: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -418,12 +404,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id027
+  requirement: *id026
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
   name: wirble
-  version_requirements: &id028 !ruby/object:Gem::Requirement 
+  version_requirements: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -432,7 +418,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id028
+  requirement: *id027
 description: Blog engine for Rails 3+
 email: michael@pixels-and-bits.com
 executables: []
@@ -454,6 +440,7 @@ files:
 - app/controllers/admin/settings_controller.rb
 - app/controllers/comments_controller.rb
 - app/controllers/entries_controller.rb
+- app/controllers/feed_controller.rb
 - app/helpers/jabe_helper.rb
 - app/models/admin.rb
 - app/models/comment.rb
@@ -473,6 +460,7 @@ files:
 - app/views/entries/_comment_form.html.haml
 - app/views/entries/index.html.haml
 - app/views/entries/show.html.haml
+- app/views/feed/index.xml.builder
 - app/views/layouts/_footer.html.haml
 - app/views/layouts/_header.html.haml
 - app/views/layouts/_sidebar.html.haml
@@ -512,15 +500,6 @@ files:
 - public/javascripts/rails.js
 - public/nginx.conf
 - public/robots.txt
-- features/admin.feature
-- features/entries.feature
-- features/step_definitions/admin_steps.rb
-- features/step_definitions/entry_steps.rb
-- features/step_definitions/support_steps.rb
-- features/step_definitions/web_steps.rb
-- features/support/blueprints.rb
-- features/support/env.rb
-- features/support/paths.rb
 - spec/support/blueprints.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -543,6 +522,15 @@ files:
 - test/dummy/db/migrate/20101229224030_create_entries.rb
 - test/dummy/db/migrate/20101229224031_create_comments.rb
 - test/dummy/db/schema.rb
+- test/dummy/features/step_definitions/admin_steps.rb
+- test/dummy/features/step_definitions/entry_steps.rb
+- test/dummy/features/step_definitions/support_steps.rb
+- test/dummy/features/step_definitions/web_steps.rb
+- test/dummy/features/support/blueprints.rb
+- test/dummy/features/support/env.rb
+- test/dummy/features/support/paths.rb
+- test/dummy/spec/spec_helper.rb
+- test/dummy/spec/support/blueprints.rb
 - test/dummy/vendor/plugins/acts_as_textiled/init.rb
 - test/dummy/vendor/plugins/acts_as_textiled/lib/acts_as_textiled.rb
 - test/dummy/vendor/plugins/acts_as_textiled/test/fixtures/author.rb
@@ -584,15 +572,6 @@ signing_key:
 specification_version: 3
 summary: Just Another Blog Engine
 test_files: 
-- features/admin.feature
-- features/entries.feature
-- features/step_definitions/admin_steps.rb
-- features/step_definitions/entry_steps.rb
-- features/step_definitions/support_steps.rb
-- features/step_definitions/web_steps.rb
-- features/support/blueprints.rb
-- features/support/env.rb
-- features/support/paths.rb
 - spec/support/blueprints.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
@@ -615,6 +594,15 @@ test_files:
 - test/dummy/db/migrate/20101229224030_create_entries.rb
 - test/dummy/db/migrate/20101229224031_create_comments.rb
 - test/dummy/db/schema.rb
+- test/dummy/features/step_definitions/admin_steps.rb
+- test/dummy/features/step_definitions/entry_steps.rb
+- test/dummy/features/step_definitions/support_steps.rb
+- test/dummy/features/step_definitions/web_steps.rb
+- test/dummy/features/support/blueprints.rb
+- test/dummy/features/support/env.rb
+- test/dummy/features/support/paths.rb
+- test/dummy/spec/spec_helper.rb
+- test/dummy/spec/support/blueprints.rb
 - test/dummy/vendor/plugins/acts_as_textiled/init.rb
 - test/dummy/vendor/plugins/acts_as_textiled/lib/acts_as_textiled.rb
 - test/dummy/vendor/plugins/acts_as_textiled/test/fixtures/author.rb

data/features/admin.feature

@@ -1,30 +0,0 @@
-Feature: Site management
-
-  Background:
-    Given a logged in admin
-
-  Scenario: An admin edits the site settings
-    When I follow "Settings"
-    And I fill in "settings_site_name" with "Pixels and Bits"
-    And I press "Save"
-    Then I should see "Pixels and Bits"
-
-  Scenario: An admin wants to add a new entry as a draft, then publish
-    When I follow "Entries"
-    And I follow "Start a new entry"
-    And I fill in "entry_title" with "Is this thing on"
-    And I fill in "entry_body" with "Hrm, Who knows"
-    And I press "Save as draft"
-    Then the entry should be a draft
-    When I go to the home page
-    Then I should not see the entry
-    When I follow "Logout"
-    And I go to the entry page
-    Then the response should be a 404
-    Given a logged in admin
-    And I go to the admin home page
-    And I follow "Entries"
-    And I follow the title of the entry
-    And I press "Publish"
-    And I go to the home page
-    Then I should see the entry

data/features/entries.feature

@@ -1,24 +0,0 @@
-Feature: Interacting with entries
-
-  Background:
-    Given a published entry
-    When I am on the home page
-    And I follow the title of the entry
-    Then I should see the entry
-
-  Scenario: A human submits a comment
-    When I fill in "comment_name" with "Michael"
-    And I fill in "comment_email" with "michael@example.com"
-    And I fill in "comment_body" with "Cool post"
-    And I press "Add comment"
-    Then I should see "Michael"
-    And I should see "Cool post"
-    And the entry should have 1 comment
-
-  Scenario: A bot submits a comment
-    When I fill in "comment_name" with "v1@gr@"
-    And I fill in "comment_nickname" with "blue pill"
-    And I fill in "comment_email" with "spambot@example.com"
-    And I fill in "comment_body" with "take the blue pill"
-    And I press "Add comment"
-    Then the entry should have 0 comments