contour 2.0.0.beta.2 → 2.0.0.beta.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDk3MDAwMmM4ZjEyMDYyYzk5NzJhYTdmMjNmZGQ1NzBjM2U3OTE1Mg==
+    YjRjZmRmNzFkYzU5ZTNkZDNmNzI3ZWVmOGNmYjRlNjY0ZDk5ZmZmMA==
   data.tar.gz: !binary |-
-    MDRmYzdiMjEwYmEwZGZkNzk3ZTkxYTBjMDQwNDY0OTYxZmJhNjNlYg==
+    MWNmZmFiOWY3YjhmYTFlNWRjYzZmOGI3YWVhMDgzMjNlMzBkNTVkZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGRhY2ZkYmY2M2IyOWRmZTMyMjU4YjRlNWU0ZmMyZGMyNjcwYWI5N2E2ZmUx
-    MzJiYWRjN2VjZGY5YzMxYWViYTNjMzc4M2M3M2NjNTgxYzMxZTc4M2UyYWVh
-    MjQ3NjFhMTU5ODVkOWY2OGYyOGQyMzc2NGRkNDJmOTM0Zjk4MzA=
+    Yzg0ZjM3ZTZkYTJmZTI5MjBmNWE2YTkyOTJlMWM4OWYwYWI0NDUyOTA1MDFm
+    ZTg4ODc4ZjZmZDg0ODlmNmIxYzFhYTRjN2VkZTI0YzUzOWExNjgyZjM3MDc2
+    Yjk5MGQwZTEyMjRjZDM4YThkY2U5ZjNiZTk4MzJhYmM4MWIyNjY=
   data.tar.gz: !binary |-
-    NzFjNjI1Njg1NDljMjI1M2NhMzFlNzE5YTY1NDdjZDBmM2M4Y2M2MWRhN2Ri
-    ZWRlZDYxZmFlNTBhOTU1YjQxYzFiOWQ5ZmRmZGUxMjE0NWRiNjdiNjhiZDFj
-    YTEyZjgzMjM4NDE5YzkyYTk1ZGQ4YmVjMzEwMzFiNGQ3YTdhYjA=
+    ODg5OGY1MzlhNWI3Y2QzMzU4MjhhODRmZTA0NGQzZjQyMjM1NDg4ZmFiZTdj
+    NmZjMDFiZDhkYjczMWY3NzlhNzdmM2VlZmQ4MmNiMDY2NjYzODMzZDZlYWE5
+    OTkwZmI5MGM3MGY4OTQ4NzA3OTg2NzhhOTIwYWFiN2QxMDdjNmI=

data/CHANGELOG.md

@@ -4,6 +4,11 @@
 - **Gem Changes**
   - Updated to Rails 4.0.0.beta1
 
+### Refactoring
+- Added a fix for Rack that respecifies the Content-Type as "text/html"
+  - This fixes the OmniAuth-LDAP form from returning as "text/plain"
+- Removed an temporary fix that allowed OmniAuth to interact properly with Rack
+
 ## 1.3.0 (February 26, 2013)
 
 ### Breaking Changes

data/lib/contour/fixes/omniauth.rb

@@ -1,45 +1,45 @@
 require 'omniauth'
 require 'omniauth-ldap'
 
-# Overwriting methods from Rack
-# While OmniAuth 1.0.2 fixes the Builder setup, Rack 1.4.0 still responds incorrectly to it's release version.
-# Wait for Rack 1.4.1 or updated version before removing the Builder fixes
-module OmniAuth
-
-  # class Builder updates for Rack 1.4.0
-  class Builder
-    def initialize(app = nil,&block)
-      @use, @map, @run = [], nil, app
-      instance_eval(&block) if block_given?
-    end
-
-    def on_failure(&block)
-      OmniAuth.config.on_failure = block
-    end
-
-    def configure(&block)
-      OmniAuth.configure(&block)
-    end
-
-    def provider(klass, *args, &block)
-      if klass.is_a?(Class)
-        middleware = klass
-      else
-        begin
-          middleware = OmniAuth::Strategies.const_get("#{OmniAuth::Utils.camelize(klass.to_s)}")
-        rescue NameError
-          raise LoadError, "Could not find matching strategy for #{klass.inspect}. You may need to install an additional gem (such as omniauth-#{klass})."
-        end
-      end
-
-      use middleware, *args, &block
-    end
-
-    def call(env)
-      to_app.call(env)
-    end
-  end
-end
+# # Overwriting methods from Rack
+# # While OmniAuth 1.0.2 fixes the Builder setup, Rack 1.4.0 still responds incorrectly to it's release version.
+# # Wait for Rack 1.4.1 or updated version before removing the Builder fixes
+# module OmniAuth
+
+#   # class Builder updates for Rack 1.4.0
+#   class Builder
+#     def initialize(app = nil,&block)
+#       @use, @map, @run = [], nil, app
+#       instance_eval(&block) if block_given?
+#     end
+
+#     def on_failure(&block)
+#       OmniAuth.config.on_failure = block
+#     end
+
+#     def configure(&block)
+#       OmniAuth.configure(&block)
+#     end
+
+#     def provider(klass, *args, &block)
+#       if klass.is_a?(Class)
+#         middleware = klass
+#       else
+#         begin
+#           middleware = OmniAuth::Strategies.const_get("#{OmniAuth::Utils.camelize(klass.to_s)}")
+#         rescue NameError
+#           raise LoadError, "Could not find matching strategy for #{klass.inspect}. You may need to install an additional gem (such as omniauth-#{klass})."
+#         end
+#       end
+
+#       use middleware, *args, &block
+#     end
+
+#     def call(env)
+#       to_app.call(env)
+#     end
+#   end
+# end
 
 # Fix for LDAP Authentication with Domains
 module OmniAuth
@@ -107,4 +107,4 @@ module OmniAuth
       end
     end
   end
-end
+end

data/lib/contour/fixes/rack.rb

@@ -13,4 +13,33 @@ module Rack
       end
     end
   end
+
+
+  # Required as Rack 1.5.x series removed the default content type of text/html for some unknown reason, something about "adhering to standards for HTTP 1.0 and 1.1 protocols"
+  # Was removed in this commit: https://github.com/rack/rack/commit/3623d04526b953a63bfb3e72de2d6920a042563f#L2L21
+  class Response
+    def initialize(body=[], status=200, header={})
+      @status = status.to_i
+      @header = Utils::HeaderHash.new("Content-Type" => "text/html").merge(header) # This is the modified line that requires Content-Type set to text/html.
+
+      @chunked = "chunked" == @header['Transfer-Encoding']
+      @writer  = lambda { |x| @body << x }
+      @block   = nil
+      @length  = 0
+
+      @body = []
+
+      if body.respond_to? :to_str
+        write body.to_str
+      elsif body.respond_to?(:each)
+        body.each { |part|
+          write part.to_s
+        }
+      else
+        raise TypeError, "stringable or iterable required"
+      end
+
+      yield self  if block_given?
+    end
+  end
 end

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 2
     MINOR = 0
     TINY = 0
-    BUILD = "beta.2" # nil, "pre", "rc", "rc2"
+    BUILD = "beta.3" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.2
+  version: 2.0.0.beta.3
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails