flickvimeo 1.0.1 → 1.0.2

data/flickvimeo.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'flickvimeo'
-  s.version           = '1.0.1'
+  s.version           = '1.0.2'
   s.date              = '2011-01-02'
   # s.rubyforge_project = 'flickvimeo'
 
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('yajl-ruby', '~> 0.7.8')
+  s.add_dependency('nokogiri', '~> 1.4.3')
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development

data/lib/flickvimeo.rb

@@ -2,5 +2,5 @@
 require 'flickvimeo/video'
 
 module FlickVimeo
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/flickvimeo/video.rb

@@ -1,17 +1,19 @@
 require "net/http"
 require "uri"
-require 'yajl'
+require 'nokogiri'
 
 module FlickVimeo
   class Video
+    attr_accessor :clip_id, :url
+
     def initialize(id)
-      @id  = id
-      @url = vimeo_url(id)
+      @clip_id = vimeo_id(id)
+      @url     = "http://vimeo.com/moogaloop/load/clip:#{@clip_id}/local/"
       @codec = 'h264'
     end
     
     def video_redirect_url
-      "http://player.vimeo.com/play_redirect?quality=#{best_quality}&codecs=#{@codec}&clip_id=#{clip_id}&time=#{timestamp}&sig=#{signature}&type=html5_desktop_local"
+      "http://player.vimeo.com/play_redirect?quality=#{quality}&codecs=#{@codec}&clip_id=#{clip_id}&time=#{timestamp}&sig=#{signature}&type=html5_desktop_local"
     end
     
     def video_file_url
@@ -22,48 +24,35 @@ module FlickVimeo
     end
     
     def timestamp
-      config['config']['request']['timestamp']
+      config.search('timestamp').text
     end
     
     def signature
-      config['config']['request']['signature']
-    end
-    
-    def clip_id
-      config['config']['video']['id']
+      config.search('request_signature').text
     end
     
-    def best_quality
-      config['config']['video']['files'][@codec].first
+    def quality
+      config.search('video isHD').text == '1' ? 'hd' : 'sd'
     end
     
     def config
       @config ||= begin
         response = http_request(@url)
-        
-        if m = response.body.match(/clip\d+_\d+ = (.*)?;Player.checkRatio/)
-          Yajl::Parser.parse(convert_javascript_to_valid_json(m[1]))
-        end
+        Nokogiri::XML.parse(response.body)
       end
     end
     
-    def convert_javascript_to_valid_json(input)
-      # Cleanup javascript to be valid JSON
-      json = input.gsub(/([\{\[,]\s*)([a-zA-Z_]+):/) { %{#{$1}"#{$2}":} }
-      json = json.gsub(/(:\s*)'((?:[^'\\]|\\.)*)'/, '\1"\2"')
-    end
-
-    def vimeo_url(id)
+    def vimeo_id(id)
       case id.to_s
       when %r{^http://.*vimeo.com.*[#/](\d+)}
-        "http://player.vimeo.com/video/#{$1}"
+        $1
       when /^\d+$/
-        "http://player.vimeo.com/video/#{id}"
+        id
       else
         raise "Unknown id format: #{id}"
       end
     end
-    
+
     def http_request(url)
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)

data/test/test_video.rb

@@ -7,7 +7,7 @@ class TestBasic < Test::Unit::TestCase
   end
   
   def test_format
-    assert_equal 'hd', @video.best_quality
+    assert_equal 'hd', @video.quality
   end
   
   def test_clip_id

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flickvimeo
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Eric Lindvall
@@ -19,19 +19,19 @@ date: 2011-01-02 00:00:00 -08:00
 default_executable: flickvimeo
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 1
         segments: 
-        - 0
-        - 7
-        - 8
-        version: 0.7.8
+        - 1
+        - 4
+        - 3
+        version: 1.4.3
   type: :runtime
   version_requirements: *id001
 description: A simple tool to use AirFlick to send Vimeo videos to your AppleTV