thumblemonks-chicago 0.1.2.4 → 0.2

data/HISTORY.txt

@@ -0,0 +1,8 @@
+0.2
+
+* Updated to work with the latest Sinatra (0.9.1) and use proper extension nomenclature
+* Fixed catch_all_css to punt on stylesheets that are not defined as SASS files
+
+0.1.2.4
+
+* Updated to work with Sinatra 0.9

data/chicago.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "chicago"
-  s.version  = "0.1.2.4"
-  s.date     = "2009-02-01"
+  s.version  = "0.2"
+  s.date     = "2009-03-12"
   s.summary  = "Sinatra runtime and testing extensions used commonly by Thumblemonks"
   s.email    = %w[gus@gusg.us gabriel.gironda@gmail.com]
   s.homepage = "http://github.com/thumblemonks/chicago/tree/master"

data/lib/chicago/application.rb

@@ -1,26 +1,30 @@
-module Thumblemonks
-  module Sinatra
+module Sinatra
+  module ThumbleMonks
     module Base
 
       # Assumes all CSS is SASS and is referenced as being in a directory named stylesheets
+      # If SASS file is not defined, the route will passed on to - theoretically - the real
+      # CSS in the public directory.
       def catch_all_css(path='/stylesheets')
         get("#{path}/*.css") do
-          content_type 'text/css'
-          sass params["splat"].first.to_sym
+          begin
+            content_type 'text/css'
+            sass params["splat"].first.to_sym
+          rescue Errno::ENOENT
+            pass
+          end
         end
       end
 
-      # When you don't want anything special, but to load a named view
+      # When you don't want anything special, but to load a named view as HAML.
       def get_obvious(name)
         get "/#{name}" do
-          title = name.to_s
           haml name.to_sym
         end
       end
 
     end # Base
+  end # ThumbleMonks
 
-  end # Sinatra
-end # Thumblemonks
-
-Sinatra::Base.extend(Thumblemonks::Sinatra::Base)
+  register ThumbleMonks::Base
+end # Sinatra

data/lib/chicago/helpers.rb

@@ -1,12 +1,37 @@
-module Thumblemonks
-  module Sinatra
+module Sinatra
+  module ThumbleMonks
     module Helpers
+      # A basic anchor (link_to) tag
+      #
+      # Exmaples:
+      #
+      #   anchor('GusGus', 'http://gusg.us')
+      #   => <a href="http://gusg.us">GusG.us</a>
+      #
+      #   anchor('GusGus', 'http://gusg.us', :title => 'You know who!')
+      #   => <a href="http://gusg.us" title="You know who!">GusG.us</a>
       def anchor(name, url, options={})
         defaults = {:href => url}
         options_str = hash_to_attributes(defaults.merge(options))
         %Q[<a #{options_str}>#{name}</a>]
       end
 
+      # A helper to include stylesheet links. Currently defaults everything to
+      # load from a /stylesheets directory.
+      #
+      # Exmaples:
+      #
+      #   stylesheet_include('foo')
+      #   => <link href="/stylsheets/foo.css" media="screen" rel="stylesheet" type="text/css" />
+      #
+      #   stylesheet_include('foo/bar')
+      #   => <link href="/stylsheets/foo/bar.css" media="screen" rel="stylesheet" type="text/css" />
+      #
+      #   stylesheet_include('foo', :media => "print")
+      #   => <link href="/stylsheets/foo.css" media="print" rel="stylesheet" type="text/css" />
+      #
+      #   stylesheet_include('http://example.com/foo.css')
+      #   => <link href="http://example.com/foo.css" media="print" rel="stylesheet" type="text/css" />
       def stylesheet_include(name, options={})
         name = "/stylesheets/#{name}.css" unless remote_asset?(name)
         defaults = {:href => name, :media => "screen",
@@ -15,6 +40,22 @@ module Thumblemonks
         %Q[<link #{options_str}/>]
       end
 
+      # A helper to include javascript source tags. Currently defaults everything
+      # to load from a /javascripts directory.
+      #
+      # Exmaples:
+      #
+      #   javascript_include('foo')
+      #   => <javascript src="/javascripts/foo.js" type="text/javascript"></script>
+      #
+      #   javascript_include('foo/bar')
+      #   => <javascript src="/javascripts/foo/bar.js" type="text/javascript"></script>
+      #
+      #   javascript_include('foo', :something => "great")
+      #   => <javascript src="/javascripts/foo.js" type="text/javascript" something="great"></script>
+      #
+      #   javascript_include('http://example.com/foo.js')
+      #   => <javascript src="http://example.com/foo.js" type="text/javascript"></script>
       def javascript_include(name, options={})
         name = "/javascripts/#{name}.js" unless remote_asset?(name)
         defaults = {:src => name, :type => "text/javascript"}
@@ -30,7 +71,7 @@ module Thumblemonks
         options.map {|k,v| "#{k}=\"#{v}\""}.join(' ')
       end
     end # Helpers
-  end # Sinatra
-end # Thumblemonks
+  end # ThumbleMonks
 
-Sinatra::Base.instance_eval { include Thumblemonks::Sinatra::Helpers }
+  helpers ThumbleMonks::Helpers
+end # Sinatra

data/lib/chicago/responders.rb

@@ -1,5 +1,5 @@
-module Thumblemonks
-  module Sinatra
+module Sinatra
+  module Thumblemonks
     module Responders
 
       # Returns a JSON response for an object
@@ -9,7 +9,7 @@ module Thumblemonks
       end
 
     end # Responders
-  end # Sinatra
-end # Thumblemonks
+  end # Thumblemonks
 
-Sinatra::Base.instance_eval { include Thumblemonks::Sinatra::Responders }
+  helpers Thumblemonks::Responders
+end # Sinatra

data/lib/chicago/shoulda/sinatra.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'ostruct'
 
-module Thumblemonks
+module ThumbleMonks
   module Shoulda
     module Sinatra
 
@@ -32,20 +32,6 @@ module Thumblemonks
             assert_response_body json
           end
         end
-
-        # Will invoke a helper method in the EventContext and set the result of
-        # output to @response.body.
-        # 
-        # NOTE: This will probably break right now if you need access to specific
-        # event context methods or Sinatra.app options in your helper.
-        def should_invoke_helper(name, *args, &assert_block)
-          should "invoke helper #{name} with #{args.inspect}" do
-            @response = OpenStruct.new(:body => nil)
-            event_context = ::Sinatra::EventContext.new(nil, @response, nil)
-            @response.body = event_context.send(name, *args)
-            self.instance_eval(&assert_block)
-          end
-        end
       end # Macros
 
       module Helpers
@@ -80,6 +66,6 @@ module Thumblemonks
 
     end # Sinatra
   end # Shoulda
-end # Thumblemonks
+end # ThumbleMonks
 
-Test::Unit::TestCase.instance_eval { include Thumblemonks::Shoulda::Sinatra }
+Test::Unit::TestCase.instance_eval { include ThumbleMonks::Shoulda::Sinatra }

data/lib/chicago.rb

@@ -1,3 +1,4 @@
+require 'sinatra/base'
 require 'chicago/application'
 require 'chicago/responders'
 require 'chicago/helpers'

data/test/application_test.rb

@@ -34,6 +34,16 @@ class ApplicationTest < Test::Unit::TestCase
       should_have_content_type 'text/css'
       should_have_response_body %r[.car \{\s+display: some; \}\s]
     end
+
+    context "with path that's not a defined a sass file" do
+      setup do
+        mock_app { catch_all_css }
+        get '/stylesheets/goo.css'
+      end
+
+      should_have_response_status 404
+      should_have_content_type 'text/css'
+    end
   end # catching all css
 
   context "getting obvious views" do

data/test/test_helper.rb

@@ -1,10 +1,11 @@
 require 'rubygems'
 
-require 'shoulda'
-
-require 'sinatra/base'
+require 'haml'
+require 'sinatra'
+require 'test/unit'
 require 'sinatra/test'
-require 'sinatra/test/unit'
+
+require 'shoulda'
 
 require 'chicago'
 require 'chicago/shoulda'
@@ -13,7 +14,11 @@ module Sinatra::Test
   # Sets up a Sinatra::Base subclass defined with the block
   # given. Used in setup or individual spec methods to establish
   # the application.
-  def mock_app(base=Sinatra::Base, &block)
+  def mock_app(base=Sinatra::Default, &block)
     @app = Sinatra.new(base, &block)
   end
 end
+
+class Test::Unit::TestCase
+  include Sinatra::Test
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thumblemonks-chicago
 version: !ruby/object:Gem::Version 
-  version: 0.1.2.4
+  version: "0.2"
 platform: ruby
 authors: 
 - Justin Knowlden
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-01 00:00:00 -08:00
+date: 2009-03-12 00:00:00 -07:00
 default_executable: 
 dependencies: []