safrano 0.4.1 → 0.4.6

data/lib/safrano/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Safrano
-  VERSION = '0.4.1'
+  VERSION = '0.4.6'  
 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.4.1
+  version: 0.4.6
 platform: ruby
 authors:
-- D.M.
+- oz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-17 00:00:00.000000000 Z
+date: 2021-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -56,16 +56,16 @@ dependencies:
   name: rfc2047
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,12 +108,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.51'
-description: Safrano is an OData server library based on Ruby, Rack and Sequel.
+description: Safrano is an OData server library based on Ruby Sequel and Rack.
 email: dev@aithscel.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- 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
@@ -121,22 +132,34 @@ 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/safrano.rb
+- lib/safrano/contract.rb
 - lib/safrano/core.rb
+- lib/safrano/core_ext.rb
+- lib/safrano/deprecation.rb
 - lib/safrano/multipart.rb
-- lib/safrano/odata_rack_builder.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
@@ -166,8 +189,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
-summary: Safrano is a Ruby  OData server based on Sequel and Rack
+summary: Safrano is an OData server library based on Ruby Sequel and Rack
 test_files: []