Merge branch 'feature/update-reports'

adamkittelson · adamkittelson · commit fce1f5e33cb4 · 2014-01-03T13:42:42.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ Gemfile.lock
 /tmp
 /.rbx
 .zenflow-log
+.ruby-gemset
+.ruby-version
diff --git a/Gemfile b/Gemfile
@@ -1,9 +1,11 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gem "multi_json"
+gem "rake"
 
 group :test do
-  gem "shoulda"
+  gem "shoulda", "2.11.3"
+  gem "activesupport", "3.2.16"
   gem "mocha"
   gem "webmock", "~>1.6.0"
 end
@@ -12,5 +14,6 @@ group :development do
   gem "jruby-openssl", :platforms => :jruby
   gem "ruby-debug",    :platforms => :mri_18
   gem "ruby-debug19",  :platforms => :mri_19
-  gem "typhoeus",      :platforms => [:mri_18, :mri_19]
+  gem "byebug",        :platforms => :mri_20
+  gem "typhoeus",      :platforms => [:mri_18, :mri_19, :mri_20]
 end
diff --git a/README.markdown b/README.markdown
@@ -11,6 +11,7 @@ Tested on the following versions of Ruby:
 * Ruby 1.8.7-p352
 * Ruby 1.9.2-p290
 * Ruby 1.9.3-p0
+* Ruby 2.0.0-p353
 * Rubinius 2.0.0dev
 * jRuby 1.6.5
 
@@ -35,6 +36,9 @@ With the release of version two of the Zencoder API, there are some new methods
 * Zencoder::Input.progress(input\_id)
 * Zencoder::Output.details(output\_id)
 * Zencoder::Report.minutes(:from => "2011-01-01", :to => "2011-03-01")
+* Zencoder::Report.all(:from => "2011-01-01", :to => "2011-03-01")
+* Zencoder::Report.live(:from => "2011-01-01", :to => "2011-03-01")
+* Zencoder::Report.vod(:from => "2011-01-01", :to => "2011-03-01")
 
 These new methods will not work with older versions of the API. Please see the [Zencoder documentation](https://app.zencoder.com/docs) and our [blog post on the subject](http://blog.zencoder.com/2012/01/05/announcing-zencoder-api-v2/) for more information on APIv2.
 
@@ -279,6 +283,30 @@ This will list the minutes used for your account within a certain, configurable
 Zencoder::Report.minutes(:from => "2011-10-30", :to => "2011-11-24")
 ```
 
+### all
+
+This will list all usage, including VOD and Live for your account within a certain, configurable range.
+
+```ruby
+Zencoder::Report.all(:from => "2011-10-30", :to => "2011-11-24")
+```
+
+### vod
+
+This will list just VOD usage for your account within a certain, configurable range.
+
+```ruby
+Zencoder::Report.vod(:from => "2011-10-30", :to => "2011-11-24")
+```
+
+### live
+
+This will list just Live usage for your account within a certain, configurable range.
+
+```ruby
+Zencoder::Report.live(:from => "2011-10-30", :to => "2011-11-24")
+```
+
 ## Advanced HTTP
 
 ### Alternate HTTP Libraries
diff --git a/lib/zencoder/report.rb b/lib/zencoder/report.rb
@@ -2,7 +2,33 @@ module Zencoder
   class Report < Resource
 
     def self.minutes(options={})
-      get("/reports/minutes", options)
+      get("/reports/minutes", merge_params(*extract_params(options)))
+    end
+
+    def self.all(options={})
+      get("/reports/all", merge_params(*extract_params(options)))
+    end
+
+    def self.live(options={})
+      get("/reports/live", merge_params(*extract_params(options)))
+    end
+
+    def self.vod(options={})
+      get("/reports/vod", merge_params(*extract_params(options)))
+    end
+
+
+  protected
+
+    def self.extract_params(options={})
+      options = options.dup
+      params = {
+        :from => options.delete(:from),
+        :to   => options.delete(:to),
+        :grouping => options.delete(:grouping)
+      }
+
+      return options, params.delete_if { |k, v| v.nil? }
     end
 
   end
diff --git a/test/zencoder/reports_test.rb b/test/zencoder/reports_test.rb
@@ -13,16 +13,88 @@ class Zencoder::ReportTest < Test::Unit::TestCase
                                                           :to => "2011-06-01",
                                                           :grouping => "foo"},
                                              :headers => { "Zencoder-Api-Key" => @api_key }}).returns(Zencoder::Response.new)
-      assert_equal Zencoder::Response, Zencoder::Report.minutes(:api_key => @api_key, :params => { :from => "2011-01-01",
-                                                                                                   :to => "2011-06-01",
-                                                                                                   :grouping => "foo" }).class
+      assert_equal Zencoder::Response, Zencoder::Report.minutes(:api_key => @api_key, :from => "2011-01-01",
+                                                                                      :to => "2011-06-01",
+                                                                                      :grouping => "foo").class
     end
 
     should "merge params well" do
       Zencoder::HTTP.stubs(:get).with(@url, {:params => { :from => "2011-01-01",
                                                           :to => "2011-06-01"},
                                              :headers => { "Zencoder-Api-Key" => @api_key }}).returns(Zencoder::Response.new)
-      assert_equal Zencoder::Response, Zencoder::Report.minutes(:api_key => @api_key, :params => {:from => "2011-01-01", :to => "2011-06-01"}).class
+      assert_equal Zencoder::Response, Zencoder::Report.minutes(:api_key => @api_key, :from => "2011-01-01", :to => "2011-06-01").class
+    end
+  end
+
+  context ".all" do
+    setup do
+      @api_key = "abcd123"
+      @url = "#{Zencoder.base_url}/reports/all"
+    end
+
+    should "GET the correct url and return a response" do
+      Zencoder::HTTP.stubs(:get).with(@url, {:params => { :from => "2011-01-01",
+                                                          :to => "2011-06-01",
+                                                          :grouping => "foo"},
+                                             :headers => { "Zencoder-Api-Key" => @api_key }}).returns(Zencoder::Response.new)
+      assert_equal Zencoder::Response, Zencoder::Report.all(:api_key => @api_key, :from => "2011-01-01",
+                                                                                      :to => "2011-06-01",
+                                                                                      :grouping => "foo").class
+    end
+
+    should "merge params well" do
+      Zencoder::HTTP.stubs(:get).with(@url, {:params => { :from => "2011-01-01",
+                                                          :to => "2011-06-01"},
+                                             :headers => { "Zencoder-Api-Key" => @api_key }}).returns(Zencoder::Response.new)
+      assert_equal Zencoder::Response, Zencoder::Report.all(:api_key => @api_key, :from => "2011-01-01", :to => "2011-06-01").class
+    end
+  end
+
+  context ".vod" do
+    setup do
+      @api_key = "abcd123"
+      @url = "#{Zencoder.base_url}/reports/vod"
+    end
+
+    should "GET the correct url and return a response" do
+      Zencoder::HTTP.stubs(:get).with(@url, {:params => { :from => "2011-01-01",
+                                                          :to => "2011-06-01",
+                                                          :grouping => "foo"},
+                                             :headers => { "Zencoder-Api-Key" => @api_key }}).returns(Zencoder::Response.new)
+      assert_equal Zencoder::Response, Zencoder::Report.vod(:api_key => @api_key, :from => "2011-01-01",
+                                                                                      :to => "2011-06-01",
+                                                                                      :grouping => "foo").class
+    end
+
+    should "merge params well" do
+      Zencoder::HTTP.stubs(:get).with(@url, {:params => { :from => "2011-01-01",
+                                                          :to => "2011-06-01"},
+                                             :headers => { "Zencoder-Api-Key" => @api_key }}).returns(Zencoder::Response.new)
+      assert_equal Zencoder::Response, Zencoder::Report.vod(:api_key => @api_key, :from => "2011-01-01", :to => "2011-06-01").class
+    end
+  end
+
+  context ".live" do
+    setup do
+      @api_key = "abcd123"
+      @url = "#{Zencoder.base_url}/reports/live"
+    end
+
+    should "GET the correct url and return a response" do
+      Zencoder::HTTP.stubs(:get).with(@url, {:params => { :from => "2011-01-01",
+                                                          :to => "2011-06-01",
+                                                          :grouping => "foo"},
+                                             :headers => { "Zencoder-Api-Key" => @api_key }}).returns(Zencoder::Response.new)
+      assert_equal Zencoder::Response, Zencoder::Report.live(:api_key => @api_key, :from => "2011-01-01",
+                                                                                      :to => "2011-06-01",
+                                                                                      :grouping => "foo").class
+    end
+
+    should "merge params well" do
+      Zencoder::HTTP.stubs(:get).with(@url, {:params => { :from => "2011-01-01",
+                                                          :to => "2011-06-01"},
+                                             :headers => { "Zencoder-Api-Key" => @api_key }}).returns(Zencoder::Response.new)
+      assert_equal Zencoder::Response, Zencoder::Report.live(:api_key => @api_key, :from => "2011-01-01", :to => "2011-06-01").class
     end
   end
 
