helium-ruby 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43e173ae51cf81b50cd37e722e907a77a0361868
-  data.tar.gz: a7869b3f5887e95dbdab8b5cb85500b43def65ff
+  metadata.gz: e020a0f77221244c8f3610773410718bd4609048
+  data.tar.gz: a7dfe863e2ba493480596852726401696ea27814
 SHA512:
-  metadata.gz: c6e471b7bfb6dc6064c69f3eee51b21b7c7d91cfa64de7238e0fe9ac6ccd58d38fba76458e2d943881d786c0129a5f85e08ed3bb6dae6c96b93338cc55ebffb2
-  data.tar.gz: da14f3d09e1b1d04904317bf79177d84934528ba7d1aefdd470453ea70910e91a862e9b121122d9b514355e64817a4663faeb9245ff50272a85b60c1a95570a5
+  metadata.gz: 17c7b6554c56efc3e1aba9c687a98a0a6a7dbcdd7df6f5575f44238a755031b5b4f5cefa94562d42e404ac1a49099813b9e063fdc28374289f119f83b3018ae3
+  data.tar.gz: c0e67983f97cb527b104f27ddb3944e86f0176b7af2db386222ea186002a1edb635ca6b621dd9e6c348e3c9bd23c0680420ddacce4829fdecbf962b9aad12d4b

data/CONTRIBUTORS.md

@@ -2,3 +2,4 @@
 
 - Andrew "Bones" Allen
 - Jared Morrow (of the Canadian Morrows)
+- Lane Seppala

data/lib/helium/client/http.rb

@@ -29,8 +29,8 @@ module Helium
         run(path, :put, opts)
       end
 
-      def delete(path)
-        response = run(path, :delete)
+      def delete(path, opts = {})
+        response = run(path, :delete, opts)
         response.code == 204
       end
 

data/lib/helium/client/labels.rb

@@ -13,36 +13,6 @@ module Helium
         Label.create(attributes, client: self)
       end
 
-      # TODO incorporate this logic into Helium::Collection
-      def update_label_sensors(label, opts = {})
-        sensors = opts.fetch(:sensors, [])
-
-        path = "/label/#{label.id}/relationships/sensor"
-
-        sensors = Array(sensors)
-
-        new_sensor_data = sensors.map do |sensor|
-          {
-            id: sensor.id,
-            type: 'sensor'
-          }
-        end
-
-        body = {
-          data: new_sensor_data
-        }
-
-        response = patch(path, body: body)
-        sensors_data = JSON.parse(response.body)["data"]
-
-        # TODO: these come back deflated. need to either inflate at this point or
-        # when needed
-        sensors = sensors_data.map do |sensor_data|
-          Sensor.new(client: self, params: sensor_data)
-        end
-
-        return sensors
-      end
     end
   end
 end

data/lib/helium/collection.rb

@@ -80,6 +80,27 @@ module Helium
       collection.last
     end
 
+    # Adds resources of the same type to the collection related to the
+    # '@belongs_to' resource
+    def add_relationships(items)
+      body = relationship_request_body(items)
+      @client.post(relationship_path, body: body)
+    end
+
+    # Replaces resources of the same type to the collection related to the
+    # '@belongs_to' resource. An empty array removes all resources.
+    def replace_relationships(items)
+      body = relationship_request_body(items)
+      @client.patch(relationship_path, body: body)
+    end
+
+    # Removes resources of the same type to the collection related to the
+    # '@belongs_to' resource. An empty array removes all resources.
+    def remove_relationships(items)
+      body = relationship_request_body(items)
+      @client.delete(relationship_path, body: body)
+    end
+
     protected
 
     def add_filter_criteria(criteria)
@@ -115,6 +136,16 @@ module Helium
       uri.to_s
     end
 
+    def relationship_path
+      if @belongs_to
+        URI.parse("#{@belongs_to.resource_path}/relationships/#{@klass.resource_name}").to_s
+      else
+        raise Helium::Error.new(
+          "The collection must be associated with a resource to modify the
+          relationship")
+      end
+    end
+
     def collection_from_response(response)
       resources_data = JSON.parse(response.body)["data"]
 
@@ -125,5 +156,22 @@ module Helium
       return resources
     end
 
+    def relationship_request_body(items)
+      items = Array(items)
+      if items.all? {|item| item.is_a? @klass }
+        new_items_data = items.map do |item|
+          {
+            id: item.id,
+            type: "#{@klass.resource_name}"
+          }
+        end
+        { data: new_items_data }
+      else
+        raise Helium::Error.new(
+          "All items added to the collection must be of type " + @klass.to_s)
+      end
+
+    end
+
   end
 end

data/lib/helium/label.rb

@@ -13,15 +13,18 @@ module Helium
     end
 
     def add_sensors(sensors_to_add = [])
-      sensors_to_add = Array(sensors_to_add)
+      sensors.add_relationships(sensors_to_add)
+      self
+    end
 
-      @client.update_label_sensors(self, sensors: sensors + sensors_to_add)
+    def replace_sensors(sensors_to_replace = [])
+      sensors.replace_relationships(sensors_to_replace)
+      self
     end
 
     def remove_sensors(sensors_to_remove = [])
-      sensors_to_remove = Array(sensors_to_remove)
-
-      @client.update_label_sensors(self, sensors: sensors - sensors_to_remove)
+      sensors.remove_relationships(sensors_to_remove)
+      self
     end
 
     # TODO can probably generalize this a bit more

data/lib/helium/sensor.rb

@@ -83,5 +83,35 @@ module Helium
         device_type: device_type
       })
     end
+
+    def add_labels(labels_to_add = [])
+      # There's no first-class support for modifying the labels of a sensor in
+      # the API yet, so we modify each label's relationship to the sensor. Once
+      # this is supported in the API, this can use #add_relationships instead.
+      # Same comment applies for the following 3 functions
+      labels_to_add = Array(labels_to_add)
+      labels_to_add.each do |label|
+        label.add_sensors(self)
+      end
+    end
+
+    def replace_labels(labels_to_replace = [])
+      # To support replacement, we remove this sensor from each label, and then
+      # add it to the specified set
+      labels_to_replace = Array(labels_to_replace)
+      labels.each do |label|
+        label.remove_sensors(self)
+      end
+      labels_to_replace.each do |label|
+        label.add_sensors(self)
+      end
+    end
+
+    def remove_labels(labels_to_remove = [])
+      labels_to_remove = Array(labels_to_remove)
+      labels_to_remove.each do |label|
+        label.remove_sensors(self)
+      end
+    end
   end
 end

data/lib/helium/version.rb

@@ -1,3 +1,3 @@
 module Helium
-  VERSION = "0.23.0"
+  VERSION = "0.24.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helium-ruby
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Andrew Allen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-25 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus