safrano 0.3.4 → 0.4.4

data/lib/safrano/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Safrano
+  VERSION = '0.4.4'
+end

data/lib/sequel/plugins/join_by_paths.rb

@@ -1,31 +1,14 @@
-#!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'set'
 require 'sequel'
 
-# some helpers
-class String
-  # thanks https://stackoverflow.com/questions/1448670/ruby-stringto-class
-  def constantize
-    names = split('::')
-    names.shift if names.empty? || names.first.empty?
-
-    const = Object
-    names.each do |name|
-      const = if const.const_defined?(name)
-                const.const_get(name)
-              else
-                const.const_missing(name)
-              end
-    end
-    const
-  end
-end
+require 'safrano/core_ext'
 
 class PathNode < String
-  attr_reader :table_name
   attr_accessor :model_class
   attr_accessor :path_str
+
   def initialize(str, start_model)
     super(str)
     @start_model = start_model
@@ -80,14 +63,14 @@ class QPath
     path_nodes = []
     start_node.path_str = path_str
     nodes = [start_node]
-    nodes.concat @qpath.split('/').map { |nstr| @start_model.create_path_node(nstr) }
-    if (ns = nodes.size) > 1
-      nodes[0...-1].each_with_index do |node, i|
-        nodes[i + 1].set_model_class_by_parent_model(node.model_class)
-        path_nodes << nodes[i + 1]
-        nodes[i + 1].path_str = path_nodes.join('/')
-        @segments << [node, nodes[i + 1]]
-      end
+    nodes.concat(@qpath.split('/').map { |nstr| @start_model.create_path_node(nstr) })
+    return unless nodes.size > 1
+
+    nodes[0...-1].each_with_index do |node, i|
+      nodes[i + 1].set_model_class_by_parent_model(node.model_class)
+      path_nodes << nodes[i + 1]
+      nodes[i + 1].path_str = path_nodes.join('/')
+      @segments << [node, nodes[i + 1]]
     end
   end
 end
@@ -96,13 +79,15 @@ class JoinByPathsHelper < Set
   attr_reader :result
   attr_reader :start_model
 
+  EMPTY_ARRAY = [].freeze
+
   def initialize(smodel)
     super()
     @start_model = smodel
   end
 
   def build_unique_join_segments
-    return (@result = []) if empty?
+    return (@result = EMPTY_ARRAY) if empty?
 
     maxlen = map(&:size).max
     iset = nil
@@ -118,6 +103,7 @@ class JoinByPathsHelper < Set
       jseg.map  do |seg|
         leftm = seg.first.model_class
         assoc = leftm.association_reflection(seg.last.to_sym)
+
         rightm = seg.last.model_class
         # cf.  documentation in sequel/model/associations.rb
         case assoc[:type]
@@ -205,6 +191,7 @@ module Sequel
       module ClassMethods
         attr_reader :aliases_sym
         attr_reader :alias_cnt
+
         Plugins.inherited_instance_variables(self,
                                              :@aliases_sym => :dup,
                                              :@alias_cnt => :dup)
@@ -231,6 +218,7 @@ module Sequel
 
       module DatasetMethods
         attr_reader :join_helper
+
         def join_by_paths(*pathlist)
           model.join_by_paths_helper(*pathlist).dataset
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.4
 platform: ruby
 authors:
-- D.M.
+- oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2020-10-30 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
@@ -94,13 +108,23 @@ 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 '
+description: Safrano is an OData server library based on Ruby, Rack and Sequel.
+email: dev@aithscel.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/multipart.rb
+- lib/core_ext/Dir/iter.rb
+- lib/core_ext/Hash/transform.rb
+- lib/core_ext/Integer/edm.rb
+- lib/core_ext/REXML/Document/output.rb
+- lib/core_ext/String/convert.rb
+- lib/core_ext/String/edm.rb
+- lib/core_ext/dir.rb
+- lib/core_ext/hash.rb
+- lib/core_ext/integer.rb
+- lib/core_ext/rexml.rb
+- lib/core_ext/string.rb
 - lib/odata/attribute.rb
 - lib/odata/batch.rb
 - lib/odata/collection.rb
@@ -108,27 +132,40 @@ files:
 - lib/odata/collection_media.rb
 - lib/odata/collection_order.rb
 - lib/odata/common_logger.rb
+- lib/odata/complex_type.rb
+- lib/odata/edm/primitive_types.rb
 - lib/odata/entity.rb
 - lib/odata/error.rb
+- lib/odata/expand.rb
+- lib/odata/filter/base.rb
 - lib/odata/filter/error.rb
 - lib/odata/filter/parse.rb
 - lib/odata/filter/sequel.rb
+- lib/odata/filter/sequel_function_adapter.rb
 - lib/odata/filter/token.rb
 - lib/odata/filter/tree.rb
+- lib/odata/function_import.rb
+- lib/odata/model_ext.rb
 - lib/odata/navigation_attribute.rb
 - lib/odata/relations.rb
+- lib/odata/select.rb
+- lib/odata/transition.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/contract.rb
+- lib/safrano/core.rb
+- lib/safrano/core_ext.rb
+- lib/safrano/deprecation.rb
+- lib/safrano/multipart.rb
+- lib/safrano/rack_app.rb
+- lib/safrano/rack_builder.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
@@ -152,9 +189,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Safrano is a Ruby  OData provider based on Sequel and Rack
+summary: Safrano is a Ruby OData server library based on Sequel and Rack
 test_files: []

data/lib/rack_app.rb

@@ -1,174 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rack'
-require_relative 'odata/walker.rb'
-require_relative 'request.rb'
-require_relative 'response.rb'
-
-module OData
-  # handle GET PUT etc
-  module MethodHandlers
-    def odata_options
-      # cf. stackoverflow.com/questions/22924678/sinatra-delete-response-headers
-
-      x = if @walker.status == :end
-            headers.delete('Content-Type')
-            @response.headers.delete('Content-Type')
-            [200, {}, '']
-          else
-            odata_error
-          end
-      @response.headers['Content-Type'] = ''
-      x
-    end
-
-    def odata_error
-      return @walker.error.odata_get(@request) unless @walker.error.nil?
-
-      # this is too critical; raise a real Exception
-      raise 'Walker construction failed with a unknown Error '
-    end
-
-    def odata_delete
-      if @walker.status == :end
-        @walker.end_context.odata_delete(@request)
-      else
-        odata_error
-      end
-    end
-
-    def odata_put
-      if @walker.status == :end
-        @walker.end_context.odata_put(@request)
-      else
-        odata_error
-      end
-    end
-
-    def odata_patch
-      if @walker.status == :end
-        @walker.end_context.odata_patch(@request)
-      else
-        odata_error
-      end
-    end
-
-    def odata_get
-      if @walker.status == :end
-        @walker.end_context.odata_get(@request)
-      else
-        odata_error
-      end
-    end
-
-    def odata_post
-      if @walker.status == :end
-        @walker.end_context.odata_post(@request)
-      else
-        odata_error
-      end
-    end
-
-    def odata_head
-      [200, {}, ['']]
-    end
-  end
-
-  # the main Rack server app. Source: the Rack docu/examples and partly
-  # inspired from Sinatra
-  class ServerApp
-    METHODS_REGEXP = Regexp.new('HEAD|OPTIONS|GET|POST|PATCH|MERGE|PUT|DELETE')
-    include MethodHandlers
-    def before
-      headers 'Cache-Control' => 'no-cache'
-      headers 'Expires' => '-1'
-      headers 'Pragma' => 'no-cache'
-
-      @request.service_base = self.class.get_service_base
-
-      neg_error = @request.negotiate_service_version
-
-      raise RuntimeError if neg_error
-
-      return false unless @request.service
-
-      headers 'DataServiceVersion' => @request.service.data_service_version
-    end
-
-    # dispatch for all methods requiring parsing of the path
-    # with walker (ie. allmost all excepted HEAD)
-    def dispatch_with_walker
-      @walker = @request.create_odata_walker
-      case @request.request_method
-      when 'GET'
-        odata_get
-      when 'POST'
-        odata_post
-      when 'DELETE'
-        odata_delete
-      when 'OPTIONS'
-        odata_options
-      when 'PUT'
-        odata_put
-      when 'PATCH', 'MERGE'
-        odata_patch
-      else
-        raise Error
-      end
-    end
-
-    def dispatch
-      req_ret = if @request.request_method !~ METHODS_REGEXP
-                  [404, {}, ['Did you get lost?']]
-                elsif @request.request_method == 'HEAD'
-                  odata_head
-                else
-                  dispatch_with_walker
-                end
-      @response.status, rsph, @response.body = req_ret
-      headers rsph
-    end
-
-    def call(env)
-      @request = OData::Request.new(env)
-      @response = OData::Response.new
-
-      before
-
-      dispatch
-
-      @response.finish
-    end
-
-    # Set multiple response headers with Hash.
-    def headers(hash = nil)
-      @response.headers.merge! hash if hash
-      @response.headers
-    end
-
-    def self.enable_batch
-      @service_base.enable_batch
-    end
-
-    def self.path_prefix(path_pr)
-      @service_base.path_prefix path_pr
-    end
-
-    def self.get_service_base
-      @service_base
-    end
-
-    def self.set_servicebase(sbase)
-      @service_base = sbase
-      @service_base.enable_v1_service
-      @service_base.enable_v2_service
-    end
-
-    def self.publish_service(&block)
-      sbase = OData::ServiceBase.new
-      sbase.instance_eval(&block) if block_given?
-      sbase.finalize_publishing
-      set_servicebase(sbase)
-    end
-  end
-end

data/lib/sequel_join_by_paths.rb

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

data/lib/version.rb

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