ecoportal-api 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a872d32e0481811ea0ab8cd922a27917d164e91032750d42987e43035408dfe8
-  data.tar.gz: fb83215e5acb23390fd0e2fd040ab5f6afbe0d0d78ccdc486d3058c05f5ad454
+  metadata.gz: 5b5603297e3d8f896195915049712b370adfe3dd903fa980bb89d57b4c41c8cb
+  data.tar.gz: 46ea17c5f957ac03f8db92241477b8c823e2f0685fc0ef6bbf2dbf3e0722461e
 SHA512:
-  metadata.gz: 7a1b0ad316cdb30703c9d10db2a64de762d209e1f1e174ff17aedaf391f8ef10e2ca0959c4724dd533f9e92c1aa88e523bec71edd12a9b5e4bc9f28188b96775
-  data.tar.gz: 2d24729c40a17c9d3afb80ee9b7bdffedaedcf502a77f6ffd1ca300b4de0b8de75d4e71db4dc0abacf0bd9643fb8652217d146e8ef72d4fed58a9ef3fb61279a
+  metadata.gz: f8ebd19ddf1ccce8b78bd703043f9e2f02fa9296c4872bea6f4143aa097b4dba200e65dbb030bb2c06694615e2e9e4de29b8fa4b0f6d10d5aff8a649a005826c
+  data.tar.gz: a2437d527e4043160bd2cd8c74bf011ee419b4348f37679ed02db890a95de436ae4d325f3a9f84b44f270c8cefa518bb8a4f11c481958379513080a82d116ff7

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

@@ -8,6 +8,12 @@ module Ecoportal
           @original_doc = JSON.parse(doc.to_json)
         end
 
+        def self.build(doc = {})
+          new(doc).tap do |instance|
+            instance.instance_variable_set("@original_doc", {})
+          end
+        end
+
         def print
           puts JSON.pretty_generate(as_json)
           self

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

@@ -30,7 +30,7 @@ module Ecoportal
 
               batch_response = BatchResponse.new(status, body)
               if batch_response.success? && method == "GET"
-                callback.call response, @wrapper.new(body)
+                callback.call batch_response, @wrapper.new(body)
               else
                 callback.call batch_response
               end

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

@@ -21,6 +21,9 @@ module Ecoportal
           id or raise "No ID has been given!"
           id
         end
+        def get_external_id(doc)
+          doc.respond_to?(:external_id) ? doc.external_id : nil
+        end
       end
     end
   end

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

@@ -13,7 +13,7 @@ module Ecoportal
                 b_value = b[key]
                 next if a_value == b_value && !ID_KEYS.include?(key)
                 diffed[key] = diff(a_value, b_value)
-                diffed.delete[key] if diffed[key] == {}
+                diffed.delete(key) if diffed[key] == {}
               end
               # All keys are IDs, so it's actually blank
               if (diffed.keys - ID_KEYS).empty?

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

@@ -47,9 +47,10 @@ module Ecoportal
         end
 
         def upsert(doc)
-          body = get_body(doc)
-          id   = get_id(doc)
-          @client.post("/people/"+CGI::escape(id), data: body)
+          body        = get_body(doc)
+          id          = get_id(doc)
+          external_id = get_external_id(doc)
+          @client.post("/people/"+CGI::escape(external_id || id), data: body)
         end
 
         def batch
@@ -74,26 +75,6 @@ module Ecoportal
         def person_class
           V1::Person
         end
-
-        def get_body(doc)
-          if doc.respond_to?(:as_update)
-            doc.as_update
-          elsif doc.respond_to?(:as_json)
-            doc.as_json
-          else
-            doc
-          end
-        end
-        def get_id(doc)
-          id = nil
-          id ||= doc.id if doc.respond_to?(:id)
-          id ||= doc.external_id if doc.respond_to?(:external_id)
-          id ||= doc["id"] if doc.is_a?(Hash)
-          id ||= doc["external_id"] if doc.is_a?(Hash)
-          id ||= doc if doc.is_a?(String)
-          id or raise "No ID has been given!"
-          id
-        end
       end
     end
   end

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

@@ -41,6 +41,8 @@ module Ecoportal
         def []=(id, value)
           if field = get_field(id)
             field.value = value
+          else
+            raise "details[#{id.inspect}] is missing. Did you forget to load the schema?"
           end
         end
 

data/lib/ecoportal/api/version.rb

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

metadata

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