ohmage 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2169fc32e39f48c29654ae1999aa620bbae898b
-  data.tar.gz: 3801b035b32612fc88ff2c8200d8d5ebb4412778
+  metadata.gz: 37dc20d0591f071bbf12a953fc0814cab13c8923
+  data.tar.gz: 9b09debd1c7c1430b66fd3a2645bcd3854cb6bd0
 SHA512:
-  metadata.gz: 335dd945c810dfd59e84d5cef5816ead69f4ed401df096b3352bb9655a1e8398803b8237da36bed4e33da38e7258873d9e98dfd99cd20bdbd2f285f12b41c2fc
-  data.tar.gz: 02b671f8eb2c8c7700c1432fe71f66e36c6c7da2f738dc146c32361bb22562b9ecc4add0965dc469ea328bc2af4e0f61645aff38b06b8b75885460a2e27c213b
+  metadata.gz: 2da59701975de44f0a0a00e244eda1a9746baa98d1c2dc166d436c0c0180db9191569b54f8dad3f06301ec42751b259bd5789f843055d85af2ab7681d4b14607
+  data.tar.gz: 794e46d0799cbbe5c443bf41c8d14cd763a1558986809c67bfdac97143c4eee778c99543c18a8308559aba516ff4695d91b746f28a90ab0f87aad35d12843a7b

data/lib/ohmage/api.rb

@@ -2,6 +2,7 @@ require 'ohmage/user'
 require 'ohmage/campaign'
 require 'ohmage/clazz'
 require 'ohmage/document'
+require 'ohmage/media'
 
 module Ohmage
   module API
@@ -9,5 +10,6 @@ module Ohmage
     include Ohmage::API::Clazz
     include Ohmage::API::Campaign
     include Ohmage::API::Document
+    include Ohmage::API::Media
   end
 end

data/lib/ohmage/entity/clazz.rb

@@ -6,7 +6,7 @@ module Ohmage
     # @return [Hash]
     attr_reader :users
     # @return [Array]
-    attr_reader :usernames #class/search returns only array of usernames
+    attr_reader :usernames # class/search returns only array of usernames
 
     def initialize(attrs = {})
       @urn = attrs.keys[0].to_s

data/lib/ohmage/media.rb

@@ -0,0 +1,34 @@
+module Ohmage
+  module API
+    module Media
+      #
+      # ohmage media/read call
+      # @see https://github.com/ohmage/server/wiki/Media-Manipulation#mediaRead
+      # @returns [Binary File] from raw HTTP Response Body.
+      def media_read(params = {})
+        # support for media/read exists only in 2.17+
+        if server_config[:application_version].to_f >= 2.17
+          # 2.17 beta does not currently support size param for images
+          # in media/read. wire in image_read.
+          if params[:size]
+            image_read(params)
+          else
+            request = Ohmage::Request.new(self, :get, 'media/read', params)
+            request.perform
+          end
+        else
+          # finaly, if server ver is <= 2.16 fall back to image/read for all
+          # media calls. yes, this is weird. but it works!
+          image_read(params)
+        end
+      end
+      alias_method :audio_read, :media_read
+      alias_method :video_read, :media_read
+
+      def image_read(params = {})
+        request = Ohmage::Request.new(self, :get, 'image/read', params)
+        request.perform
+      end
+    end
+  end
+end

data/lib/ohmage/request.rb

@@ -24,6 +24,10 @@ module Ohmage
     end
     def perform # rubocop:disable all
       response = HTTP.public_send(@request_method, @uri.to_s, @params)
+      # ohmage responds to image/read, audio/read, video/read (and media/read) with a file only.
+      unless (response.headers['Content-Type'] == 'application/json')
+        return response.body
+      end
       response_body = symbolize_keys!(response.parse)
       response_headers = response.headers
       begin

data/lib/ohmage/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohmage
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Steve Nolen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -89,6 +89,7 @@ files:
 - lib/ohmage/entity/document.rb
 - lib/ohmage/entity/user.rb
 - lib/ohmage/error.rb
+- lib/ohmage/media.rb
 - lib/ohmage/request.rb
 - lib/ohmage/user.rb
 - lib/ohmage/version.rb