scorched 0.12 → 0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83445d0e97b4717ff0d830c7e72f09bf0c8f8fa1
-  data.tar.gz: eb90cc0893a4b53d180d7dca083f04340026b964
+  metadata.gz: 097dc690273075ecec2044e7ef6cc9ef285e4c03
+  data.tar.gz: ceac380dfda10425b551488c953e34efc4d681a6
 SHA512:
-  metadata.gz: d90ea66b9a3a280fa2746d0a9cf12a0697c6169e035fdcba9753612bf3297bd01c87b4ca7fa286740c24441e6ec539105cb4621c99a4b28facacdfe2deedeade
-  data.tar.gz: db597065e5a9d1dd93be4a738f998bea0cc85be0b057cd8b107eaad98f5932cc4ebf51aefc03a7b11c5ee412672f2c695e687e755cab5ed69c5f1c93f200d522
+  metadata.gz: 8b67fe3315887ef8cc9863c1353a803ff27e82d9f5c6ecb6b3d1b611077c1ec2ffad754e175e8adecaba2fb50f1ad7d96f3f3e5ce27f83c4005a5b5c44df8745
+  data.tar.gz: 4d68ca06da03b5cf45d25191b6786008591066f85e2bceb246e82e6ffccbef6d21a357e2534ee5114855e81015712cf3de584cb2ba93145fa213dc80c926b779

data/CHANGES.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+### v0.13
+* Added `content_type` condition, corresponding to the `Content-Type` request header.
+* Reverted rogue commit containing experimental debugging logging that I didn't plan to merge. Fixes issue #12.
+
 ### v0.12
 * Halt can now take an optional response body (typically a string).
 * Controller now returns a valid rack array, rather than a Scorched::Response.

data/docs/02_fundamentals/03_routing.md

@@ -69,6 +69,7 @@ Conditions are essentially just pre-requisites that must be met before a mapping
 
 * `:charset` - Character sets accepted by the client.
 * `:config` - Takes a hash, each element of which must match the value of the corresponding config option.
+* `:content_type` - The content-type of the body of the request. E.g. "multipart/form-data", "application/json"
 * `:encoding` - Encodings accepted by the client.
 * `:failed_condition` - If one or more mappings are matched, but they're conditions do not pass, the first failed condition of the first matched mapping is considered the `failed_condition` for the request.
 * `:host` - The host name (i.e. domain name) used in the request.

data/lib/scorched/controller.rb

@@ -39,13 +39,16 @@ module Scorched
     
     conditions << {
       charset: proc { |charsets|
-        [*charsets].any? { |charset| request.env['rack-accept.request'].charset? charset }
+        [*charsets].any? { |charset| env['rack-accept.request'].charset? charset }
       },
       config: proc { |map|
         map.all? { |k,v| config[k] == v }
       },
+      content_type: proc { |content_types|
+        [*content_types].include? env['CONTENT_TYPE']
+      },
       encoding: proc { |encodings|
-        [*encodings].any? { |encoding| request.env['rack-accept.request'].encoding? encoding }
+        [*encodings].any? { |encoding| env['rack-accept.request'].encoding? encoding }
       },
       failed_condition: proc { |conditions|
         if !matches.empty? && matches.all? { |m| m.failed_condition }
@@ -56,10 +59,10 @@ module Scorched
         (Regexp === host) ? host =~ request.host : host == request.host 
       },
       language: proc { |languages|
-        [*languages].any? { |language| request.env['rack-accept.request'].language? language }
+        [*languages].any? { |language| env['rack-accept.request'].language? language }
       },
       media_type: proc { |types|
-        [*types].any? { |type| request.env['rack-accept.request'].media_type? type }
+        [*types].any? { |type| env['rack-accept.request'].media_type? type }
       },
       method: proc { |methods| 
         [*methods].include?(request.request_method)
@@ -236,8 +239,6 @@ module Scorched
       end
       env['scorched.request'] ||= Request.new(env)
       env['scorched.response'] ||= Response.new
-      @_log_prefix = ' ' * (4 * request.breadcrumb.length)
-      log :debug, "#{log_object(self)} instantiated"
     end
     
     def action
@@ -256,7 +257,6 @@ module Scorched
             redirect(request.path.chomp('/'))
           end
           
-          log :debug, :matches
           if matches.all? { |m| m.failed_condition }
             pass if config[:auto_pass]
             response.status = matches.empty? ? 404 : 403
@@ -267,19 +267,17 @@ module Scorched
             @_matched = true == matches.each { |match|
               next if match.failed_condition
               request.breadcrumb << match
-              target = match.mapping[:target]
               break if catch(:pass) {
-                log :debug, "Invoking target: #{log_object(target)}"
+                target = match.mapping[:target]
                 response.merge! (Proc === target) ? instance_exec(env, &target) : target.call(env)
               }
               request.breadcrumb.pop
-              log :debug, "#{log_object(target)} passed the request"
             }
           rescue => inner_error
             rescue_block.call(inner_error)
           end
           run_filters(:after)
-        end || log(:debug, "Request halted")
+        end
       rescue => outer_error
         outer_error == inner_error ? raise : rescue_block.call(outer_error)
       end
@@ -520,52 +518,18 @@ module Scorched
   
     def run_filters(type)
       tracker = env['scorched.executed_filters'] ||= {before: Set.new, after: Set.new}
-      eligable = filters[type].reject{ |f| tracker[type].include? f || check_for_failed_condition(f[:conditions])}
-      log :debug, "Running #{eligable.length} eligable #{type} filters:"
-      eligable.each do |f|
-        log :debug, "  #{f[:conditions]} => #{log_object f[:proc]}"
-        tracker[type] << f
-        instance_exec(&f[:proc])
-      end
-    end
-    
-    def log(type, message = nil, *args)
-      if config[:logger]
-        logger = config[:logger]
-        type = Logger.const_get(type.to_s.upcase)
-        logger.progname ||= 'Scorched'
-        
-        case message
-        when :matches
-          message = []
-          eligable = matches.reject { |m| m.failed_condition }
-          message << "#{matches.length} mappings matched #{request.unmatched_path.inspect}:"
-          matches.each do |m|
-            message << "  #{m.mapping[:pattern].inspect} => #{log_object m.mapping[:target]}"
-          end
-          message << "#{eligable.length} of which are eligable:"
-          eligable.each do |m|
-            message << "  #{m.mapping[:pattern].inspect} => #{log_object m.mapping[:target]}"
-          end
-        end
-
-        [*message].each do |v|
-          v.insert(0, @_log_prefix)
-          logger.add(type, v)
+      filters[type].reject{ |f| tracker[type].include? f }.each do |f|
+        unless check_for_failed_condition(f[:conditions])
+          tracker[type] << f
+          instance_exec(&f[:proc])
         end
       end
-      true # Makes it safe to use in conditions
     end
     
-    def log_object(obj)
-      case obj
-      when Proc
-        "<Proc @#{obj.source_location.join(':')}>"
-      when Array
-        obj.map { |v| log_object(v) }.inspect
-      else
-        obj.class.name || Controller === obj.class ? 'Anonymous controller' : 'Anonymous class'
-      end
+    def log(type, message)
+      config[:logger].progname ||= 'Scorched'
+      type = Logger.const_get(type.to_s.upcase)
+      config[:logger].add(type, message)
     end
   end
 end

data/lib/scorched/version.rb

@@ -1,3 +1,3 @@
 module Scorched
-  VERSION = '0.12'
+  VERSION = '0.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorched
 version: !ruby/object:Gem::Version
-  version: '0.12'
+  version: '0.13'
 platform: ruby
 authors:
 - Tom Wardrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack