heroku-nav 0.1.19 → 0.1.20

data/Rakefile

@@ -21,7 +21,7 @@ begin
     gemspec.add_dependency(%q<rest-client>, [">= 1.0"])
     gemspec.add_dependency(%q<json>, [">= 0"])
 
-    gemspec.version = '0.1.19'
+    gemspec.version = '0.1.20'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/heroku-nav.gemspec

@@ -1,46 +1,43 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{heroku-nav}
-  s.version = "0.1.19"
+  s.version = "0.1.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Dollar", "Pedro Belo", "Todd Matthews"]
-  s.date = %q{2010-10-21}
+  s.date = %q{2011-01-10}
   s.description = %q{}
   s.email = ["david@heroku.com", "pedro@heroku.com", "todd@heroku.com"]
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "README.md",
-     "Rakefile",
-     "heroku-nav.gemspec",
-     "lib/heroku/nav.rb",
-     "spec/api_spec.rb",
-     "spec/base.rb",
-     "spec/nav_spec.rb"
+    "README.md",
+    "Rakefile",
+    "heroku-nav.gemspec",
+    "lib/heroku/nav.rb",
+    "spec/api_spec.rb",
+    "spec/base.rb",
+    "spec/nav_spec.rb"
   ]
   s.homepage = %q{http://heroku.com}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{}
   s.test_files = [
     "spec/api_spec.rb",
-     "spec/base.rb",
-     "spec/nav_spec.rb"
+    "spec/base.rb",
+    "spec/nav_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<baconmocha>, [">= 0"])
       s.add_development_dependency(%q<sinatra>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])

data/lib/heroku/nav.rb

@@ -8,8 +8,7 @@ module Heroku
       def initialize(app, options={})
         @app     = app
         @options = options
-        @options[:only]   = [@options[:only]].compact   unless @options[:only].is_a?(Array)
-        @options[:except] = [@options[:except]].compact unless @options[:except].is_a?(Array)
+        @options[:except] = [@options[:except]] unless @options[:except].is_a?(Array)
         @options[:status] ||= [200]
         refresh
       end
@@ -17,31 +16,18 @@ module Heroku
       def call(env)
         @status, @headers, @body = @app.call(env)
         @body.extend(Enumerable)
-        @body = @body.map.join
+        @body = @body.to_a.join
         insert! if can_insert?(env)
         [@status, @headers, [@body]]
       end
 
       def can_insert?(env)
         return unless @options[:status].include?(@status)
-        return unless @headers['Content-Type'] =~ /text\/html/
-        return if !@options[:only].empty? && !@options[:only].any? { |route| match_route(route, env['PATH_INFO']) }
-        return if @options[:except].any? { |route| match_route(route, env['PATH_INFO']) }
+        return unless @headers['Content-Type'] =~ /text\/html/ || @headers['content-type'] =~ /text\/html/
+        return if @options[:except].any? { |route| env['PATH_INFO'] =~ route }
         true
       end
 
-      def match_route(route, path)
-        return unless route
-        case route.class.name
-          when 'Regexp'
-            path =~ route
-          when 'String'
-            path.chomp('/') == route.chomp('/')
-          else
-            raise "Don't know how to match the route: #{route} (#{route.class.name})"
-        end
-      end
-
       def refresh
         @nav = self.class.fetch
       end
@@ -79,7 +65,7 @@ module Heroku
     class Header < Base
       def insert!
         if @nav['html']
-          @body.gsub!(/(<head>)/i, "\\1<link href='#{self.class.api_url}/header.css' media='all' rel='stylesheet' type='text/css' />") 
+          @body.gsub!(/(<head>)/i, "\\1<link href='#{self.class.api_url}/header.css' media='all' rel='stylesheet' type='text/css' />")
           @body.gsub!(/(<body.*?>\s*(<div .*?class=["'].*?container.*?["'].*?>)?)/i, "\\1#{@nav['html']}")
           @headers['Content-Length'] = @body.length.to_s
         end
@@ -89,7 +75,7 @@ module Heroku
     class Footer < Base
       def insert!
         if @nav['html']
-          @body.gsub!(/(<head>)/i, "\\1<link href='#{self.class.api_url}/footer.css' media='all' rel='stylesheet' type='text/css' />") 
+          @body.gsub!(/(<head>)/i, "\\1<link href='#{self.class.api_url}/footer.css' media='all' rel='stylesheet' type='text/css' />")
           @body.gsub!(/(<\/body>)/i, "#{@nav['html']}\\1")
           @headers['Content-Length'] = @body.length.to_s
         end

data/spec/nav_spec.rb

@@ -65,17 +65,6 @@ describe Heroku::Nav::Header do
       last_response.body.should.not =~ /<!-- header -->/
     end
   end
-
-  describe "only including certain paths" do
-    def app
-      make_app { use Heroku::Nav::Header, :only => /x/ }
-    end
-
-    it "respects the :only option" do
-      get '/alternate', :body => '<html><body>hi'
-      last_response.body.should.not =~ /<!-- header -->/
-    end
-  end
 end
 
 describe Heroku::Nav::Footer do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heroku-nav
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 51
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 19
-  version: 0.1.19
+  - 20
+  version: 0.1.20
 platform: ruby
 authors: 
 - David Dollar
@@ -16,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 -07:00
+date: 2011-01-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: baconmocha
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -35,9 +38,11 @@ dependencies:
   name: sinatra
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,9 +52,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -59,9 +66,11 @@ dependencies:
   name: rest-client
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -72,9 +81,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -92,7 +103,6 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .gitignore
 - README.md
 - Rakefile
 - heroku-nav.gemspec
@@ -105,28 +115,32 @@ homepage: http://heroku.com
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: ""

data/.gitignore

@@ -1 +0,0 @@
-pkg/