cpee-dstore 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abfbfb8ae9eb6dcdee4a63e346a07adff179dd69a8f24f9a39cf05a91a3c1ef9
-  data.tar.gz: ff32c8d32760a160cfa4962123a6df4d6108f3b943dfd355a8912622f986c31e
+  metadata.gz: 1ccd12e54e8d15208553763a9bc03e339892a4bfca6b5d777cc18e8218bba196
+  data.tar.gz: af2d5eba2eeb9b3e148ce4d06df8555d4101a57d5cbb572b24c48e15be100722
 SHA512:
-  metadata.gz: 7b10646a092658cbe842c4153be747ff3a047fc656e8704f7dc0700d745d6d6afb708708bab4a955749634dac9bba475fb8542599b36d0b365564735a732c7d5
-  data.tar.gz: 1f997f2268a32b1150fd6411ecccd339907126817756972b4e5addbd5a1dd19c659aafd52e80682d2e394b23d81e8f9606ab1ce7c168f5a17998071a0d92f7d5
+  metadata.gz: 2defba9a5d8c816a6d46d73e9db7e0bb555b223c22e79ddfd3a37803329552c35893e1456c2a6b87b6ae9d58a94df24e07a9713f325c00ebaccb4acb86c10631
+  data.tar.gz: '08253bf3a7fe587488606550fcacc968d6cee8a0605a064c7f365656de7ca686461cdbbd10970c7d6d5b8f013cf043b16829028ce1bc6d7df778d7c583f14383'

data/cpee-dstore.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-dstore"
-  s.version          = "1.0.0"
+  s.version          = "1.0.2"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Generic document store for the cloud process execution engine (cpee.org)"
@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   s.homepage         = 'http://cpee.org/'
 
   s.add_runtime_dependency 'riddl', '~> 1.0'
+  s.add_runtime_dependency 'mimemagic', '~>0'
 end

data/lib/cpee-dstore/implementation.rb

@@ -16,11 +16,31 @@
 # along with CPEE-DSTORE (file LICENSE in the main directory). If not, see
 # <http://www.gnu.org/licenses/>.
 
-require 'rubygems'
 require 'mimemagic'
 require 'riddl/server'
 require 'fileutils'
 
+class File
+  def tail(n)
+    buffer = 1024
+    idx = [size - buffer, 0].max
+    chunks = []
+    lines = 0
+
+    begin
+      seek(idx)
+      chunk = read(buffer)
+      lines += chunk.count("\n")
+      chunks.unshift chunk
+      idx -= buffer
+    end while lines < ( n + 1 ) && pos != 0
+
+    tail_of_file = chunks.join('')
+    ary = tail_of_file.split("\n")
+    ary[ ary.size - n, ary.size - 1 ].join("\n")
+  end
+end
+
 module CPEE
   module DStore
     SERVER = File.expand_path(File.join(__dir__,'implementation.xml'))
@@ -30,7 +50,12 @@ module CPEE
         file = File.join(@a[0],@r[-2],@r[-1])
         meta = file + '.mimetype'
         if File.exist?(file) && File.exist?(meta)
-          Riddl::Parameter::Complex.new('file',File.read(meta).strip,File.open(file,'rb'))
+          f = File.open(file,'rb')
+          if @p.length > 0 && @p[0].name == 'tail'
+            Riddl::Parameter::Complex.new('file',File.read(meta).strip,f.tail(@p[0].value.to_i))
+          else
+            Riddl::Parameter::Complex.new('file',File.read(meta).strip,f)
+          end
         else
           @status = 404
           nil
@@ -40,11 +65,17 @@ module CPEE
 
     class DoPut < Riddl::Implementation #{{{
       def response
+        if @p[0].name == 'append'
+          mode = 'ab'
+          @p.shift
+        else
+          mode = 'wb'
+        end
         name = @r[-1]
         dir = File.join(@a[0],@r[-2])
         FileUtils.mkdir_p(dir)
 
-        File.open(File.join(dir,name),'wb') do |f|
+        File.open(File.join(dir,name),mode) do |f|
           IO.copy_stream(@p[0].value,f)
           mime = MimeMagic.by_magic(@p[0].value.read)
           mt = if mime.nil?
@@ -63,11 +94,11 @@ module CPEE
       opts[:data_dir] ||= File.expand_path(File.join(__dir__,'data'))
 
       Proc.new do
-        on resource do                                                                     # "/"
-          on resource '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' do      # uuid
-            on resource '[a-z_][a-zA-Z0-9_]*' do                                            # name
-              run DoGet, opts[:data_dir] if get
-              run DoPut, opts[:data_dir] if put 'file'
+        on resource do
+          on resource '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}' do
+            on resource '[a-z_][a-zA-Z0-9_]*' do
+              run DoGet, opts[:data_dir] if get 'rfile'
+              run DoPut, opts[:data_dir] if put 'ifile'
             end
           end
         end

data/lib/cpee-dstore/implementation.xml

@@ -17,15 +17,26 @@
 -->
 
 <description xmlns="http://riddl.org/ns/description/1.0" xmlns:ann="http://riddl.org/ns/annotation/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <message name="file">
+  <message name="ifile">
+    <optional>
+      <parameter name="append" type="string"/>
+    </optional>
+    <parameter name="file" mimetype="*"/>
+  </message>
+  <message name="rfile">
+    <optional>
+      <parameter name="tail" type="integer"/>
+    </optional>
+  </message>
+  <message name="ofile">
     <parameter name="file" mimetype="*"/>
   </message>
 
   <resource>
     <resource relative="[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}">
       <resource relative='[a-z_][a-zA-Z0-9_]*'>
-        <get out="file"/>
-        <put in="file"/>
+        <get in="rfile" out="ofile"/>
+        <put in="ifile"/>
       </resource>
     </resource>
   </resource>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-dstore
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -23,6 +23,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  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'
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables: