helix 0.0.1.8.pre → 0.0.1.9.pre

data/README.md

@@ -1,4 +1,4 @@
-# Helix
+# Helix [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/Twistage/helix)
 
 The Helix gem allows developers to easily connect to and manipulate the Twistage API.
 

data/lib/helix/config.rb

@@ -76,6 +76,7 @@ module Helix
     def get_base_url(opts)
       creds     = credentials
       base_url  = creds[:site]
+      return base_url if opts[:guid]
       reseller, company, library = SCOPES.map { |scope| creds[scope] }
       base_url += "/resellers/#{reseller}" if reseller
       if company

data/lib/helix/statistics.rb

@@ -17,7 +17,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.album_delivery(opts={})
-      self.image_delivery(opts)
+      image_delivery(opts)
     end
 
     # @example
@@ -25,7 +25,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.album_storage(opts={})
-      self.image_storage(opts)
+      image_storage(opts)
     end
 
     # @example
@@ -33,7 +33,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.audio_delivery(opts={})
-      self.delivery(:track, opts)
+      delivery(:track, opts)
     end
 
     # @example
@@ -43,8 +43,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.audio_ingest(opts={})
-      opts[:action] ||= :breakdown
-      self.storage(:track, opts.merge(action: :"track_ingest/#{opts[:action]}"))
+      ingest(:track, opts)
     end
 
     # @example
@@ -52,7 +51,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.audio_storage(opts={})
-      self.storage(:track, opts)
+      storage(:track, opts)
     end
 
     # @example
@@ -60,7 +59,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.image_delivery(opts={})
-      self.delivery(:image, opts)
+      delivery(:image, opts)
     end
 
     # @example
@@ -68,7 +67,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.image_storage(opts={})
-      self.storage(:image, opts)
+      storage(:image, opts)
     end
 
     # @example
@@ -76,7 +75,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.track_delivery(opts={})
-      self.audio_delivery(opts)
+      audio_delivery(opts)
     end
 
     # @example
@@ -86,7 +85,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.track_ingest(opts={})
-      self.audio_ingest(opts)
+      audio_ingest(opts)
     end
 
     # @example
@@ -94,7 +93,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.track_storage(opts={})
-      self.audio_storage(opts)
+      audio_storage(opts)
     end
 
     # @example
@@ -102,7 +101,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.video_delivery(opts={})
-      self.delivery(:video, opts)
+      delivery(:video, opts)
     end
 
     # @example
@@ -112,8 +111,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.video_ingest(opts={})
-      opts[:action] ||= :breakdown
-      self.storage(:video, opts.merge(action: :"video_publish/#{opts[:action]}"))
+      ingest(:video, opts)
     end
 
     # @example
@@ -121,7 +119,7 @@ module Helix
     #
     # @return [Array of Hashes] Statistics information.
     def self.video_storage(opts={})
-      self.storage(:video, opts)
+      storage(:video, opts)
     end
 
     private
@@ -139,6 +137,12 @@ module Helix
       memo_cfg.get_response(url, {sig_type: :view}.merge(opts))
     end
 
+    def self.ingest(media_type, opts)
+      opts[:action] ||= :breakdown
+      action_prefix   = ingest_action_prefix_for(media_type)
+      storage(media_type, opts.merge(action: :"#{action_prefix}/#{opts[:action]}"))
+    end
+
     def self.storage(media_type, opts)
       memo_cfg = Helix::Config.instance
       format   = opts.delete(:format)
@@ -150,6 +154,10 @@ module Helix
       memo_cfg.get_response(url, {sig_type: :view}.merge(opts))
     end
 
+    def self.ingest_action_prefix_for(media_type)
+      STORAGE_ACTION_FOR[media_type].split('/').first
+    end
+
     def self.storage_action_for(media_type)
       STORAGE_ACTION_FOR[media_type].to_sym
     end

data/spec/config_spec.rb

@@ -103,18 +103,27 @@ describe Helix::Config do
     end
   end
 
+  def build_test_url(site, sub_url, guid, action, media_type, format)
+    expected_url  = site
+    expected_url += sub_url unless guid
+    expected_url += "/#{media_type}"
+    expected_url += "/the_guid" if guid
+    expected_url += "/#{action}" if action
+    expected_url += ".#{format}"
+  end
+
   describe "#build_url" do
     site = 'http://example.com'
     let(:meth)  { :build_url }
     subject     { obj.method(meth) }
     its(:arity) { should be(-1) }
-    before(:each) do
-      obj.credentials = {site: site}
-    end
+    before(:each) do obj.credentials = { site: site } end
     shared_examples_for "reads scope from credentials for build_url" do |media_type,format,more_opts|
-      more_opts ||= {}
-      guid   = more_opts[:guid]
-      action = more_opts[:action]
+      let(:opts)          { more_opts || {} }
+      let(:action)        { opts[:action] } 
+      let(:guid)          { opts[:guid] } 
+      let(:url_pieces)    { [site, sub_url, guid, action, media_type, format] }
+      let(:expected_url)  { build_test_url(*url_pieces) } 
       before(:each) do obj.credentials = {site: 'http://example.com'} end
       context "and credentials has a key for :reseller" do
         before(:each) do obj.credentials.merge!(reseller: 're_id') end
@@ -122,27 +131,18 @@ describe Helix::Config do
           before(:each) do obj.credentials.merge!(company: 'co_id') end
           context "and credentials has a key for :library" do
             before(:each) do obj.credentials.merge!(library: 'lib_id') end
-            expected_url  = "#{site}/resellers/re_id/companies/co_id/libraries/lib_id/#{media_type}"
-            expected_url += "/the_guid"  if guid
-            expected_url += "/#{action}" if action
-            expected_url += ".#{format}"
+            let(:sub_url) { "/resellers/re_id/companies/co_id/libraries/lib_id" }
             it { should eq(expected_url) }
           end
           context "and credentials does NOT have a key for :library" do
             before(:each) do obj.credentials.delete(:library) end
-            expected_url  = "#{site}/resellers/re_id/companies/co_id/#{media_type}"
-            expected_url += "/the_guid"  if guid
-            expected_url += "/#{action}" if action
-            expected_url += ".#{format}"
+            let(:sub_url) { "/resellers/re_id/companies/co_id" }
             it { should eq(expected_url) }
           end
         end
         context "and credentials does NOT have a key for :company" do
           before(:each) do obj.credentials.delete(:company) end
-          expected_url  = "#{site}/resellers/re_id/#{media_type}"
-          expected_url += "/the_guid"  if guid
-          expected_url += "/#{action}" if action
-          expected_url += ".#{format}"
+          let(:sub_url) { "/resellers/re_id" }
           it { should eq(expected_url) }
         end
       end
@@ -152,10 +152,7 @@ describe Helix::Config do
           before(:each) do obj.credentials[:company] = 'co_id' end
           context "and credentials has a key for 'library'" do
             before(:each) do obj.credentials[:library] = 'lib_id' end
-            expected_url  = "#{site}/companies/co_id/libraries/lib_id/#{media_type}"
-            expected_url += "/the_guid"  if guid
-            expected_url += "/#{action}" if action
-            expected_url += ".#{format}"
+            let(:sub_url) { "/companies/co_id/libraries/lib_id" }
             it { should eq(expected_url) }
           end
         end
@@ -165,7 +162,6 @@ describe Helix::Config do
       subject { obj.send(meth) }
       it_behaves_like "reads scope from credentials for build_url", :videos, :json
     end
-=begin
     context "when given opts of {}" do
       subject { obj.send(meth, {}) }
       it_behaves_like "reads scope from credentials for build_url", :videos, :json
@@ -236,7 +232,6 @@ describe Helix::Config do
         end
       end
     end
-=end
   end
 
   describe "#clear_signatures!" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helix
 version: !ruby/object:Gem::Version
-  version: 0.0.1.8.pre
+  version: 0.0.1.9.pre
   prerelease: 8
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json