runcible 1.0.5 → 1.0.6

data/lib/runcible/base.rb

@@ -82,7 +82,7 @@ module Runcible
 
       args = [method]
       args << generate_payload(options) if [:post, :put].include?(method)
-      args << headers 
+      args << headers
 
       response = get_response(client, path, *args)
       process_response(response)
@@ -112,17 +112,25 @@ module Runcible
     end
 
     def generate_payload(options)
-      if options[:payload]
-        if options[:payload][:optional]
-          if options[:payload][:required]
-            payload = options[:payload][:required].merge(options[:payload][:optional])
+      if options[:payload].is_a?(String)
+        return options[:payload]
+      elsif options[:payload].is_a?(Hash)
+        format_payload_json(options[:payload])
+      end
+    end
+
+    def format_payload_json(payload_hash)
+      if payload_hash
+        if payload_hash[:optional]
+          if payload_hash[:required]
+            payload = payload_hash[:required].merge(payload_hash[:optional])
           else
-            payload = options[:payload][:optional]
+            payload = payload_hash[:optional]
           end
-        elsif options[:payload][:delta]
-          payload = options[:payload]
+        elsif payload_hash[:delta]
+          payload = payload_hash
         else
-          payload = options[:payload][:required]
+          payload = payload_hash[:required]
         end
       else
         payload = {}

data/lib/runcible/extensions/consumer.rb

@@ -137,7 +137,13 @@ module Runcible
           units.each do |unit|
             content_unit = {}
             content_unit[:type_id] = type_id
-            content_unit[:unit_key] = { unit_key => unit }
+            if unit.is_a?(Hash)
+              #allow user to pass in entire unit
+              content_unit[:unit_key] = unit
+            else
+              content_unit[:unit_key] = { unit_key => unit }
+            end
+
             content.push(content_unit)
           end
         end

data/lib/runcible/resources/content.rb

@@ -50,8 +50,7 @@ module Runcible
       # @param  [File]    content    content of the file being uploaded to the server
       # @return  [RestClient::Response] none
       def upload_bits(upload_id, offset, content)
-        required = required_params(binding.send(:local_variables), binding)
-        call(:put, path("#{upload_id}/#{offset}/"), :payload => { :required => required })
+        call(:put, path("#{upload_id}/#{offset}/"), :payload => content)
       end
 
       # Import into a repository

data/lib/runcible/version.rb

@@ -1,3 +1,3 @@
 module Runcible
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runcible
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json