smoke-rack 0.0.3 → 0.0.4

data/Rakefile

@@ -12,8 +12,11 @@ begin
     gem.authors = ["Ben Schwarz"]
     gem.rubyforge_project = "smoke-rack"
     gem.add_development_dependency "rspec"
-    gem.add_dependency "smoke", "0.5.16"
+    gem.add_development_dependency "rack-test"
+    gem.add_dependency "smoke", "0.5.17"
     gem.add_dependency "haml"
+    gem.add_dependency "sinatra"
+    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/config.ru

@@ -2,8 +2,8 @@
 
 # Ensure your sources (and smoke) are required before smoke-rack
 require 'examples/smoke-source'
-require 'lib/smoke-rack'
-use Smoke::Rack
+require 'lib/rack/smoke'
+use Rack::Smoke
 
 run Sinatra::Application
 get '/' do

data/examples/smoke-source.rb

@@ -50,6 +50,8 @@ Smoke.data(:github) do
 end
 
 Smoke.data(:slideshare) do
+  conceal
+  
   prepare do
     timestamp = Time.now.to_i
     hash = Digest::SHA1.hexdigest("FeXBxg0G#{timestamp}")

data/lib/rack/smoke.rb

@@ -0,0 +1,37 @@
+require 'sinatra'
+require 'haml'
+require 'md5'
+
+module Rack
+  class Smoke < Sinatra::Base  
+    set :root, "#{::File.dirname(__FILE__)}/../../"
+    set :haml, {:format => :html5, :attr_wrapper => '"'}
+    enable :static
+    
+    mime :xml,  "application/xml"
+    mime :json, "application/json"
+    mime :yaml, "application/x-yaml"
+    
+    get "/smoke" do
+      @sources = ::Smoke.exposed_sources.keys
+      haml :index
+    end
+    
+    ::Smoke.exposed_sources.keys.each do |source|
+      get "/smoke/#{source.to_s}" do
+        @source = source
+        haml :usage
+      end
+      
+      get "/smoke/#{source.to_s}.:format" do
+        format = params[:format].to_sym
+        output = ::Smoke.send(source).output(format)
+        
+        content_type format
+        etag Digest::MD5.hexdigest(output)
+        
+        output
+      end
+    end
+  end
+end

data/lib/smoke-rack.rb

@@ -1,33 +1 @@
-require 'sinatra'
-
-module Smoke
-  class Rack < Sinatra::Base    
-    set :public, File.join(File.dirname(__FILE__), '..', 'public')
-    set :views, File.join(File.dirname(__FILE__), '..', 'views')
-    set :haml, {:format => :html5, :attr_wrapper => '"'}
-    enable :static
-    
-    mime :xml,  "application/xml"
-    mime :json, "application/json"
-    mime :yaml, "application/x-yaml"
-    
-    get '/smoke' do
-      @sources = Smoke.active_sources.keys
-      haml :index
-    end
-    
-    Smoke.active_sources.keys.each do |source|
-      get "/smoke/#{source.to_s}" do
-        @source = source
-        haml :usage
-      end
-      
-      get "/smoke/#{source.to_s}.:format" do
-        format = params[:format].to_sym
-        
-        content_type format
-        Smoke.send(source).output(format)
-      end
-    end
-  end
-end
+require 'rack/smoke'

data/smoke-rack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smoke-rack}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Schwarz"]
-  s.date = %q{2009-10-25}
+  s.date = %q{2009-10-29}
   s.description = %q{Expose Smoke sources and transcode them into JSON, XML or YAML}
   s.email = %q{ben.schwarz@gmail.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "config.ru",
      "examples/smoke-source.rb",
+     "lib/rack/smoke.rb",
      "lib/smoke-rack.rb",
      "public/css/base.css",
      "public/css/reset.css",
@@ -55,17 +56,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_runtime_dependency(%q<smoke>, ["= 0.5.16"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
+      s.add_runtime_dependency(%q<smoke>, ["= 0.5.17"])
       s.add_runtime_dependency(%q<haml>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<smoke>, ["= 0.5.16"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
+      s.add_dependency(%q<smoke>, ["= 0.5.17"])
       s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<smoke>, ["= 0.5.16"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
+    s.add_dependency(%q<smoke>, ["= 0.5.17"])
     s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
   end
 end
 

data/spec/smoke-rack_spec.rb

@@ -4,7 +4,7 @@ describe "SmokeRack" do
   include Rack::Test::Methods
 
   def app
-    Smoke::Rack
+    Rack::Smoke
   end
     
   it "renders the index" do
@@ -34,6 +34,11 @@ describe "SmokeRack" do
           get "/smoke/github.#{format}"
           last_response.content_type.should include(format)
         end
+        
+        it "should have an etag set" do
+          get "/smoke/github.#{format}"
+          last_response.headers.should have_key("ETag")
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+unless defined? SPEC_DIR 
+  SPEC_DIR = File.join(File.dirname(__FILE__))
+end
+
 require 'rubygems'
 require 'spec'
 require 'spec/autorun'
@@ -7,8 +9,8 @@ require 'rack/test'
 
 gem 'smoke', '>= 0.5.16'
 require 'smoke'
-require 'support/source'
-require 'smoke-rack'
+require "#{SPEC_DIR}/support/source"
+require File.join(File.dirname(__FILE__), '..', 'lib', 'rack', 'smoke')
 
 set :environment, :test
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smoke-rack
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ben Schwarz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 00:00:00 +11:00
+date: 2009-10-29 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: smoke
   type: :runtime
@@ -30,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.16
+        version: 0.5.17
     version: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -42,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Expose Smoke sources and transcode them into JSON, XML or YAML
 email: ben.schwarz@gmail.com
 executables: []
@@ -60,6 +80,7 @@ files:
 - VERSION
 - config.ru
 - examples/smoke-source.rb
+- lib/rack/smoke.rb
 - lib/smoke-rack.rb
 - public/css/base.css
 - public/css/reset.css