dhis2 2.3.7 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2db2c0f90a0889c1c8d69bbba0d0960289e9afd7
-  data.tar.gz: 7a7b013a8d2ced4b77c939cbcac23a949f68f48c
+  metadata.gz: 31237affd866d0b4d8f2f3d206ee0f4e87fc0887
+  data.tar.gz: 3342245ed20209d6cf8d14b43b6afd84c1a2195f
 SHA512:
-  metadata.gz: ed252220cb1844dd29924f8be097a61f011d0ffc33682f0d19bb866693f16071356df7f6edb2739d2a0187eae3bf9d12f04b8e9dee71ac29431f6441a102fd6d
-  data.tar.gz: 910e88d474e0ae7452d7cc4e83f122ecf6858f326769bf188d1dcfae0f3598e561b54bfcfeffb39459c94e4ecfe6eedb0a1c553fea60bea0b885d7e36d00f954
+  metadata.gz: 7b92380e27981c30c95779d27b2cfa9310280c29e672859428a638e7bd1f801ca27d4c1106d8ba3ae9cda577e7785f575d43c9dde777a725576cda4047100b39
+  data.tar.gz: a0cd65724a439e6467aac2673bf21bc853cb1ebdc0d21ca3d2dafccb0a1be7c7db0e4a3719bf3372b2a98e814a318e842bc3c8746965f20b893c31a15305c8f3

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3.1

data/.travis.yml

@@ -1,5 +1,13 @@
+env:
+  global:
+    - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
 sudo: false
 language: ruby
-rvm:
-  - 2.3.0
+cache: bundler
 before_install: gem install bundler -v 1.12.5
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+script: 
+  - "bundle exec rspec"
+  - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi

data/README.md

@@ -2,6 +2,8 @@
 
 <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)
+[![Build Status](https://travis-ci.org/BLSQ/dhis2.svg?branch=master)](https://travis-ci.org/BLSQ/dhis2)
+[![Test Coverage](https://codeclimate.com/github/BLSQ/dhis2/badges/coverage.svg)](https://codeclimate.com/github/BLSQ/dhis2/coverage)
 
 Basic DHIS2 API client for Ruby.
 
@@ -144,6 +146,7 @@ The API is currently limited to actions on the following elements:
 * `SystemInfo`
 * `Attribute`
 * `Indicator`
+* `IndicatorGroup`
 * `DataElementGroup`
 * `User`
 * `Report`

data/lib/dhis2.rb

@@ -27,6 +27,7 @@ require_relative "dhis2/api/data_value_set"
 require_relative "dhis2/api/data_value"
 require_relative "dhis2/api/organisation_unit_level"
 require_relative "dhis2/api/indicator"
+require_relative "dhis2/api/indicator_group"
 require_relative "dhis2/api/analytic"
 require_relative "dhis2/api/organisation_unit_group"
 require_relative "dhis2/api/organisation_unit_group_set"
@@ -41,6 +42,15 @@ require_relative "dhis2/api/report"
 
 module Dhis2
   class << self
+    def play(debug = false)
+      Dhis2::Client.new(
+        url:      "https://play.dhis2.org/demo/",
+        user:     "admin",
+        password: "district",
+        debug:    debug
+      )
+    end
+
     def client
       if @client.nil?
         @client ||= if config.user.nil? && config.password.nil?
@@ -48,7 +58,8 @@ module Dhis2
                     else
                       Dhis2::Client.new(url:      config.url,
                                         user:     config.user,
-                                        password: config.password)
+                                        password: config.password,
+                                        debug:    config.debug)
                     end
       else
         @client

data/lib/dhis2/api/data_value_set.rb

@@ -51,7 +51,7 @@ module Dhis2
         end
 
         def build_where_url(options)
-          children = options[:children] || true
+          children = options[:children].nil? ? true : options[:children]
           organisation_unit_id = options[:organisation_unit]
           organisation_unit_group = options[:organisation_unit_group]
           if organisation_unit_id

data/lib/dhis2/api/indicator_group.rb

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

data/lib/dhis2/api/organisation_unit_group.rb

@@ -9,6 +9,12 @@ module Dhis2
         end
       end
 
+      def group_set_ids
+        [organisation_unit_group_set, group_sets].flatten.compact.map do |group_set|
+          group_set["id"]
+        end
+      end
+
       class << self
         def create(client, orgunit_groups)
           orgunit_groups = [orgunit_groups].flatten

data/lib/dhis2/client.rb

@@ -60,6 +60,7 @@ module Dhis2
         @base_url    = url.to_s
         @verify_ssl = options[:no_ssl_verification] ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
         @timeout = options[:timeout] ? options[:timeout].to_i : 120
+        @debug = options[:debug] && options[:debug] == true
       end
     end
 
@@ -96,8 +97,12 @@ module Dhis2
       }
 
       raw_response = RestClient::Request.execute(query)
-      response     = raw_response.nil? || raw_response == "" ? {} : JSON.parse(raw_response)
-      response     = self.class.deep_change_case(response, :underscore)
+
+      response = raw_response.nil? || raw_response == "" ? {} : JSON.parse(raw_response)
+
+      puts [raw_response.request.url, query[:payload], response].join("\t") if @debug
+
+      response = self.class.deep_change_case(response, :underscore)
 
       if  response.class == Hash && response["import_type_summaries"] &&
           response["import_type_summaries"][0] &&

data/lib/dhis2/configuration.rb

@@ -2,6 +2,6 @@
 
 module Dhis2
   class Configuration
-    attr_accessor :url, :user, :password
+    attr_accessor :url, :user, :password, :debug
   end
 end

data/lib/dhis2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dhis2
-  VERSION = "2.3.7"
+  VERSION = "2.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhis2
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
 platform: ruby
 authors:
 - Martin Van Aken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -204,6 +204,7 @@ files:
 - lib/dhis2/api/data_value_set.rb
 - lib/dhis2/api/event.rb
 - lib/dhis2/api/indicator.rb
+- lib/dhis2/api/indicator_group.rb
 - lib/dhis2/api/organisation_unit.rb
 - lib/dhis2/api/organisation_unit_group.rb
 - lib/dhis2/api/organisation_unit_group_set.rb