uencode 0.0.1 → 0.0.2

data/README.md

@@ -33,7 +33,7 @@ capture = UEncode::CaptureOutput.new :destination => "http://whatever.com/foo.zi
 job.add_capture capture
 
 request = UEncode::Request.new job
-puts job.to_xml
+
 response = request.send
 
 puts response.code # => 'Ok'
@@ -46,12 +46,16 @@ puts response.userdata # => 'This is a simple test'
 
 Currently all the uEncode API parameters are supported (or so I think :)
 
-Currently the gem does not validate parameters' values, so pay attention at the API docs.
+Currently the gem does not validate parameters values, so pay attention to the API docs.
 
 You can see the whole list of accepted parameters in the [uEncode API documentation](http://www.uencode.com/api/300#response_codes).
 
 For the UEncode classes that map to each complex API parameters (like Crop, Size, FrameRate, etc) take a look at the spec file at /spec/elements_spec.rb or read the docs.
 
+## Credits
+
+This gem was created during my work to integrate the uEncode API in our application at [DailyDigital](http://www.dailydigital.com). Thanks for letting me open source it!
+
 ## Running the specs
 
 * bundle install

data/lib/uencode/elements.rb

@@ -111,11 +111,40 @@ module UEncode
 
   # Medium is a single video to transcode
   class Medium
+    attr_reader :video_config, :audio_config
+
     def initialize
       @video_config = VideoConfig.new
       @audio_config = AudioConfig.new
     end
 
+    # Configures the transcoding using a nested hash with the following format:
+    #
+    #   config = {"video" => { ... }, "audio" => { ... }
+    #
+    # The keys for the "video" hash can be any of the following: bitrate, codec, cbr, crop, 
+    # deinterlace, framerate, height, keyframe_interval, maxbitrate, par, profile, passes,
+    # stretch, width.
+    #
+    # The "framerate" and "par" values must be also hashes, with the following format:
+    #
+    #   {"numerator" => 10, "denominator" => 11}
+    #
+    # The keys for the "audio" hash can be any of the following:
+    # codec, bitrate, channels, samplerate.
+    #   
+    def configure(hash)
+      video = hash["video"]
+      audio = hash["audio"]      
+      configure_video do |c|
+        video.each_pair { |key, value| c.send("#{key}=", value) }
+      end
+
+      configure_audio do |c|
+        audio.each_pair { |key, value| c.send("#{key}=", value) }
+      end
+    end
+
     def configure_video
       yield @video_config
     end
@@ -186,6 +215,10 @@ module UEncode
 
     include Enumerable
 
+    def self.from_hash(hash)
+      new({})
+    end
+
     def initialize(options)
       @video_output = VideoOutput.new options[:video_output] || {}
       @captures = []

data/lib/uencode/version.rb

@@ -1,3 +1,3 @@
 module UEncode
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/elements_spec.rb

@@ -31,6 +31,9 @@ describe UEncode::Medium do
 
   describe "#configure_video" do
     let(:medium) { UEncode::Medium.new }
+    let(:config) { YAML::load_file("spec/fixtures/configuration.yaml") }
+    let(:video_config) { config["video"] }
+    let(:audio_config) { config["audio"] }
 
     it { medium.video.bitrate.should == 10000 }
     it { medium.video.codec.should == "mp4" }
@@ -46,6 +49,36 @@ describe UEncode::Medium do
     it { medium.video.passes.should == 1 }
     it { medium.video.stretch.should == false }
     it { medium.video.width.should == 400 }
+
+    context "from a hash (video parameters)" do
+      before { medium.configure config }
+      subject { medium.video_config }
+
+      its(:bitrate) { should == video_config["bitrate"] }
+      its(:codec) { should == video_config["codec"] }
+      its(:cbr) { should == video_config["cbr"] }
+      its(:crop) { should == video_config["crop"] }
+      its(:deinterlace) { should == video_config["deinterlace"] }
+      its(:framerate) { should == video_config["framerate"] }
+      its(:height) { should == video_config["height"] }
+      its(:keyframe_interval) { should == video_config["keyframe_interval"] }
+      its(:maxbitrate) { should == video_config["maxbitrate"] }
+      its(:par) { should == video_config["par"] }
+      its(:profile) { should == video_config["profile"] }
+      its(:passes) { should == video_config["passes"] }
+      its(:stretch) { should == video_config["stretch"] }
+      its(:width) { should == video_config["width"] }
+    end
+
+    context "from a hash (audio parameters)" do
+      before { medium.configure config }
+      subject { medium.audio_config }
+
+      its(:codec) { should == audio_config["codec"] }
+      its(:bitrate) { should == audio_config["bitrate"] }
+      its(:channels) { should == audio_config["channels"] }
+      its(:samplerate) { should == audio_config["samplerate"] }
+    end
   end
 
   describe "#configure_audio" do

data/spec/fixtures/configuration.yaml

@@ -0,0 +1,23 @@
+video:
+  bitrate: 4500000
+  codec: "mp4"
+  width: 1920
+  height: 1080
+  passes: 1
+  maxbitrate: 2000000
+  deinterlace: false
+  cbr: false
+  stretch: false
+  profile: "baseline"
+  framerate: 
+    numerator: 30000
+    denominator: 1001
+  par:
+    numerator: 1
+    denominator: 1
+  keyframe_interval: 60
+audio:
+  codec: "aac"
+  bitrate: 256000
+  channels: 2
+  samplerate: 44100

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ require 'rspec'
 require 'rspec/autorun'
 require "vcr"
 
-
 VCR.config do |c|
   library_dir = File.join(File.dirname(__FILE__), 'fixtures/')
   c.cassette_library_dir = library_dir

data/uencode.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "nokogiri", "1.4.4"
   s.add_dependency "httparty"
+  s.add_dependency "rake"
 end

metadata

@@ -2,7 +2,7 @@
 name: uencode
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - "C\xC3\xA1ssio Marques"
@@ -10,12 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -03:00
+date: 2011-07-07 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -23,10 +22,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.6.0
   type: :development
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: vcr
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,10 +33,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.9.0
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: guard
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,10 +44,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: guard-rspec
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -56,10 +55,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: growl
-  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -67,10 +66,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rb-fsevent
-  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,10 +77,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: webmock
-  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -89,10 +88,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
+  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -100,10 +99,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.4
   type: :runtime
+  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: httparty
-  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,7 +110,19 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id010
 description: UEncode API client
 email: 
 - cassiommc@gmail.com
@@ -134,6 +145,7 @@ files:
 - lib/uencode/response.rb
 - lib/uencode/version.rb
 - spec/elements_spec.rb
+- spec/fixtures/configuration.yaml
 - spec/fixtures/job_with_one_video_and_no_capture.yml
 - spec/request_spec.rb
 - spec/response_spec.rb
@@ -154,12 +166,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2924149938077751902
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 2924149938077751902
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
@@ -170,6 +188,7 @@ specification_version: 3
 summary: Simple UEncode API client written in Ruby
 test_files: 
 - spec/elements_spec.rb
+- spec/fixtures/configuration.yaml
 - spec/fixtures/job_with_one_video_and_no_capture.yml
 - spec/request_spec.rb
 - spec/response_spec.rb