safrano 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4f2a075aba57f7986bf9727748730eb17f4302da16a3193c66f260971b5e1c6
-  data.tar.gz: c11e78ef5ed8b63332129dfc0fc23829ba9494697ce7fc65334e34ceaf68b90c
+  metadata.gz: 0a16c6b649ec630fbada504c11039b017b4055c7038c2aa126e7c6b55dd768ff
+  data.tar.gz: 03b387f824a5f2e4d53c3e16dd9b013ca8d3c308bc06e13cc0bf09bf54f4f3eb
 SHA512:
-  metadata.gz: cdc676ba941a7170ff9ca0076614a62e495c1c8f39959a7a64e7a747a94e3676b5ee35eaa10fd832f116f10279e40ae7929b1ac5109db69bc1b7eebb20d08730
-  data.tar.gz: 03ec76d115241fc7c22337b15228cf294f5e5a15366ba7869fd05f9e1feaf7ce6ac278faa9ae0b34b013ed0c22b04babc5e14a67463d811dcb1edfc58640438f
+  metadata.gz: d40563e3e2ad2db813954318aaf5d0f3097f71d9210af9434524cc7e8e25ba81b37694e0fe5fb7d7f9c662679a3b5c8425d11e771d8ba0fe42162598d4f81f65
+  data.tar.gz: 8dc6cfea884a95c2841e0646d0051dcf4926c3fad85734978e8ee2bc98ea7dbae5fd3718cf6a3a8b49f66c2a3566c33c70c64fd8babde8c4c66a1cbe2eb46929

data/lib/odata/attribute.rb

@@ -1,5 +1,5 @@
 require 'json'
-require_relative '../safrano_core.rb'
+require_relative '../safrano/core.rb'
 require_relative './entity.rb'
 
 module OData

data/lib/odata/batch.rb

@@ -1,5 +1,5 @@
-require 'rack_app.rb'
-require 'safrano_core.rb'
+require_relative '../safrano/rack_app.rb'
+require_relative '../safrano/core.rb'
 require 'rack/body_proxy'
 require_relative './common_logger.rb'
 
@@ -59,7 +59,7 @@ module OData
         # 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) 
+          # TODO check why/if we need Rack::Utils::HeaderHash.new(header)
           # and Rack::BodyProxy.new(body) ?
         end
         [status, header, body]

data/lib/odata/collection.rb

@@ -4,12 +4,12 @@
 
 require 'json'
 require 'rexml/document'
-require 'safrano_core.rb'
-require 'odata/error.rb'
-require 'odata/collection_filter.rb'
-require 'odata/collection_order.rb'
-require 'odata/url_parameters.rb'
-require 'odata/collection_media.rb'
+require_relative '../safrano/core.rb'
+require_relative 'error.rb'
+require_relative 'collection_filter.rb'
+require_relative 'collection_order.rb'
+require_relative 'url_parameters.rb'
+require_relative 'collection_media.rb'
 
 # small helper method
 # http://stackoverflow.com/
@@ -53,6 +53,13 @@ module OData
     attr_reader :nav_entity_attribs
     attr_reader :data_fields
     attr_reader :inlinecount
+    
+    # Sequel associations pointing to this model. Sequel provides association 
+    # reflection information on the "from" side. But in some cases
+    # we will need the reverted way
+    # finally not needed and not used yet
+    # attr_accessor :assocs_to
+    
     # set to parent entity in case the collection is a nav.collection
     # nil otherwise
     attr_reader :nav_parent
@@ -288,7 +295,11 @@ module OData
 
     # add metadata xml to the passed REXML schema object
     def add_metadata_rexml(schema)
-      enty = schema.add_element('EntityType', 'Name' => to_s)
+      enty = if @media_handler
+        schema.add_element('EntityType', 'Name' => to_s, 'HasStream' => 'true' )
+      else
+        schema.add_element('EntityType', 'Name' => to_s)
+      end
       # with their properties
       db_schema.each do |pnam, prop|
         if prop[:primary_key] == true
@@ -304,25 +315,37 @@ module OData
     end
 
     # metadata REXML data  for a single Nav attribute
-    def metadata_nav_rexml_attribs(assoc, cmap, relman, xnamespace)
+    def metadata_nav_rexml_attribs(assoc, to_klass, relman, xnamespace)
       from = type_name
-      to = cmap[assoc.to_s].type_name
+      to = to_klass.type_name
       relman.get_metadata_xml_attribs(from,
                                       to,
-                                      association_reflection(assoc)[:type],
-                                      xnamespace)
+                                      association_reflection(assoc.to_sym)[:type],
+                                      xnamespace,
+                                      assoc)
+                                      
     end
 
     # and their Nav attributes == Sequel Model association
-    def add_metadata_navs_rexml(schema_enty, cmap, relman, xnamespace)
-      associations.each do |assoc|
-        # associated objects need to be in the map...
-        next unless cmap[assoc.to_s]
-
-        nattrs = metadata_nav_rexml_attribs(assoc, cmap, relman, xnamespace)
-
-        schema_enty.add_element('NavigationProperty', nattrs)
-      end
+    def add_metadata_navs_rexml(schema_enty, relman, xnamespace)
+    
+      @nav_entity_attribs.each{|ne,klass|
+        nattr = metadata_nav_rexml_attribs(ne, 
+                                           klass, 
+                                           relman, 
+                                           xnamespace)
+        schema_enty.add_element('NavigationProperty', nattr)
+      } if @nav_entity_attribs 
+    
+     
+      @nav_collection_attribs.each{|nc,klass|
+        nattr = metadata_nav_rexml_attribs(nc, 
+                                           klass, 
+                                           relman, 
+                                           xnamespace)
+          schema_enty.add_element('NavigationProperty', nattr)
+      } if @nav_collection_attribs 
+      
     end
 
     D = 'd'.freeze
@@ -351,6 +374,7 @@ module OData
     # We need to base this on the Sequel rels, or extend them
     def add_nav_prop_collection(assoc_symb, attr_name_str = nil)
       @nav_collection_attribs = (@nav_collection_attribs || {})
+#      @assocs_to = ( @assocs_to || [] )
       # DONE: Error handling. This requires that associations
       # have been properly defined with Sequel before
       assoc = all_association_reflections.find do |a|
@@ -368,6 +392,7 @@ module OData
 
     def add_nav_prop_single(assoc_symb, attr_name_str = nil)
       @nav_entity_attribs = (@nav_entity_attribs || {})
+#      @assocs_to = ( @assocs_to || [])
       # DONE: Error handling. This requires that associations
       # have been properly defined with Sequel before
       assoc = all_association_reflections.find do |a|
@@ -381,12 +406,22 @@ module OData
       lattr_name_str = (attr_name_str || assoc_symb.to_s)
       @nav_entity_attribs[lattr_name_str] = attr_class
       @nav_entity_url_regexp = @nav_entity_attribs.keys.join('|')
+#      attr_class.assocs_to = ( attr_class.assocs_to || [] )
+#      attr_class.assocs_to << assoc 
     end
 
     # old names...
     #    alias_method :add_nav_prop_collection, :addNavCollectionAttrib
     #    alias_method :add_nav_prop_single, :addNavEntityAttrib
 
+    def finalize_publishing
+      # finalize media handler
+      @media_handler.register(self) if @media_handler
+      
+      # and finally build the path list
+      build_attribute_path_list
+    end
+    
     def prepare_pk
       if primary_key.is_a? Array
         @pk_names = []

data/lib/odata/collection_media.rb

@@ -1,4 +1,5 @@
 require 'rack'
+require 'fileutils'
 require_relative './navigation_attribute.rb'
 
 module OData
@@ -9,49 +10,84 @@ module OData
 
     # Simple static File/Directory based media store handler
     # similar to Rack::Static
+    # with a flat directory structure
     class Static < Handler
+    
       def initialize(root: nil)
         @root = File.absolute_path(root || Dir.pwd)
         @file_server = ::Rack::File.new(@root)
       end
 
+      # TODO testcase and better abs_klass_dir design
+      def register(klass)
+        abs_klass_dir = File.absolute_path(klass.type_name, @root)
+        FileUtils.makedirs abs_klass_dir unless Dir.exists?(abs_klass_dir)
+      end
+      
       # minimal working implementation...
       #  Note: @file_server works relative to @root directory
       def odata_get(request:, entity:)
         media_env = request.env.dup
-        relpath = Dir.chdir(abs_path(entity)) do
-          # simple design: one file per directory, and the directory
-          # contains the media entity-id --> implicit link between the media
-          # entity
-          filename = Dir.glob('*').first
-
-          File.join(path(entity), filename)
-        end
-        media_env['PATH_INFO'] = relpath
+        media_env['PATH_INFO'] = filename(entity)
         @file_server.call(media_env)
       end
 
       # TODO perf: this can be precalculated and cached on MediaModelKlass level
       #            and passed as argument to save_file
+      # eg. /@root/Photo
       def abs_klass_dir(entity)
         File.absolute_path(entity.klass_dir, @root)
       end
 
+      # this is relative to @root
+      # eg. Photo/1
+      def media_path(entity)
+        File.join(entity.klass_dir, media_directory(entity))
+      end
+      
+      # relative to @root
+      # eg Photo/1/pommes-topaz.jpg
+      def filename(entity)
+        Dir.chdir(abs_path(entity)) do
+          # simple design: one file per directory, and the directory
+          # contains the media entity-id --> implicit link between the media
+          # entity
+          File.join(media_path(entity), Dir.glob('*').first)
+        end
+      end
+      
+      # /@root/Photo/1
       def abs_path(entity)
-        File.absolute_path(path(entity), @root)
+        File.absolute_path(media_path(entity), @root)
       end
 
-      # this is relative to @root
-      def path(entity)
-        File.join(entity.klass_dir, entity.media_path_id)
+      # this is relative to abs_klass_dir(entity) eg to /@root/Photo
+      # simplest implementation is media_directory = entity.media_path_id
+      # --> we get a 1 level depth flat directory structure
+      def media_directory(entity)
+        entity.media_path_id
+      end
+
+      def in_media_directory(entity)
+        mpi = media_directory(entity)
+        Dir.mkdir mpi unless Dir.exists?(mpi)
+        Dir.chdir mpi do
+          yield
+        end
+      end
+
+      def odata_delete(request:, entity:)
+        Dir.chdir(abs_klass_dir(entity)) do
+          in_media_directory(entity) do
+            Dir.glob('*').each { |oldf| File.delete(oldf) }
+          end
+        end      
       end
 
       # Here as well, MVP implementation
       def save_file(data:, filename:, entity:)
-        mpi = entity.media_path_id
         Dir.chdir(abs_klass_dir(entity)) do
-          Dir.mkdir mpi unless Dir.exists?(mpi)
-          Dir.chdir mpi do
+          in_media_directory(entity) do
             File.open(filename, 'wb') { |f| IO.copy_stream(data, f) }
           end
         end
@@ -59,22 +95,75 @@ module OData
 
       # Here as well, MVP implementation
       def replace_file(data:, filename:, entity:)
-        mpi = entity.media_path_id
         Dir.chdir(abs_klass_dir(entity)) do
-          Dir.mkdir mpi unless Dir.exists?(mpi)
-          Dir.chdir mpi do
+          in_media_directory(entity) do
             Dir.glob('*').each { |oldf| File.delete(oldf) }
             File.open(filename, 'wb') { |f| IO.copy_stream(data, f) }
           end
         end
       end
     end
+    # Simple static File/Directory based media store handler
+    # similar to Rack::Static
+    # with directory Tree structure
+    
+    class StaticTree < Static
+      
+      SEP = '/00/'
+           
+      def StaticTree.path_builder(ids)
+        ids.map{|id| id.to_s.chars.join('/')}.join(SEP)
+      end
+      
+      # this is relative to abs_klass_dir(entity) eg to /@root/Photo
+      # tree-structure
+      #  media_path_ids = 1  -->  1
+      #  media_path_ids = 15  -->  1/5
+      #  media_path_ids = 555  -->  5/5/5
+      #  media_path_ids = 5,5,5  -->  5/00/5/00/5
+      #  media_path_ids = 5,00,5  -->  5/00/0/0/00/5
+      #  media_path_ids = 5,xyz,5  -->  5/00/x/y/z/00/5
+      def media_directory(entity)
+        StaticTree.path_builder(entity.media_path_ids)
+#        entity.media_path_ids.map{|id| id.to_s.chars.join('/')}.join(@sep)
+      end
+
+      def in_media_directory(entity)
+        mpi = media_directory(entity)
+        FileUtils.makedirs mpi unless Dir.exists?(mpi)
+        Dir.chdir mpi do
+          yield
+        end
+      end
+
+      def odata_delete(request:, entity:)
+        Dir.chdir(abs_klass_dir(entity)) do
+          in_media_directory(entity) do
+            Dir.glob('*').each { |oldf| File.delete(oldf) if File.file?(oldf) }
+          end
+        end      
+      end
+    
+      # Here as well, MVP implementation
+      def replace_file(data:, filename:, entity:)
+        Dir.chdir(abs_klass_dir(entity)) do
+          in_media_directory(entity) do
+            Dir.glob('*').each { |oldf| File.delete(oldf) if File.file?(oldf) }
+            File.open(filename, 'wb') { |f| IO.copy_stream(data, f) }
+          end
+        end
+      end
+    
+    
+    end
+    
   end
 
   # special handling for media entity
   module EntityClassMedia
     attr_reader :media_handler
-
+    attr_reader :slug_field
+    
     # API method for defining the media handler
     # eg.
     # publish_media_model photos do
@@ -89,6 +178,11 @@ module OData
       @media_handler = klass.new(*args)
     end
 
+    # API method for setting the model field mapped to SLUG on upload
+    def slug(inp)
+      @slug_field = inp 
+    end
+    
     def api_check_media_fields
       unless self.db_schema.has_key?(:content_type)
         raise OData::API::MediaModelError, self
@@ -98,6 +192,8 @@ module OData
       #      end
     end
 
+#  END API methods
+
     def new_media_entity(mimetype:)
       nh = {}
       nh['content_type'] = mimetype
@@ -125,6 +221,13 @@ module OData
 
           new_entity = new_media_entity(mimetype: mimetype)
 
+          if slug_field
+
+            new_entity.set_fields({ slug_field =>  filename}, 
+                              data_fields, 
+                              missing: :skip)
+          end
+          
           # to_one rels are create with FK data set on the parent entity
           if parent
             odata_create_save_entity_and_rel(req, new_entity, assoc, parent)

data/lib/odata/common_logger.rb

@@ -5,21 +5,46 @@ module Rack
       super
     end
 
+    # Handle https://github.com/rack/rack/pull/1526 
+    # new in Rack 2.2.2 : Format has now 11 placeholders instead of 10
+    
+    MSG_FUNC = if (FORMAT.count('%') == 10)
+      lambda {|env,length,status,began_at|
+        FORMAT % [
+          env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
+          env["REMOTE_USER"] || "-",
+          Time.now.strftime("%d/%b/%Y:%H:%M:%S %z"),
+          env[REQUEST_METHOD],
+          env[SCRIPT_NAME] + env[PATH_INFO],
+          env[QUERY_STRING].empty? ? "" : "?#{env[QUERY_STRING]}",
+          env[SERVER_PROTOCOL],
+          status.to_s[0..3],
+          length,
+          Utils.clock_time - began_at
+        ]
+      } 
+      elsif (FORMAT.count('%') == 11)
+       lambda {|env,length,status,began_at|
+        FORMAT % [
+          env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
+          env["REMOTE_USER"] || "-",
+          Time.now.strftime("%d/%b/%Y:%H:%M:%S %z"),
+          env[REQUEST_METHOD],
+          env[SCRIPT_NAME],
+          env[PATH_INFO],
+          env[QUERY_STRING].empty? ? "" : "?#{env[QUERY_STRING]}",
+          env[SERVER_PROTOCOL],
+          status.to_s[0..3],
+          length,
+          Utils.clock_time - began_at 
+          ]
+        }
+      end
+
     def batch_log(env, status, header, began_at)
       length = extract_content_length(header)
 
-      msg = FORMAT % [
-        env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
-        env["REMOTE_USER"] || "-",
-        Time.now.strftime("%d/%b/%Y:%H:%M:%S %z"),
-        env[REQUEST_METHOD],
-        env[PATH_INFO],
-        env[QUERY_STRING].empty? ? "" : "?#{env[QUERY_STRING]}",
-        env[SERVER_PROTOCOL],
-        status.to_s[0..3],
-        length,
-        Utils.clock_time - began_at
-      ]
+      msg = MSG_FUNC.call(env, length, status, began_at)
 
       logger = @logger || env[RACK_ERRORS]
       # Standard library logger doesn't support write but it supports << which actually

data/lib/odata/entity.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'rexml/document'
 require 'safrano.rb'
 require 'odata/collection.rb' # required for  self.class.entity_type_name ??
+require_relative 'navigation_attribute'
 
 module OData
   # this will be mixed in the  Model classes (subclasses of Sequel Model)
@@ -9,6 +10,8 @@ module OData
     attr_reader :params
     attr_reader :uribase
 
+    include EntityBase::NavigationInfo
+    
     # methods related to transitions to next state (cf. walker)
     module Transitions
       def allowed_transitions
@@ -98,11 +101,18 @@ module OData
     def to_odata_json(service:)
       innerj = service.get_entity_odata_h(entity: self,
                                           expand: @params['$expand'],
-                                          #     links: @do_links,
                                           uribase: @uribase).to_json
       "#{DJopen}#{innerj}#{DJclose}"
     end
 
+    # Json formatter for a single entity reached by navigation $links
+    def to_odata_onelink_json(service:)
+      innerj = service.get_entity_odata_link_h(entity: self,
+                                               uribase: @uribase).to_json
+      "#{DJopen}#{innerj}#{DJclose}"
+    end
+
+
     # needed for proper datetime output
     # TODO design/performance
     def casted_values
@@ -144,21 +154,38 @@ module OData
       if req.walker.media_value
         odata_media_value_get(req)
       elsif req.accept?(APPJSON)
-        [200, CT_JSON, [to_odata_json(service: req.service)]]
+        if req.walker.do_links
+          [200, CT_JSON, [to_odata_onelink_json(service: req.service)]]
+        else
+          [200, CT_JSON, [to_odata_json(service: req.service)]]
+        end
       else # TODO: other formats
         415
       end
     end
-
-    def odata_delete(req)
-      if req.accept?(APPJSON)
-        delete
-        [200, CT_JSON, [{ 'd' => req.service.get_emptycoll_odata_h }.to_json]]
-      else # TODO: other formats
-        415
+    
+    DELETE_REL_AND_ENTY = lambda do |entity, assoc, parent|
+      OData.remove_nav_relation(entity, assoc, parent)
+      entity.destroy(transaction: false)
+    end
+    
+    def odata_delete_relation_and_entity(req, assoc, parent)
+      if parent
+        if req.in_changeset
+          # in-changeset requests get their own transaction
+          DELETE_REL_AND_ENTY.call(self, assoc, parent)
+        else
+          db.transaction do
+            DELETE_REL_AND_ENTY.call(self, assoc, parent)
+          end
+        end
+      else
+        destroy(transaction: false)
       end
+      rescue StandardError => e
+        raise SequelAdapterError.new(e)
     end
-
+    
     # TODO: differentiate between POST/PUT/PATCH/MERGE
     def odata_post(req)
       data = JSON.parse(req.body.read)
@@ -253,6 +280,11 @@ module OData
         y.each { |enty| yield enty }
       end
 
+      # TODO design... this is not DRY
+      def slug_field
+        superclass.slug_field
+      end
+
       def type_name
         superclass.type_name
       end
@@ -288,7 +320,7 @@ module OData
         extend NavigationRedefinitions
       end
     end
-
+    
     # GetRelatedEntity that returns an single related Entity
     # (...to_one relationship )
     def get_related_entity(childattrib)
@@ -301,9 +333,10 @@ module OData
       # then we return a Nil... wrapper object. This object then
       # allows to receive a POST operation that would actually create the nav attribute entity
 
-      ret = method(childattrib.to_sym).call ||
-            OData::NilNavigationAttribute.new(self, childattrib)
-
+      ret = method(childattrib.to_sym).call || OData::NilNavigationAttribute.new
+            
+      ret.set_relation_info(self, childattrib)
+        
       ret
     end
   end
@@ -323,6 +356,20 @@ module OData
       values.dup
     end
 
+    def odata_delete(req)
+      if req.accept?(APPJSON)
+#        delete
+        begin
+          odata_delete_relation_and_entity(req, @navattr_reflection, @nav_parent)
+          [200, CT_JSON, [{ 'd' => req.service.get_emptycoll_odata_h }.to_json]]
+        rescue SequelAdapterError => e
+          BadRequestSequelAdapterError.new(e).odata_get(req)
+        end
+      else # TODO: other formats
+        415
+      end
+    end
+
     # in case of a non media entity, we have to return an error on $value request
     def odata_media_value_get(req)
       return BadRequestNonMediaValue.odata_get
@@ -364,6 +411,23 @@ module OData
       ret
     end
 
+    def odata_delete(req)
+      if req.accept?(APPJSON)
+        # delete the MR
+        # delegate to the media handler on collection(ie class) level
+        # TODO error handling
+        
+      
+        self.class.media_handler.odata_delete(request: req, entity: self)
+        # delete the relation(s)  to parent(s) (if any) and then entity
+        odata_delete_relation_and_entity(req, @navattr_reflection, @nav_parent)
+        # result
+        [200, CT_JSON, [{ 'd' => req.service.get_emptycoll_odata_h }.to_json]]
+      else # TODO: other formats
+        415
+      end
+    end
+
     # real implementation for returning $value for a media entity
     def odata_media_value_get(req)
       # delegate to the media handler on collection(ie class) level
@@ -399,6 +463,9 @@ module OData
     def media_path_id
       pk.to_s
     end
+    def media_path_ids
+      [pk]
+    end
   end
 
   # for multiple key
@@ -412,6 +479,10 @@ module OData
     def media_path_id
       self.pk_hash.values.join('_')
     end
+    
+    def media_path_ids
+      self.pk_hash.values
+    end
   end
 end
 # end of Module OData

data/lib/odata/error.rb

@@ -31,8 +31,8 @@ module OData
     end
   end
 
-  # base module for HTTP errors
-  module Error
+  # base module for HTTP errors, when used as a Error Class
+  module ErrorClass
     def odata_get(req)
       if req.accept?(APPJSON)
         [const_get(:HTTP_CODE), CT_JSON,
@@ -42,9 +42,22 @@ module OData
       end
     end
   end
+  
+  # base module for HTTP errors, when used as an Error instance
+  module ErrorInstance
+    def odata_get(req)
+      if req.accept?(APPJSON)
+        [self.class.const_get(:HTTP_CODE), CT_JSON,
+         { 'odata.error' => { 'code' => '', 'message' => @msg } }.to_json]
+      else
+        [self.class.const_get(:HTTP_CODE), CT_TEXT, @msg]
+      end
+    end
+  end
+  
   # http Bad Req.
   class BadRequestError
-    extend  Error
+    extend  ErrorClass
     HTTP_CODE = 400
     @msg = 'Bad Request Error'
   end
@@ -59,7 +72,13 @@ module OData
     HTTP_CODE = 400
     @msg = 'Bad Request: $value request for a non-media entity'
   end
-
+  class BadRequestSequelAdapterError < BadRequestError
+    include ErrorInstance
+    def initialize(err)
+      @msg = err.inner.message
+    end
+  end
+  
   # for Syntax error in Filtering
   class BadRequestFilterParseError < BadRequestError
     HTTP_CODE = 400
@@ -72,36 +91,36 @@ module OData
   end
   # http not found
   class ErrorNotFound
-    extend  Error
+    extend  ErrorClass
     HTTP_CODE = 404
     @msg = 'The requested ressource was not found'
   end
   # Transition error (Safrano specific)
   class ServerTransitionError
-    extend  Error
+    extend  ErrorClass
     HTTP_CODE = 500
     @msg = 'Server error: Segment could not be parsed'
   end
   # generic http 500 server err
   class ServerError
-    extend  Error
+    extend  ErrorClass
     HTTP_CODE = 500
     @msg = 'Server error'
   end
   # not implemented (Safrano specific)
   class NotImplementedError
-    extend  Error
+    extend  ErrorClass
     HTTP_CODE = 501
   end
   # batch not implemented (Safrano specific)
   class BatchNotImplementedError
-    extend  Error
+    extend  ErrorClass
     HTTP_CODE = 501
     @msg = 'Not implemented: OData batch'
   end
   # error in filter parsing (Safrano specific)
   class FilterParseError < BadRequestError
-    extend  Error
+    extend  ErrorClass
     HTTP_CODE = 400
   end
 end

data/lib/odata/filter/error.rb

@@ -1,4 +1,10 @@
 module OData
+  class SequelAdapterError < StandardError
+    attr_reader :inner
+    def initialize(err)
+      @inner = err
+    end
+  end
   module Filter
     class Parser
       # Parser errors

data/lib/odata/navigation_attribute.rb

@@ -1,8 +1,30 @@
 require 'json'
-require_relative '../safrano_core.rb'
+require_relative '../safrano/core.rb'
 require_relative './entity.rb'
 
 module OData
+  
+  # remove the relation between entity and parent by clearing 
+  # the FK field(s) (if allowed)
+  def OData.remove_nav_relation(entity, assoc, parent)
+    return unless assoc
+
+    case assoc[:type]
+      when :one_to_many, :one_to_one
+      when :many_to_one
+      # removes/clear the FK values in parent 
+      # thus deleting the "link" between the entity and the parent
+      # Note: This is called if we have to delete the child--> can only be
+      # done after removing the FK in parent (if allowed!)
+        lks = [assoc[:key]].flatten
+        lks.each{|lk| 
+          parent.set(lk => nil )
+          parent.save(transaction: false)
+        }
+      
+    end  
+  end
+  
   # link newly created entities(child) to an existing parent
   # by following the association_reflection rules
   def OData.create_nav_relation(child, assoc, parent)
@@ -55,18 +77,24 @@ module OData
     end
   end
 
+  module EntityBase
+    module NavigationInfo
+      attr_reader :nav_parent
+      attr_reader :navattr_reflection
+      attr_reader :nav_name
+      def set_relation_info(parent,name)
+        @nav_parent = parent
+        @nav_name = name
+        @navattr_reflection = parent.class.association_reflections[name.to_sym]
+        @nav_klass = @navattr_reflection[:class_name].constantize
+      end
+    end
+  end
+
   # Represents a named but nil-valued navigation-attribute of an Entity
   # (usually resulting from a NULL FK db value)
   class NilNavigationAttribute
-    attr_reader :name
-    attr_reader :parent
-    def initialize(parent, name)
-      @parent = parent
-      @name = name
-      @navattr_reflection = parent.class.association_reflections[name.to_sym]
-      @klass = @navattr_reflection[:class_name].constantize
-    end
-
+    include EntityBase::NavigationInfo
     def odata_get(req)
       if req.walker.media_value
         OData::ErrorNotFound.odata_get
@@ -80,13 +108,20 @@ module OData
     # create the nav. entity
     def odata_post(req)
       # delegate to the class method
-      @klass.odata_create_entity_and_relation(req, @navattr_reflection, @parent)
+      @nav_klass.odata_create_entity_and_relation(req, 
+                                                  @navattr_reflection, 
+                                                  @nav_parent)
     end
 
     # create the nav. entity
     def odata_put(req)
-      # delegate to the class method
-      @klass.odata_create_entity_and_relation(req, @navattr_reflection, @parent)
+#      if req.walker.raw_value 
+        # delegate to the class method
+        @nav_klass.odata_create_entity_and_relation(req, 
+                                                    @navattr_reflection, 
+                                                    @nav_parent)
+#      else
+#      end
     end
 
     # empty output as OData json (v2)
@@ -96,7 +131,7 @@ module OData
 
     # for testing purpose (assert_equal ...)
     def ==(other)
-      (@parent == other.parent) && (@name == other.name)
+      (@nav_parent == other.nav_parent) && (@nav_name == other.nav_name)
     end
 
     # methods related to transitions to next state (cf. walker)

data/lib/odata/relations.rb

@@ -85,7 +85,7 @@ module OData
       end
     end
 
-    def get_metadata_xml_attribs(from, to, assoc_type, xnamespace)
+    def get_metadata_xml_attribs(from, to, assoc_type, xnamespace, attrname)
       rel = get([from, to])
       # use Sequel reflection to get multiplicity (will be used later
       # in 2. Associations below)
@@ -107,7 +107,7 @@ module OData
       # <NavigationProperty Name="Supplier"
       # Relationship="ODataDemo.Product_Supplier_Supplier_Products"
       #         FromRole="Product_Supplier" ToRole="Supplier_Products"/>
-      { 'Name' => to, 'Relationship' => "#{xnamespace}.#{rel.name}",
+      { 'Name' => attrname, 'Relationship' => "#{xnamespace}.#{rel.name}",
         'FromRole' => from, 'ToRole' => to }
     end
   end

data/lib/safrano.rb

@@ -1,19 +1,19 @@
-#!/usr/bin/env ruby
 
 require 'json'
 require 'rexml/document'
-require_relative './multipart.rb'
-require 'safrano_core.rb'
-require 'odata/entity.rb'
-require 'odata/attribute.rb'
-require 'odata/navigation_attribute.rb'
-require 'odata/collection.rb'
-require 'service.rb'
-require 'odata/walker.rb'
+require_relative 'safrano/multipart.rb'
+require_relative 'safrano/core.rb'
+require_relative 'odata/entity.rb'
+require_relative 'odata/attribute.rb'
+require_relative 'odata/navigation_attribute.rb'
+require_relative 'odata/collection.rb'
+require_relative 'safrano/service.rb'
+require_relative 'odata/walker.rb'
 require 'sequel'
-require_relative './sequel_join_by_paths.rb'
-require 'rack_app'
-require 'odata_rack_builder'
+require_relative 'safrano/sequel_join_by_paths.rb'
+require_relative 'safrano/rack_app'
+require_relative 'safrano/odata_rack_builder'
+require_relative 'safrano/version'
 
 # picked from activsupport; needed for ruby < 2.5
 # Destructively converts all keys using the +block+ operations.
@@ -30,3 +30,13 @@ class Hash
     transform_keys! { |key| key.to_sym rescue key }
   end
 end
+
+# needed for ruby < 2.5
+class Dir
+  def self.each_child(dir)
+    Dir.foreach(dir) {|x| 
+      next if ( ( x == '.' ) or  ( x == '..' ) )
+      yield x
+     }
+  end unless respond_to? :each_child
+end

data/lib/{safrano_core.rb → safrano/core.rb}

@@ -32,14 +32,15 @@ module OData
   # database-specific types.
   DB_TYPE_STRING_RGX = /\ACHAR\s*\(\d+\)\z/.freeze
 
+# TODO... complete; used in $metadata
   def self.get_edm_type(db_type:)
-    case db_type
+    case db_type.upcase
     when 'INTEGER'
       'Edm.Int32'
     when 'TEXT', 'STRING'
       'Edm.String'
     else
-      'Edm.String' if DB_TYPE_STRING_RGX =~ db_type
+      'Edm.String' if DB_TYPE_STRING_RGX =~ db_type.upcase
     end
   end
 end

data/lib/{rack_app.rb → safrano/rack_app.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rack'
-require_relative 'odata/walker.rb'
+require_relative '../odata/walker.rb'
 require_relative 'request.rb'
 require_relative 'response.rb'
 

data/lib/{request.rb → safrano/request.rb}

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
 require 'rack'
+require 'rfc2047'
 
 module OData
   # monkey patch deactivate Rack/multipart because it does not work on simple
@@ -135,8 +134,10 @@ module OData
 
     def with_media_data
       if (filename = @env['HTTP_SLUG'])
-
-        yield @env['rack.input'], content_type.split(';').first, filename
+        
+        yield @env['rack.input'], 
+               content_type.split(';').first,
+               Rfc2047.decode(filename)
 
       else
         ON_CGST_ERROR.call(self)

data/lib/{response.rb → safrano/response.rb}

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 require 'rack'
 
 # monkey patch deactivate Rack/multipart because it does not work on simple

data/lib/{sequel_join_by_paths.rb → safrano/sequel_join_by_paths.rb}

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require_relative './sequel/plugins/join_by_paths.rb'
+require_relative '../sequel/plugins/join_by_paths.rb'
 
 Sequel::Model.plugin Sequel::Plugins::JoinByPaths

data/lib/{service.rb → safrano/service.rb}

@@ -46,20 +46,40 @@ module OData
       end
     end
 
+    # for expand 1..n nav attributes
+    # actually same as  v1 get_coll_odata_h
+#    def get_expandcoll_odata_h(array:, expand: nil, uribase:, icount: nil)
+#      array.map do |w|
+#        get_entity_odata_h(entity: w,
+#                           expand: expand,
+#                           uribase: uribase)
+#      end
+#    end
+
     # handle a single expand
     def handle_entity_expand_one(entity:, exp_one:, nav_values_h:, nav_coll_h:,
                                  uribase:)
 
+
       split_entity_expand_arg(exp_one) do |first, rest_exp|
-        if (enval = entity.nav_values[first])
-          nav_values_h[first.to_s] = get_entity_odata_h(entity: enval,
+         if ( entity.nav_values.has_key?(first) )
+          if (enval = entity.nav_values[first])
+            nav_values_h[first.to_s] = get_entity_odata_h(entity: enval,
                                                         expand: rest_exp,
                                                         uribase: uribase)
+          else
+# FK is NULL --> nav_value is nil --> return empty json          
+            nav_values_h[first.to_s] = {}
+          end                                              
         elsif (encoll = entity.nav_coll[first])
-          # nav attributes that are a collection (x..n)
-          nav_coll_h[first.to_s] = get_coll_odata_h(array: encoll,
+#           nav attributes that are a collection (x..n)
+           nav_coll_h[first.to_s] = get_coll_odata_h(array: encoll,
                                                     expand: rest_exp,
                                                     uribase: uribase)
+#          nav_coll_h[first.to_s] = get_expandcoll_odata_h(array: encoll,
+#                                                    expand: rest_exp,
+#                                                    uribase: uribase)
+
 
         end
       end
@@ -71,7 +91,8 @@ module OData
       explist = expand.split(',')
       # handle multiple expands
       explist.each do |exp|
-        handle_entity_expand_one(entity: entity, exp_one: exp,
+        handle_entity_expand_one(entity: entity, 
+                                 exp_one: exp,
                                  nav_values_h: nav_values_h,
                                  nav_coll_h: nav_coll_h,
                                  uribase: uribase)
@@ -335,6 +356,7 @@ module OData
     # to be called at end of publishing block to ensure we get the right names
     # and additionally build the list of valid attribute path's used
     # for validation of $orderby or $filter params
+
     def finalize_publishing
       # build the cmap
       @cmap = {}
@@ -348,8 +370,10 @@ module OData
       # set default path prefix if path_prefix was not called
       path_prefix(DEFAULT_PATH_PREFIX) unless @xpath_prefix
 
-      # and finally build the path list
-      @collections.each(&:build_attribute_path_list)
+      @collections.each(&:finalize_publishing)
+      
+      #finalize the media handlers
+      @collections.each{|klass| }
     end
 
     def execute_deferred_iblocks
@@ -397,7 +421,7 @@ module OData
     def add_metadata_xml_entity_type(schema)
       @collections.each do |klass|
         enty = klass.add_metadata_rexml(schema)
-        klass.add_metadata_navs_rexml(enty, @cmap, @relman, @xnamespace)
+        klass.add_metadata_navs_rexml(enty, @relman, @xnamespace)
       end
     end
 

data/lib/safrano/version.rb

@@ -0,0 +1,3 @@
+module Safrano
+  VERSION = '0.4.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - D.M.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2020-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.15'
+- !ruby/object:Gem::Dependency
+  name: rfc2047
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,12 +109,11 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.51'
 description: Safrano is an OData server framework based on Ruby, Rack and Sequel.
-email: 'dev@aithscel.eu '
+email: dev@aithscel.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/multipart.rb
 - lib/odata/attribute.rb
 - lib/odata/batch.rb
 - lib/odata/collection.rb
@@ -119,16 +132,17 @@ files:
 - lib/odata/relations.rb
 - lib/odata/url_parameters.rb
 - lib/odata/walker.rb
-- lib/odata_rack_builder.rb
-- lib/rack_app.rb
-- lib/request.rb
-- lib/response.rb
 - lib/safrano.rb
-- lib/safrano_core.rb
+- lib/safrano/core.rb
+- lib/safrano/multipart.rb
+- lib/safrano/odata_rack_builder.rb
+- lib/safrano/rack_app.rb
+- lib/safrano/request.rb
+- lib/safrano/response.rb
+- lib/safrano/sequel_join_by_paths.rb
+- lib/safrano/service.rb
+- lib/safrano/version.rb
 - lib/sequel/plugins/join_by_paths.rb
-- lib/sequel_join_by_paths.rb
-- lib/service.rb
-- lib/version.rb
 homepage: https://gitlab.com/dm0da/safrano
 licenses:
 - MIT

data/lib/version.rb

@@ -1,4 +0,0 @@
-
-module Safrano
-  VERSION = '0.3.4'
-end