helix 0.0.2.2.pre → 0.0.2.3.pre

data/lib/helix/base.rb

@@ -60,8 +60,8 @@ module Helix
     end
 
     def self.get_data_sets(opts)
-      url          = config.build_url(format:     opts[:format] || :json,
-                                      media_type: self.plural_media_type)
+      url          = config.build_url(content_type: opts[:content_type] || :xml,
+                                      media_type:   self.plural_media_type)
       # We allow opts[:sig_type] for internal negative testing only.
       raw_response = config.get_response(url, {sig_type: :view}.merge(opts))
       data_sets    = raw_response[plural_media_type]
@@ -112,7 +112,8 @@ module Helix
     #
     # @return [String] The response from the HTTP DELETE call.
     def destroy
-      url      = config.build_url(format: :xml, guid: guid, media_type: plural_media_type)
+      RestClient.log = 'helix.log'
+      url      = config.build_url(content_type: :xml, guid: guid, media_type: plural_media_type)
       RestClient.delete(url, params: {signature: config.signature(:update)})
     end
 
@@ -133,7 +134,7 @@ module Helix
     # @return [Base] Returns an instance of the class.
     def load(opts={})
       memo_cfg    = config
-      url         = memo_cfg.build_url(format: :json, guid: self.guid, media_type: plural_media_type)
+      url         = memo_cfg.build_url(content_type: :json, guid: self.guid, media_type: plural_media_type)
       # We allow opts[:sig_type] for internal negative testing only.
       raw_attrs   = memo_cfg.get_response(url, {sig_type: :view}.merge(opts))
       @attributes = massage_raw_attrs(raw_attrs)

data/lib/helix/config.rb

@@ -59,7 +59,7 @@ module Helix
     # @param [Hash] opts a hash of options for building URL
     # @return [String] The full RESTful URL string object
     def build_url(opts={})
-      opts[:content_type] ||= :json
+      opts[:content_type] ||= :xml
       opts[:media_type]   ||= :videos
       base_url              = get_base_url(opts)
       url                   = add_sub_urls(base_url, opts)

data/lib/helix/statistics.rb

@@ -125,13 +125,13 @@ module Helix
     private
 
     def self.delivery(media_type, opts)
-      memo_cfg = Helix::Config.instance
-      format   = opts.delete(:format)
-      guid     = opts.delete("#{media_type}_id".to_sym)
-      url_opts = guid ?
+      memo_cfg      = Helix::Config.instance
+      content_type  = opts.delete(:content_type)
+      guid          = opts.delete("#{media_type}_id".to_sym)
+      url_opts      = guid ?
         {guid: guid, media_type: "#{media_type}s".to_sym, action: :statistics} :
         {media_type: :statistics, action: "#{media_type}_delivery".to_sym}
-      url_opts.merge!(format: format) if format
+      url_opts.merge!(content_type: content_type) if content_type
       url = memo_cfg.build_url(url_opts)
       # We allow opts[:sig_type] for internal negative testing only.
       memo_cfg.get_response(url, {sig_type: :view}.merge(opts))
@@ -144,11 +144,11 @@ module Helix
     end
 
     def self.storage(media_type, opts)
-      memo_cfg = Helix::Config.instance
-      format   = opts.delete(:format)
-      action   = opts.delete(:action) || storage_action_for(media_type)
-      url_opts = {media_type: :statistics, action: action}
-      url_opts.merge!(format: format) if format
+      memo_cfg      = Helix::Config.instance
+      content_type  = opts.delete(:content_type)
+      action        = opts.delete(:action) || storage_action_for(media_type)
+      url_opts      = {media_type: :statistics, action: action}
+      url_opts.merge!(content_type: content_type) if content_type
       url = memo_cfg.build_url(url_opts)
       # We allow opts[:sig_type] for internal negative testing only.
       memo_cfg.get_response(url, {sig_type: :view}.merge(opts))

data/spec/base_spec.rb

@@ -52,8 +52,8 @@ describe Helix::Base do
       Helix::Config.stub(:instance) { mock_config }
     end
     it "should get an ingest signature" do
-      mock_config.should_receive(:build_url).with(media_type: :klasses,
-                                                  format:     :xml)
+      mock_config.should_receive(:build_url).with(media_type:   :klasses,
+                                                  content_type: :xml)
       RestClient.stub(:post).with(:url, params) { resp_json }
       Hash.should_receive(:from_xml).with(resp_json) { resp_value }
       klass.stub(:new).with(expected)
@@ -61,8 +61,8 @@ describe Helix::Base do
       klass.send(meth)
     end
     it "should do an HTTP post call, parse response and call new" do
-      mock_config.should_receive(:build_url).with(media_type: :klasses,
-                                                  format:     :xml)
+      mock_config.should_receive(:build_url).with(media_type:   :klasses,
+                                                  content_type: :xml)
       RestClient.should_receive(:post).with(:url, params) { resp_json }
       Hash.should_receive(:from_xml).with(resp_json)      { resp_value }
       klass.should_receive(:new).with(expected)
@@ -108,8 +108,8 @@ describe Helix::Base do
       let(:plural_media_type) { :videos }
       before(:each) do klass.stub(:plural_media_type) { plural_media_type } end
       it "should build a JSON URL -> the_url" do
-        mock_config.should_receive(:build_url).with(format:     :json,
-                                                    media_type: plural_media_type)
+        mock_config.should_receive(:build_url).with(content_type: :xml,
+                                                    media_type:   plural_media_type)
         klass.send(meth, opts)
       end
       it "should get_response(the_url, {sig_type: :view}.merge(opts) -> raw_response" do
@@ -173,7 +173,7 @@ describe Helix::Base do
       it "should get an update signature" do
         url = mock_config.build_url(media_type: :media_type,
                                     guid:       :some_guid,
-                                    format:     :xml)
+                                    content_type:     :xml)
         RestClient.stub(:delete).with(url, params)
         mock_config.should_receive(:signature).with(:update) { :some_sig }
         obj.send(meth)
@@ -181,7 +181,7 @@ describe Helix::Base do
       it "should call for an HTTP delete and return nil" do
         url = mock_config.build_url(media_type: :media_type,
                                     guid:       :some_guid,
-                                    format:     :xml)
+                                    content_type:     :xml)
         RestClient.should_receive(:delete).with(url, params)
         expect(obj.send(meth)).to be_nil
       end
@@ -225,8 +225,8 @@ describe Helix::Base do
           obj.should_receive(:guid) { 'some_guid' }
           obj.send(meth)
         end
-        it "should build_url(format: :json, guid: the_guid, media_type: 'videos')" do
-          mock_config.should_receive(:build_url).with(format: :json, guid: 'some_guid', media_type: 'videos')
+        it "should build_url(content_type: :json, guid: the_guid, media_type: 'videos')" do
+          mock_config.should_receive(:build_url).with(content_type: :json, guid: 'some_guid', media_type: 'videos')
           RestClient.stub(:put)
           obj.send(meth)
         end

data/spec/config_spec.rb

@@ -161,44 +161,44 @@ describe Helix::Config do
     context "when given 'create_many' as an action" do
       opts =  { action: :create_many }
       subject { obj.send(meth, opts) }
-      it_behaves_like "reads scope from credentials for build_url", :videos, :json, opts
+      it_behaves_like "reads scope from credentials for build_url", :videos, :xml, opts
     end
     context "when given NO opts" do
       subject { obj.send(meth) }
-      it_behaves_like "reads scope from credentials for build_url", :videos, :json
+      it_behaves_like "reads scope from credentials for build_url", :videos, :xml
     end
     context "when given opts of {}" do
       subject { obj.send(meth, {}) }
-      it_behaves_like "reads scope from credentials for build_url", :videos, :json
+      it_behaves_like "reads scope from credentials for build_url", :videos, :xml
     end
     context "when given opts of {guid: :the_guid}" do
       subject { obj.send(meth, {guid: :the_guid}) }
-      it_behaves_like "reads scope from credentials for build_url", :videos, :json, {guid: :the_guid}
+      it_behaves_like "reads scope from credentials for build_url", :videos, :xml, {guid: :the_guid}
     end
     context "when given opts of {action: :the_action}" do
       subject { obj.send(meth, {action: :the_action}) }
-      it_behaves_like "reads scope from credentials for build_url", :videos, :json, {action: :the_action}
+      it_behaves_like "reads scope from credentials for build_url", :videos, :xml, {action: :the_action}
     end
     context "when given opts of {guid: :the_guid, action: :the_action}" do
       subject { obj.send(meth, {guid: :the_guid, action: :the_action}) }
-      it_behaves_like "reads scope from credentials for build_url", :videos, :json, {guid: :the_guid, action: :the_action}
+      it_behaves_like "reads scope from credentials for build_url", :videos, :xml, {guid: :the_guid, action: :the_action}
     end
     [ :videos, :tracks ].each do |media_type|
       context "when given opts[:media_type] of :#{media_type}" do
         subject { obj.send(meth, media_type: media_type) }
-        it_behaves_like "reads scope from credentials for build_url", media_type, :json
+        it_behaves_like "reads scope from credentials for build_url", media_type, :xml
       end
       context "when given opts[:media_type] of :#{media_type} and opts[:guid] of :the_guid" do
         subject { obj.send(meth, media_type: media_type, guid: :the_guid) }
-        it_behaves_like "reads scope from credentials for build_url", media_type, :json, {guid: :the_guid}
+        it_behaves_like "reads scope from credentials for build_url", media_type, :xml, {guid: :the_guid}
       end
       context "when given opts[:media_type] of :#{media_type} and opts[:action] of :the_action" do
         subject { obj.send(meth, media_type: media_type, action: :the_action) }
-        it_behaves_like "reads scope from credentials for build_url", media_type, :json, {action: :the_action}
+        it_behaves_like "reads scope from credentials for build_url", media_type, :xml, {action: :the_action}
       end
       context "when given opts[:media_type] of :#{media_type}, opts[:guid] of :the_guid, opts[:action] of :the_action" do
         subject { obj.send(meth, media_type: media_type, guid: :the_guid, action: :the_action) }
-        it_behaves_like "reads scope from credentials for build_url", media_type, :json, {guid: :the_guid, action: :the_action}
+        it_behaves_like "reads scope from credentials for build_url", media_type, :xml, {guid: :the_guid, action: :the_action}
       end
     end
     [ :json, :xml ].each do |content_type|

data/spec/statistics_spec.rb

@@ -39,9 +39,9 @@ describe Helix::Statistics do
                 Helix::Config.should_receive(:instance) { mock_config }
                 mod.send(meth, opts)
               end
-              it "should delete :format from opts" do
+              it "should delete :content_type from opts" do
                 opts.stub(:delete)
-                opts.should_receive(:delete).with(:format) { "the_#{media_name}_id".to_sym }
+                opts.should_receive(:delete).with(:content_type) { "the_#{media_name}_id".to_sym }
                 mod.send(meth, opts)
               end
               it "should delete :#{media_name}_id from opts" do
@@ -49,20 +49,20 @@ describe Helix::Statistics do
                 opts.should_receive(:delete).with("#{media_name}_id".to_sym) { "the_#{media_name}_id".to_sym }
                 mod.send(meth, opts)
               end
-              context "when opts contains a :format" do
-                before(:each) do opts.merge!(format: :the_format) end
-                it "should call config.build_url(guid: the_#{media_name}_id, media_type: :#{media_name}s, action: :statistics, format: :the_format)" do
+              context "when opts contains a :content_type" do
+                before(:each) do opts.merge!(content_type: :the_format) end
+                it "should call config.build_url(guid: the_#{media_name}_id, media_type: :#{media_name}s, action: :statistics, content_type: :the_format)" do
                   build_opts_url = {
                     guid: "the_#{media_name}_id".to_sym,
                     media_type: "#{media_name}s".to_sym,
                     action: :statistics,
-                    format: :the_format
+                    content_type: :the_format
                   }
                   mock_config.should_receive(:build_url).with(build_opts_url) { :built_url }
                   mod.send(meth, opts)
                 end
               end
-              context "when opts did NOT contain a :format" do
+              context "when opts did NOT contain a :content_type" do
                 it "should call config.build_url(guid: the_#{media_name}_id, media_type: :#{media_name}s, action: :statistics)" do
                   mock_config.should_receive(:build_url).with({guid: "the_#{media_name}_id".to_sym, media_type: "#{media_name}s".to_sym, action: :statistics}) { :built_url }
                   mod.send(meth, opts)
@@ -79,9 +79,9 @@ describe Helix::Statistics do
                 Helix::Config.should_receive(:instance) { mock_config }
                 mod.send(meth, opts)
               end
-              it "should delete :format from opts" do
+              it "should delete :content_type from opts" do
                 opts.stub(:delete)
-                opts.should_receive(:delete).with(:format) { nil }
+                opts.should_receive(:delete).with(:content_type) { nil }
                 mod.send(meth, opts)
               end
               it "should (fail to) delete :#{media_name}_id from opts" do
@@ -89,15 +89,15 @@ describe Helix::Statistics do
                 opts.should_receive(:delete).with("#{media_name}_id".to_sym) { nil }
                 mod.send(meth, opts)
               end
-              context "when opts contains a :format" do
-                before(:each) do opts.merge!(format: :the_format) end
-                it "should call config.build_url(media_type: :statistics, action: :#{media_name}_delivery, format: :the_format)" do
-                  build_url_opts = {media_type: :statistics, action: "#{media_name}_delivery".to_sym, format: :the_format}
+              context "when opts contains a :content_type" do
+                before(:each) do opts.merge!(content_type: :the_format) end
+                it "should call config.build_url(media_type: :statistics, action: :#{media_name}_delivery, content_type: :the_format)" do
+                  build_url_opts = {media_type: :statistics, action: "#{media_name}_delivery".to_sym, content_type: :the_format}
                   mock_config.should_receive(:build_url).with(build_url_opts) { :built_url }
                   mod.send(meth, opts)
                 end
               end
-              context "when opts did NOT contain a :format" do
+              context "when opts did NOT contain a :content_type" do
                 it "should call config.build_url(media_type: :statistics, action: :#{media_name}_delivery)" do
                   mock_config.should_receive(:build_url).with({media_type: :statistics, action: "#{media_name}_delivery".to_sym}) { :built_url }
                   mod.send(meth, opts)

metadata

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