darkhelmet-darkext 0.8.2 → 0.8.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.8.3 2009-2-23
+
+* Fix up sinatra stuff to be extensions
+* Don't include sinatra stuff by default. you must require explicitly.
+
 == 0.8.2 2009-2-21
 
 * Okay the one needed to be there...

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 8
-:patch: 2
+:patch: 3
 :major: 0

data/lib/darkext/sinatra.rb

@@ -1,6 +1,8 @@
-module Darkext
-  module Sinatra
-    module Helpers
+require 'sinatra/base'
+
+module Sinatra
+  module DarkHelpers
+    module HelperMethods
       def view(view, options = {})
         html = haml(view,options)
         flash.clear
@@ -13,11 +15,11 @@ module Darkext
       end
 
       def css_link_tag(sheet, media = 'screen,projection')
-        partial("%link{ :type => 'text/css', :href => '/stylesheets/#{sheet}.css', :rel => 'stylesheet', :media => '#{media}' }")
+        partial("%link{ :type => 'text/css', :href => 'stylesheets/#{sheet}.css', :rel => 'stylesheet', :media => '#{media}' }")
       end
 
       def js_script_tag(script)
-        partial("%script{ :type => 'text/javascript', :src => '/javascripts/#{script}.js' }")
+        partial("%script{ :type => 'text/javascript', :src => 'javascripts/#{script}.js' }")
       end
 
       def js_tag(script)
@@ -35,7 +37,7 @@ module Darkext
       end
 
       def host
-        port = request.env['SERVER_PORT']
+        port = request.env['SERVER_PORT'].to_i
         port = port == 80 ? "" : ":#{port}"
         "#{protocol}://#{server_name}#{port}"
       end
@@ -56,5 +58,11 @@ module Darkext
         "#{host}#{options.site_base}"
       end
     end
+
+    def self.registered(app)
+      app.helpers HelperMethods
+    end
   end
+
+  register DarkHelpers
 end

data/lib/darkext.rb

@@ -1,4 +1,6 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-Dir[File.join(File.join(File.dirname(__FILE__), 'darkext'), '*.rb')].sort.each { |lib| require lib }
+Dir[File.join(File.join(File.dirname(__FILE__), 'darkext'), '*.rb')].sort.each do |lib|
+  require lib unless lib.include?('sinatra') # don't include sinatra stuff by defaults
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: darkhelmet-darkext
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-21 00:00:00 -08:00
+date: 2009-02-23 00:00:00 -08:00
 default_executable: 
 dependencies: []