postmarkdown 0.0.1 → 0.0.2

data/.gitignore

@@ -1,5 +1,6 @@
 .bundle
 Gemfile.lock
+gemfiles/*.gemfile.lock
 db/*.sqlite3
 log/*.log
 tmp/

data/.rvmrc

@@ -1 +1 @@
-rvm --create ruby-1.9.2-p180@postmarkdown
+rvm --create ruby-1.9.2-p290@postmarkdown

data/Appraisals

@@ -0,0 +1,8 @@
+appraise 'rails3_0' do
+  gem 'rails', '~> 3.0.0'
+end
+
+appraise 'rails3_1' do
+  gem 'rails', '~> 3.1.0'
+  gem 'combustion', '~> 0.3.1'
+end

data/Gemfile

@@ -1,3 +1,5 @@
 source 'http://rubygems.org'
 
 gemspec
+
+gem 'ruby-debug19', :require => false

data/Rakefile

@@ -1,24 +1,11 @@
 require 'rubygems'
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rake'
-require 'rake/rdoctask'
+require 'appraisal'
+require 'bundler/setup'
+require 'bundler/gem_tasks'
 
-require 'rspec/core'
 require 'rspec/core/rake_task'
-
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
-
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ContactForm'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+task :default do
+  exec 'rake appraisal spec'
 end

data/app/controllers/posts_controller.rb

@@ -21,11 +21,7 @@ class PostsController < ApplicationController
   helper_method :resource
 
   def collection
-    @collection ||= begin
-      posts = Post.where(params.slice(:year, :month, :day))
-      posts = Kaminari.paginate_array(posts).page(params[:page]).per(10)
-      posts
-    end
+    @collection ||= Post.where(params.slice(:year, :month, :day))
   end
   helper_method :collection
 end

data/app/views/posts/index.html.haml

@@ -3,6 +3,5 @@
 %section#posts
   - if collection.present?
     = render collection, :summary => true
-    = paginate
   - else
     No posts found.

data/config.ru

@@ -0,0 +1,7 @@
+ENV['BUNDLE_GEMFILE'] = 'gemfiles/rails3_1.gemfile'
+require 'bundler'
+
+Bundler.require :default, :development
+
+Combustion.initialize!
+run Combustion::Application

data/gemfiles/rails3_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "ruby-debug19", :require=>false
+gem "rails", "~> 3.0.0"
+
+gemspec :path=>"../"

data/gemfiles/rails3_1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "ruby-debug19", :require=>false
+gem "rails", "~> 3.1.0"
+gem "combustion", "~> 0.3.1"
+
+gemspec :path=>"../"

data/lib/generators/postmarkdown/override_generator.rb

@@ -37,7 +37,11 @@ module Postmarkdown
     def override_theme
       if options.theme || options.all
         directory 'views/layouts', 'views/layouts'
-        directory '../public/stylesheets', 'public/stylesheets'
+        if Rails.application.config.respond_to?(:assets) && Rails.application.config.assets.enabled
+          directory '../vendor/assets/stylesheets', 'app/assets/stylesheets'
+        else
+          directory '../vendor/assets/stylesheets', 'public/stylesheets'
+        end
       end
     end
   end

data/lib/postmarkdown/engine.rb

@@ -5,7 +5,6 @@ module Postmarkdown
   require 'rdiscount'
   require 'nokogiri'
   require 'haml'
-  require 'kaminari'
 
   class Engine < Rails::Engine
   end

data/lib/postmarkdown/railtie.rb

@@ -1,12 +1,14 @@
 module Postmarkdown
   class Railtie < Rails::Railtie
     initializer :before_initialize do
-      require 'rack'
-      Rails.configuration.middleware.insert_before('Rack::Sendfile', 'Rack::Static',
-        :urls => ['/stylesheets/postmarkdown'],
-        :root => "#{postmarkdown_root}/public"
-      )
-      ActionController::Base.prepend_view_path("#{postmarkdown_root}/app/views")
+      unless Rails.application.config.respond_to?(:assets) && Rails.application.config.assets.enabled
+        require 'rack'
+        Rails.configuration.middleware.insert_before('Rack::Sendfile', 'Rack::Static',
+          :urls => ['/stylesheets/postmarkdown'],
+          :root => "#{postmarkdown_root}/vendor/assets"
+        )
+      end
+      ActionController::Base.append_view_path("#{postmarkdown_root}/app/views")
     end
 
     private

data/lib/postmarkdown/version.rb

@@ -1,3 +1,3 @@
 module Postmarkdown
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/postmarkdown.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'gravtastic'
   s.add_dependency 'nokogiri'
   s.add_dependency 'rdiscount'
-  s.add_dependency 'kaminari'
 
+  s.add_development_dependency 'appraisal'
   s.add_development_dependency 'rspec-rails', '~> 2.5'
   s.add_development_dependency 'capybara', '~> 1.0.0.beta'
   s.add_development_dependency 'sqlite3'

data/readme.md

@@ -2,7 +2,7 @@
 
 A simple Rails blog engine powered by Markdown.
 
-Postmarkdown is compatible with Rails 3 only and the gem is (soon to be) hosted on [RubyGems.org](http://rubygems.org).
+Postmarkdown is compatible with Rails 3 only and the gem is hosted on [RubyGems.org](http://rubygems.org/gems/postmarkdown).
 
 ## Features
 

data/spec/internal/.gitignore

@@ -0,0 +1,2 @@
+db/*.sqlite3
+log/*.log

data/spec/{support/rails_app → internal}/app/views/layouts/application.html.erb

@@ -2,8 +2,6 @@
 <html>
 <head>
   <title>RailsApp</title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
   <%= csrf_meta_tag %>
 </head>
 <body>

data/spec/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/combustion_test.sqlite3

data/spec/internal/config/environments/test.rb

@@ -0,0 +1,9 @@
+Rails.application.class.configure do
+  config.cache_classes = true
+  config.whiny_nils = true
+  config.consider_all_requests_local = true
+  config.action_controller.perform_caching = false
+  config.action_dispatch.show_exceptions = false
+  config.action_mailer.delivery_method = :test
+  config.active_support.deprecation = :stderr
+end

data/spec/internal/config/routes.rb

@@ -0,0 +1,3 @@
+Rails.application.routes.draw do
+  postmarkdown
+end

data/spec/internal/db/schema.rb

@@ -0,0 +1,3 @@
+ActiveRecord::Schema.define do
+  #
+end

data/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/requests/assets_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'stylesheet', :type => :request do
+  include RSpec::Rails::HelperExampleGroup
+
+  def stylesheet_path
+    html = helper.stylesheet_link_tag 'postmarkdown/postmarkdown'
+    Nokogiri::HTML.fragment(html).at('link')[:href]
+  end
+
+  it 'should be served' do
+    visit stylesheet_path
+    page.source.should match /font-family:/
+    page.source.should match /}\s*\z/
+  end
+end

data/spec/requests/views_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe 'views', :type => :request do
+  context 'without application index view' do
+    it 'should use internal view' do
+      visit '/posts'
+      page.should have_css 'section#posts'
+      page.should_not have_content 'test application view'
+    end
+  end
+
+  context 'with application index view' do
+    let(:view_path) { Rails.root + 'app/views/posts/index.html.haml' }
+
+    before do
+      ApplicationController.view_paths.each(&:clear_cache)
+      FileUtils.mkdir_p File.dirname(view_path)
+      File.open view_path, 'w' do |io|
+        io.puts 'This is a test application view.'
+      end
+    end
+
+    after do
+      File.unlink view_path
+      ApplicationController.view_paths.each(&:clear_cache)
+    end
+
+    it 'should not use internal view' do
+      visit '/posts'
+      page.should have_content 'test application view'
+      page.should_not have_css 'section#posts'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,10 +1,24 @@
 ENV['RAILS_ENV'] ||= 'test'
-require 'support/rails_app/config/environment'
-require 'rspec/rails'
+
+require 'rubygems'
+require 'bundler'
+Bundler.setup :default, :development
+
+require 'postmarkdown'
+
+require 'rails/version'
+if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 0
+  require 'support/rails_app/config/environment'
+else
+  require 'combustion'
+  Combustion.initialize!
+end
+
 require 'capybara/rspec'
-require 'delorean'
+require 'rspec/rails'
+require 'capybara/rails'
 
-Dir[Rails.root.join('spec/support/**/*.rb')].each {|f| require f}
+require 'delorean'
 
 RSpec.configure do |config|
   config.mock_with :rspec

data/spec/support/rails_app/config/routes.rb

@@ -1,3 +1,3 @@
-RailsApp::Application.routes.draw do
+Rails.application.routes.draw do
   postmarkdown
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postmarkdown
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70346286148320 !ruby/object:Gem::Requirement
+  requirement: &70221596662580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346286148320
+  version_requirements: *70221596662580
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70346286147800 !ruby/object:Gem::Requirement
+  requirement: &70221596661220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70346286147800
+  version_requirements: *70221596661220
 - !ruby/object:Gem::Dependency
   name: gravtastic
-  requirement: &70346286147400 !ruby/object:Gem::Requirement
+  requirement: &70221596676340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346286147400
+  version_requirements: *70221596676340
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70346286146940 !ruby/object:Gem::Requirement
+  requirement: &70221596675560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346286146940
+  version_requirements: *70221596675560
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70346286146500 !ruby/object:Gem::Requirement
+  requirement: &70221596674340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,21 +68,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70346286146500
+  version_requirements: *70221596674340
 - !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: &70346286146080 !ruby/object:Gem::Requirement
+  name: appraisal
+  requirement: &70221596672320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70346286146080
+  version_requirements: *70221596672320
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70346286145580 !ruby/object:Gem::Requirement
+  requirement: &70221596671060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70346286145580
+  version_requirements: *70221596671060
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70346286145020 !ruby/object:Gem::Requirement
+  requirement: &70221596670200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: 1.0.0.beta
   type: :development
   prerelease: false
-  version_requirements: *70346286145020
+  version_requirements: *70221596670200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70346286144560 !ruby/object:Gem::Requirement
+  requirement: &70221596669620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346286144560
+  version_requirements: *70221596669620
 - !ruby/object:Gem::Dependency
   name: delorean
-  requirement: &70346286143940 !ruby/object:Gem::Requirement
+  requirement: &70221596682860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,7 +123,7 @@ dependencies:
         version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *70346286143940
+  version_requirements: *70221596682860
 description: A simple Rails blog engine powered by markdown.
 email:
 - jason.weathered@ennova.com.au
@@ -137,6 +137,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- Appraisals
 - Gemfile
 - Rakefile
 - app/controllers/application_controller.rb
@@ -148,6 +149,9 @@ files:
 - app/views/posts/feed.xml.builder
 - app/views/posts/index.html.haml
 - app/views/posts/show.html.haml
+- config.ru
+- gemfiles/rails3_0.gemfile
+- gemfiles/rails3_1.gemfile
 - lib/generators/postmarkdown/install_generator.rb
 - lib/generators/postmarkdown/override_generator.rb
 - lib/generators/postmarkdown/post_generator.rb
@@ -163,10 +167,23 @@ files:
 - lib/postmarkdown/util.rb
 - lib/postmarkdown/version.rb
 - postmarkdown.gemspec
-- public/stylesheets/postmarkdown/postmarkdown.css
 - readme.md
 - spec/acceptance/posts_spec.rb
+- spec/internal/.gitignore
+- spec/internal/app/posts/2011-04-01-first-post.markdown
+- spec/internal/app/posts/2011-04-28-image.markdown
+- spec/internal/app/posts/2011-04-28-summary.markdown
+- spec/internal/app/posts/2011-05-01-full-metadata.markdown
+- spec/internal/app/posts/2015-02-13-custom-title.markdown
+- spec/internal/app/views/layouts/application.html.erb
+- spec/internal/config/database.yml
+- spec/internal/config/environments/test.rb
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
 - spec/models/posts_spec.rb
+- spec/requests/assets_spec.rb
+- spec/requests/views_spec.rb
 - spec/routing/posts_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/data/posts/2011-04-01-first-post.markdown
@@ -179,53 +196,18 @@ files:
 - spec/support/data/posts/2015-02-13-custom-title.markdown
 - spec/support/data/posts/missing-date-from-filename.markdown
 - spec/support/rails_app/.gitignore
-- spec/support/rails_app/README
-- spec/support/rails_app/Rakefile
 - spec/support/rails_app/app/controllers/application_controller.rb
-- spec/support/rails_app/app/helpers/application_helper.rb
-- spec/support/rails_app/app/posts/2011-04-01-first-post.markdown
-- spec/support/rails_app/app/posts/2011-04-28-image.markdown
-- spec/support/rails_app/app/posts/2011-04-28-summary.markdown
-- spec/support/rails_app/app/posts/2011-05-01-full-metadata.markdown
-- spec/support/rails_app/app/posts/2015-02-13-custom-title.markdown
-- spec/support/rails_app/app/views/layouts/application.html.erb
 - spec/support/rails_app/config.ru
 - spec/support/rails_app/config/application.rb
 - spec/support/rails_app/config/boot.rb
 - spec/support/rails_app/config/database.yml
 - spec/support/rails_app/config/environment.rb
-- spec/support/rails_app/config/environments/development.rb
-- spec/support/rails_app/config/environments/production.rb
-- spec/support/rails_app/config/environments/test.rb
-- spec/support/rails_app/config/initializers/backtrace_silencers.rb
-- spec/support/rails_app/config/initializers/inflections.rb
-- spec/support/rails_app/config/initializers/mime_types.rb
 - spec/support/rails_app/config/initializers/secret_token.rb
-- spec/support/rails_app/config/initializers/session_store.rb
-- spec/support/rails_app/config/locales/en.yml
 - spec/support/rails_app/config/routes.rb
 - spec/support/rails_app/db/seeds.rb
 - spec/support/rails_app/doc/README_FOR_APP
-- spec/support/rails_app/lib/tasks/.gitkeep
-- spec/support/rails_app/public/404.html
-- spec/support/rails_app/public/422.html
-- spec/support/rails_app/public/500.html
-- spec/support/rails_app/public/favicon.ico
-- spec/support/rails_app/public/images/rails.png
-- spec/support/rails_app/public/index.html
-- spec/support/rails_app/public/javascripts/application.js
-- spec/support/rails_app/public/javascripts/controls.js
-- spec/support/rails_app/public/javascripts/dragdrop.js
-- spec/support/rails_app/public/javascripts/effects.js
-- spec/support/rails_app/public/javascripts/prototype.js
-- spec/support/rails_app/public/javascripts/rails.js
-- spec/support/rails_app/public/robots.txt
-- spec/support/rails_app/public/stylesheets/.gitkeep
-- spec/support/rails_app/script/rails
-- spec/support/rails_app/test/performance/browsing_test.rb
-- spec/support/rails_app/test/test_helper.rb
-- spec/support/rails_app/vendor/plugins/.gitkeep
 - todo.txt
+- vendor/assets/stylesheets/postmarkdown/postmarkdown.css
 homepage: ''
 licenses:
 - MIT
@@ -240,21 +222,41 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3074464421691389538
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3074464421691389538
 requirements: []
 rubyforge_project: postmarkdown
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A simple Rails blog engine powered by markdown.
 test_files:
 - spec/acceptance/posts_spec.rb
+- spec/internal/.gitignore
+- spec/internal/app/posts/2011-04-01-first-post.markdown
+- spec/internal/app/posts/2011-04-28-image.markdown
+- spec/internal/app/posts/2011-04-28-summary.markdown
+- spec/internal/app/posts/2011-05-01-full-metadata.markdown
+- spec/internal/app/posts/2015-02-13-custom-title.markdown
+- spec/internal/app/views/layouts/application.html.erb
+- spec/internal/config/database.yml
+- spec/internal/config/environments/test.rb
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
 - spec/models/posts_spec.rb
+- spec/requests/assets_spec.rb
+- spec/requests/views_spec.rb
 - spec/routing/posts_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/data/posts/2011-04-01-first-post.markdown
@@ -267,49 +269,13 @@ test_files:
 - spec/support/data/posts/2015-02-13-custom-title.markdown
 - spec/support/data/posts/missing-date-from-filename.markdown
 - spec/support/rails_app/.gitignore
-- spec/support/rails_app/README
-- spec/support/rails_app/Rakefile
 - spec/support/rails_app/app/controllers/application_controller.rb
-- spec/support/rails_app/app/helpers/application_helper.rb
-- spec/support/rails_app/app/posts/2011-04-01-first-post.markdown
-- spec/support/rails_app/app/posts/2011-04-28-image.markdown
-- spec/support/rails_app/app/posts/2011-04-28-summary.markdown
-- spec/support/rails_app/app/posts/2011-05-01-full-metadata.markdown
-- spec/support/rails_app/app/posts/2015-02-13-custom-title.markdown
-- spec/support/rails_app/app/views/layouts/application.html.erb
 - spec/support/rails_app/config.ru
 - spec/support/rails_app/config/application.rb
 - spec/support/rails_app/config/boot.rb
 - spec/support/rails_app/config/database.yml
 - spec/support/rails_app/config/environment.rb
-- spec/support/rails_app/config/environments/development.rb
-- spec/support/rails_app/config/environments/production.rb
-- spec/support/rails_app/config/environments/test.rb
-- spec/support/rails_app/config/initializers/backtrace_silencers.rb
-- spec/support/rails_app/config/initializers/inflections.rb
-- spec/support/rails_app/config/initializers/mime_types.rb
 - spec/support/rails_app/config/initializers/secret_token.rb
-- spec/support/rails_app/config/initializers/session_store.rb
-- spec/support/rails_app/config/locales/en.yml
 - spec/support/rails_app/config/routes.rb
 - spec/support/rails_app/db/seeds.rb
 - spec/support/rails_app/doc/README_FOR_APP
-- spec/support/rails_app/lib/tasks/.gitkeep
-- spec/support/rails_app/public/404.html
-- spec/support/rails_app/public/422.html
-- spec/support/rails_app/public/500.html
-- spec/support/rails_app/public/favicon.ico
-- spec/support/rails_app/public/images/rails.png
-- spec/support/rails_app/public/index.html
-- spec/support/rails_app/public/javascripts/application.js
-- spec/support/rails_app/public/javascripts/controls.js
-- spec/support/rails_app/public/javascripts/dragdrop.js
-- spec/support/rails_app/public/javascripts/effects.js
-- spec/support/rails_app/public/javascripts/prototype.js
-- spec/support/rails_app/public/javascripts/rails.js
-- spec/support/rails_app/public/robots.txt
-- spec/support/rails_app/public/stylesheets/.gitkeep
-- spec/support/rails_app/script/rails
-- spec/support/rails_app/test/performance/browsing_test.rb
-- spec/support/rails_app/test/test_helper.rb
-- spec/support/rails_app/vendor/plugins/.gitkeep