dhis2 2.3.5 → 2.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad9f8562a6b20e47968d07c3dbeae1abb92e8a51
-  data.tar.gz: ad3d24476b089f578204230cebcf0e6d2fc03447
+  metadata.gz: d03ac1a95b0c73815866f14268e03502d0912e4c
+  data.tar.gz: 0a10d402e5c0cf26418fae541a993f34b059d482
 SHA512:
-  metadata.gz: bccc7fa2eb369cbe48d08bc34676334b8663007ccbc5243f319d41d7f4c53fc2ec3fc7fd646719f9a9b84356d2431e0fdb214249b61440762981bffcc1492d22
-  data.tar.gz: bcd2e59e1452d68b5fcbd79bee0c5fa0872d0be4339c8e06e41a5a5a4b78a7571fbd6aee0983b6fe0c812e8be3ad3398443af1d892f607e5e910d196a5c0c534
+  metadata.gz: 13087348f19e9b435270f48c08fde3b808892ddd5a8db78178166f0549e05ab62774f3ac295a0adfa5ecef3d04fe9591e09b837115096f261ce8e417b69f6687
+  data.tar.gz: 5a803e3506df42cc61f6b205d16858be21200f774628f0f8485d279b5ee0e8ebc8509fbe7db6b21faaff3065f392e2aa262a2fae7859bad5308e338dd79ed05d

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.ruby-version

@@ -0,0 +1 @@
+2.3.0

data/README.md

@@ -1,6 +1,7 @@
 # Dhis2
 
 <a href="https://codeclimate.com/github/BLSQ/dhis2"><img src="https://codeclimate.com/github/BLSQ/dhis2/badges/gpa.svg" /></a>
+[![Gem Version](https://badge.fury.io/rb/dhis2.svg)](https://badge.fury.io/rb/dhis2)
 
 Basic DHIS2 API client for Ruby.
 
@@ -147,6 +148,9 @@ The API is currently limited to actions on the following elements:
 * `User`
 * `Report`
 * `ReportTable`
+* `Program`
+* `Events`
+* `ResourceTables`
 
 ## Update
 
@@ -190,9 +194,16 @@ DHIS2 API does not return the ids of the created elements, but you can retreive
     status = Dhis2.client.data_elements.create(elements)
     element = Dhis2.client.data_elements.find_by(name: "TesTesT2")
 
+
+## Trigger analytics
+
+You can trigger Analytics with
+
+Dhis2.client.resource_tables.analytics
+
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. Note that the tests are using the DHIS2 demo server, which is reset every day but can be updated by anyone - so if someone change the password of the default user, the tests are going to fail.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rake test` and `bundle exec rspec` to run the tests. Note that the tests are using the DHIS2 demo server, which is reset every day but can be updated by anyone - so if someone change the password of the default user, the tests are going to fail.
 
 You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 

data/design.md

@@ -0,0 +1,195 @@
+# Design
+
+Some internal notes about the application - may be of interest to visitors also.
+
+## Why a wrapper?
+
+A HTTP request:
+
+    response = Net::HTTP.get('https://play.dhis2.org/demo', '/api/organisationUnits?filter=name:eq:Baoma&fields=[id,name]')
+    org_units = JSON.parse(response)
+
+We need basic auth:
+
+    uri = URI('https://play.dhis2.org/demo/api/organisationUnits?filter=name:eq:Baoma&fields=[id,name]')
+
+    req = Net::HTTP::Get.new(uri)
+    req.basic_auth 'user', 'pass'
+
+    res = Net::HTTP.start(uri.hostname, uri.port) {|http|
+      http.request(req)
+    }
+    puts res.body
+
+We need to connect to various DHIS2 clients:
+
+    project = Project.find(1)
+    user = project.dhis2_user
+    password = project.dhis2_password
+    url = project.dhis2_url
+
+    uri = URI("#{url}/api/organisationUnits?filter=name:eq:Baoma&fields=[id,name]")
+
+    req = Net::HTTP::Get.new(uri)
+    req.basic_auth user, password
+
+    ...
+
+and this all over the place
+
+A bit better with Rest Client:
+
+    response = RestClient.get 'https://play.dhis2.org/demo/api/organisationUnits', {params: {filter: "name:eq:Baoma", fields: '[id,name]'}}
+
+But still:
+
+- url all over the place
+- user/passwords all over the place
+- need to parse the JSON after (where is the data?)
+
+vs:
+
+    client = Dhis2::Client.new(user: "admin", password: "district", url: "https://play.dhis2.org/demo")
+   
+    # then:
+
+    org_units = client.organisation_units.list
+    org_units = client.organisation_units.list(fields: :all)
+
+## Topics
+
+### OpenStructs
+
+OpenStruct: create an object with any fields you want from a Hash:
+
+    s = OpenStruct.new
+    s.name = "Van Aken"
+    s.first_name = "Martin"
+    s # name=Van Aken, first_name=Martin
+
+Hash with object like syntax (nicer) - can be created from a Hash, so working very well with JSON:
+
+    response = RestClient.get 'https://play.dhis2.org/demo/api/organisationUnits/123'
+    raw = JSON.parse(response)
+    ou = OpenStruct.new(raw) # got a nice object out of JSON
+
+### Multi client
+
+Initial API was very much ActiveRecord like:
+
+    OrganisationUnit.find(id)
+    DataElement.list(filter: "name:like:param")
+
+we had to move to support multi clients:
+
+    client.organisation_units.find(id)
+    client.data_elements.list(filter: "name:like:param")
+
+### Case conversion
+
+Url is CamelCase, but this is not very ruby-ish:
+
+   ous = client.organisationUnits
+   puts ous.first.displayName
+
+so we convert everything we get back to snake case.
+
+### Status and error messages
+
+We create a Status object able to answer to simple questions such as "was the call successful" - this is different depending on the DHIS2 version, and the usage of HTTP status code is not always consistent (it tend to return 200 even when a creation fail for instance).
+
+### Version control
+
+The Gem also help with the management of different versions of DHIS2, resolving some differences without impacting the end user.
+
+## How it works:
+
+   class Indicator < Base
+   end
+
+   report = client.indicators.find("xxx")
+   puts report.name # "Deliveries coverage"
+
+### A bit of meta programming for finders:
+
+    class OrganisationUnit
+      def self.find(id)
+         execute("/organisationUnits/#{id}")
+      end
+    end
+
+    class DataElement
+      def self.find(id)
+         execute("/dataElements/#{id}")
+      end
+    end
+
+To:
+
+    class Base
+      def self.find(id)
+        execute("#{resource_name}/#{id}")
+      end
+    end
+
+    class DataElement < Base
+      def self.resource_name
+         "dataElements"
+      end
+    end
+
+To:
+
+    class Base
+      def self.find(id)
+        execute("#{resource_name}/#{id}")
+      end
+
+      def self.resource_name
+        simple_name = name.split("::").last
+        simple_name[0].downcase + simple_name[1..-1] + "s"
+      end
+    end
+
+    class DataElement < Base
+    end
+
+### A bit of meta programming for objects
+
+We want something such:
+
+  client.organisation_units.find(id)
+  client.data_elements.find(id)
+  client.data_sets.find(id)
+  ...
+
+Again, those are just the "resource names" - no need to repeat ourselves.
+
+We want
+
+  client.data_sets.find(id)
+
+to call the `find` method on the DataSet class.
+
+We want one method on client for each class that inherit from Base:
+
+Enter `inherited` - a method called each time a class inherit from this one:
+
+    class Base
+      def self.inherited(base)
+        Dhis2::Client.register_resource(base)
+      end
+    end
+
+We can use `define_method` to create a method for the given class (we underscore the name again as above):
+
+    class Client
+      def self.register_resource(resource_class)
+        class_name  = resource_class.name.split("::").last
+        method_name = underscore(class_name) + "s"
+        define_method(method_name) do
+          CollectionWrapper.new(resource_class, self)
+        end
+      end
+    end
+

data/dhis2.gemspec

@@ -28,4 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "faker", "~> 1.6", ">= 1.6.3"
   spec.add_development_dependency "byebug"
 
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "rest-client-logger"
 end

data/lib/dhis2.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rest-client"
 require "json"
 require "ostruct"
@@ -17,6 +18,7 @@ require_relative "dhis2/client"
 
 require_relative "dhis2/api/base"
 require_relative "dhis2/api/category_combo"
+require_relative "dhis2/api/category_option_combo"
 require_relative "dhis2/api/organisation_unit"
 require_relative "dhis2/api/data_element"
 require_relative "dhis2/api/data_element_group"
@@ -27,23 +29,27 @@ require_relative "dhis2/api/organisation_unit_level"
 require_relative "dhis2/api/indicator"
 require_relative "dhis2/api/analytic"
 require_relative "dhis2/api/organisation_unit_group"
+require_relative "dhis2/api/organisation_unit_group_set"
 require_relative "dhis2/api/system_info"
 require_relative "dhis2/api/attribute"
 require_relative "dhis2/api/user"
+require_relative "dhis2/api/event"
+require_relative "dhis2/api/program"
 require_relative "dhis2/api/report_table"
+require_relative "dhis2/api/resource_table"
 require_relative "dhis2/api/report"
 
 module Dhis2
   class << self
     def client
       if @client.nil?
-        if config.user.nil? && config.password.nil?
-          @client ||= Dhis2::Client.new(config.url)
-        else
-          @client ||= Dhis2::Client.new(url:      config.url,
+        @client ||= if config.user.nil? && config.password.nil?
+                      Dhis2::Client.new(config.url)
+                    else
+                      Dhis2::Client.new(url:      config.url,
                                         user:     config.user,
                                         password: config.password)
-        end
+                    end
       else
         @client
       end

data/lib/dhis2/api/analytic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class Analytic < Base
@@ -8,9 +10,9 @@ module Dhis2
             [:dimension, "dx:#{data_elements}"],
             [:dimension, "pe:#{periods}"]
           ]
-          params << [:filter, "#{filter}"] if filter
+          params << [:filter, filter.to_s] if filter
 
-          client.get(self.resource_name, RestClient::ParamsArray.new(params))
+          client.get(resource_name, RestClient::ParamsArray.new(params))
         end
       end
     end

data/lib/dhis2/api/attribute.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class Attribute < Base

data/lib/dhis2/api/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class Base < OpenStruct
@@ -79,7 +81,7 @@ module Dhis2
       end
 
       def initialize(client, raw_data)
-        raw_data["display_name"] ||= raw_data["name"]  # for backward compatbility with v2.19
+        raw_data["display_name"] ||= raw_data["name"] # for backward compatbility with v2.19
         super(raw_data)
         self.client = client
       end
@@ -93,12 +95,12 @@ module Dhis2
       end
 
       def add_relation(relation, relation_id)
-        client.post("#{self.class.resource_name}/#{id}/#{relation}/#{relation_id}",{})
+        client.post("#{self.class.resource_name}/#{id}/#{relation}/#{relation_id}", {})
         self
       end
 
       def remove_relation(relation, relation_id)
-        client.delete("#{self.class.resource_name}/#{id}/#{relation}/#{relation_id}",{})
+        client.delete("#{self.class.resource_name}/#{id}/#{relation}/#{relation_id}", {})
         self
       end
 
@@ -112,7 +114,7 @@ module Dhis2
       end
 
       def update
-        client.put("#{self.class.resource_name}/#{id}", self.to_h)
+        client.put("#{self.class.resource_name}/#{id}", to_h)
       end
     end
   end

data/lib/dhis2/api/category_combo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class CategoryCombo < Base

data/lib/dhis2/api/category_option_combo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class CategoryOptionCombo < Base

data/lib/dhis2/api/data_element.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class DataElement < Base
       class << self
-        def create(client, elements)
+        def create(client, elements, query_params = { preheat_cache: false })
           elements = [elements].flatten
           category_combo = client.category_combos.find_by(name: "default")
 
@@ -17,12 +19,13 @@ module Dhis2
                 aggregation_type:     element[:aggregation_type] || "SUM",
                 type:                 element[:type] || "int", # for backward compatbility
                 aggregation_operator: element[:aggregation_type] || "SUM", # for backward compatbility
+                zero_is_significant:  element[:zero_is_significant] || true,
                 category_combo:       { id: category_combo.id, name: category_combo.name }
               }
             end
           }
 
-          response = client.post("metadata", data_element)
+          response = client.post("metadata", data_element, client.class.deep_change_case(query_params, :camelize))
           Dhis2::Status.new(response)
         end
       end

data/lib/dhis2/api/data_element_group.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dhis2
   module Api
     class DataElementGroup < Base

data/lib/dhis2/api/data_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dhis2
   module Api
     class DataSet < Base
@@ -15,7 +16,7 @@ module Dhis2
                 short_name:         set[:short_name],
                 code:               set[:code],
                 period_type:        "Monthly",
-                data_elements:  set[:data_element_ids] ? set[:data_element_ids].map { |id| { id: id } } : [],
+                data_elements:      set[:data_element_ids] ? set[:data_element_ids].map { |id| { id: id } } : [],
                 organisation_units: set[:organisation_unit_ids] ? set[:organisation_unit_ids].map { |id| { id: id } } : [],
                 category_combo:     { id: category_combo.id, name: category_combo.name }
               }

data/lib/dhis2/api/data_value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class DataValue < Base
@@ -5,7 +7,7 @@ module Dhis2
         def find(client, period:, organisation_unit:, data_element:)
           params = { pe: period, ou: organisation_unit, de: data_element }
 
-          client.get(self.resource_name, params).first
+          client.get(resource_name, params).first
         end
       end
     end

data/lib/dhis2/api/data_value_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dhis2
   module Api
     class DataValueSet < Base
@@ -20,12 +21,12 @@ module Dhis2
         end
 
         def build_list_url(_client, options)
-          params = [build_what_url(options),  build_when_url(options), build_where_url(options)].join("&")
+          params = [build_what_url(options), build_when_url(options), build_where_url(options)].join("&")
           resource_name + "?" + params
         end
 
         def build_what_url(options)
-          data_set_ids  = options[:data_sets]
+          data_set_ids = options[:data_sets]
           if data_set_ids
             data_sets_url = data_set_ids.map { |ds| "dataSet=#{ds}" }.join("&")
           else
@@ -50,7 +51,7 @@ module Dhis2
         end
 
         def build_where_url(options)
-          children  = options[:children] || true
+          children = options[:children] || true
           organisation_unit_id = options[:organisation_unit]
           organisation_unit_group = options[:organisation_unit_group]
           if organisation_unit_id

data/lib/dhis2/api/event.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Dhis2
+  module Api
+    class Event < Base
+      def id
+        event
+      end
+      class << self
+        def format_query_parameters(options)
+
+          params = []
+          params.push([:page, options[:page]])                    if options[:page]
+          params.push([:pageSize, options[:page_size]])           if options[:page_size]
+          params.push([:fields, format_fields(options[:fields])]) if options[:fields]
+          params.concat(format_filter(options[:filter]))          if options[:filter]
+          params.push([:program, options[:program]])               if options[:program]
+          params.push([:orgUnit, options[:org_unit]])             if options[:org_unit]
+          params.push([:trackedEntityInstance, options[:tracked_entity_instance]]) if options[:tracked_entity_instance]
+
+          RestClient::ParamsArray.new(params)
+        end
+
+        def create(client, tuples)
+          begin
+            body = { resource_name.to_sym => tuples }
+            response = client.post(resource_name, body)
+          rescue RestClient::Conflict => e
+            response = Dhis2::Client.deep_change_case(JSON.parse(e.response.body), :underscore)
+          end
+          Dhis2::Status.new(response)
+        end
+      end
+    end
+  end
+end

data/lib/dhis2/api/indicator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class Indicator < Base

data/lib/dhis2/api/organisation_unit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class OrganisationUnit < Base
@@ -15,7 +17,7 @@ module Dhis2
           elsif options.any?
             params = []
             options.each do |name, value|
-              params << [name, value]
+              params << [client.class.camelize(name.to_s, false), value]
             end
             params        = client.class.deep_change_case(params, :camelize)
             json_response = client.get("#{resource_name}/#{id}", RestClient::ParamsArray.new(params))

data/lib/dhis2/api/organisation_unit_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class OrganisationUnitGroup < Base

data/lib/dhis2/api/organisation_unit_group_set.rb

@@ -0,0 +1,6 @@
+module Dhis2
+  module Api
+    class OrganisationUnitGroupSet < Base
+    end
+  end
+end

data/lib/dhis2/api/organisation_unit_level.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class OrganisationUnitLevel < Base

data/lib/dhis2/api/program.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Dhis2
+  module Api
+    class Program < Base
+    end
+  end
+end

data/lib/dhis2/api/report.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class Report < Base

data/lib/dhis2/api/report_table.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class ReportTable < Base
     end
   end
-end
+end

data/lib/dhis2/api/resource_table.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Dhis2
+  module Api
+    class ResourceTable < Base
+      class << self
+        def analytics(client)
+          response = client.post("resourceTables")
+          Dhis2::Status.new(response)
+        end
+      end
+    end
+  end
+end

data/lib/dhis2/api/system_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class SystemInfo < Base

data/lib/dhis2/api/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   module Api
     class User < Base

data/lib/dhis2/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   class Client
     def self.register_resource(resource_class)
@@ -7,11 +9,13 @@ module Dhis2
         CollectionWrapper.new(resource_class, self)
       end
     end
+    SUPPORTER_CASE_CHANGES = %i[underscore camelize].freeze
 
     def self.deep_change_case(hash, type)
+      raise "unsupported case changes #{type} vs #{SUPPORTER_CASE_CHANGES}" unless SUPPORTER_CASE_CHANGES.include?(type)
       case hash
       when Array
-        hash.map {|v| deep_change_case(v, type) }
+        hash.map { |v| deep_change_case(v, type) }
       when Hash
         new_hash = {}
         hash.each do |k, v|
@@ -25,19 +29,19 @@ module Dhis2
     end
 
     def self.camelize(string, uppercase_first_letter = true)
-      if uppercase_first_letter
-        string = string.sub(/^[a-z\d]*/) { $&.capitalize }
-      else
-        string = string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { $&.downcase }
-      end
-      string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub('/', '::')
+      string = if uppercase_first_letter
+                 string.sub(/^[a-z\d]*/) { $&.capitalize }
+               else
+                 string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { $&.downcase }
+               end
+      string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{Regexp.last_match(1)}#{Regexp.last_match(2).capitalize}" }.gsub("/", "::")
     end
 
     def self.underscore(camel_cased_word)
       return camel_cased_word unless camel_cased_word =~ /[A-Z-]|::/
-      word = camel_cased_word.to_s.gsub(/::/, '/')
-      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word = camel_cased_word.to_s.gsub(/::/, "/")
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
       word.tr!("-", "_")
       word.downcase!
       word
@@ -54,11 +58,12 @@ module Dhis2
         url.user     = CGI.escape(options[:user])
         url.password = CGI.escape(options[:password])
         @base_url    = url.to_s
-        @verify_ssl = options[:no_ssl_verification] ? OpenSSL::SSL::VERIFY_NONE :  OpenSSL::SSL::VERIFY_PEER
+        @verify_ssl = options[:no_ssl_verification] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
+        @timeout = options[:timeout] ? options[:timeout].to_i : 120
       end
     end
 
-    def post(path, payload, query_params = {})
+    def post(path, payload = nil, query_params = {})
       execute(:post, uri(path), headers, query_params, payload)
     end
 
@@ -82,11 +87,12 @@ module Dhis2
 
     def execute(method, url, headers, query_params = {}, payload = nil)
       query = {
-        method:  method,
-        url:     url,
-        headers: { params: query_params }.merge(headers),
-        payload: payload ? self.class.deep_change_case(payload, :camelize).to_json : nil,
-        verify_ssl: @verify_ssl
+        method:     method,
+        url:        url,
+        headers:    { params: query_params }.merge(headers),
+        payload:    payload ? self.class.deep_change_case(payload, :camelize).to_json : nil,
+        verify_ssl: @verify_ssl,
+        timeout:    @timeout
       }
 
       raw_response = RestClient::Request.execute(query)

data/lib/dhis2/collection_wrapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   class CollectionWrapper
     def initialize(klass, client)

data/lib/dhis2/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   class Configuration
     attr_accessor :url, :user, :password

data/lib/dhis2/import_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   class ImportError < StandardError
   end

data/lib/dhis2/pager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Dhis2
   class Pager
     attr_reader :page, :page_count, :total, :next_page

data/lib/dhis2/paginated_array.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   class PaginatedArray < DelegateClass(Array)
     attr_reader :pager

data/lib/dhis2/status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
   class Status
     attr_reader :raw_status
@@ -12,7 +14,7 @@ module Dhis2
           summary["status"] == "SUCCESS"
         end
       end
-      ["SUCCESS", "OK"].include?(@raw_status["status"])
+      %w[SUCCESS OK].include?(@raw_status["status"])
     end
 
     def total_imported
@@ -31,5 +33,10 @@ module Dhis2
       return [] unless @raw_status["import_type_summaries"]
       @raw_status["import_type_summaries"].map { |summary| summary["last_imported"] }
     end
+
+    def import_summaries
+      return [] unless @raw_status["response"]["import_summaries"]
+      @raw_status["response"]["import_summaries"].map { |it| OpenStruct.new(it) }
+    end
   end
 end

data/lib/dhis2/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dhis2
-  VERSION = "2.3.5"
+  VERSION = "2.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhis2
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors:
 - Martin Van Aken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -114,6 +114,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allows to retreive items from a DHIS2 server in a more "Ruby way".
 email:
 - mvanaken@bluesquare.org
@@ -122,7 +178,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -131,6 +189,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- design.md
 - dhis2.gemspec
 - lib/dhis2.rb
 - lib/dhis2/api/analytic.rb
@@ -143,12 +202,16 @@ files:
 - lib/dhis2/api/data_set.rb
 - lib/dhis2/api/data_value.rb
 - lib/dhis2/api/data_value_set.rb
+- lib/dhis2/api/event.rb
 - lib/dhis2/api/indicator.rb
 - lib/dhis2/api/organisation_unit.rb
 - lib/dhis2/api/organisation_unit_group.rb
+- lib/dhis2/api/organisation_unit_group_set.rb
 - lib/dhis2/api/organisation_unit_level.rb
+- lib/dhis2/api/program.rb
 - lib/dhis2/api/report.rb
 - lib/dhis2/api/report_table.rb
+- lib/dhis2/api/resource_table.rb
 - lib/dhis2/api/system_info.rb
 - lib/dhis2/api/user.rb
 - lib/dhis2/client.rb