viddler 0.2.0 → 0.2.1

data/History.txt

@@ -1,9 +1,13 @@
+== 0.2.1 2008-04-19
+
+* 1 bug fix:
+  * Fixing compatibility of <tt>viddler.videos.upload</tt> method with Rails
+
 == 0.2.0 2008-04-18
 
 * 1 major enhancement:
   * Implemented <tt>videos.getRecordToken</tt> method
 
-
 == 0.1.0 2008-04-17
 
 * 1 major enhancement:

data/Manifest.txt

@@ -5,6 +5,7 @@ README.txt
 Rakefile
 config/hoe.rb
 config/requirements.rb
+lib/ext/array.rb
 lib/ext/hash.rb
 lib/ext/open_struct.rb
 lib/viddler.rb

data/lib/ext/array.rb

@@ -0,0 +1,18 @@
+class Array #:nodoc:
+  
+  # Extraceted from Ruby Facets:
+  # Converts a two-element associative array into a hash.
+  def to_h(arrayed=nil)
+    h = {}
+    if arrayed
+      each{ |k,*v| h[k] = v }
+    else
+      ary = []
+      each do |a|
+        Array===a ? ary.concat(a) : ary << a
+      end
+      h = Hash[*ary]
+    end
+    h
+  end
+end

data/lib/ext/hash.rb

@@ -7,4 +7,22 @@ class Hash #:nodoc:
     true
   end
   
+  # Extracted from Ruby Facets:
+  # Operator for remove hash paris. If another hash is given the pairs are only removed if both key and value are equal. If an array is given then matching keys are removed.
+  def -(other)
+    h = self.dup
+    if other.respond_to?(:to_ary)
+      other.to_ary.each do |k|
+        h.delete(k)
+      end
+    else
+      other.each do |k,v|
+        if h.key?(k)
+          h.delete(k) if v == h[k]
+        end
+      end
+    end
+    h
+  end
+  
 end

data/lib/viddler.rb

@@ -7,6 +7,7 @@ require 'ostruct'
 
 require 'ext/open_struct'
 require 'ext/hash'
+require 'ext/array'
 require 'viddler/api_spec'
 require 'viddler/base'
 require 'viddler/multipart_params'

data/lib/viddler/multipart_params.rb

@@ -4,20 +4,36 @@ class MultipartParams #:nodoc:
   attr_accessor :content_type, :body
   
   def initialize(param_hash={})
-    boundary_token = [Array.new(8) {rand(256)}].join
-    self.content_type = "multipart/form-data; boundary=#{boundary_token}"
-    boundary_marker = "--#{boundary_token}\r\n"
-    self.body = param_hash.map { |param_name, param_value|
-      boundary_marker + case param_value
+    @boundary_token = generate_boundary_token    
+    self.content_type = "multipart/form-data; boundary=#{@boundary_token}"        
+    self.body = pack_params(param_hash)    
+  end
+
+  protected
+  
+  def generate_boundary_token
+    [Array.new(8) {rand(256)}].join
+  end
+  
+  def pack_params(hash)
+    marker = "--#{@boundary_token}\r\n"
+    files_params = hash.find_all{|k,v| v.is_a?(File)}.to_h
+    text_params = hash - files_params
+    
+    pack_hash(text_params, marker) + marker + pack_hash(files_params, marker) + "--#{@boundary_token}--\r\n"
+  end
+  
+  def pack_hash(hash, marker)
+    hash.map do |name, value|
+      marker + case value
       when String
-        text_to_multipart(param_name, param_value)
+        text_to_multipart(name, value)
       when File
-        file_to_multipart(param_name, param_value)
+        file_to_multipart(name, value)
       end
-    }.join('') + "--#{boundary_token}--\r\n"
+    end.join('')
   end
-
-  protected
+  
   def file_to_multipart(key,file)
     filename = File.basename(file.path)
     mime_types = MIME::Types.of(filename)

data/lib/viddler/version.rb

@@ -2,7 +2,7 @@ module Viddler #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_viddler.rb

@@ -17,7 +17,7 @@ class ViddlerTest < Test::Unit::TestCase
   API_KEY               = nil
   LOGIN                 = nil
   PASSWORD              = nil
-  TEST_VIDEO_FILE_PATH  = '/path/to/video'
+  TEST_VIDEO_FILE_PATH  = '/Users/ilya/Desktop/file.mov'
   
   def setup
     raise KeyRequired unless API_KEY
@@ -39,7 +39,7 @@ class ViddlerTest < Test::Unit::TestCase
   def test_should_upload_video
     credentials_required
     file = File.open(TEST_VIDEO_FILE_PATH)
-    video = @viddler.upload_video(:file => file, :title => 'Testing', :description => 'Bla', :tags => 'one, two, three')
+    video = @viddler.upload_video(:file => file, :title => 'Testing', :description => 'Bla', :tags => 'one, two, three', :make_public => '0')
   end
   
   def test_should_find_profile

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>viddler</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/viddler"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/viddler" class="numbers">0.2.0</a>
+      <a href="http://rubyforge.org/projects/viddler" class="numbers">0.2.1</a>
     </div>
     <h1>&#x2192; &#8216;viddler&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: viddler
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-18 00:00:00 +08:00
+date: 2008-04-19 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - Rakefile
 - config/hoe.rb
 - config/requirements.rb
+- lib/ext/array.rb
 - lib/ext/hash.rb
 - lib/ext/open_struct.rb
 - lib/viddler.rb