heywatch 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d482a6450031f3364db56939debb1976f06ef069
-  data.tar.gz: 1873df2b09bb721c1dd7bb216c8e57a8f4df5bbb
+  metadata.gz: c17fc5449cb72029b803d8a8fa3ddd92bea21735
+  data.tar.gz: 0acf4d7ed1e1cff75939cf0ed79c8b9e8ace35bc
 SHA512:
-  metadata.gz: 8c7b3b980cefa70b2403622d7261a730446b52c95022d22260ae99b9b1d742b40b3e3efa42c453214519130e02a8b5c17ed9de29e69d0cbd8b29c3ceec4fea08
-  data.tar.gz: 1019aaccd1d6b9d1e224304d16df551380a0f5efcc7573a3254a0668d9ce0248f9a8c860cacc1b0b5718a0aba4ecec34bf774775edf279a3fd6a84fcf57ed3a7
+  metadata.gz: f6a044e0ba5ff5c0bed2b0a55058b6a1e8b52a7efa8227c72e055eff204f5972f0dc2c0fb08326dfedb9f6cf4b36a0f5d207349463b99f7fa97e91357c1abc80
+  data.tar.gz: 330dd4a59b356e4d8326fc77770868d3e350771d48d76e756ee7c3fb9544fd35a65e7d7002582aed2fd99834a0bf3e1598185263456064274298c10a18b3eb8f

data/bin/heywatch

@@ -92,7 +92,7 @@ begin
   end
 
   if ARGV.size == 1 and ARGV[0] == "account"
-    puts JSON.pretty_generate(hw.account)
+    puts MultiJson.dump(hw.account, :pretty => true)
     exit
   end
 
@@ -111,7 +111,7 @@ begin
   if resource == "upload"
     path = ARGV[1]
     params = Hash[*ARGV[2..-1].map{|p| k,v = p.split("=") }.flatten]
-    puts JSON.pretty_generate(hw.upload(path, params))
+    puts MultiJson.dump(hw.upload(path, params), :pretty => true)
     exit
   end
 
@@ -119,7 +119,7 @@ begin
     params = Hash[*ARGV[1..-1].map{|p| k,v = p.split("=") }.flatten]
 
     if resource == "account"
-      puts JSON.pretty_generate(HeyWatch.register(params))
+      puts MultiJson.dump(HeyWatch.register(params), :pretty => true)
     else
       if resource == "robot/job" # read from STDIN
         params = $stdin.read
@@ -129,7 +129,7 @@ begin
       if res.empty?
         puts "ok"
       else
-        puts JSON.pretty_generate(res)
+        puts MultiJson.dump(res, :pretty => true)
       end
     end
     exit
@@ -161,7 +161,7 @@ begin
       exit
     end
 
-    puts JSON.pretty_generate(res)
+    puts MultiJson.dump(res, :pretty => true)
     exit
   end
 
@@ -187,10 +187,10 @@ begin
 
   res = res[offset] if offset
 
-  puts JSON.pretty_generate(res)
+  puts MultiJson.dump(res, :pretty => true)
   exit
 
 rescue => e
   puts e
   puts e.backtrace.join("\n") if ENV["DEBUG"]
-end
+end

data/lib/heywatch.rb

@@ -1,5 +1,5 @@
 require "rest-client"
-require "json"
+require "multi_json"
 require "uri"
 
 class HeyWatch
@@ -7,7 +7,7 @@ class HeyWatch
   class BadRequest < RuntimeError; end
 
   URL = ENV["HEYWATCH_URL"] || "https://heywatch.com"
-  VERSION = "1.2.6"
+  VERSION = "1.2.8"
 
   attr_reader :credits_left
 
@@ -156,7 +156,7 @@ class HeyWatch
     end
 
     if(res.headers[:content_type] =~ /json/ && !res.to_s.strip.empty?)
-      return JSON.parse(res)
+      return MultiJson.decode(res)
     end
 
     return res.to_s.strip
@@ -190,4 +190,4 @@ class HeyWatch
       @credits_left = gb.to_f
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heywatch
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Bruno Celeste
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Client Library for encoding Videos with HeyWatch, a Video Encoding Web
   Service.
 email: bruno@particle-s.com