dhis2 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23a68a6e9121453b5f029afc363dae6e4b2acf85
-  data.tar.gz: e6f31c8d2d40edbfbdeea5136a28ca7f08defa1c
+  metadata.gz: 66cf5849a25c1a4f9dc97664e086a02cdb30fb9e
+  data.tar.gz: c4695d707a8b06dbaad62fb98047374100116ea0
 SHA512:
-  metadata.gz: 86bc17621e4f32b5dee4fbb350a5bfc5d0a82445cb468a8c7160450ae8f3bc72cfc0046a8a68463ef11219766b41741a30d97f1e7e4110e46fe2436402b4a9a5
-  data.tar.gz: 707583e0ed6e6c6af41573b49f68d7749f3dbb5f4b1161f2ab14fd45acfd95c8951ddbcbce6fc63f72583f7aba87732586e31edaf5717cdb52790afc914ce0fc
+  metadata.gz: 6b6b5229099449c13c93b7674125e6f6ddbb5df84f49b1b5ee7bb957077511317151b48920913639d127925f029cd9d947712b40a582865a713d5fc2ea494c86
+  data.tar.gz: e1517df7e484908f8278cd45d8188fd4de111fb376617eab171f55eaf532a3fe258fff21ec597833340535894908fdeeea343957a78990ceb0d4490ac6dc6791

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+.byebug_history
+.rake_tasks~

data/README.md

@@ -104,6 +104,16 @@ If you have an equality condition or set of equality conditions that should retu
     # Just do:
     data_element = Dhis2.client.data_elements.find_by(code: "C27")
 
+### Manage relations
+
+You can add or remove items in collections using `add_relation` and `remove_relation`:
+
+    data_set = Dhis2.client.data_sets.list(page_size:1).first
+    data_element = Dhis2.client.data_elements.list(page_size: 1).first
+    data_set.add_relation(:dataSetElements, data_element.id)
+    ...
+    data_set.remove_relation(:dataSetElements, data_element.id)
+
 ### Values
 
 You can retreive data values this way:

data/dhis2.gemspec

@@ -26,4 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "faker", "~> 1.6", ">= 1.6.3"
+  spec.add_development_dependency "byebug"
+
 end

data/lib/dhis2/api/base.rb

@@ -92,6 +92,16 @@ module Dhis2
         self
       end
 
+      def add_relation(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}",{})
+        self
+      end
+
       def delete
         client.delete("#{self.class.resource_name}/#{id}")
         true

data/lib/dhis2/api/data_set.rb

@@ -6,19 +6,21 @@ module Dhis2
         def create(client, sets)
           sets = [sets].flatten
 
-          category_combo_id = client.category_combos.find_by(name: "default").id
+          category_combo = client.category_combos.find_by(name: "default")
 
           data_set = {
             data_sets: sets.map do |set|
-              {
+              dataset = {
                 name:               set[:name],
                 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 }
+                category_combo:     { id: category_combo.id, name: category_combo.name }
               }
+
+              dataset
             end
           }
           response = client.post("metadata", data_set)

data/lib/dhis2/version.rb

@@ -1,3 +1,3 @@
 module Dhis2
-  VERSION = "2.3.3"
+  VERSION = "2.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhis2
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Martin Van Aken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -100,6 +100,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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