cuba-api 0.5.0 → 0.5.1

data/lib/cuba_api/accept_content.rb

@@ -51,7 +51,7 @@ module CubaApi
         res[ "Content-Type" ] = mime + "; charset=utf-8"
         obj.send self.class[ :mimes ][ mime ]
       else
-        head :not_found
+        no_body :not_found
         nil
       end
     end

data/lib/cuba_api/accept_content.rb~

@@ -143,7 +143,7 @@ module CubaApi
         res[ "Content-Type" ] = mime + "; charset=utf-8"
         obj.send self.class[ :mimes ][ mime ]
       else
-        head 404
+        no_body 404
         nil
       end
     end

data/lib/cuba_api/cors.rb

@@ -1,113 +1,117 @@
-class CORS
+require 'uri'
+module CubaApi
+  class CORS
 
-  DEFAULT_METHODS = [ 'GET',  'HEAD', 'POST', 'PUT', 'DELETE' ]
+    DEFAULT_METHODS = [ 'GET',  'HEAD', 'POST', 'PUT', 'DELETE' ]
 
-  def initialize( options, &block )
-    @options = options
-    # only for inspect
-    @config = options.config
-    # set default max_ago
-    self.max_age = 60 * 60 * 24 # one day
-    block.call self if block
-  end
+    def initialize( options, &block )
+      @options = options
+      # only for inspect
+      @config = options.config
+      # set default max_ago
+      self.max_age = 60 * 60 * 24 # one day
+      block.call self if block
+    end
 
-  def config
-    @config
-  end
+    def config
+      @config
+    end
 
-  def method_missing( method, *args )
-    m = method.to_s
-    if m.match /^_/
-      if m =~ /=$/
-        @options[ "cors_#{m[1..-2]}".to_sym ] = args.flatten
+    def method_missing( method, *args )
+      m = method.to_s
+      if m.match /^_/
+        if m =~ /=$/
+          @options[ "cors_#{m[1..-2]}".to_sym ] = args.flatten
+        else
+          @options[ "cors_#{m[1..-1]}".to_sym ]
+        end
       else
-        @options[ "cors_#{m[1..-1]}".to_sym ]
+        super
       end
-    else
-      super
     end
-  end
-
-  def max_age=( max )
-    @options[ :cors_max_age ] = max
-  end
-  
-  def expose=( expose )
-    self._expose = expose
-  end
 
-  def origins=( *origins )
-    self._origins = [ origins ].flatten
-  end
-  
-  def origins( domain )
-    origins = self._origins
-    if origins == [ '*' ] || origins.nil? || origins.member?( domain )
-      domain
+    def max_age=( max )
+      @options[ :cors_max_age ] = max
     end
-  end
-
-  def methods=( *methods )
-    self._methods = [ methods ].flatten.collect{ |h| h.to_s.upcase } 
-  end
-  
-  def methods( method, methods = nil )
-    methods = methods.collect { |m| m.to_s.upcase } if methods
-    if (methods || self._methods || DEFAULT_METHODS).member?( method.to_s.upcase )
-      methods || self._methods || DEFAULT_METHODS
+    
+    def expose=( expose )
+      self._expose = expose
     end
-  end
 
-  def allowed?( methods )
-    if methods
-      methods = methods.collect { |m| m.to_s.upcase }
-      ( ( self._methods || DEFAULT_METHODS ) & methods ).size > 0
-    else
-      true
+    def origins=( *origins )
+      self._origins = [ origins ].flatten
+    end
+    
+    def origins( domain )
+      if domain
+        host = URI.parse( domain ).host
+        origins = self._origins
+        if origins == [ '*' ] || origins.nil? || origins.member?( host )
+          domain
+        end
+      end
     end
-  end
 
-  def headers=( *headers )
-    self._headers = [ headers ].flatten.collect{ |h| h.to_s.upcase }
-  end
+    def methods=( *methods )
+      self._methods = [ methods ].flatten.collect{ |h| h.to_s.upcase } 
+    end
+    
+    def methods( method, methods = nil )
+      methods = methods.collect { |m| m.to_s.upcase } if methods
+      if (methods || self._methods || DEFAULT_METHODS).member?( method.to_s.upcase )
+        methods || self._methods || DEFAULT_METHODS
+      end
+    end
 
-  def headers( headers )
-    # return headers as they come in when not configured
-    headers = headers.split( /,\s+/ ) if headers
-    if self._headers && headers
-      given = headers.collect{ |h| h.to_s.upcase }
-      # give back the allowed subset of the given headers
-      result = given & self._headers
-      result = nil if result.empty?
-      result
-    else
-      headers
+    def allowed?( methods )
+      if methods
+        methods = methods.collect { |m| m.to_s.upcase }
+        ( ( self._methods || DEFAULT_METHODS ) & methods ).size > 0
+      else
+        true
+      end
     end
-  end
 
-  def allow_origin( req, res )
-    if orig = origins( req[ 'HTTP_ORIGIN' ] )
-      res[ 'Access-Control-Allow-Origin' ] = orig
+    def headers=( *headers )
+      self._headers = [ headers ].flatten.collect{ |h| h.to_s.upcase }
     end
-  end
 
-  def process( req, res, methods )
-    allow_origin( req, res )
-    res[ 'Access-Control-Max-Age' ] = _max_age.to_s if _max_age
-    if m = methods( req[ 'HTTP_ACCESS_CONTROL_REQUEST_METHOD' ], methods )
-      res[ 'Access-Control-Allow-Methods' ] = m.join( ', ' )
+    def headers( headers )
+      # return headers as they come in when not configured
+      headers = headers.split( /,\s+/ ) if headers
+      if self._headers && headers
+        given = headers.collect{ |h| h.to_s.upcase }
+        # give back the allowed subset of the given headers
+        result = given & self._headers
+        result = nil if result.empty?
+        result
+      else
+        headers
+      end
     end
-    if h = headers( req[ 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' ] )
-      res[ 'Access-Control-Allow-Headers' ] = h.join( ', ' )
+
+    def allow_origin( req, res )
+      if orig = origins( req[ 'HTTP_ORIGIN' ] )
+        res[ 'Access-Control-Allow-Origin' ] = orig
+      end
     end
-    unless _expose.nil? || _expose.empty?
-      res[ 'Access-Control-Expose-Headers' ] = _expose.join( ', ' )
+
+    def process( req, res, methods )
+      allow_origin( req, res )
+      res[ 'Access-Control-Max-Age' ] = _max_age.to_s if _max_age
+      if m = methods( req[ 'HTTP_ACCESS_CONTROL_REQUEST_METHOD' ], methods )
+        res[ 'Access-Control-Allow-Methods' ] = m.join( ', ' )
+      end
+      if h = headers( req[ 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' ] )
+        res[ 'Access-Control-Allow-Headers' ] = h.join( ', ' )
+      end
+      unless _expose.nil? || _expose.empty?
+        res[ 'Access-Control-Expose-Headers' ] = _expose.join( ', ' )
+      end
+      res.status = 200
     end
-    res.status = 200
   end
-end
 
-module CubaApi
   module Cors
     module ClassMethods
 

data/lib/cuba_api/current_user.rb~

@@ -143,7 +143,7 @@ module CubaApi
         res[ "Content-Type" ] = mime + "; charset=utf-8"
         obj.send self.class[ :mimes ][ mime ]
       else
-        head 404
+        no_body 404
         nil
       end
     end

data/lib/cuba_api/guard.rb~

@@ -143,7 +143,7 @@ module CubaApi
         res[ "Content-Type" ] = mime + "; charset=utf-8"
         obj.send self.class[ :mimes ][ mime ]
       else
-        head 404
+        no_body 404
         nil
       end
     end

data/lib/cuba_api/reponse_status.rb~

@@ -133,7 +133,7 @@ puts req.request_method
         #   config = Configuration.optimistic_get( updated_at,
         #                                          id )
         #   config.destroy
-        #   head 200
+        #   no_body 200
         # end
 
       end

data/lib/cuba_api/serializer.rb~

@@ -143,7 +143,7 @@ module CubaApi
         res[ "Content-Type" ] = mime + "; charset=utf-8"
         obj.send self.class[ :mimes ][ mime ]
       else
-        head 404
+        no_body 404
         nil
       end
     end

data/lib/cuba_api/write_aspect.rb

@@ -39,7 +39,7 @@ module CubaApi
       end
     end
 
-    def head( status )
+    def no_body( status )
       res.status = Rack::Utils.status_code( status )
       res.write Rack::Utils::HTTP_STATUS_CODES[ res.status ]
       res['Content-Type' ] = 'text/plain'

data/lib/cuba_api/write_aspects.rb~

@@ -143,7 +143,7 @@ module CubaApi
         res[ "Content-Type" ] = mime + "; charset=utf-8"
         obj.send self.class[ :mimes ][ mime ]
       else
-        head 404
+        no_body 404
         nil
       end
     end

data/spec/cors_with_config_spec.rb

@@ -14,7 +14,7 @@ describe CubaApi::Cors do
         cors.max_age = 123
         cors.methods = :put
         cors.headers = 'x-requested-with'
-        cors.origins = 'http://middleearth'
+        cors.origins = 'middleearth'
         cors.expose = 'x-requested-with'
       end
       define do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba-api
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba