safrano 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a16c6b649ec630fbada504c11039b017b4055c7038c2aa126e7c6b55dd768ff
-  data.tar.gz: 03b387f824a5f2e4d53c3e16dd9b013ca8d3c308bc06e13cc0bf09bf54f4f3eb
+  metadata.gz: cc504918971031d5c89c44a26e970a65da7e2cbd3da865e65138e95f90a2460d
+  data.tar.gz: dd418e35d807619d101b385434ab4f886e7a0b9d10267471a09418e50d14db49
 SHA512:
-  metadata.gz: d40563e3e2ad2db813954318aaf5d0f3097f71d9210af9434524cc7e8e25ba81b37694e0fe5fb7d7f9c662679a3b5c8425d11e771d8ba0fe42162598d4f81f65
-  data.tar.gz: 8dc6cfea884a95c2841e0646d0051dcf4926c3fad85734978e8ee2bc98ea7dbae5fd3718cf6a3a8b49f66c2a3566c33c70c64fd8babde8c4c66a1cbe2eb46929
+  metadata.gz: af6cdb6492826c77f0d43846492e53bb5fdaf023de23f0a73496fec5076818291300d248f7d82874886cef99ac864b5632e928061ff8dfe3bf2dafb29cd0593e
+  data.tar.gz: 86893ddd4605f7d7eaa063c2cf869923db1c17acb42d69e880ab9fc92523743abaab205b18147452b5f55050a65676b2786458b6fcca560c65c4160bf069357d

data/lib/odata/collection_media.rb

@@ -29,7 +29,12 @@ module OData
       def odata_get(request:, entity:)
         media_env = request.env.dup
         media_env['PATH_INFO'] = filename(entity)
-        @file_server.call(media_env)
+        fsret = @file_server.call(media_env)
+        if fsret.first == 200
+          # provide own content type as we keep it in the media entity
+          fsret[1]['Content-Type'] = entity.content_type
+        end
+        fsret
       end
 
       # TODO perf: this can be precalculated and cached on MediaModelKlass level
@@ -88,16 +93,30 @@ module OData
       def save_file(data:, filename:, entity:)
         Dir.chdir(abs_klass_dir(entity)) do
           in_media_directory(entity) do
+            filename = '1'
             File.open(filename, 'wb') { |f| IO.copy_stream(data, f) }
           end
         end
       end
 
+      # needed for having a changing media ressource "source" metadata
+      # after each upload, so that clients get informed about new versions
+      # of the same media ressource
+      def ressource_version(entity)
+        Dir.chdir(abs_klass_dir(entity)) do
+          in_media_directory(entity) do
+            Dir.glob('*').last 
+          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) }
+            version = nil
+            Dir.glob('*').each { |oldf| version = oldf; File.delete(oldf) }
+            filename = (version.to_i + 1).to_s
             File.open(filename, 'wb') { |f| IO.copy_stream(data, f) }
           end
         end
@@ -112,7 +131,7 @@ module OData
       SEP = '/00/'
            
       def StaticTree.path_builder(ids)
-        ids.map{|id| id.to_s.chars.join('/')}.join(SEP)
+        ids.map{|id| id.to_s.chars.join('/')}.join(SEP) + '/v'
       end
       
       # this is relative to abs_klass_dir(entity) eg to /@root/Photo
@@ -145,16 +164,26 @@ module OData
       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
+       # 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) }
+            version = nil
+            Dir.glob('*').each { |oldf| version = oldf; File.delete(oldf) }
+            filename = (version.to_i + 1).to_s
             File.open(filename, 'wb') { |f| IO.copy_stream(data, f) }
           end
         end
       end
     
-    
     end
     
   end
@@ -174,8 +203,8 @@ module OData
       @media_handler = OData::Media::Static.new
     end
 
-    def use(klass, *args)
-      @media_handler = klass.new(*args)
+    def use(klass, args)
+      @media_handler = klass.new(**args)
     end
 
     # API method for setting the model field mapped to SLUG on upload

data/lib/odata/entity.rb

@@ -188,22 +188,23 @@ module OData
     
     # TODO: differentiate between POST/PUT/PATCH/MERGE
     def odata_post(req)
-      data = JSON.parse(req.body.read)
-      @uribase = req.uribase
-
-      if req.accept?(APPJSON)
-        data.delete('__metadata')
-
-        if req.in_changeset
-          set_fields(data, self.class.data_fields, missing: :skip)
-          save(transaction: false)
-        else
-          update_fields(data, self.class.data_fields, missing: :skip)
+      if req.walker.media_value
+        odata_media_value_put(req)
+      else
+        if req.accept?(APPJSON)
+          data.delete('__metadata')
+  
+          if req.in_changeset
+            set_fields(data, self.class.data_fields, missing: :skip)
+            save(transaction: false)
+          else
+            update_fields(data, self.class.data_fields, missing: :skip)
+          end
+  
+          [202, {}, to_odata_post_json(service: req.service)]
+        else # TODO: other formats
+          415
         end
-
-        [202, {}, to_odata_post_json(service: req.service)]
-      else # TODO: other formats
-        415
       end
     end
 
@@ -387,14 +388,19 @@ module OData
       {   uri: uri(uribase),
           type: type_name,
           media_src: media_src(uribase),
-          edit_media: media_src(uribase),
+          edit_media: edit_media(uribase),
           content_type: @values[:content_type] }
     end
 
-    def media_src(urbase)
-      "#{uri(urbase)}/$value"
+    def media_src(uribase)
+      version = self.class.media_handler.ressource_version(self)
+      "#{uri(uribase)}/$value?version=#{version}"
     end
-
+    
+    def edit_media(uribase)
+      "#{uri(uribase)}/$value"
+    end
+    
     # directory where to put/find the media files for this entity-type
     def klass_dir
       type_name

data/lib/odata/error.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'json'
 require 'rexml/document'
 require 'safrano.rb'

data/lib/odata/walker.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'json'
 require 'rexml/document'
 require 'safrano.rb'

data/lib/safrano/service.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'rexml/document'
 require 'odata/relations.rb'
 require 'odata/batch.rb'

data/lib/safrano/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: safrano
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - D.M.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-26 00:00:00.000000000 Z
+date: 2020-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -108,7 +108,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.51'
-description: Safrano is an OData server framework based on Ruby, Rack and Sequel.
+description: Safrano is an OData server library based on Ruby, Rack and Sequel.
 email: dev@aithscel.eu
 executables: []
 extensions: []
@@ -166,9 +166,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 based on Sequel and Rack
 test_files: []