heywatch 1.0.6 → 1.1.0

data/bin/heywatch

@@ -72,6 +72,7 @@ begin
       download      # manage download      | all, info, delete, count, create         
       job           # manage job           | all, info, delete, count, create         
       format        # manage format        | all, info, delete, count, create, update 
+      upload        # upload a video       
     
     Usage:
     
@@ -85,6 +86,7 @@ begin
       heywatch video:all "[0]"
       heywatch job:all "[0..10]"
       heywatch format:count owner=true
+      heywatch upload path/to/video.mp4 "title=my title"
     )
     exit
   end
@@ -95,11 +97,24 @@ begin
   end
   
   resource, method = ARGV[0].split(":")
-  method ||= "all"
   params = ARGV[1..-1]
+  if method.nil?
+    if params.size == 1 && params[0].to_i > 0
+      method = "info"
+    else
+      method = "all"
+    end
+  end
 
   $stderr.puts [resource, method, params].inspect if ENV["DEBUG"]
   
+  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))
+    exit
+  end
+
   if method == "create"
     params = Hash[*ARGV[1..-1].map{|p| k,v = p.split("=") }.flatten]
     

data/lib/heywatch.rb

@@ -6,9 +6,9 @@ class HeyWatch
   class BadRequest < RuntimeError; end
   
   URL = ENV["HEYWATCH_URL"] || "https://heywatch.com"
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
   
-  attr_reader :cli
+  attr_reader :credits_left
   
   # Authenticate with your HeyWatch credentials
   #
@@ -16,27 +16,24 @@ class HeyWatch
   def initialize(user, password)
     @cli = RestClient::Resource.new(URL, {:user => user, :password => password, :headers =>
       {:user_agent => "HeyWatch Ruby/#{VERSION}", :accept => "application/json"}})
-      
+    
+    self.account
     self
   end
   
   def self.register(data={})
-    cli = RestClient::Resource.new(URL, {:headers =>
-      {:user_agent => "HeyWatch Ruby/#{VERSION}", :accept => "application/json"}})
-    JSON.parse(cli["/account"].post(data))
-  rescue RestClient::BadRequest=> e
-    raise BadRequest, e.http_body
+    HeyWatch.new(nil, nil).req("/account", :post, data)
   end
   
   def inspect # :nodoc:
-    "#<HeyWatch: " + account.inspect + ">"
+    "#<HeyWatch: " + @me.inspect + ">"
   end
   
   # Get account information
   #
   # hw.account
   def account
-    JSON.parse(@cli["/account"].get)
+    @me = req("/account")
   end
 
   # Get all from a given resource.
@@ -46,18 +43,16 @@ class HeyWatch
   # hw.all :format, :owner => true
   def all(*resource_and_filters)
     resource, filters = resource_and_filters
-  
-    result = JSON.parse(@cli["/#{resource}"].get)
-    return result if filters.nil? or filters.empty?
-
-    return filter_all(result, filters)
+    results = req("/#{resource}")
+    return results if filters.nil? || filters.empty?
+    return filter_all(results, filters)
   end
   
   # Get info about a given resource and id
   #
   # hw.info :format, 31
   def info(resource, id)
-    JSON.parse(@cli["/#{resource}/#{id}"].get)
+    req("/#{resource}/#{id}")
   end
   
   # Count objects from a given resources.
@@ -77,7 +72,7 @@ class HeyWatch
       raise InvalidResource, "Can't retrieve '#{resource}'"
     end
     
-    @cli["/#{resource}/#{id}.bin"].head do |res, req|
+    req("/#{resource}/#{id}.bin", :head) do |res, req|
       return RestClient.get(res.headers[:location], :raw_response => true, &block)
     end
   end
@@ -90,26 +85,21 @@ class HeyWatch
   # hw.jpg 12345, :async => true, :number => 6, :s3_directive => "s3://accesskey:secretkey@bucket"
   # => true
   def jpg(id, params={})
-    if params.delete(:async) or params.delete("async")
-      @cli["/encoded_video/#{id}/thumbnails"].post(params)
-      return true
+    if params.delete(:async) || params.delete("async")
+      return req("/encoded_video/#{id}/thumbnails", :post, params)
     end
-    
+
     unless params.empty?
       params = "?" + params.map{|k,v| "#{k}=#{v}"}.join("&")
     end
-    @cli["/encoded_video/#{id}.jpg#{params}"].get
-  rescue RestClient::BadRequest=> e
-    raise BadRequest, e.http_body
+    req("/encoded_video/#{id}.jpg#{params}")
   end
   
   # Create a resource with the give data
   #
   # hw.create :download, :url => "http://site.com/video.mp4", :title => "testing"
-  def create(resource, data={}) 
-    JSON.parse(@cli["/#{resource}"].post(data))
-  rescue RestClient::BadRequest=> e
-    raise BadRequest, e.http_body
+  def create(resource, data={})
+    req("/#{resource}", :post, data)
   end
   
   # Update an object by giving its resource and ID (except account)
@@ -117,38 +107,68 @@ class HeyWatch
   # hw.update :format, 9877, :video_bitrate => 890
   def update(resource, *params)
     if resource.to_sym == :account
-      @cli["/#{resource}"].put(params[0])
-      return true
+      return req("/#{resource}", :put, params[0])
     end
 
     id, data = params
-    @cli["/#{resource}/#{id}"].put(data)
-    true
-  rescue RestClient::BadRequest=> e
-    raise BadRequest, e.http_body
+    req("/#{resource}/#{id}", :put, data)
   end
   
   # Delete a resource
   #
   # hw.delete :format, 9807
   def delete(resource, id)
-    @cli["/#{resource}/#{id}"].delete
-    true
+    req("/#{resource}/#{id}", :delete)
+  end
+
+  # Upload a video from the disk
+  #
+  # hw.upload "/path/to/video.mp4"
+  def upload(path, params={})
+    req("/upload", :post, params.merge({:data => File.new(path, "rb")}))
+  end
+
+  def req(path, method=:get, params={}, &block) # :nodoc:
+    res = @cli[singularize_resource_in_path(path)].send(method, params, &block)
+    retrieve_credits_or_gb_left(res.headers)
+
+    if res.headers[:status] == "204" || res.empty?
+      return true
+    end
+
+    if(res.headers[:content_type] =~ /json/ && !res.to_s.strip.empty?)
+      return JSON.parse(res)
+    end
+
+    return res
+  rescue RestClient::BadRequest=> e
+    raise BadRequest, e.http_body
   end
   
   private
   
-  def filter_all(result, filters) # :nodoc:
-    if filters.is_a?(Array)
-      filters = Hash[*filters.map{|f| f.split("=") }.flatten]
-    end
+  def filter_all(results, filters)
+    filters = filters.map{ |f| f.split("=") } if filters.is_a?(Array)
+    filters = Hash[filters.map{ |k, v| [k.to_s, Regexp.new(v.to_s)] }]
     
-    filtered = []
-    result.each do |r|
-      if eval("true if " + filters.map{|k,v| "'#{r[k.to_s]}' =~ /#{v}/"}.join(" and "))
-        filtered << r
-      end
+    results.select do |result|
+      filters.all?{ |key, matcher| result[key].to_s =~ matcher }
+    end
+  end
+
+  def singularize_resource_in_path(path)
+    s_path = path.split("/")
+    if s_path[1][-1..-1] == "s"
+      s_path[1] = s_path[1].slice(0..-2)
+    end
+    return s_path.join("/")
+  end
+
+  def retrieve_credits_or_gb_left(headers)
+    if credits = headers[:x_hw_credits_left]
+      @credits_left = credits.to_i
+    elsif gb = headers[:x_hw_gb_left]
+      @credits_left = gb.to_f
     end
-    filtered
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: heywatch
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
+  prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 6
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors: 
 - Bruno Celeste
@@ -15,17 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-23 00:00:00 Z
+date: 2012-08-21 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -35,11 +33,9 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -56,6 +52,7 @@ extra_rdoc_files: []
 files: 
 - lib/heywatch.rb
 - bin/heywatch
+has_rdoc: true
 homepage: http://heywatch.com
 licenses: []
 
@@ -65,27 +62,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to encode videos with HeyWatch