ohmage 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59ab780b8079f500ce47352892b7decd6e1c0ef8
-  data.tar.gz: f7055a09f90ef2c8643c6977a115dae2fbdc9f11
+  metadata.gz: b7ea98c99950eb34b5f6b3094e0a0ec13ef08093
+  data.tar.gz: 3af51ee5659c687a28ae39abbae831ba526915af
 SHA512:
-  metadata.gz: df90c35418b29eeea0e4fb2a7ef80c0f11591e363204123fd214a2b5285ce8ce798026d9a66ff866df052363740199aa61e1faf2fc4460db55dac3e4b8d0b5b7
-  data.tar.gz: ba6990e6bb8bb75fb477d405f63dbf85a8057a2be5dc95ce753ef0db4dd112e9d80027748cc7cca315883820ecdc3cf9ab4b7cc0d0be886b37ddade14c7bfbf2
+  metadata.gz: eb9c98a3daa3a036977e18f2bccb09dab46540dacecb7a482cf84fa2f15388d05159f635e3e3be94931b7288da6fb491ad71574080771dba9f2e56eb3c454884
+  data.tar.gz: 861c83f6a29ac44769f6ef7b8f7025ef08fb14bd90bfeafff5b6538fdd4890fa36d985e0de10a66d362be7df2be3a78f4c801e4163cd7ffc3ec3c8d1abfafa6d

data/lib/ohmage/cli.rb

@@ -29,6 +29,21 @@ module Ohmage
         ls = Ohmage.user_read(user_list: username, username_search: options[:search])
         Ohmage::CliHelpers.format_output(ls, options[:table], [:username, :first_name, :last_name, :email_address, :enabled, :admin, :new_account], :username)
       end
+
+      desc 'ls document <options>', 'Lists documents that match criteria and parameters'
+      option :search, aliases: :s, desc: 'a search string to limit the returned user list'
+      option :campaign, desc: 'limit results to only documents attached to given urn list'
+      option :class, desc: 'limit results to only documents attached to given urn list'
+      option :description, aliases: :d, desc: 'limit results to those with this string in description'
+      option :personal, type: :boolean, desc: 'will return only documents explicitly related to user if true'
+      def document()
+        ls = Ohmage.document_read(document_name_search: options[:search],
+                                  document_description_search: options[:description],
+                                  campaign_urn_list: options[:campaign],
+                                  class_urn_list: options[:class],
+                                  personal_documents: options[:personal])
+        Ohmage::CliHelpers.format_output(ls, options[:table], [:urn, :name, :description, :privacy_state], :name)
+      end
     end
 
     class Create < Thor
@@ -57,6 +72,39 @@ module Ohmage
         Ohmage::CliHelpers.format_output(new_class, options[:table], [:urn, :name, :description], :urn)
       end
       map class: :clazz
+
+      desc 'create document <file> <options>', 'creates a new document with parameters'
+      option :description, aliases: :d, type: :string, desc: 'description of document'
+      option :name, aliases: :n, type: :string, desc: 'name of document (defaults to filename if not passed)'
+      option :share, type: :boolean, default: false, desc: 'is document private or shared?'
+      option :class_role, type: :string, desc: 'class_role param: like urn:class:public;reader'
+      option :campaign_role, type: :string, desc: 'campaign_role param: like urn:campaign:snack;reader'
+      def document(file)
+        case options[:share]
+        when false
+          privacy_state = 'private'
+        else
+          privacy_state = 'shared'
+        end
+        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,
+                                                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,
+                                                document_class_role_list: options[:class_role],
+                                                document_campaign_role_list: options[:campaign_role],
+                                                privacy_state: privacy_state,
+                                                description: options[:description],
+                                                document_name: options[:name])
+        end          
+          Ohmage::CliHelpers.format_output(new_document, options[:table], [:urn, :name, :description, :privacy_state], :name)
+      end
+
     end
 
     class Delete < Thor
@@ -75,6 +123,11 @@ module Ohmage
       def campaign(urn)
         Ohmage.campaign_delete(campaign_urn: urn)
       end
+
+      desc 'delete document <document_id>', 'deletes an existing ohmage document'
+      def document(id)
+        Ohmage.document_delete(document_id: id)
+      end
     end
 
     class Update < Thor

data/lib/ohmage/document.rb

@@ -23,6 +23,11 @@ module Ohmage
         request.perform
         document_read(document_name_search: params[:document_name])
       end
+
+      def document_delete(params = {})
+        request = Ohmage::Request.new(self, :post, 'document/delete', params)
+        request.perform
+      end
     end
   end
 end

data/lib/ohmage/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohmage
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Steve Nolen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable