safrano 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34ab64bf4fd2bbde8453e754091a3bd5618f41e6d51d9d15c9c678efcb38d544
-  data.tar.gz: d0ee4590389199a0e3530aee4a7aa244dde9355de8506a1091c5e0215ad40d78
+  metadata.gz: 6894a03a0224ba8beedc0a05fba7700ad4e06b34d79858478c5e4fe998ed8eef
+  data.tar.gz: '059f1dc5d7d3c4537f279be2b170b5c67b2c61fdbe27199f511e8f1e894776ad'
 SHA512:
-  metadata.gz: b9531e9de93d7d117ea1b58c1a90967706b102078513752f0bfef2447dc9c5988438d7ee1e9053827da0e58ac2aad07a6450a7c27b1fa5833ba329fe6c2bd4a8
-  data.tar.gz: 9e102e3c98ce0d47c0dd1dda33c8b2b76e0b7a3b9503d3af86c2ae08404773000b87442711ca230875d715148f90d870e9e63b9aae5c866677d4b0e8ca687ddd
+  metadata.gz: d41f73aa8bdd9084eaa150ee06d6c9b05e91ff18dd24f25daae75f25572cf0500c0c5669ade95275b65891655fae4e0e0c53fbb2712e414fe8daf6df91efb8cb
+  data.tar.gz: 11e49d68d0fc005be501f069ab8fcbaad40050449435f4369938b10f1cb90c71cc86b361b4bbaa7541ac7e274ec34de1f6925a1a63d481bcd5bb5690bfb84649

data/lib/multipart.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 CRLF = "\r\n".freeze
 LF = "\n".freeze
 
@@ -293,6 +291,7 @@ module MIME
         def initialize(boundary)
           @boundary = boundary
           @hd = {}
+          @content_id_references = nil
           @parser = Parser.new(self)
         end
 
@@ -300,6 +299,37 @@ module MIME
           (@boundary == other.boundary) && (@content == other.content)
         end
 
+        def each_changeset
+          return unless @level.zero?
+
+          @content.each do |part|
+            yield part if part.is_a? MIME::Content::Multipart::Base
+          end
+        end
+
+        def prepare_content_id_refs
+          if @level.zero?
+            each_changeset(&:prepare_content_id_refs)
+          elsif @level == 1
+
+            @content_id_references = {}
+
+            @content.each do |part|
+              next unless part.is_a? MIME::Content::Application::Http
+
+              case part.content.http_method
+              when 'POST', 'PUT'
+                if (ctid = part.hd['content-id'])
+                  part.content.content_id = ctid
+                  @content_id_references[ctid] = nil
+                end
+              end
+              part.content.content_id_references = @content_id_references
+            end
+
+          end
+        end
+
         def set_multipart_header
           @hd['content-type'] = "multipart/mixed; boundary=#{@boundary}"
         end
@@ -313,29 +343,41 @@ module MIME
           @response = self.class.new(::SecureRandom.uuid)
           @response.set_multipart_header
           if @level == 1 # changeset need their own global transaction
-            # the change requests that are part of if have @level==2
+            # the change requests that are part of it have @level==2
             # and will be flagged with in_changeset=true
             # and this will finally be used to skip the transaction
             # of the changes
             batcha.db.transaction do
               begin
-                @response.content = @content.map { |part| part.get_response(batcha) }
+                @response.content = @content.map { |part|
+                  part.get_response(batcha)
+                }
               rescue Sequel::Rollback => e
                 # one of the changes of the changeset has failed
                 # --> provide a dummy empty response for the change-parts
                 # then transmit the Rollback to Sequel
-                @response.content = @content.map { |_part|
-                  MIME::Content::Application::HttpResp.new
-                }
+                get_failed_changeset_response(e)
                 raise
               end
             end
           else
-            @response.content = @content.map { |part| part.get_response(batcha) }
+            @response.content = @content.map { |part|
+              part.get_response(batcha)
+            }
           end
           @response
         end
 
+        def get_failed_changeset_response(_xeption)
+          @response = MIME::Content::Application::HttpResp.new
+          @response.status = '400'
+          @response.content = [{ 'odata.error' =>
+                               { 'message' =>
+                                 'Bad Request: Failed changeset ' } }.to_json]
+          @response.hd = { 'Content-Type' => 'application/json;charset=utf-8' }
+          @response
+        end
+
         def unparse(bodyonly = false)
           b = ''
           unless bodyonly
@@ -356,6 +398,10 @@ module MIME
         attr_accessor :http_method
         attr_accessor :uri
 
+        # for changeset content-id refs
+        attr_accessor :content_id
+        attr_accessor :content_id_references
+
         def initialize
           @hd = {}
           @content = ''

data/lib/odata/batch.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'rack_app.rb'
 require 'safrano_core.rb'
 
@@ -44,7 +42,11 @@ module OData
         @request = OData::Request.new(env)
         @response = OData::Response.new
 
-        @request.in_changeset = true if part_req.level == 2
+        if part_req.level == 2
+          @request.in_changeset = true
+          @request.content_id = part_req.content_id
+          @request.content_id_references = part_req.content_id_references
+        end
 
         before
         dispatch
@@ -114,6 +116,8 @@ module OData
 
           batcha = @request.create_batch_app
           @mult_request = @request.parse_multipart
+
+          @mult_request.prepare_content_id_refs
           @mult_response = OData::Response.new
 
           resp_hdrs, @mult_response.body = @mult_request.get_http_resp(batcha)

data/lib/odata/collection.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # Design: Collections are nothing more as Sequel based model classes that have
 # somehow the character of an array (Enumerable)
 # Thus Below we have called that "EntityClass". It's meant as "Collection"
@@ -179,7 +178,7 @@ module OData
       return unless @params['$skip']
 
       iskip = number_or_nil(@params['$skip'])
-      return BadRequestError if iskip.nil? || (iskip < 0)
+      return BadRequestError if iskip.nil? || iskip.negative?
     end
 
     def check_u_p_inlinecount
@@ -303,9 +302,9 @@ module OData
     end
 
     def odata_post(req)
-      # TODO: check Request body format...
       # TODO: this is for v2 only...
       on_error = (proc { raise Sequel::Rollback } if req.in_changeset)
+
       req.with_parsed_data(on_error: on_error) do |data|
         data.delete('__metadata')
         # validate payload column names
@@ -315,9 +314,14 @@ module OData
         end
 
         if req.accept?('application/json')
-          [201, { 'Content-Type' => 'application/json;charset=utf-8' },
-           new_from_hson_h(data, in_changeset: req.in_changeset)
-             .to_odata_post_json(service: req.service)]
+
+          new_entity = new_from_hson_h(data, in_changeset: req.in_changeset)
+          req.register_content_id_ref(new_entity)
+          new_entity.copy_request_infos(req)
+
+          [201,
+           { 'Content-Type' => 'application/json;charset=utf-8' },
+           new_entity.to_odata_post_json(service: req.service)]
         else # TODO: other formats
           415
         end

data/lib/odata/collection_order.rb

@@ -18,7 +18,7 @@ module OData
     attr_reader :assoc
     attr_reader :assocs
     attr_reader :oarg
-    def initialize(ostr, _dt)
+    def initialize(ostr, _dtset)
       ostr.strip!
       @orderp = ostr
       @assocs = Set.new

data/lib/odata/entity.rb

@@ -101,7 +101,7 @@ module OData
     def to_odata_json(service:)
       { 'd' => service.get_entity_odata_h(entity: self,
                                           expand: @params['$expand'],
-                                          #                                          links: @do_links,
+                                          #     links: @do_links,
                                           uribase: @uribase) }.to_json
     end
 
@@ -121,11 +121,16 @@ module OData
           type: type_name }
     end
 
-    # Finally Process REST verbs...
-    def odata_get(req)
+    def copy_request_infos(req)
       @params = req.params
       @uribase = req.uribase
       @do_links = req.walker.do_links
+    end
+
+    # Finally Process REST verbs...
+    def odata_get(req)
+      copy_request_infos(req)
+
       if req.accept?('application/json')
         [200, { 'Content-Type' => 'application/json;charset=utf-8' },
          to_odata_json(service: req.service)]

data/lib/odata/error.rb

@@ -43,6 +43,12 @@ module OData
     HTTP_CODE = 400
     @msg = 'Bad Request Error'
   end
+  # Generic failed changeset
+  class BadRequestFailedChangeSet < BadRequestError
+    HTTP_CODE = 400
+    @msg = 'Bad Request: Failed changeset '
+  end
+
   # for Syntax error in Filtering
   class BadRequestFilterParseError < BadRequestError
     HTTP_CODE = 400

data/lib/odata/walker.rb

@@ -27,11 +27,13 @@ module OData
     # are $links requested ?
     attr_reader :do_links
 
-    def initialize(service, path)
+    def initialize(service, path, content_id_refs = nil)
       raise 'Walker is called with a nil service' unless service
 
       path = URI.decode_www_form_component(path)
       @context = service
+      @content_id_refs = content_id_refs
+
       @contexts = [@context]
       @path_start = @path_remain = if service
                                      unprefixed(service.xpath_prefix, path)
@@ -82,17 +84,42 @@ module OData
         get_next_transition
         if @tr_next
           @context, @status, @error = @tr_next.do_transition(@context)
+          # little hack's
+          case @status
+            # we dont have the content-id references data on service level
+            # but we have it here, so in case of a $content-id transition
+            # the returned context is just the id, and we get the final result
+            # entity reference here and place it in @context
+          when :run_with_content_id
+            if @content_id_refs.is_a? Hash
+              if (@context = @content_id_refs[@context.to_s])
+                @status = :run
+              else
+                @context = nil
+                @status = :error
+                # TODO: more appropriate error handling
+                @error = OData::ErrorNotFound
+              end
+            else
+              @context = nil
+              @status = :error
+              # TODO: more appropriate error handling
+              @error = OData::ErrorNotFound
+            end
+          end
+
           @contexts << @context
           @path_remain = @tr_next.path_remain
           @path_done << @tr_next.path_done
+
           # little hack's
           case @status
           when :end_with_count
             @do_count = true
-            @status == :end
+            @status = :end
           when :end_with_value
             @raw_value = true
-            @status == :end
+            @status = :end
           when :run_with_links
             @do_links = true
             @status = :run

data/lib/odata_rack_builder.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'rack'
 require 'rack/cors'
 

data/lib/rack_app.rb

@@ -23,18 +23,15 @@ module OData
     end
 
     def odata_error
-      if @walker.error.nil?
+      return @walker.error.odata_get(@request) unless @walker.error.nil?
 
-        # this is too critical; raise a real Exception
-        #        begin
-        raise 'Walker construction failed with a unknown 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
     end
 
     def odata_delete

data/lib/request.rb

@@ -13,8 +13,6 @@ module OData
     HEADER_VAL_RAW = '(?:\w+|\*)\/(?:\w+(?:\.|\-|\+)?|\*)*'.freeze
     HEADER_VAL_WITH_PAR = /(?:#{HEADER_VAL_RAW})\s*(?:;#{HEADER_PARAM})*/.freeze
 
-    attr_accessor :in_changeset
-
     # borowed from Sinatra
     class AcceptEntry
       attr_accessor :params
@@ -73,13 +71,32 @@ module OData
     def parseable_data?
       false
     end
+
     # OData extension
     attr_accessor :service_base
     attr_accessor :service
     attr_accessor :walker
 
+    # request is part of a $batch changeset
+    attr_accessor :in_changeset
+
+    # content_id of request in a $batch changeset
+    attr_accessor :content_id
+
+    # content-id references map
+    attr_accessor :content_id_references
+
+    # stores the newly created entity for the current content-id of
+    # the processed request
+    def register_content_id_ref(new_entity)
+      return unless @in_changeset
+      return unless @content_id
+
+      @content_id_references[@content_id] = new_entity
+    end
+
     def create_odata_walker
-      @walker = Walker.new(@service, path_info)
+      @walker = Walker.new(@service, path_info, @content_id_references)
     end
 
     def accept

data/lib/safrano_core.rb

@@ -81,6 +81,8 @@ module Safrano
                                       trans: 'transition_metadata')
   TransitionBatch = Transition.new('\A(\/\$batch)(.*)',
                                    trans: 'transition_batch')
+  TransitionContentId = Transition.new('\A(\/\$\d+)(.*)',
+                                       trans: 'transition_content_id')
   TransitionCount = Transition.new('(\A\/\$count)(.*)\z',
                                    trans: 'transition_count')
   TransitionValue = Transition.new('(\A\/\$value)(.*)\z',

data/lib/service.rb

@@ -77,7 +77,7 @@ module OData
     # handle $links ... Note: $expand seems to be ignored when $links
     # are  requested
     def get_entity_odata_link_h(entity:, uribase:)
-      hres = { uri: entity.uri(uribase) }
+      { uri: entity.uri(uribase) }
     end
 
     def get_entity_odata_h(entity:, expand: nil, uribase:)
@@ -470,6 +470,7 @@ module OData
           Safrano::TransitionEnd,
           Safrano::TransitionMetadata,
           Safrano::TransitionBatch,
+          Safrano::TransitionContentId,
           Safrano::Transition.new(%r{\A/(#{base_url_regexp})(.*)},
                                   trans: 'transition_collection')
         ]
@@ -483,6 +484,11 @@ module OData
         [@batch_handler, :run]
       end
 
+      def transition_content_id(match_result)
+        # TODO: a nicer way of extracting the content-id number?
+        [match_result[1].sub!(Regexp.new('\A\/\$'), ''), :run_with_content_id]
+      end
+
       def transition_metadata(_match_result)
         [@meta, :run]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - D.M.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-07 00:00:00.000000000 Z
+date: 2019-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -140,7 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Safrano is a Ruby  OData provider based on Sequel and Rack