flickvimeo 1.0.0 → 1.0.1

data/README.md

@@ -40,7 +40,7 @@ For example:
 
 Once you've made your great commits:
 
- 1. [Fork][fk] Mustache
+ 1. [Fork][fk] FlickVimeo
  2. Create a topic branch - `git checkout -b my_branch`
  3. Push to your branch - `git push origin my_branch`
  4. Create a Pull Request or an [Issue][is] with a link to your branch
@@ -52,11 +52,12 @@ on coding standards, new features, etc.
 
 # License
 
-Copyright (c) 2010-2011 Eric Lindvall. See LICENSE for details.
+Copyright (c) 2010-2011 Eric Lindvall. See [LICENSE][] for details.
 
 
 [Vimeo]: http://vimeo.com/
 [AirFlick]: http://ericasadun.com/ftp/AirPlay/
-[cb]: http://wiki.github.com/defunkt/resque/contributing
+[cb]: https://wiki.github.com/defunkt/resque/contributing
 [fk]: http://help.github.com/forking/
-[is]: http://github.com/eric/flickvimeo/issues
+[is]: https://github.com/eric/flickvimeo/issues
+[LICENSE]: https://github.com/eric/flickvimeo/blob/master/LICENSE

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.0'
+  s.version           = '1.0.1'
   s.date              = '2011-01-02'
   # s.rubyforge_project = 'flickvimeo'
 
@@ -56,7 +56,6 @@ Gem::Specification.new do |s|
   # = MANIFEST =
   s.files = %w[
     Gemfile
-    Gemfile.lock
     LICENSE
     README.md
     Rakefile

data/lib/flickvimeo.rb

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

data/lib/flickvimeo/video.rb

@@ -42,15 +42,17 @@ module FlickVimeo
         response = http_request(@url)
         
         if m = response.body.match(/clip\d+_\d+ = (.*)?;Player.checkRatio/)
-          # Cleanup javascript to be valid JSON
-          json = m[1].gsub(/([\{\[,]\s*)([a-zA-Z_]+):/) { %{#{$1}"#{$2}":} }
-          json = json.gsub(/(:\s*)'(.*?)'/, '\1"\2"')
-          
-          Yajl::Parser.parse(json)
+          Yajl::Parser.parse(convert_javascript_to_valid_json(m[1]))
         end
       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)
       case id.to_s
       when %r{^http://.*vimeo.com.*[#/](\d+)}

data/test/test_video.rb

@@ -15,8 +15,6 @@ class TestBasic < Test::Unit::TestCase
   end
   
   def test_video_file_url
-    pp @video.config
-    puts @video.video_file_url
     assert_not_nil @video.video_file_url
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flickvimeo
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Eric Lindvall
@@ -45,7 +45,6 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -87,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 2
 summary: A simple tool to use AirFlick to send Vimeo videos to your AppleTV

data/Gemfile.lock

@@ -1,19 +0,0 @@
-PATH
-  remote: .
-  specs:
-    flickvimeo (0.0)
-      yajl-ruby
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    rake (0.8.7)
-    yajl-ruby (0.7.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  flickvimeo!
-  rake
-  yajl-ruby