helix 0.0.1.1.pre → 0.0.1.2.pre

data/lib/helix/base.rb

@@ -105,9 +105,9 @@ module Helix
     #
     # @return [String] The response from the HTTP DELETE call.
     def destroy
-      memo_cfg = config
-      url      = memo_cfg.build_url(format: :xml, guid: guid, media_type: plural_media_type)
-      RestClient.delete(url, params: {signature: memo_cfg.signature(:update)})
+      config   = Helix::Config.instance
+      url      = config.build_url(format: :xml, guid: guid, media_type: plural_media_type)
+      RestClient.delete(url, params: {signature: config.signature(:update)})
     end
 
     # Creates a string that associates to the class id.

data/lib/helix/video.rb

@@ -16,6 +16,7 @@ module Helix
     def self.media_type_sym; :video; end
 
     # Used to import videos from a URL into the Twistage system.
+    # Doc reference: /doc/api/video/import
     #
     # @example
     #   video = Helix::Video.import(src:          "www.google.com/video.mp4", 
@@ -23,10 +24,12 @@ module Helix
     #                               description:  "A random video.")
     #   new_video.video_id # => dd891b83ba39e
     #
-    # @param [Hash] attrs The attributes for creating a video
+    # @param [Hash] attrs The attributes for creating a video.
     # @return [RestClient] The response object.
     def self.import(attrs={})
-      RestClient.post(self.get_url, self.get_xml(attrs), self.get_params)
+      RestClient.post(self.get_url, 
+                      self.get_xml(attrs), 
+                      self.get_params(self.extract_params(attrs)))
     end
 
     private
@@ -36,7 +39,7 @@ module Helix
     # takes raw xml as an argument. Allowing for xml files to be
     # used in place of attributes.
     #
-    #
+    # @param [Hash] attrs The attributes for creating xml.
     # @return [String] Returns xml either from a raw entry or generated from attributes.
     def self.get_xml(attrs={})
       return attrs[:use_raw_xml] if attrs[:use_raw_xml].present?
@@ -61,12 +64,18 @@ module Helix
       Helix::Config.instance.build_url(self.get_url_opts)
     end
 
+    def self.extract_params(attrs)
+      [:contributor, :library_id].each_with_object({}) do |param, hash|
+        hash[param] = attrs[param] unless attrs[param].nil?
+      end
+    end
+
     # Gets the hash used in adding the signature to the API
     # call.
     #
     # @return [Hash] Returns a formatted hash for passing in the signature to the API call. 
-    def self.get_params
-      opts  = { contributor: :helix, library_id: :development }
+    def self.get_params(opts={})
+      opts  = { contributor: :helix, library_id: :development }.merge(opts)
       sig   = Helix::Config.instance.signature(:ingest, opts)
       { params: { signature: sig } } 
     end

data/spec/video_spec.rb

@@ -90,12 +90,24 @@ describe Helix::Video do
   describe ".get_params" do
     let(:meth)  { :get_params }
     subject     { klass.method(meth) }
-    its(:arity) { should eq(0) }
+    its(:arity) { should eq(-1) }
     it "should call Helix::Config#signature and return a hash of params" do
       Helix::Config.instance.should_receive(:signature).with(:ingest, sig_opts) { :sig }
       expect(klass.send(meth)).to eq({ params: { signature: :sig } })
     end
   end
 
+  describe ".extract_params" do
+    let(:meth)          { :extract_params }
+    subject             { klass.method(meth) }
+    its(:arity)         { should eq(1) }
+    let(:expected_hash) { { contributor: :con, library_id: :id } }
+    let(:attrs)         { { extra_key_one: :one, 
+                            extra_key_two: :two }.merge(expected_hash) }
+    it "should return the correct key values from attributes" do
+      expect(klass.send(meth, attrs)).to eq(expected_hash)
+    end
+  end
+
 
 end

metadata

@@ -1,104 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: helix
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.1.2.pre
   prerelease: 8
-  version: 0.0.1.1.pre
 platform: ruby
-authors: 
+authors:
 - Twistage, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.4
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.9
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.9
 description: Provides helper libraries for Ruby access to the Twistage API
 email: kbaird@twistage.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/helix.rb
-- lib/helix/album.rb
 - lib/helix/track.rb
-- lib/helix/base.rb
-- lib/helix/statistics.rb
 - lib/helix/video.rb
-- lib/helix/config.rb
+- lib/helix/statistics.rb
 - lib/helix/image.rb
+- lib/helix/album.rb
+- lib/helix/config.rb
+- lib/helix/base.rb
+- spec/video_spec.rb
+- spec/album_spec.rb
+- spec/config_spec.rb
 - spec/base_spec.rb
 - spec/statistics_spec.rb
-- spec/config_spec.rb
+- spec/spec_helper.rb
 - spec/track_spec.rb
 - spec/image_spec.rb
-- spec/spec_helper.rb
-- spec/video_spec.rb
-- spec/album_spec.rb
 - LICENSE
 - README.md
 homepage: https://github.com/Twistage/helix/
-licenses: 
+licenses:
 - 3-Clause BSD
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Wrapper library for the video API
 test_files: []
-
 has_rdoc: true