ecoportal-api 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b5603297e3d8f896195915049712b370adfe3dd903fa980bb89d57b4c41c8cb
-  data.tar.gz: 46ea17c5f957ac03f8db92241477b8c823e2f0685fc0ef6bbf2dbf3e0722461e
+  metadata.gz: dc61e1dcd4fce98df40134e6d8803ecb1cf173dfc3fc2e728fffe1651b9b00be
+  data.tar.gz: edc0798d69fc802c50f0f6fce556e9bb62c4242a05145286332148c3ee4fce72
 SHA512:
-  metadata.gz: f8ebd19ddf1ccce8b78bd703043f9e2f02fa9296c4872bea6f4143aa097b4dba200e65dbb030bb2c06694615e2e9e4de29b8fa4b0f6d10d5aff8a649a005826c
-  data.tar.gz: a2437d527e4043160bd2cd8c74bf011ee419b4348f37679ed02db890a95de436ae4d325f3a9f84b44f270c8cefa518bb8a4f11c481958379513080a82d116ff7
+  metadata.gz: 29ea3c284644656303b702dd507e1d133319bf9cd6b48403ae2b738b4e16ba19d93692ffcd20b110070c571086f0cda7b3ea1db2b0a7f8afd69b7c56bb261b64
+  data.tar.gz: aeb583b4065f68809d52145913854faac2feb8098ff0e2f993db03916df08fa55a70d3fe27383c02bdc01ebf1988602c20c55e801b5f553abe961f7af7ef2ea7

data/lib/ecoportal/api/common/batch_operation.rb

@@ -28,10 +28,11 @@ module Ecoportal
               body   = subresponse["response"]
               method = @operations[idx][:method]
 
-              batch_response = BatchResponse.new(status, body)
-              if batch_response.success? && method == "GET"
-                callback.call batch_response, @wrapper.new(body)
+              if status == 200 && method == "GET"
+                batch_response = BatchResponse.new(status, body, @wrapper.new(body))
+                callback.call batch_response, batch_response.result
               else
+                batch_response = BatchResponse.new(status, body)
                 callback.call batch_response
               end
             end
@@ -61,10 +62,11 @@ module Ecoportal
         end
 
         def upsert(doc)
-          id   = get_id(doc)
-          body = get_body(doc)
+          id          = get_id(doc)
+          external_id = get_external_id(doc)
+          body        = get_body(doc)
           @operations << {
-            path:     @base_path + "/" + CGI::escape(id),
+            path:     @base_path + "/" + CGI::escape(external_id || id),
             method:   "POST",
             body:     body,
             callback: block_given? && Proc.new

data/lib/ecoportal/api/common/batch_response.rb

@@ -2,14 +2,27 @@ module Ecoportal
   module API
     module Common
       class BatchResponse
-        attr_reader :status, :body
-        def initialize(status, body)
+        attr_reader :status, :body, :result
+        def initialize(status, body, result = nil)
           @status = status
           @body   = body
+          @result = result
         end
         def success?
           (0..299).include?(status)
         end
+        def each
+          [*@result].each do |doc|
+            yield doc
+          end
+        end
+        def print
+          if success?
+            each(&:print)
+          else
+            puts "Request failed."
+          end
+        end
       end
     end
   end

data/lib/ecoportal/api/common/wrapped_response.rb

@@ -18,17 +18,23 @@ module Ecoportal
                       end
           end
         end
+        def body
+          response.body.to_s
+        end
         def each
           [*@result].each do |doc|
             yield doc
           end
         end
+        def status
+          @response.status.code
+        end
         def success?
           @response.success?
         end
         def print
           if success?
-            @result&.map(&:print)
+            each(&:print)
           else
             puts "Request failed."
           end

data/lib/ecoportal/api/internal/account.rb

@@ -4,10 +4,24 @@ module Ecoportal
       class Account < Common::BaseModel
         passthrough :policy_group_ids, :landing_page_id, :permissions_preset, :permissions_custom, :preferences, :prefilter, :filter_tags, :login_provider_ids, :starred_ids, to: :doc
 
+        VALID_TAG_REGEX = /^[A-Za-z0-9 &_'\/-]+$/
+
         def preset=(value)
           self.permissions_preset = value == "custom" ? nil : value
         end
 
+        def filter_tags=(value)
+          unless value.is_a?(Array)
+            raise "filter_tags= needs to be passed an Array, got #{value.class}"
+          end
+          doc["filter_tags"] = value.map do |tag|
+            unless tag.match(VALID_TAG_REGEX)
+              raise "Invalid filter tag #{tag.inspect}"
+            end
+            tag.upcase
+          end
+        end
+
         def preset
           self.permissions_preset.nil? ? "custom" : self.permissions_preset
         end

data/lib/ecoportal/api/v1/person_schema.rb

@@ -41,6 +41,10 @@ module Ecoportal
               "value" => field.multiple ? [] : nil
             )
           end
+          # Patch out static data from as_update
+          original = details.instance_variable_get("@original_doc")
+          original["fields"] = JSON.parse(details.doc["fields"].to_json)
+          return
         end
 
         private

data/lib/ecoportal/api/v1/schema_field_value.rb

@@ -12,7 +12,7 @@ module Ecoportal
                    when "date"
                      if doc["value"]
                        maybe_multiple(doc["value"]) do |v|
-                         DateTime.iso8601(v)
+                         Date.iso8601(v)
                        end
                      end
                    else
@@ -37,13 +37,13 @@ module Ecoportal
             doc["value"] = @value = !!value
           when "date"
             maybe_multiple(value) do |v|
-              unless v.nil? || v.respond_to?(:iso8601)
+              unless v.nil? || v.respond_to?(:to_date)
                 raise "Invalid date type #{v.class}"
               end
             end
             @value       = value
             doc["value"] = maybe_multiple(@value) do |v|
-              v&.iso8601
+              v&.to_date&.to_s
             end
           else
             raise "Unknown type #{type}"

data/lib/ecoportal/api/version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tapio Saarinen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
+date: 2018-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler