gnarly 0.0.5 → 0.0.6

data/lib/gnarly/application.rb

@@ -65,17 +65,18 @@ module Gnarly
           if before = url.before
             environment.instance_exec *url.parameters, &before
           end
-          keys = url.keys request.method
-          response = environment.instance_exec *url.parameters(keys, request.params), &@responder
+          response = environment.instance_exec *url.parameters(request.method), &@responder
+          @response = environment.response ? environment.response : response
           if after = url.after
             environment.instance_exec *url.parameters, &after
           end
-          unless response.is_a? Array and response.size == 3
+          if @response.is_a? Array and @response.size == 3
+            @response[2] = [@response[2]] unless @response[2].respond_to? :each
+            @response
+          else
             name, line = @responder.source_location
             msg = "Bad return type for block in  #{name} line #{line}"
             internal_server_error msg
-          else
-            response
           end
         else
           method_not_allowed url.allow

data/lib/gnarly/client/emhttp.rb

@@ -8,7 +8,7 @@ module Gnarly
 
     module EMHttp
 
-      def http(request, &block)
+      def http(request, options={}, &block)
         if block
           method, url, headers, body = request
           opts = {}
@@ -18,11 +18,11 @@ module Gnarly
             url, query = url
             opts[:query] = query
           end
-          http = EventMachine::HttpRequest.new(url).__send__(method, opts) 
+          http = EventMachine::HttpRequest.new(url).__send__(method, opts)
+          http.stream &options[:stream] if options[:stream]
           http.callback {
             headers = Client.symbolize_headers http.response_header.to_hash
             block.call [http.response_header.status, headers, http.response]
-            EventMachine.stop
           }
         else
           raise :async_only

data/lib/gnarly/client/patron.rb

@@ -8,9 +8,10 @@ module Gnarly
 
     module Patron
 
-      def http(request)
+      def http(request, opts={})
         method, url, headers, body = request
         session = ::Patron::Session.new
+        session.timeout = opts[:timeout] if opts[:timeout]
         options = {}
         options[:data] = body if body
         r = session.request method, Client.create_url(url), headers, options
@@ -22,8 +23,8 @@ module Gnarly
         end
       end
 
-      def self.http(request)
-        Object.new.extend(self).http request
+      def self.http(request, opts={})
+        Object.new.extend(self).http request, opts
       end
 
     end

data/lib/gnarly/client/test.rb

@@ -0,0 +1,19 @@
+
+module Gnarly
+
+  module Client
+
+    module Test
+      attr_reader :gnarly_test_request
+      attr_writer :gnarly_test_response
+
+      def http(request)
+        @gnarly_test_request = request
+        @gnarly_test_response
+      end
+
+    end
+    
+  end
+
+end

data/lib/gnarly/client/typhoeus.rb

@@ -0,0 +1,38 @@
+require 'typhoeus'
+
+require 'gnarly/client.rb'
+
+module Gnarly
+
+  module Client
+
+    module Typhoeus
+
+      def http(request, opts={})
+        method, url, headers, body = request
+        options = {:headers => headers}
+        case url
+        when Array
+          url, query = url
+          options[:params] = query
+        end
+        options[:body] = body if body
+        options[:timeout] = opts[:timeout] * 1000 if opts[:timeout]
+        r = ::Typhoeus::Request.send method, url, options
+        response = [r.code, Client.symbolize_headers(r.headers_hash), r.body]
+        if block_given?
+          yield response
+        else
+          response
+        end
+      end
+
+      def self.http(request, opts={})
+        Object.new.extend(self).http request, opts
+      end
+
+    end
+
+  end
+
+end

data/lib/gnarly/client.rb

@@ -8,8 +8,10 @@ module Gnarly
     def self.symbolize_headers(headers)
       symbolized = {}
       headers.each_pair do |key, value|
-        sym = key.downcase.gsub('-', '_').to_sym
-        symbolized[sym] = value
+        if value
+          sym = key.downcase.gsub('-', '_').to_sym
+          symbolized[sym] = value
+        end
       end
       symbolized
     end

data/lib/gnarly/environment.rb

@@ -22,6 +22,14 @@ module Gnarly
       extend helper
     end
 
+    def response(response=nil)
+      if response
+        @response = response
+      else
+        response
+      end
+    end
+
   end
 
 end

data/lib/gnarly/static.rb

@@ -0,0 +1,26 @@
+
+module Gnarly
+
+  class Static
+
+    def initialize(app, options={})
+      @app = app
+      @urls = options[:urls] || ["/favicon.ico"]
+      root = options[:root] || Dir.pwd
+      @file_server = Rack::File.new(root)
+    end
+
+    def call(env)
+      path = env["PATH_INFO"]
+      can_serve = @urls.any? { |url| path.index(url) == 0 }
+
+      if can_serve
+        @file_server.call(env)
+      else
+        @app.call(env)
+      end
+    end
+
+  end
+
+end

data/lib/gnarly/status.rb

@@ -15,9 +15,10 @@ module Gnarly
       @default_content_types.last if @default_content_types
     end
 
-    def ok(body, mime=nil)
+    def ok(body, mime=nil, charset=nil)
       mime = default_content_type unless mime
-      headers = mime ? {"Content-type" => mime} : {}
+      charset = body.encoding.name.downcase unless charset
+      headers = mime ? {"Content-type" => "#{mime}; charset=#{charset}"} : {}
       [200, headers, [body]]
     end
 

data/lib/gnarly/url.rb

@@ -20,23 +20,9 @@ module Gnarly
       @match != nil
     end
 
-    def parameters(keys=nil, defaults=nil)
-      if keys
-        if @type_map
-          keys.collect do |key|
-            case @type_map[key.to_s]
-            when :integer
-              fetch_match(key, defaults).to_i            
-            else
-              fetch_match key, defaults
-            end
-          end
-        else
-          keys.collect do |key|
-            fetch_match key, defaults
-          end
-        end
-      else
+    def parameters(method)
+      keys = @keys[method] 
+      if keys.empty?
         a = @match.to_a
         a.shift
         if @types
@@ -51,26 +37,28 @@ module Gnarly
         else
           a
         end
+      else
+        if @type_map
+          keys.collect do |key|
+            case @type_map[key.to_s]
+            when :integer
+              @match[key].to_i            
+            else
+              @match[key]
+            end
+          end
+        else
+          keys.collect do |key|
+            @match[key]
+          end
+        end
       end
     end
-
-    def fetch_match(key, defaults=nil)
-      #TODO: Is this a hack?
-      begin
-        @match[key]
-      rescue IndexError
-        defaults ? defaults[key.to_s] : nil
-      end
-    end
-
+    
     def responder(method)
       @responders[method]
     end
 
-    def keys(method)
-      @keys[method]
-    end
-
     def allow()
       @allow.join " "
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gnarly
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Kim Dalsgaard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 +02:00
+date: 2010-10-31 01:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,8 @@ files:
 - lib/gnarly/base.rb
 - lib/gnarly/client/emhttp.rb
 - lib/gnarly/client/patron.rb
+- lib/gnarly/client/test.rb
+- lib/gnarly/client/typhoeus.rb
 - lib/gnarly/client.rb
 - lib/gnarly/environment.rb
 - lib/gnarly/haml.rb
@@ -52,6 +54,7 @@ files:
 - lib/gnarly/parameters.rb
 - lib/gnarly/provides.rb
 - lib/gnarly/request.rb
+- lib/gnarly/static.rb
 - lib/gnarly/status.rb
 - lib/gnarly/system.rb
 - lib/gnarly/typhoeus.rb