safrano 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd0dda1e8d7fc80e01fc15b50b0893a31b189bb95e0138c8c1e49f4d3cdb11d5
-  data.tar.gz: 4155a3d6ca1dcd2817aab51bc85208ada311b8a120d4ed90e5a8fcd6c05d23b7
+  metadata.gz: 4af1e3f2a6c005cb7269a3eb1a0f3d9f4de7c46aa76a79323b2b4052599e41ed
+  data.tar.gz: c7293279d1b38862dd8c26e8e98c8f90ca3cf75f0111ef7bf7f5c3994a6d9d44
 SHA512:
-  metadata.gz: e1b61fcb3776b7435821121eb41b21afcf5fba422cb7665182ca7dc4d5e11155c3ba92a41eee7c9dc20730728c838033aa4b30367fd0e518d108547b7fbb7bf5
-  data.tar.gz: 270e6f1942254b239aed16b0bdb4ba8c5f48eba6fa676f9e9da9758e984c1cdd37a72cd355ed30326881013342538bf59b4de7b9143aabd2104d4c3fdf7faa0d
+  metadata.gz: ca004d2c4842f70b6032f0d4d3930d02df98f7d29dc661bba3e8fa4e54fd5b9617dd640fb1333be8af7e8a110f778956f7e62c0c42f64fe7dfdf65804793dc5d
+  data.tar.gz: '09cdef8944addc559a2b7231344dd25b216965e42ed4f0e4e71b7e400bcb6a23a0070a65d250897cf44e8a5b363b72174edb847ecd787204650ed873343f1db2'

data/lib/multipart.rb

@@ -0,0 +1,182 @@
+#!/usr/bin/env ruby
+
+# Simple multipart support for OData $batch purpose
+
+module Multi
+  RETNL = "\r\n".freeze
+  HTTP_VERB_URI_REGEXP = /^(POST|GET|PUT|PATCH)\s+(\S*)\s?(\S*)$/.freeze
+  HEADER_REGEXP = %r{^([a-zA-Z\-]+):\s*([0-9a-zA-Z\-\/,\s]+;?\S*)\s*$}.freeze
+  module Parts
+    class Base
+      attr_accessor :parts
+      attr_reader :body
+      attr_reader :headers
+
+      def initialize(boundary)
+        @boundary = boundary
+        @headers = {}
+        @body = ''
+        @parts = []
+      end
+
+      def finalize
+        @parts.each do |part|
+          @body << "--#{@boundary}#{RETNL}"
+          @body << part.message_s
+          @body << RETNL
+        end
+        @body << "--#{@boundary}--#{RETNL}"
+        @headers['Content-Length'] = @body.bytesize.to_s
+        @body
+      end
+    end
+    class Mixed < Base
+      def initialize(boundary)
+        super(boundary)
+        @headers['Content-Type'] = "multipart/mixed;boundary=#{@boundary}"
+      end
+
+      def shadow_copy
+        self.class.new(@boundary)
+      end
+
+      def self.parse(inp, boundary)
+        @mmboundary = "--#{boundary}"
+        ret = Multi::Parts::Mixed.new(boundary)
+        inp.split(@mmboundary).each do |p|
+          ret.parts << parse_part(p) unless (p.strip == '--') || p.empty?
+        end
+        ret
+      end
+
+      # Ultrasimplified parser...
+      def self.parse_part(inp)
+        state = :start
+        ct_headers = {}
+        headers = {}
+        body_str = ''
+        http_method = nil
+        uri = nil
+        inp.each_line do |l|
+          next if l.strip.empty?
+
+          case state
+          when :start, :ohd
+            md = l.strip.match(HEADER_REGEXP)
+
+            if md
+              state = :ohd
+              ct_headers[md[1]] = md[2]
+            else
+              md = l.strip.match(HTTP_VERB_URI_REGEXP)
+              if md
+                state = :hd
+                http_method = md[1]
+                uri = md[2]
+              end
+            end
+          when :hd
+            md = l.strip.match(HEADER_REGEXP)
+            if md
+              state = :hd
+              headers[md[1]] = md[2]
+            else
+              body_str << l
+              state = :bd
+            end
+
+          when :bd
+            body_str << l
+          end
+        end
+        if ct_headers['Content-Type'] == 'application/http'
+
+          Multi::Part::HttpReq.new(headers,
+                                   http_method,
+                                   uri,
+                                   body_str)
+
+        else
+          # TODO: should probably be a BadRequestError ?
+          raise RuntimeError
+        end
+      end
+    end
+  end
+
+  module Part
+    class Base
+      attr_accessor :content_type
+      attr_accessor :content_transfer_enc
+      def initialize
+        @content = nil
+      end
+
+      attr_writer :content
+
+      def message_s
+        result = ''
+        result << "Content-Type: #{@content_type}#{RETNL}"
+        result << "Content-Transfer-Encoding: #{@content_transfer_enc}#{RETNL}"
+        result << RETNL
+        result << content.to_s
+        result
+      end
+    end
+
+    class HttpReq < Base
+      def initialize(headers, method, url, body)
+        super()
+        @content_type = 'application/http'
+        @content_transfer_enc = 'binary'
+        @headers = headers
+        @http_method = method
+        @url = url
+        @body = body
+      end
+
+      def finalize
+        @content = "#{@http_method} #{@url} HTTP/1.1#{RETNL}"
+        @headers.each do |k, v|
+          @content << "#{k}: #{v}#{RETNL}"
+        end
+        if @body != ''
+          @content << RETNL
+          @content << @body
+        end
+        @content
+      end
+
+      def content
+        @content = (@content || finalize)
+      end
+
+      # shamelessely copied from Rack::TEST:Session
+      def headers_for_env
+        converted_headers = {}
+
+        @headers.each do |name, value|
+          env_key = name.upcase.tr('-', '_')
+          env_key = 'HTTP_' + env_key unless env_key == 'CONTENT_TYPE'
+          converted_headers[env_key] = value
+        end
+
+        converted_headers
+      end
+
+      def batch_env
+        @env = ::Rack::MockRequest.env_for(@url,
+                                           method: @http_method,
+                                           input: @body_str)
+        @env.merge! headers_for_env
+        @env
+      end
+    end
+
+    class HttpGet < HttpReq
+      def initialize(url, app_headers)
+        super(app_headers, 'GET', url, '')
+      end
+    end
+  end
+end

data/lib/odata/batch.rb

@@ -2,66 +2,66 @@
 
 require 'rack_app.rb'
 require 'safrano_core.rb'
+require 'webrick/httpstatus'
 
 module OData
-  module Batch
-    # Mayonaise
-    class MyOApp < OData::ServerApp
-      attr_writer :full_req
+  RETNEW = "\r\n".freeze
+  class Request
+    def create_batch_app
+      Batch::MyOApp.new(self)
+    end
 
-      def batch_call(env)
-        @request = OData::Request.new(env)
-        @response = OData::Response.new
+    def parse_multipart_mixed
+      @boundary = media_type_params['boundary']
+      Multi::Parts::Mixed.parse(body.read, @boundary)
+    end
+  end
 
-        dispatch
+  class Response
+    APPLICATION_HTTP_11 = ['Content-Type: application/http',
+                           "Content-Transfer-Encoding: binary#{RETNEW}",
+                           'HTTP/1.1 '].join(RETNEW).freeze
+    StatusMessage = WEBrick::HTTPStatus::StatusMessage.freeze
+    def message_s
+      b = String.new(APPLICATION_HTTP_11)
+      b << "#{@status} #{StatusMessage[@status]} #{RETNEW}"
+      headers.each { |k, v| b << k.to_s << ':' << v.to_s << RETNEW }
+      b << RETNEW
+      b << @body[0].to_s
+      b << RETNEW
+    end
+  end
 
-        @response.finish
-      end
+  module Batch
+    # Mayonaise
+    class MyOApp < OData::ServerApp
+      attr_reader :full_req
+      attr_reader :response
 
-      def batch_body
-        b = ''
-        @response.headers.each { |k, v| b << k.to_s << ':' << v.to_s << "\r\n" }
-        b << "\r\n"
-        b << @response.body[0].to_s
-        b << "\r\n"
+      def initialize(full_req)
+        @full_req = full_req
       end
-    end
 
-    # Moutarde
-    class RequestPartBuilder
-      attr_accessor :body_str
-      attr_accessor :odata_headers
-      attr_accessor :headers
-      attr_accessor :http_method
-      attr_accessor :uri
-      attr_accessor :env
-      def initialize
-        @headers = {}
-        @odata_headers = {}
-        @body_str = ''
+      # redefined for $batch
+      def before
+        headers 'Cache-Control' => 'no-cache'
+        @request.service = @full_req.service
+        headers 'DataServiceVersion' => @request.service.data_service_version
       end
 
-      # shamelessely copied from Rack::TEST:Session
-      def headers_for_env
-        converted_headers = {}
+      def batch_call(part_req)
+        env = part_req.batch_env
+        env['HTTP_HOST'] = @full_req.env['HTTP_HOST']
 
-        @headers.each do |name, value|
-          env_key = name.upcase.tr('-', '_')
-          env_key = 'HTTP_' + env_key unless env_key == 'CONTENT_TYPE'
-          converted_headers[env_key] = value
-        end
-
-        converted_headers
-      end
+        @request = OData::Request.new(env)
+        @response = OData::Response.new
 
-      def batch_env
-        @env = ::Rack::MockRequest.env_for(@uri,
-                                           method: @http_method,
-                                           input: @body_str)
-        @env.merge! headers_for_env
-        @env
+        before
+        dispatch
+        @response.finish
       end
     end
+
     # Huile d'olive extra
     class HandlerBase
       TREND = Safrano::Transition.new('', trans: 'transition_end')
@@ -85,8 +85,6 @@ module OData
     end
     # battre le tout
     class EnabledHandler < HandlerBase
-      HTTP_VERB_URI_REGEXP = /^(POST|GET|PUT|PATCH)\s+(\S*)\s?(\S*)$/.freeze
-      HEADER_REGEXP = %r{^([a-zA-Z\-]+):\s*([0-9a-zA-Z\-\/]+;?\S*)\s*$}.freeze
       attr_accessor :boundary
       attr_accessor :mmboundary
       attr_accessor :body_str
@@ -97,93 +95,28 @@ module OData
         @parts = []
       end
 
+      # here we are in the Batch handler object, and this POST should
+      # normally handle a $batch request
       def odata_post(req)
-        odata_batch(req)
-      end
-
-      def odata_get(_req)
-        [405, {}, 'You cant GET $batch, POST it ']
-      end
-
-      def odata_batch(req)
         @request = req
-        if @request.media_type == 'multipart/mixed'
-          read
-          parse
-          [202,
-           { 'Content-Type' => "multipart/mixed;boundary=#{@boundary}" },
-           process_parts]
-        else
-          [415, {}, 'Unsupported Media Type']
-        end
-      end
-
-      def read
-        @body_str = @request.body.read
-        @boundary = @request.media_type_params['boundary']
-        @mmboundary = '--' << @boundary
-      end
 
-      def parse
-        body_str.split(@mmboundary).each do |p|
-          @parts << parse_part(p) unless (p == '--\n') || p == '--' || p.empty?
-        end
-      end
+        if @request.media_type == 'multipart/mixed'
+          batcha = @request.create_batch_app
+          @mult_request = @request.parse_multipart_mixed
+          @mult_response = @mult_request.shadow_copy
 
-      # Ultrasimplified parser...
-      def parse_part(inp)
-        state = :start
-        part = RequestPartBuilder.new
-        inp.each_line do |l|
-          next if l.strip.empty?
-
-          case state
-          when :start, :ohd
-            md = l.strip.match(HEADER_REGEXP)
-
-            if md
-              state = :ohd
-              part.odata_headers[md[1]] = md[2]
-            else
-              md = l.strip.match(HTTP_VERB_URI_REGEXP)
-              if md
-                state = :hd
-                part.http_method = md[1]
-                part.uri = md[2]
-              end
-            end
-          when :hd
-            md = l.strip.match(HEADER_REGEXP)
-            if md
-              state = :hd
-              part.headers[md[1]] = md[2]
-            else
-              part.body_str << l
-              state = :bd
-            end
-
-          when :bd
-            part.body_str << l
+          @mult_request.parts.each_with_object(@mult_response) do |req_part, mresp|
+            batcha.batch_call(req_part)
+            mresp.parts << batcha.response
           end
+          [202, @mult_response.headers, @mult_response.finalize]
+        else
+          [415, {}, 'Unsupported Media Type']
         end
-        part
       end
 
-      def process_parts
-        full_batch_body = ''
-        @parts.each do |p|
-          next unless p.uri
-
-          batcha = MyOApp.new
-
-          batcha.full_req = @request
-
-          batcha.batch_call(p.batch_env)
-
-          full_batch_body << @mmboundary << "\r\n"
-          full_batch_body << batcha.batch_body
-        end
-        full_batch_body << @mmboundary << "--\r\n"
+      def odata_get(_req)
+        [405, {}, 'You cant GET $batch, POST it ']
       end
     end
   end

data/lib/odata/collection.rb

@@ -4,8 +4,6 @@
 # Thus Below we have called that "EntityClass". It's meant as "Collection"
 
 require 'json'
-require 'pp'
-require 'pry'
 require 'rexml/document'
 require 'safrano_core.rb'
 require 'odata/error.rb'

data/lib/odata/collection_order.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'pp'
 require 'odata/error.rb'
 
 # Ordering with ruby expression

data/lib/odata/entity.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'pp'
 require 'rexml/document'
 require 'safrano.rb'
 require 'odata/collection.rb' # required for  self.class.entity_type_name ??

data/lib/odata/error.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'json'
-require 'pp'
 require 'rexml/document'
 require 'safrano.rb'
 

data/lib/odata/relations.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'set'
-require 'pp'
 
 # OData relation related classes/module
 module OData

data/lib/odata/walker.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'json'
-require 'pp'
 require 'rexml/document'
 require 'safrano.rb'
 
@@ -29,6 +28,8 @@ module OData
     attr_reader :do_links
 
     def initialize(service, path)
+      raise 'Walker is called with a nil service' unless service
+
       path = URI.decode_www_form_component(path)
       @context = service
       @contexts = [@context]
@@ -99,7 +100,6 @@ module OData
         else
           @context = nil
           @status = :error
-          #          @error = OData::ServerError
           @error = OData::ErrorNotFound
         end
 

data/lib/rack_app.rb

@@ -4,7 +4,6 @@ require 'rack'
 require_relative 'odata/walker.rb'
 require_relative 'request.rb'
 require_relative 'response.rb'
-require 'pry'
 
 module OData
   # handle GET PUT etc
@@ -25,7 +24,14 @@ module OData
 
     def odata_error
       if @walker.error.nil?
-        [500, {}, 'Server Error']
+
+        # this is too critical; raise a real Exception
+        #        begin
+        raise 'Walker construction failed with a unknown Error '
+      #        rescue StandardError
+      #          binding.pry
+      #        end
+      #        [500, {}, 'Server Error']
       else
         @walker.error.odata_get(@request)
       end
@@ -82,7 +88,7 @@ module OData
 
       neg_error = @request.negotiate_service_version
 
-      raise Error if neg_error
+      raise RuntimeError if neg_error
 
       return false unless @request.service
 

data/lib/safrano.rb

@@ -2,6 +2,7 @@
 
 require 'json'
 require 'rexml/document'
+require_relative './multipart.rb'
 require 'safrano_core.rb'
 require 'odata/entity.rb'
 require 'odata/attribute.rb'

data/lib/service.rb

@@ -185,8 +185,8 @@ module OData
 
     def enable_batch
       @batch_handler = OData::Batch::EnabledHandler.new
-      @v1.batch_handler = @batch_handler
-      @v2.batch_handler = @batch_handler
+      (@v1.batch_handler = @batch_handler) if @v1
+      (@v2.batch_handler = @batch_handler) if @v2
     end
 
     def enable_v1_service

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - D.M.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.15'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: rack-cors
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +100,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/multipart.rb
 - lib/odata/attribute.rb
 - lib/odata/batch.rb
 - lib/odata/collection.rb