dhis2 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed649a064de87ceea944479aa82f20e239e912ee
-  data.tar.gz: 862e2be603b90d7da556faae38ba8df02ee51759
+  metadata.gz: a392c3f988989d0b3f6e14785464d5abba279cc3
+  data.tar.gz: 35acd3072f5a4ebdd7d47a136eb12e14dd5beade
 SHA512:
-  metadata.gz: 5ccb72a75795cd3c0e9d1b863ea25c93181410d09cf03dacafebe19b25c84a99defc1da3aaee01236b61f530f9381b4c177a2cb2c9ae608d7d046cf9cb0c9f39
-  data.tar.gz: 82a608fd72682b034e53b4df5107474ea4b89b14bc93968829398b55499f2abfa05afd7bedded231be603bff9697c33195087ee63fe49eb2694fd48c79224bc5
+  metadata.gz: 79ac47b20d744f9cfa6e24b0dc23fc8bd923213d3aa358f22f48c2b544e807cf17cbfe7cc98378edd6072f7c6183f251cbc42c9ad5059c568b7829b02f73a453
+  data.tar.gz: 04a31d19f9097937e350fe6f29ec674cbcdcd8381d82deda6cc279f69670b19632a089d1509e32de3364b33d50b6194cec920a0acbfc7f59013f29e90109acc0

data/lib/dhis2/api/organisation_unit.rb

@@ -40,13 +40,8 @@ module Dhis2
 
           payload = {
             organisationUnits: orgunits.map do |orgunit|
-              organisation_unit = {
-                name:        orgunit[:name],
-                short_name:   orgunit[:short_name],
-                opening_date: orgunit[:opening_date]
-              }
-              organisation_unit[:parent] = {id: orgunit[:parent_id]} if orgunit[:parent_id] 
-              organisation_unit
+              orgunit[:parent] = { id: orgunit[:parent_id] } if orgunit[:parent_id]
+              orgunit
             end
           }
 

data/lib/dhis2/status.rb

@@ -12,22 +12,23 @@ module Dhis2
           summary["status"] == "SUCCESS"
         end
       end
-      @raw_status["status"] == "SUCCESS"
-    end
-
-    def import_count
-      @raw_status["import_count"]
+      ["SUCCESS", "OK"].include?(@raw_status["status"])
     end
 
     def total_imported
       total = 0
-      import_count.each do |_, count|
-        total += count
+      if @raw_status["import_count"]
+        @raw_status["import_count"].each do |_, count|
+          total += count
+        end
+      elsif @raw_status["type_reports"]
+        total += @raw_status["type_reports"].first["stats"]["total"]
       end
       total
     end
 
     def last_imported_ids
+      return [] unless @raw_status["import_type_summaries"]
       @raw_status["import_type_summaries"].map { |summary| summary["last_imported"] }
     end
   end

data/lib/dhis2/version.rb

@@ -1,3 +1,3 @@
 module Dhis2
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhis2
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Martin Van Aken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client