olelo 0.9.7 → 0.9.8

data/Rakefile

@@ -100,12 +100,12 @@ namespace :locale do
 end
 
 namespace :notes do
-  task :todo      do; sh('ack T''ODO');      end
-  task :fixme     do; sh('ack F''IXME');     end
-  task :hack      do; sh('ack H''ACK');      end
-  task :warning   do; sh('ack W''ARNING');   end
-  task :important do; sh('ack I''MPORTANT'); end
+  task :todo      do; system('ack T''ODO');      end
+  task :fixme     do; system('ack F''IXME');     end
+  task :hack      do; system('ack H''ACK');      end
+  task :warn      do; system('ack W''ARN');      end
+  task :important do; system('ack I''MPORTANT'); end
 end
 
 desc 'Show annotations'
-task notes: %w(notes:todo notes:fixme notes:hack notes:warning notes:important)
+task notes: %w(notes:todo notes:fixme notes:hack notes:warn notes:important)

data/config.ru

@@ -10,9 +10,6 @@ require 'fileutils'
 require 'rack/relative_redirect'
 require 'rack/static_cache'
 require 'olelo'
-require 'olelo/middleware/degrade_mime_type'
-require 'olelo/middleware/ua_header'
-require 'olelo/middleware/force_encoding'
 require 'securerandom'
 
 Olelo::Config.instance['app_path'] = app_path
@@ -98,8 +95,8 @@ end
 use Rack::MethodOverride
 use Rack::CommonLogger, LoggerOutput.new(logger)
 use Rack::RelativeRedirect
+use Rack::ContentLength
 use Olelo::Middleware::ForceEncoding
-use Rack::Head
 run Olelo::Application.new
 
 logger.info "Olelo started in #{Olelo::Config['production'] ? 'production' : 'development'} mode"

data/lib/olelo.rb

@@ -31,3 +31,7 @@ require 'olelo/patch'
 require 'olelo/initializer'
 require 'olelo/application'
 require 'olelo/version'
+
+require 'olelo/middleware/degrade_mime_type'
+require 'olelo/middleware/ua_header'
+require 'olelo/middleware/force_encoding'

data/lib/olelo/middleware/degrade_mime_type.rb

@@ -7,9 +7,10 @@ module Olelo
 
       def call(env)
         status, header, body = @app.call(env)
-        if env['HTTP_ACCEPT'].to_s !~ %r{application/xhtml\+xml}
-          if header['Content-Type'] =~ %r{\Aapplication/xhtml\+xml(;?.*)\Z}
-            header['Content-Type'] = "text/html#{$1}"
+        if header['Content-Type'] && header['Content-Type'] =~ %r{\Aapplication/xhtml\+xml(;?.*)\Z}
+          charset = $1
+          if env['HTTP_ACCEPT'].to_s !~ %r{application/xhtml\+xml}
+            header['Content-Type'] = "text/html#{charset}"
           end
         end
         [status, header, body]

data/lib/olelo/routing.rb

@@ -32,7 +32,8 @@ module Olelo
 
       catch(:forward) do
         with_hooks(:request) { perform! }
-        return response.finish
+        status, header, body = response.finish
+        return [status, header, request.head? ? [] : body]
       end
 
       @app ? @app.call(env) : error!(NotFound.new(@request.path_info))
@@ -194,6 +195,7 @@ module Olelo
 
       def get(path, patterns = {}, &block)
         add_route('GET',  path, patterns, &block)
+        add_route('HEAD', path, patterns, &block)
       end
 
       def put(path, patterns = {}, &block)

data/lib/olelo/version.rb

@@ -1,3 +1,3 @@
 module Olelo
-  VERSION = '0.9.7'
+  VERSION = '0.9.8'
 end

data/olelo.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.2'
 
-  s.add_runtime_dependency('multi_json', ['~> 1.3.6'])
+  s.add_runtime_dependency('multi_json', ['~> 1.3.7'])
   s.add_runtime_dependency('slim', ['~> 1.3.3'])
   s.add_runtime_dependency('creole', ['~> 0.5.0'])
   s.add_runtime_dependency('nokogiri', ['~> 1.5.5'])
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('evaluator', ['~> 0.1.6'])
 
   s.add_development_dependency('rake', ['>= 0.8.7'])
-  s.add_development_dependency('sass', ['>= 3.1.0'])
+  s.add_development_dependency('sass', ['~> 3.2.3'])
   s.add_development_dependency('bacon', ['~> 1.1.0'])
   s.add_development_dependency('rack-test', ['~> 0.6.2'])
 end

data/plugins/misc/fragment_cache.rb

@@ -19,7 +19,8 @@ class ::Olelo::Application
   end
 
   redefine_method :footer do |content = nil, &block|
-    if block_given? || content
+    # FIXME: Use block instead of block_given?, block_given? returns always false. Is this a ruby issue?
+    if block || content
       super(content, &block)
     else
       Cache.cache("footer-#{cache_id}", update: no_cache?) do |cache|

data/test/request_test.rb

@@ -1,7 +1,4 @@
 require 'helper'
-require 'olelo/middleware/force_encoding'
-require 'olelo/middleware/degrade_mime_type'
-require 'olelo/middleware/ua_header'
 require 'rack/relative_redirect'
 
 class Bacon::Context
@@ -32,7 +29,7 @@ describe 'requests' do
         }
       },
       base_path:          '/',
-      production:         true,
+      production:         false,
       locale:             'en_US',
       sidebar_page:       'Sidebar',
       authentication: {
@@ -76,7 +73,6 @@ describe 'requests' do
       use Olelo::Middleware::DegradeMimeType
       use Olelo::Middleware::UAHeader
       #use Rack::RelativeRedirect
-      use Rack::Head
       run Olelo::Application.new
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: olelo
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &9838140 !ruby/object:Gem::Requirement
+  requirement: &13779700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.3.7
   type: :runtime
   prerelease: false
-  version_requirements: *9838140
+  version_requirements: *13779700
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &9836960 !ruby/object:Gem::Requirement
+  requirement: &13779020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *9836960
+  version_requirements: *13779020
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &9835660 !ruby/object:Gem::Requirement
+  requirement: &13778360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *9835660
+  version_requirements: *13778360
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &9833880 !ruby/object:Gem::Requirement
+  requirement: &13777660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *9833880
+  version_requirements: *13777660
 - !ruby/object:Gem::Dependency
   name: mimemagic
-  requirement: &9832440 !ruby/object:Gem::Requirement
+  requirement: &13777160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *9832440
+  version_requirements: *13777160
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &9829740 !ruby/object:Gem::Requirement
+  requirement: &13776640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *9829740
+  version_requirements: *13776640
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &9829040 !ruby/object:Gem::Requirement
+  requirement: &13776120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *9829040
+  version_requirements: *13776120
 - !ruby/object:Gem::Dependency
   name: rugged
-  requirement: &9828020 !ruby/object:Gem::Requirement
+  requirement: &13775620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.17.0.b7
   type: :runtime
   prerelease: false
-  version_requirements: *9828020
+  version_requirements: *13775620
 - !ruby/object:Gem::Dependency
   name: evaluator
-  requirement: &9826260 !ruby/object:Gem::Requirement
+  requirement: &13210260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *9826260
+  version_requirements: *13210260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9824340 !ruby/object:Gem::Requirement
+  requirement: &13209540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,21 +120,21 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *9824340
+  version_requirements: *13209540
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &9822920 !ruby/object:Gem::Requirement
+  requirement: &13208740 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.3
   type: :development
   prerelease: false
-  version_requirements: *9822920
+  version_requirements: *13208740
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &9822060 !ruby/object:Gem::Requirement
+  requirement: &13207120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *9822060
+  version_requirements: *13207120
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &9812980 !ruby/object:Gem::Requirement
+  requirement: &13205280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *9812980
+  version_requirements: *13205280
 description: Olelo is a git-based wiki which supports many markup languages, tags,
   embedded TeX and much more. It can be extended through plugins.
 email: