zencoder-fetcher 0.2.6 → 0.2.7

data/bin/zencoder_fetcher

@@ -23,6 +23,7 @@ EOS
   opt :page, "The page to load.", :short => 'p', :type => Integer, :default => 1
   opt :since, "Load notifications starting since _n_ minutes ago.", :short => 'm', :type => Integer, :default => nil
   opt :endpoint, "Zencoder endpoint to use. Defaults to https://app.zencoder.com/.", :short => 'e', :type => String
+  opt :api_version, "API version to use.", :short => 'v', :type => String, :default => 'v1'
 end
 
 
@@ -47,13 +48,14 @@ end
 # Run Zencoder Notifier
 #
 
-options            = {}
-options[:api_key]  = ARGV[0]
-options[:url]      = opts[:url]
-options[:count]    = opts[:count]
-options[:page]     = opts[:page]
-options[:since]    = (opts[:since] && (Time.now.utc - (opts[:since].to_i * 60))) || nil
-options[:endpoint] = opts[:endpoint]
+options               = {}
+options[:api_key]     = ARGV[0]
+options[:url]         = opts[:url]
+options[:count]       = opts[:count]
+options[:page]        = opts[:page]
+options[:since]       = (opts[:since] && (Time.now.utc - (opts[:since].to_i * 60))) || nil
+options[:endpoint]    = opts[:endpoint]
+options[:api_version] = opts[:api_version]
 
 begin
   if opts[:loop]

data/lib/zencoder_fetcher.rb

@@ -9,7 +9,7 @@ rescue
 end
 
 module ZencoderFetcher
-  FETCHER_VERSION = [0,2,6] unless defined?(FETCHER_VERSION)
+  FETCHER_VERSION = [0,2,7] unless defined?(FETCHER_VERSION)
 
   def self.version
     FETCHER_VERSION.join(".")
@@ -28,26 +28,34 @@ module ZencoderFetcher
     local_url = options[:url] || "http://localhost:3000/"
     auth = local_url.match(/^https?:\/\/([^\/]+):([^\/]+)@/) ? {:username=>$1, :password=>$2} : {}
 
-    response = HTTParty.get("https://#{options[:endpoint] || 'app'}.zencoder.com/api/v1/notifications.json?#{query}",
+    response = HTTParty.get("https://#{options[:endpoint] || 'app'}.zencoder.com/api/#{options[:api_version] || 'v1'}/notifications.json?#{query}",
                             :headers => { "HTTP_X_FETCHER_VERSION" => version })
 
     if response["errors"]
       puts "There was an error fetching notifications:"
       puts response.body.to_s
-      raise
+      raise FetcherError
     else
       puts "Notifications retrieved: #{response["notifications"].size}"
       puts "Posting to #{local_url}" if response["notifications"].size > 0
       response["notifications"].each do |notification|
-        begin
-          format = notification.delete("format")
-          if format == "xml"
+        format = notification.delete("format")
+        if format == "xml"
+          begin
             options = {:body => notification.to_xml}
-          else
+          rescue
+            puts "Unable to build notification."
+          end
+        else
+          begin
             options = {:body => notification.to_json}
+          rescue
+            puts "Unable to build notification."
           end
-          options = options.merge({:headers => {"Content-Type" => "application/#{format}"}}) if format
-          options = options.merge({:basic_auth => auth}) if !auth.empty?
+        end
+        options = options.merge({:headers => {"Content-Type" => "application/#{format}"}}) if format
+        options = options.merge({:basic_auth => auth}) if !auth.empty?
+        begin
           HTTParty.post(local_url, options)
         rescue Errno::ECONNREFUSED => e
           puts "Unable to connect to your local server at #{local_url}. Is it running?"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zencoder-fetcher
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Chris Warren
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 Z
+date: 2011-10-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: trollop