safrano 0.3.3 → 0.4.3

data/lib/safrano/version.rb

@@ -0,0 +1,3 @@
+module Safrano
+  VERSION = '0.4.3'.freeze
+end

data/lib/sequel/plugins/join_by_paths.rb

@@ -23,7 +23,6 @@ class String
 end
 
 class PathNode < String
-  attr_reader :table_name
   attr_accessor :model_class
   attr_accessor :path_str
   def initialize(str, start_model)
@@ -80,14 +79,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
@@ -95,6 +94,7 @@ end
 class JoinByPathsHelper < Set
   attr_reader :result
   attr_reader :start_model
+  EMPTY_ARRAY = [].freeze
 
   def initialize(smodel)
     super()
@@ -102,7 +102,7 @@ class JoinByPathsHelper < Set
   end
 
   def build_unique_join_segments
-    return (@result = []) if empty?
+    return (@result = EMPTY_ARRAY) if empty?
 
     maxlen = map(&:size).max
     iset = nil
@@ -118,6 +118,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]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.3
 platform: ruby
 authors:
 - D.M.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-07-19 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,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.51'
-description: Safrano is an OData server framework based on Ruby, Rack and Sequel.
-email: dm@0data.dev
+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/odata/attribute.rb
 - lib/odata/batch.rb
 - lib/odata/collection.rb
@@ -110,25 +123,30 @@ files:
 - lib/odata/common_logger.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/navigation_attribute.rb
 - lib/odata/relations.rb
+- lib/odata/select.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
@@ -152,9 +170,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.2
 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/version.rb

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