gnarly 0.0.4 → 0.0.5

data/lib/gnarly/application.rb

@@ -22,7 +22,8 @@ module Gnarly
       url
     end
 
-    def helper(helper)
+    def helper(helper=nil, &block)
+      helper = Module.new &block if block and not helper
       (@helpers ||= []) << helper
     end
 
@@ -65,7 +66,7 @@ module Gnarly
             environment.instance_exec *url.parameters, &before
           end
           keys = url.keys request.method
-          response = environment.instance_exec *url.parameters(*keys), &@responder
+          response = environment.instance_exec *url.parameters(keys, request.params), &@responder
           if after = url.after
             environment.instance_exec *url.parameters, &after
           end

data/lib/gnarly/client/emhttp.rb

@@ -0,0 +1,36 @@
+require 'em-http'
+
+require 'gnarly/client.rb'
+
+module Gnarly
+
+  module Client
+
+    module EMHttp
+
+      def http(request, &block)
+        if block
+          method, url, headers, body = request
+          opts = {}
+          opts[:head] = headers if headers
+          case url
+          when Array
+            url, query = url
+            opts[:query] = query
+          end
+          http = EventMachine::HttpRequest.new(url).__send__(method, opts) 
+          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
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/gnarly/client/patron.rb

@@ -0,0 +1,33 @@
+require 'patron'
+
+require 'gnarly/client.rb'
+
+module Gnarly
+
+  module Client
+
+    module Patron
+
+      def http(request)
+        method, url, headers, body = request
+        session = ::Patron::Session.new
+        options = {}
+        options[:data] = body if body
+        r = session.request method, Client.create_url(url), headers, options
+        response = [r.status, Client.symbolize_headers(r.headers), r.body]
+        if block_given?
+          yield response
+        else
+          response
+        end
+      end
+
+      def self.http(request)
+        Object.new.extend(self).http request
+      end
+
+    end
+
+  end
+
+end

data/lib/gnarly/client.rb

@@ -0,0 +1,42 @@
+require 'stringio'
+require 'addressable/uri'
+
+module Gnarly
+
+  module Client
+
+    def self.symbolize_headers(headers)
+      symbolized = {}
+      headers.each_pair do |key, value|
+        sym = key.downcase.gsub('-', '_').to_sym
+        symbolized[sym] = value
+      end
+      symbolized
+    end
+
+    def self.create_url(url)
+      case url
+      when Array
+        path, params = url
+        sio = StringIO.new
+        sio << path
+        if params.size > 0
+          key, value = params.shift
+          sio << "?" << key << "=" << value
+          params.each_pair do |key, value|
+            sio << "&" << key << "=" << value
+          end
+        end
+        sio.string
+      else
+        url
+      end
+    end
+
+    def self.url_encode(url)
+      Addressable::URI::encode url
+    end
+
+  end
+
+end

data/lib/gnarly/environment.rb

@@ -1,5 +1,6 @@
 require 'gnarly/provides.rb'
 require 'gnarly/understands.rb'
+require 'gnarly/parameters.rb'
 
 module Gnarly
 
@@ -16,6 +17,11 @@ module Gnarly
       @application
     end
 
+    def helper(helper=nil, &block)
+      helper = Module.new &block if block and not helper
+      extend helper
+    end
+
   end
 
 end

data/lib/gnarly/parameters.rb

@@ -0,0 +1,32 @@
+require 'gnarly/base.rb'
+require 'gnarly/status.rb'
+
+module Gnarly
+
+  module Provides
+    include Base
+    include Status
+
+    def parameters(*names)
+      params = names.collect do |n|
+        name, type = n
+        p = request.params[name.to_s]
+        case type
+        when :integer, :int
+          if /^-?[0-9]+$/ =~ p
+            p.to_i
+          else
+            nil
+          end
+        when :symbol
+          p.to_sym
+        else
+          p
+        end
+      end
+      yield *params
+    end
+    
+  end
+  
+end

data/lib/gnarly/request.rb

@@ -1,8 +1,10 @@
-require 'rack/utils'
+require 'query_string_parser'
 
 module Gnarly
 
   class Request
+    include QueryStringParser
+    
     attr_reader :state
 
     def initialize(state)
@@ -41,7 +43,7 @@ module Gnarly
     end
 
     def params()
-      @params ||= ::Rack::Utils.parse_query(@state["QUERY_STRING"])
+      @params ||= qs_parse(@state["QUERY_STRING"])
     end
 
     private

data/lib/gnarly/url.rb

@@ -20,8 +20,23 @@ module Gnarly
       @match != nil
     end
 
-    def parameters(*keys)
-      if keys.empty?
+    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
         a = @match.to_a
         a.shift
         if @types
@@ -36,21 +51,15 @@ 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
 
@@ -66,7 +75,8 @@ module Gnarly
       @allow.join " "
     end
 
-    def helper(helper)
+    def helper(helper=nil, &block)
+      helper = Module.new &block if block and not helper
       (@helpers ||= []) << helper
     end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gnarly
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kim Dalsgaard
@@ -14,10 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +02:00
+date: 2010-07-19 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: query_string_parser
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Super simple DSL style web framework on top of Rack. Makes real HTTP'ish REST services easy.
 email: kim@kimdalsgaard.com
 executables: []
@@ -29,9 +43,13 @@ extra_rdoc_files: []
 files: 
 - lib/gnarly/application.rb
 - lib/gnarly/base.rb
+- lib/gnarly/client/emhttp.rb
+- lib/gnarly/client/patron.rb
+- lib/gnarly/client.rb
 - lib/gnarly/environment.rb
 - lib/gnarly/haml.rb
 - lib/gnarly/mimeparse.rb
+- lib/gnarly/parameters.rb
 - lib/gnarly/provides.rb
 - lib/gnarly/request.rb
 - lib/gnarly/status.rb
@@ -51,23 +69,27 @@ 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.3.7
 signing_key: 
 specification_version: 3
 summary: Super simple web framework on top of Rack