safrano 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffa3b9e1f282380dcdd32162bca490faa4749e05a1db11d65dc2b0c25c5ee76c
-  data.tar.gz: eae063a3541b8eec09bea8d98adf04dc4ad6bed16bdfe6dc3c06fd2df7bb0baf
+  metadata.gz: '068df72ed0e610de674a7f8771f1ff4e5a8e1d4217c5755c08bab78e3c735588'
+  data.tar.gz: e45fc20c09b7717c1354e80c9e7afd6b4e71a0b27cc97c99b2fd51b99abcb083
 SHA512:
-  metadata.gz: 0c910a0f9677d820f85ae00926b3e7f4f5b29126aa86f5386868d8681e3b9808d44d3f31a6adddac861d98ed1d6969a955691c75262c7a2f892110a4dc948797
-  data.tar.gz: 54b66c00dc7456739457cc58d7a1a68aff8f9a35dccfda3f04b7b83ce12ac7a7e9525d95b7a620cb0e779467e67b26ae3342675477e5c7a49fdb8063bad12183
+  metadata.gz: 709fe03f7939265381c276192a1db812a26a55a14914de89ae220f37b99efe21ed057f05c0e071bb388eef21c01df9a8408557aca6bc19e30a2767752f7d39f4
+  data.tar.gz: b4fb2033ec0fd0568c23762cbf660f36e879574367c61617c022847fee64747762943139eb91849f8ae762182688c7e424db5545539e1f7896e10c3e6db62113

data/lib/multipart.rb

@@ -562,4 +562,3 @@ module MIME
     end
   end
 end
-

data/lib/odata/collection.rb

@@ -290,7 +290,8 @@ module OData
 
     def to_odata_links_json(service:)
       { 'd' => service.get_coll_odata_links_h(array: get_a,
-                                              uribase: @uribase) }.to_json
+                                              uribase: @uribase,
+                                              icount: @inlinecount) }.to_json
     end
 
     def to_odata_json(service:)

data/lib/odata/collection_order.rb

@@ -75,7 +75,9 @@ module OData
 
     def apply_to_dataset(dtcx)
       @olist.each { |oarg|
-        dtcx = dtcx.order(oarg)
+        # Warning, we need order_append, simply order(oarg) overwrites
+        # previous one !
+        dtcx = dtcx.order_append(oarg)
       }
       dtcx
     end

data/lib/odata/entity.rb

@@ -114,7 +114,7 @@ module OData
           (v + v.gmt_offset).utc.to_datetime
         else
           v
-          end
+        end
       }
     end
 

data/lib/odata/url_parameters.rb

@@ -45,6 +45,7 @@ module OData
 
       if @filt.nil?
         dtcx = @jh.dataset.select_all(@jh.start_model.table_name)
+
         @ordby.apply_to_dataset(dtcx)
       elsif @ordby.nil?
         @filt.apply_to_dataset(dtcx)

data/lib/sequel/plugins/join_by_paths.rb

@@ -228,6 +228,7 @@ module Sequel
           jh
         end
       end
+
       module DatasetMethods
         attr_reader :join_helper
         def join_by_paths(*pathlist)

data/lib/service.rb

@@ -31,6 +31,21 @@ module OData
       yield k, rest_exp
     end
 
+    # default v2
+    # overriden in ServiceV1
+    def get_coll_odata_h(array:, expand: nil, uribase:, icount: nil)
+      res = array.map do |w|
+        get_entity_odata_h(entity: w,
+                           expand: expand,
+                           uribase: uribase)
+      end
+      if icount
+        { 'results' => res, '__count' => icount }
+      else
+        { 'results' => res }
+      end
+    end
+
     # handle a single expand
     def handle_entity_expand_one(entity:, exp_one:, nav_values_h:, nav_coll_h:,
                                  uribase:)
@@ -42,11 +57,10 @@ module OData
                                                         uribase: uribase)
         elsif (encoll = entity.nav_coll[first])
           # nav attributes that are a collection (x..n)
-          nav_coll_h[first.to_s] = encoll.map do |xe|
-            if xe
-              get_entity_odata_h(entity: xe, expand: rest_exp, uribase: uribase)
-            end
-          end
+          nav_coll_h[first.to_s] = get_coll_odata_h(array: encoll,
+                                                    expand: rest_exp,
+                                                    uribase: uribase)
+
         end
       end
     end
@@ -142,6 +156,9 @@ module OData
   include XMLNS
   # Base class for service. Subclass will be for V1, V2 etc...
   class ServiceBase
+    include Safrano
+    include ExpandHandler
+
     XML_PREAMBLE = '<?xml version="1.0" encoding="utf-8" standalone="yes"?>' + \
                    "\r\n".freeze
 
@@ -318,9 +335,6 @@ module OData
       @collections.map(&:entity_set_name).join('|')
     end
 
-    include Safrano
-    include ExpandHandler
-
     def service
       hres = {}
       hres['d'] = { 'EntitySets' => @collections.map(&:type_name) }
@@ -496,6 +510,12 @@ module OData
       @data_service_version = '1.0'
     end
 
+    def get_coll_odata_links_h(array:, uribase:, icount: nil)
+      array.map do |w|
+        get_entity_odata_link_h(entity: w, uribase: uribase)
+      end
+    end
+
     def get_coll_odata_h(array:, expand: nil, uribase:, icount: nil)
       array.map do |w|
         get_entity_odata_h(entity: w,
@@ -515,17 +535,9 @@ module OData
       @data_service_version = '2.0'
     end
 
-    def get_coll_odata_links_h(array:, uribase:)
-      array.map do |w|
-        get_entity_odata_link_h(entity: w, uribase: uribase)
-      end
-    end
-
-    def get_coll_odata_h(array:, expand: nil, uribase:, icount: nil)
+    def get_coll_odata_links_h(array:, uribase:, icount: nil)
       res = array.map do |w|
-        get_entity_odata_h(entity: w,
-                           expand: expand,
-                           uribase: uribase)
+        get_entity_odata_link_h(entity: w, uribase: uribase)
       end
       if icount
         { 'results' => res, '__count' => icount }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - D.M.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2019-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack