infopark_fiona7 1.6.1.1.0 → 1.6.1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd5af32d592de98bf21bad9ae13300a9c5a17786
-  data.tar.gz: 45b0946e073a24b93b2b418770c8de7eee312889
+  metadata.gz: 8619bcb34e8b06c4499cce99ce0cad5609cc5691
+  data.tar.gz: 2d10b5a8e74cfc9139ff9d10f27e7a478da66645
 SHA512:
-  metadata.gz: 1e33280b118ab2e9b6b023450be624fc0f223f8e894195493aa6aa342d7ab937e23b58bf8dd0d0910bc8e4cd4a4e17951d894c1d39b27b4fa45492c12fe29af3
-  data.tar.gz: 26841cfc7effbc06117518a6e2e1585ae44dbaf5534749015c3e8bcdf76ca7a9e07b87534ded47391e96caef0cdfbb13467bcd15bd63d659e54bcc7f263f04a4
+  metadata.gz: 2da3e5d4a375674f33e7f8003eb5bdf85e6a1a48c83c74abcd92fcacbbe7d152ba8f4b2b49d76d80bfa8e60d5f59e30861992f3afcd7d6a4288e5ea56fd987b2
+  data.tar.gz: 81be495b06b82580e67a75c229d0eca2d8162813068b900b78e19b8119a1db931530fb51be78ee6701445869045de8e8d85bdf3086da9eb36d0bb3a16899d578

data/lib/fiona7/controllers/rest_api/blob_controller.rb

@@ -75,6 +75,35 @@ module Fiona7
 
           return binary_spec
         end
+
+        def parse_blob_id_from_url( url )
+          return unless url.present?
+          match_result = url.match(/\/_b\/([a-zA-Z0-9_-]+)(\Z|\/)/)
+          return match_result[1] if match_result
+        end
+
+        def obj_id_from_blob_id(blob_id)
+          return unless blob_id.present?
+          binary = BinaryHandling::MetaBinary.new(blob_id)
+          return binary.implementation.obj.id if binary.implementation.obj.present? 
+        end
+        
+        def resolve_urls(params)
+          if urls = params[:urls]
+            if Array === urls
+              {
+                results: urls.map do |url| 
+                  obj_id = obj_id_from_blob_id( parse_blob_id_from_url( url ) )
+                  {obj_id: obj_id} if obj_id.present?
+                end
+              }
+            else
+              "The value for “urls” is not an array."
+            end
+          else
+            "Missing value for the key “urls”."
+          end
+        end
       end
     end
   end

data/lib/fiona7/routers/rest_api.rb

@@ -17,7 +17,7 @@ class Scrivito::CmsRestApi
     def get(resource_path, payload = nil, options = nil)
       @number_of_requests += 1 if resource_path == @count_requests
 
-      
+
       action = :get
       ActiveSupport::Notifications.instrumenter.instrument(
         "backend_request.scrivito",
@@ -57,12 +57,16 @@ class Scrivito::CmsRestApi
         when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/changes\Z/
           _, _, workspace_id,_ = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::WorkspaceController.new.changes(workspace_id)
-        when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/objs\/mget+\Z/
+        when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/objs\/mget\Z/
           _, _, workspace_id, _, _ = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::ObjController.new.fetch_multiple2(workspace_id, payload)
+        when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/base_objs\/mget\Z/
+          Fiona7::Controllers::RestAPI::ObjController.new.fetch_multiple2('published', payload)
         when /\A\/?workspaces\/[a-zA-Z0-9_-]+\/objs\/[a-zA-Z0-9_-]+\Z/
           _, _, workspace_id, _, obj_id = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::ObjController.new.fetch_by_id(workspace_id, obj_id)
+        when /\A\/?blobs\/resolve_urls\Z/
+          Fiona7::Controllers::RestAPI::BlobController.new.resolve_urls(payload)
         when /\A\/?blobs\/[a-zA-Z0-9_-]+\Z/
           _, _, blob_id = *resource_path.split("/")
           Fiona7::Controllers::RestAPI::BlobController.new.fetch(blob_id)

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.6.1.1.0"
+  VERSION = "1.6.1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.6.1.1.0
+  version: 1.6.1.1.1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -365,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: scrivito-compatible interface for classic Fiona