format: json option added

vzaar · May 29, 2014 · 0c9b820 · 0c9b820
1 parent 6afac57
commit 0c9b820
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/lib/vzaar/connection.rb b/lib/vzaar/connection.rb
@@ -2,7 +2,7 @@ module Vzaar
   class Connection
     include Vzaar::Helper
 
-    SERVER = "vzaar.com".freeze
+    SERVER = "vzaar.com"
     attr_reader :application_token, :force_http, :login, :options
 
     def initialize(options)

diff --git a/lib/vzaar/request/base.rb b/lib/vzaar/request/base.rb
@@ -4,7 +4,7 @@ class Base < Struct.new(:conn, :opts)
       include Vzaar::Helper
 
       class << self
-        [:authenticated, :http_verb, :format].each do |method_name|
+        [:authenticated, :http_verb].each do |method_name|
           define_method(method_name) do |val|
             define_method(method_name) do
               val.nil? ? self.options[method_name] : val
@@ -19,6 +19,13 @@ def endpoint(obj=nil, &fn)
         def resource(name)
           define_method(:resource) { name }
         end
+
+        def format(f)
+          define_method(:format) do
+            # JC: options should always overwrite format param
+            self.options[:format] ? self.options[:format] : f
+          end
+        end
       end
 
       authenticated nil
@@ -27,7 +34,12 @@ def resource(name)
 
       def execute
         conn.using_connection(url, user_options) do |res|
-          return resource_klass.new(Response::Base.new(res).body, res.code)
+          _res = Response::Base.new(res)
+          if _res.json?
+            return _res.body
+          else
+            return resource_klass.new(_res.body, res.code)
+          end
         end
       end
 

diff --git a/lib/vzaar/request/generate_thumbnail.rb b/lib/vzaar/request/generate_thumbnail.rb
@@ -8,15 +8,13 @@ class GenerateThumbnail < Video
 
       def xml_body
         <<-XML
-          <?xml version="1.0" encoding="UTF-8"?>
-          <vzaar-api>
-            <video>
-              <thumb_time>#{options[:time]}</thumb_time>
-            </video>
-          </vzaar-api>
+          <?xml version="1.0" encoding="UTF-8"?>#{hash_to_xml(json_body)}
         XML
       end
 
+      def json_body
+        { "vzaar-api" => { "video" => { "thumb_time" => options[:time] }}}
+      end
     end
   end
 end
diff --git a/lib/vzaar/request/multipart.rb b/lib/vzaar/request/multipart.rb
@@ -1,7 +1,7 @@
 module Vzaar
   module Request
     class Multipart < Struct.new(:path, :file)
-      CRLF = "\r\n".freeze
+      CRLF = "\r\n"
 
       def request
         req = Net::HTTP::Post.new(path)