ohmage 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37dc20d0591f071bbf12a953fc0814cab13c8923
-  data.tar.gz: 9b09debd1c7c1430b66fd3a2645bcd3854cb6bd0
+  metadata.gz: 5346e0bbef95966904e71f121444a7953aef1f25
+  data.tar.gz: 15c14cf7eb79247f05519225fe4beeb46627a203
 SHA512:
-  metadata.gz: 2da59701975de44f0a0a00e244eda1a9746baa98d1c2dc166d436c0c0180db9191569b54f8dad3f06301ec42751b259bd5789f843055d85af2ab7681d4b14607
-  data.tar.gz: 794e46d0799cbbe5c443bf41c8d14cd763a1558986809c67bfdac97143c4eee778c99543c18a8308559aba516ff4695d91b746f28a90ab0f87aad35d12843a7b
+  metadata.gz: ca7ad1732dd2e189ead2d9ff1360a01c4cd6a0f9be05cfca98fb40e58bfa2176122bda3cf1c522cde49313b630f79fe997c5fe86e3c3550dd58b9a28dc74c07b
+  data.tar.gz: 0b90a0cff36432d5b9f87dd6958125af287b7d5b46a619b164874615c4c7977c7a56c51e136c4cd19df061349fcdf68281d4f475ef8d3be0608328ef8c42d3b4

data/lib/ohmage/campaign.rb

@@ -15,6 +15,31 @@ module Ohmage
         t
       end
 
+      #
+      # ohmage campaign/create call
+      # @see https://github.com/ohmage/server/wiki/Campaign-Manipulation#campaignCreate
+      # @returns [Ohmage::Campaign object] or nil if urn is not passed as param
+      #
+      def campaign_create(params = {})
+        params[:xml] = HTTP::FormData::File.new(params[:xml])
+        request = Ohmage::Request.new(self, :post, 'campaign/create', params)
+        request.perform
+        # we cannot create a campaign object if campaign_urn is not passed as a param. returns nil otherwise
+        campaign_read(campaign_urn_list: params[:campaign_urn], output_format: 'long') if params[:campaign_urn]
+      end
+
+      #
+      # ohmage campaign/update call
+      # @see https://github.com/ohmage/server/wiki/Campaign-Manipulation#campaignUpdate
+      # @returns [Ohmage::Campaign object]
+      #
+      def campaign_update(params = {})
+        params[:xml] = HTTP::FormData::File.new(params[:xml]) if params[:xml]
+        request = Ohmage::Request.new(self, :post, 'campaign/update', params)
+        request.perform
+        campaign_read(campaign_urn_list: params[:campaign_urn])
+      end
+
       def campaign_delete(params = {})
         request = Ohmage::Request.new(self, :post, 'campaign/delete', params)
         request.perform

data/lib/ohmage/cli.rb

@@ -89,13 +89,13 @@ module Ohmage
         if options[:campaign_role].nil? && options[:class_role].nil?
           puts 'must supply one of [--class_role, --campaign_role]'
         elsif options[:name].nil?
-          new_document = Ohmage.document_create(file,
+          new_document = Ohmage.document_create(document: file,
                                                 document_class_role_list: options[:class_role],
                                                 document_campaign_role_list: options[:campaign_role],
                                                 privacy_state: privacy_state,
                                                 description: options[:description])
         else
-          new_document = Ohmage.document_create(file,
+          new_document = Ohmage.document_create(document: file,
                                                 document_class_role_list: options[:class_role],
                                                 document_campaign_role_list: options[:campaign_role],
                                                 privacy_state: privacy_state,

data/lib/ohmage/document.rb

@@ -15,15 +15,30 @@ module Ohmage
         t
       end
 
-      def document_create(file, params = {})
-        params[:document] = HTTP::FormData::File.new(file)
+      #
+      # ohmage document/create call
+      # @see https://github.com/ohmage/server/wiki/Document-Manipulation#documentCreate
+      # @returns [Ohmage::Document object]
+      #
+      def document_create(params = {})
+        params[:document] = HTTP::FormData::File.new(params[:document])
         # catch lack of document_name param, since we can just append the filename we have!
-        params[:document_name] = File.basename(file) unless params.key?(:document_name)
         request = Ohmage::Request.new(self, :post, 'document/create', params)
         request.perform
         document_read(document_name_search: params[:document_name])
       end
 
+      #
+      # ohmage document/update call
+      # @see https://github.com/ohmage/server/wiki/Document-Manipulation#documentUpdate
+      # @returns nil, can't be sure we can search for the updated file.
+      #
+      def document_update(params = {})
+        params[:document] = HTTP::FormData::File.new(params[:document]) if params[:document]
+        request = Ohmage::Request.new(self, :post, 'document/update', params)
+        request.perform
+      end
+
       def document_delete(params = {})
         request = Ohmage::Request.new(self, :post, 'document/delete', params)
         request.perform

data/lib/ohmage/request.rb

@@ -16,7 +16,7 @@ module Ohmage
       @request_method = request_method
       # some create/upload apis require content to be sent as multipart form. catch that here
       case api
-      when 'document/create', 'survey/upload'
+      when 'document/create', 'survey/upload', 'document/update', 'campaign/create', 'campaign/update'
         @params = {form: @options}
       else
         @params = {params: @options}

data/lib/ohmage/version.rb

@@ -14,7 +14,7 @@ module Ohmage
 
     # @return [Integer]
     def patch
-      10
+      11
     end
 
     # @return [Integer, NilClass]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohmage
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Steve Nolen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-04 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -115,9 +115,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Ruby interface for the ohmage 2.x API.
 test_files: []
-has_rdoc: