panoptes-client 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9093577357d957e9de91f8cf05a4bc4a545ae13
-  data.tar.gz: f9be472c1e3558ef8d8f2d380f715b22a968fd0b
+  metadata.gz: e96fa7b8f5e137b8dc426c6f119587471fcc9189
+  data.tar.gz: 41794d9a41090bf7fc1c3d87ef8e46ffadd5e0fe
 SHA512:
-  metadata.gz: 0adbd891e129ceacbc55b061e65cc5c63d532e0647d0fc6250c76d52a2a635c5aa7431ca5994bf34b1220417f530288306ccc3f25dcbedb92d3ed0dee522eec8
-  data.tar.gz: 70b9a45e53f6788fcfb47948800cd4861cd0996935036012a031bb8fda2cb90c3d44f64e76a801f0de0973b910fe89e2d9cae8be558e84d20ab121be0b966d9d
+  metadata.gz: fa3d24cb731c90c486c313c46c33d0ae4f8ba833e995c6515bfd1035e9477cc358ae4002d7380d6bf2d7060bcd13b02706fda799982196f5cddda5d3524ebf40
+  data.tar.gz: ccae89f05b4129fac56897aa0a823d9d23e4e2670629d7b24ad3dad3de9c709becfda07b2829eb46f3152a71a04e4c49ba2d16ec62b8c3836bfc979f1e88cf29

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.2.6
+
+* Add `client.workflow` to fetch a specific workflow.
+* Add `client.create_workflow`
+* Add `client.subjects` to fetch a list of subjects given filters
+* Add `client.subject_set` to fetch a specific subject set
+* Add `client.create_subject_set`
+* Add `client.update_subject_set`
+* Add `client.add_subjects_to_subject_set`
+* ServerErrors will now have the error message in the exception message
+
 # 0.2.5
 
 * Add `client.remove_user_from_user_group` that can be used by group admins to remove some other user from a group.

data/lib/panoptes/client.rb

@@ -6,7 +6,9 @@ require "panoptes/client/version"
 require "panoptes/client/me"
 require "panoptes/client/projects"
 require "panoptes/client/subjects"
+require "panoptes/client/subject_sets"
 require "panoptes/client/user_groups"
+require "panoptes/client/workflows"
 
 module Panoptes
   class Client
@@ -18,7 +20,9 @@ module Panoptes
     include Panoptes::Client::Me
     include Panoptes::Client::Projects
     include Panoptes::Client::Subjects
+    include Panoptes::Client::SubjectSets
     include Panoptes::Client::UserGroups
+    include Panoptes::Client::Workflows
 
     # A client is the main interface to the API.
     #
@@ -53,13 +57,19 @@ module Panoptes
       handle_response(response)
     end
 
-    def put(path, body = {})
-      response = conn.put("/api" + path, body)
+    def put(path, body = {}, etag: nil)
+      headers = {}
+      headers["If-Match"] = etag if etag
+
+      response = conn.put("/api" + path, body, headers)
       handle_response(response)
     end
 
-    def patch(path, body = {})
-      response = conn.patch("/api" + path, body)
+    def patch(path, body = {}, etag: nil)
+      headers = {}
+      headers["If-Match"] = etag if etag
+
+      response = conn.patch("/api" + path, body, headers)
       handle_response(response)
     end
 
@@ -101,7 +111,7 @@ module Panoptes
       when 404
         raise ResourceNotFound, status: response.status, body: response.body
       when 400..600
-        raise ServerError.new(response)
+        raise ServerError.new(response.body)
       else
         response.body
       end

data/lib/panoptes/client/subject_sets.rb

@@ -0,0 +1,28 @@
+module Panoptes
+  class Client
+    module SubjectSets
+      def subject_set(subject_set_id)
+        response = get("/subject_sets/#{subject_set_id}")
+        response.fetch("subject_sets").find {|i| i.fetch("id").to_s == subject_set_id.to_s }
+      end
+
+      def create_subject_set(attributes)
+        response = post("/subject_sets", subject_sets: attributes)
+        response.fetch("subject_sets").first
+      end
+
+      def update_subject_set(subject_set_id, attributes)
+        response = conn.get("/api/subject_sets/#{subject_set_id}")
+        etag = response.headers["ETag"]
+
+        response = put("/subject_sets/#{subject_set_id}", {subject_sets: attributes}, etag: etag)
+        response.fetch("subject_sets").first
+      end
+
+      def add_subjects_to_subject_set(subject_set_id, subject_ids)
+        response = post("/subject_sets/#{subject_set_id}/links/subjects", subjects: subject_ids)
+        true
+      end
+    end
+  end
+end

data/lib/panoptes/client/subjects.rb

@@ -1,6 +1,18 @@
 module Panoptes
   class Client
     module Subjects
+      # Get list of subjects
+      #
+      # @param subject_set_id [Integer] filter by subject set
+      # @return list of subjects
+      def subjects(subject_set_id:)
+        query = {}
+        query[:subject_set_id] = subject_set_id
+
+        response = get("/subjects", query)
+        response.fetch("subjects")
+      end
+
       # Retire a subject for a workflow
       #
       # @todo Add this endpoint to the Apiary docs and add a see-reference here.

data/lib/panoptes/client/version.rb

@@ -1,5 +1,5 @@
 module Panoptes
   class Client
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

data/lib/panoptes/client/workflows.rb

@@ -0,0 +1,15 @@
+module Panoptes
+  class Client
+    module Workflows
+      def workflow(workflow_id)
+        response = get("/workflows/#{workflow_id}")
+        response.fetch("workflows").find {|i| i.fetch("id").to_s == workflow_id.to_s }
+      end
+
+      def create_workflow(attributes)
+        response = post("/workflows", workflows: attributes)
+        response.fetch("workflows").first
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panoptes-client
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -116,9 +116,11 @@ files:
 - lib/panoptes/client.rb
 - lib/panoptes/client/me.rb
 - lib/panoptes/client/projects.rb
+- lib/panoptes/client/subject_sets.rb
 - lib/panoptes/client/subjects.rb
 - lib/panoptes/client/user_groups.rb
 - lib/panoptes/client/version.rb
+- lib/panoptes/client/workflows.rb
 - panoptes-client.gemspec
 homepage: https://github.com/zooniverse/panoptes-client.rb
 licenses: