safrano 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '048c3efb69194f00a6ed5593c23300ae7b9d46f7d98a546d443bd5d9c5d2c6c8'
-  data.tar.gz: 825698055233240072faee6e038e531884e23d938fc1ed9708e98d27cf0db3c6
+  metadata.gz: b25412d7e053724965ba296bdd43a6f0b3bbd8a62cee2f45a14edf18303ed6c1
+  data.tar.gz: 1e9ad5ce553d13199e4ce79cecf7209ce1bb2695f5c476d8f5e5e16bd57bd4f9
 SHA512:
-  metadata.gz: d2697db38029b2701a418a620b74e7b8080d368cd34461073de46065d7057cb3b852cc62795cabb1bbbad82d10607bff96b899beb483a3c0f03e028cf8cb8a31
-  data.tar.gz: 12a8674563e67e2f3c4e475d5867f8965e0095a0ff0afea80079f6e7e59c56921abc506d33b07ca483f5f2c16024176a6e3679db26b09e979a9f9fb6fac8d755
+  metadata.gz: ad1361bb963f77870f784ed5322318b2567bac06e6ef915dcda62f57df767a0893a988672e4ace8dbd64cdda0cbff8d78de2aa712d4ebceb8821ed109018c909
+  data.tar.gz: d4f5f16fa548883e697479f313aa824c0798c38d71ead64172552ddfaec79fb53652063bf6dbfe36362cca5c30a80534665e8a12895fb2f343f1857a0dba8c1c

data/lib/multipart.rb

@@ -10,6 +10,10 @@ module MIME
   class Media
     # Parser for MIME::Media
     class Parser
+      HMD_RGX = /^([\w-]+)\s*:\s*(.*)/.freeze
+
+      CRLF_LINE_RGX = /^#{CRLF}$/.freeze
+
       attr_accessor :lines
       attr_accessor :target
       def initialize
@@ -47,10 +51,11 @@ module MIME
       end
 
       def parse_head(line)
-        if (hmd = /^([\w-]+)\s*:\s*(.*)/.match(line))
+        if (hmd = HMD_RGX.match(line))
           @target_hd[hmd[1].downcase] = hmd[2].strip
 
-        elsif /^#{CRLF}$/ =~ line
+        #        elsif CRLF_LINE_RGX =~ line
+        elsif CRLF == line
           @target_ct = @target_hd['content-type'] || 'text/plain'
           @state = new_content
 
@@ -102,14 +107,19 @@ module MIME
         @target.ct = @target_ct
         @state = :bmp
       end
-      MP_RGX1 = %r{^multipart/(digest|mixed);\s*boundary=\"(.*)\"}.freeze
-      MP_RGX2 = %r{^multipart/(digest|mixed);\s*boundary=(.*)}.freeze
+      MPS = 'multipart/'.freeze
+      MP_RGX1 = %r{^(digest|mixed);\s*boundary=\"(.*)\"}.freeze
+      MP_RGX2 = %r{^(digest|mixed);\s*boundary=(.*)}.freeze
+      #      APP_HTTP_RGX = %r{^application/http}.freeze
+      APP_HTTP = 'application/http'.freeze
       def new_content
         @target =
-          if (md = MP_RGX1.match(@target_ct)) ||
-             (md = MP_RGX2.match(@target_ct))
+          if @target_ct.start_with?(MPS) and
+             (md = ((MP_RGX1.match(@target_ct[10..-1])) ||
+                      (MP_RGX2.match(@target_ct[10..-1])))
+             )
             multipart_content(md[2].strip)
-          elsif %r{^application/http} =~ @target_ct
+          elsif @target_ct.start_with?(APP_HTTP)
             MIME::Content::Application::Http.new
           else
             MIME::Content::Text::Plain.new
@@ -187,6 +197,8 @@ module MIME
       class Plain < Media
         # Parser for Text::Plain
         class Parser
+          HMD_RGX = /^([\w-]+)\s*:\s*(.*)/.freeze
+          CRLF_LINE_RGX = /^#{CRLF}$/.freeze
           def initialize(target)
             @state = :h
             @lines = []
@@ -198,9 +210,10 @@ module MIME
           end
 
           def parse_head(line)
-            if (hmd = /^([\w-]+)\s*:\s*(.*)/.match(line))
+            if (hmd = HMD_RGX.match(line))
               @target.hd[hmd[1].downcase] = hmd[2].strip
-            elsif /^#{CRLF}$/ =~ line
+            #            elsif CRLF_LINE_RGX =~ line
+            elsif CRLF == line
               @state = :b
             else
               @target.content << line
@@ -251,6 +264,7 @@ module MIME
       class Base < Media
         # Parser for Multipart Base class
         class Parser
+          CRLF_ENDING_RGX = /#{CRLF}$/.freeze
           def initialize(target)
             @body_lines = []
             @target = target
@@ -295,7 +309,8 @@ module MIME
             # to remove it from the end of the last body line
             return unless @body_lines
 
-            @body_lines.last.sub!(/#{CRLF}$/, '')
+            #            @body_lines.last.sub!(CRLF_ENDING_RGX, '')
+            @body_lines.last.chomp!(CRLF)
             @parts << @body_lines
           end
 
@@ -349,7 +364,7 @@ module MIME
         end
 
         def set_multipart_header
-          @hd['content-type'] = "multipart/mixed; boundary=#{@boundary}"
+          @hd['content-type'] = "#{OData::MP_MIXED}; boundary=#{@boundary}"
         end
 
         def get_http_resp(batcha)
@@ -390,14 +405,15 @@ module MIME
           @response.content = [{ 'odata.error' =>
                                { 'message' =>
                                  'Bad Request: Failed changeset ' } }.to_json]
-          @response.hd = { 'Content-Type' => 'application/json;charset=utf-8' }
+          @response.hd = OData::CT_JSON
           @response
         end
 
         def unparse(bodyonly = false)
           b = ''
           unless bodyonly
-            b << 'Content-Type' << ': ' << @hd['content-type'] << CRLF
+            #            b << OData::CONTENT_TYPE << ': ' << @hd[OData::CTT_TYPE_LC] << CRLF
+            b << "#{OData::CONTENT_TYPE}: #{@hd[OData::CTT_TYPE_LC]}#{CRLF}"
           end
           b << "#{CRLF}--#{@boundary}#{CRLF}"
           b << @content.map(&:unparse).join("#{CRLF}--#{@boundary}#{CRLF}")
@@ -425,7 +441,8 @@ module MIME
 
         def unparse
           b = "#{@http_method} #{@uri} HTTP/1.1#{CRLF}"
-          @hd.each { |k, v| b << k.to_s << ': ' << v.to_s << CRLF }
+          @hd.each { |k, v| b << "#{k}: #{v}#{CRLF}" }
+          #          @hd.each { |k, v| b << k.to_s << ': ' << v.to_s << CRLF }
           b << CRLF
           b << @content if @content != ''
           b
@@ -455,7 +472,8 @@ module MIME
         def unparse
           b = String.new(APPLICATION_HTTP_11)
           b << "#{@status} #{StatusMessage[@status]} #{CRLF}"
-          @hd.each { |k, v| b << k.to_s << ': ' << v.to_s << CRLF }
+          @hd.each { |k, v| b << "#{k}: #{v}#{CRLF}" }
+          #          @hd.each { |k, v| b << k.to_s << ': ' << v.to_s << CRLF }
           b << CRLF
           b << @content.join if @content
           b
@@ -471,6 +489,9 @@ module MIME
 
         # Parser for Http Media
         class Parser
+          HMD_RGX = /^([\w-]+)\s*:\s*(.*)/.freeze
+          CRLF_LINE_RGX = /^#{CRLF}$/.freeze
+
           def initialize(target)
             @state = :http
             @lines = []
@@ -483,7 +504,7 @@ module MIME
           end
 
           def parse_http(line)
-            if (hmd = /^([\w-]+)\s*:\s*(.*)/.match(line))
+            if (hmd = HMD_RGX.match(line))
               @target.hd[hmd[1].downcase] = hmd[2].strip
             elsif (mdht = HTTP_R_RGX.match(line))
               @state = :hd
@@ -499,9 +520,10 @@ module MIME
           end
 
           def parse_head(line)
-            if (hmd = /^([\w-]+)\s*:\s*(.*)/.match(line))
+            if (hmd = HMD_RGX.match(line))
               @target.content.hd[hmd[1].downcase] = hmd[2].strip
-            elsif /^#{CRLF}$/ =~ line
+            elsif CRLF == line
+              #            elsif CRLF_LINE_RGX =~ line
               @state = :b
             else
               @body_lines << line

data/lib/odata/batch.rb

@@ -1,5 +1,7 @@
 require 'rack_app.rb'
 require 'safrano_core.rb'
+require 'rack/body_proxy'
+require_relative './common_logger.rb'
 
 module OData
   # Support for OData multipart $batch Requests
@@ -38,7 +40,7 @@ module OData
       def batch_call(part_req)
         env = batch_env(part_req)
         env['HTTP_HOST'] = @full_req.env['HTTP_HOST']
-
+        began_at = Rack::Utils.clock_time
         @request = OData::Request.new(env)
         @response = OData::Response.new
 
@@ -51,7 +53,16 @@ module OData
         before
         dispatch
 
-        @response.finish
+        status, header, body = @response.finish
+        # Logging of sub-requests with ODataCommonLogger.
+        # A bit hacky but working
+        # TODO: test ?
+        if (logga = @full_req.env['safrano.logger_mw'])
+          logga.batch_log(env, status, header, began_at)
+          # TODO check why/if we need Rack::Utils::HeaderHash.new(header) 
+          # and Rack::BodyProxy.new(body) ?
+        end
+        [status, header, body]
       end
 
       # shamelessely copied from Rack::TEST:Session
@@ -71,7 +82,10 @@ module OData
         @env = ::Rack::MockRequest.env_for(mime_req.uri,
                                            method: mime_req.http_method,
                                            input: mime_req.content)
+        # Logging of sub-requests
+        @env[Rack::RACK_ERRORS] = @full_req.env[Rack::RACK_ERRORS]
         @env.merge! headers_for_env(mime_req.hd)
+
         @env
       end
     end
@@ -112,7 +126,7 @@ module OData
       def odata_post(req)
         @request = req
 
-        if @request.media_type == 'multipart/mixed'
+        if @request.media_type == OData::MP_MIXED
 
           batcha = @request.create_batch_app
           @mult_request = @request.parse_multipart

data/lib/odata/collection.rb

@@ -9,6 +9,7 @@ require 'odata/error.rb'
 require 'odata/collection_filter.rb'
 require 'odata/collection_order.rb'
 require 'odata/url_parameters.rb'
+require 'odata/collection_media.rb'
 
 # small helper method
 # http://stackoverflow.com/
@@ -52,6 +53,9 @@ module OData
     attr_reader :nav_entity_attribs
     attr_reader :data_fields
     attr_reader :inlinecount
+    # set to parent entity in case the collection is a nav.collection
+    # nil otherwise
+    attr_reader :nav_parent
 
     attr_accessor :namespace
 
@@ -75,13 +79,27 @@ module OData
     attr_accessor :deferred_iblock
 
     # convention: entityType is the Ruby Model class --> name is just to_s
+    # Warning: for handling Navigation relations, we use anonymous collection classes
+    # dynamically subtyped from a Model class, and in such an anonymous class
+    # the class-name is not the OData Type. In these subclass we redefine "type_name"
+    # thus when we need the Odata type name, we shall use this method instead of just the collection class name
     def type_name
       to_s
     end
 
-    # convention: default for entity_set_name is the model table name
+    # convention: default for entity_set_name is the type name
     def entity_set_name
-      @entity_set_name = (@entity_set_name || table_name.to_s)
+      @entity_set_name = (@entity_set_name || type_name)
+    end
+
+    def reset
+      # TODO: automatically reset all attributes?
+      @deferred_iblock = nil
+      @entity_set_name = nil
+      @uparms = nil
+      @params = nil
+      @ax = nil
+      @cx = nil
     end
 
     def execute_deferred_iblock
@@ -89,19 +107,37 @@ module OData
     end
 
     # Factory json-> Model Object instance
-    def new_from_hson_h(hash, in_changeset: false)
+    def new_from_hson_h(hash)
       enty = new
-      hash.delete('__metadata')
-      # DONE: move this somewhere else where it's evaluated only once at setup
-      # data_fields = db_schema.map do |col, cattr|
-      #  cattr[:primary_key] ? nil : col
-      # end.select { |col| col }
       enty.set_fields(hash, @data_fields, missing: :skip)
-      # in-changeset requests get their own transaction
-      enty.save(transaction: !in_changeset)
       enty
     end
 
+    CREATE_AND_SAVE_ENTY_AND_REL = lambda do |new_entity, assoc, parent|
+      # in-changeset requests get their own transaction
+      case assoc[:type]
+      when :one_to_many, :one_to_one
+        OData.create_nav_relation(new_entity, assoc, parent)
+        new_entity.save(transaction: false)
+      when :many_to_one
+        new_entity.save(transaction: false)
+        OData.create_nav_relation(new_entity, assoc, parent)
+        parent.save(transaction: false)
+      else
+        # not supported
+      end
+    end
+    def odata_create_save_entity_and_rel(req, new_entity, assoc, parent)
+      if req.in_changeset
+        # in-changeset requests get their own transaction
+        CREATE_AND_SAVE_ENTY_AND_REL.call(new_entity, assoc, parent)
+      else
+        db.transaction do
+          CREATE_AND_SAVE_ENTY_AND_REL.call(new_entity, assoc, parent)
+        end
+      end
+    end
+
     def odata_get_inlinecount_w_sequel
       return unless (icp = @params['$inlinecount'])
 
@@ -114,10 +150,6 @@ module OData
                      end
     end
 
-    def navigated_coll
-      false
-    end
-
     def attrib_path_valid?(path)
       @attribute_path_list.include? path
     end
@@ -209,7 +241,7 @@ module OData
     def initialize_dataset
       @cx = self
       @ax = nil
-      @cx = navigated_dataset if @cx.navigated_coll
+      @cx = navigated_dataset if @cx.nav_parent
       @model = if @cx.respond_to? :model
                  @cx.model
                else
@@ -227,9 +259,9 @@ module OData
         [200, CT_TEXT, @cx.count.to_s]
       elsif req.accept?(APPJSON)
         if req.walker.do_links
-          [200, CT_JSON, to_odata_links_json(service: req.service)]
+          [200, CT_JSON, [to_odata_links_json(service: req.service)]]
         else
-          [200, CT_JSON, to_odata_json(service: req.service)]
+          [200, CT_JSON, [to_odata_json(service: req.service)]]
         end
       else # TODO: other formats
         406
@@ -250,6 +282,10 @@ module OData
       end
     end
 
+    def odata_post(req)
+      odata_create_entity_and_relation(req, @navattr_reflection, @nav_parent)
+    end
+
     # add metadata xml to the passed REXML schema object
     def add_metadata_rexml(schema)
       enty = schema.add_element('EntityType', 'Name' => to_s)
@@ -289,48 +325,28 @@ module OData
       end
     end
 
+    D = 'd'.freeze
+    DJopen = '{"d":'.freeze
+    DJclose = '}'.freeze
     def to_odata_links_json(service:)
-      { 'd' => service.get_coll_odata_links_h(array: get_a,
+      innerj = service.get_coll_odata_links_h(array: get_a,
                                               uribase: @uribase,
-                                              icount: @inlinecount) }.to_json
+                                              icount: @inlinecount).to_json
+      "#{DJopen}#{innerj}#{DJclose}"
     end
 
     def to_odata_json(service:)
-      { 'd' => service.get_coll_odata_h(array: get_a,
+      innerj = service.get_coll_odata_h(array: get_a,
                                         expand: @params['$expand'],
                                         uribase: @uribase,
-                                        icount: @inlinecount) }.to_json
+                                        icount: @inlinecount).to_json
+      "#{DJopen}#{innerj}#{DJclose}"
     end
 
     def get_a
       @ax.nil? ? @cx.to_a : @ax
     end
 
-    def odata_post(req)
-      # 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
-        if (invalid = invalid_hash_data?(data))
-          on_error.call if on_error
-          return [422, {}, ['Invalid attribute name: ', invalid.to_s]]
-        end
-
-        if req.accept?(APPJSON)
-
-          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, CT_JSON, new_entity.to_odata_post_json(service: req.service)]
-        else # TODO: other formats
-          415
-        end
-      end
-    end
-
     # this functionally similar to the Sequel Rels (many_to_one etc)
     # We need to base this on the Sequel rels, or extend them
     def add_nav_prop_collection(assoc_symb, attr_name_str = nil)
@@ -471,6 +487,7 @@ module OData
     end
     include Transitions
   end
+
   # special handling for composite key
   module EntityClassMultiPK
     include EntityClassBase
@@ -508,4 +525,38 @@ module OData
       check_odata_val_type(id, db_schema[primary_key][:type])
     end
   end
+
+  # normal handling for non-media entity
+  module EntityClassNonMedia
+    # POST for non-media entity collection -->
+    # 1. Create and add entity from payload
+    # 2. Create relationship if needed
+    def odata_create_entity_and_relation(req, assoc, parent)
+      # TODO: this is for v2 only...
+      req.with_parsed_data do |data|
+        data.delete('__metadata')
+        # validate payload column names
+        if (invalid = invalid_hash_data?(data))
+          ::OData::Request::ON_CGST_ERROR.call(req)
+          return [422, {}, ['Invalid attribute name: ', invalid.to_s]]
+        end
+
+        if req.accept?(APPJSON)
+          new_entity = new_from_hson_h(data)
+          if parent
+            odata_create_save_entity_and_rel(req, new_entity, assoc, parent)
+          else
+            # in-changeset requests get their own transaction
+            new_entity.save(transaction: !req.in_changeset)
+          end
+          req.register_content_id_ref(new_entity)
+          new_entity.copy_request_infos(req)
+
+          [201, CT_JSON, new_entity.to_odata_post_json(service: req.service)]
+        else # TODO: other formats
+          415
+        end
+      end
+    end
+  end
 end