hlspider 0.3.3 → 0.4.0

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - jruby-19mode
+  - rbx-19mode
+  #- ruby-head
+  - jruby-head

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in hlspider.gemspec
 gemspec
+
+gem 'rake'

data/README.md

@@ -1,5 +1,8 @@
+[![BuildStatus](https://travis-ci.org/brookemckim/hlspider.png)](https://travis-ci.org/brookemckim/hlspider)
+[![CodeClimate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/brookemckim/hlspider)
+
 # HLSpider - the HTTP Live Streaming Spider
-Asynchronously downloads .m3u8 playlists and reports back on whether or not the playlists are aligned in time.
+Downloads .m3u8 playlists and reports back on whether or not the playlists are aligned in time.
 
 ## Purpose
 
@@ -25,18 +28,6 @@ parent_url = "http://host.com/video1/all_bitrates_playlist.m3u8"
 spider = HLSpider.new(parent_url)
 ```
 
-```
-spider.aligned?
-spider.invalid_playlists
-
-playlist = spider.playlists[0]
-playlist.valid?
-playlist.segments
-playlist.url
-playlist.file
-playlist.target_duration
-```
-
 ### Command line
 
 ```

data/Rakefile

@@ -1,5 +1,4 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
@@ -8,3 +7,6 @@ Rake::TestTask.new do |t|
   t.test_files = FileList['spec/**/*_spec.rb']
   t.verbose = true
 end
+
+task :default => [:test]
+task :spec => [:test]

data/hlspider.gemspec

@@ -8,9 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["brookemckim"]
   s.email       = ["brooke.mckim@gmail.com"]
   s.homepage    = "http://www.github.com/brookemckim/hlspider"
-  s.summary     = %q{Asynchronously download and parse .m3u8 playlists.}
-  s.description = %q{Asynchronously downloads .m3u8 playlists and reports back on whether or not the playlists are aligned in time.}
-
+  s.summary     = %q{Download and parse .m3u8 playlists.}
+  s.description = %q{Downloads .m3u8 playlists and reports back on whether or not the playlists are aligned in time.}
 
   s.rubyforge_project = "hlspider"
 
@@ -20,8 +19,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here
-  s.add_runtime_dependency 'eventmachine',    '~> 1.0.0.beta.4'
-  s.add_runtime_dependency 'em-http-request', '~> 1.0.0'
-  
   s.add_development_dependency 'minitest', '~> 2.7.0'
 end

data/lib/hlspider/downloader.rb

@@ -1,50 +1,44 @@
-# Internal: Asynchronsoly downloads urls and returns Array of responses.
-require 'eventmachine'
-require 'em-http-request'
+require 'net/http'
+require 'hlspider/response'
 
+# Internal: Asynchronsoly downloads urls and returns Array of responses.
 module HLSpider
   module Downloader
-    class ConnectionError < StandardError; end;
-    
-    # Internal: Asynchronosly download given URLs.
+    class DownloadError < StandardError; end;
+
+    # Internal: Download given URLs.
     #
-    # urls  - An Array of strings or a single string of URL(s)
+    # urls - An Array of strings or a single string of URL(s)
     #
     # Examples
     #
-    #   async_download(["http://www.google.com", "http://www.yahoo.com"])
-    #   # => 
+    #   download(["http://www.google.com", "http://www.yahoo.com"])
+    #   # => []
     #
-    #   async_download("http://www.bing.com")
-    #   # => 
+    #   download("http://www.bing.com")
+    #   # => []
     #
     # Returns the Array of responses.
-    # Raises HLSpider::Downloader::ConnectionError if there was a problem
-    # downloading all urls. 
+    # Raises HLSpider::Downloader::DownloadError if there was a problem
+    # downloading all urls.
     def download(urls)
       urls = Array(urls)
-            
-      responses = nil
-      EventMachine.run {
-        multi = EventMachine::MultiRequest.new
 
-        urls.each_with_index do |url, idx|
-          http = EventMachine::HttpRequest.new(url, :connect_timeout => 10)
-          req = http.get
-          multi.add idx, req
-        end
+      responses = []
+      threads = []
+
+      urls.each do |url|
+        threads << Thread.new {
+          uri = URI.parse(url)
+          body = Net::HTTP.get_response(uri).body
+
+          responses << Response.new(url, body)
+        }
 
-        multi.callback  do
-          responses = multi.responses
-          EventMachine.stop
-        end
-      }
+        threads.each { |t| t.join }
+      end
 
-      if responses[:callback].size == urls.size
-        responses[:callback].collect { |k,v| v }
-      else
-        raise ConnectionError, "Not able to download all playlsts."
-      end    
-    end  
-  end  
-end  
+      responses
+    end
+  end
+end

data/lib/hlspider/response.rb

@@ -0,0 +1,13 @@
+# Internal: Reponse from the downloader which contains the response body 
+# and the request url.
+module HLSpider
+  class Response
+    def initialize(url, body)
+      @url = url
+      @body = body
+    end
+
+    attr_reader :url, :body
+  end
+end
+

data/lib/hlspider/spider.rb

@@ -8,11 +8,6 @@
 #
 #   Spider.new("http://host.tld/video1/parent_playlist.m3u8")
 #   # => #<HLSpider::Spider:0x10cab12d0>
-
-require 'rubygems'
-require 'eventmachine'
-require 'em-http-request'
-
 module HLSpider
   class Spider 
     class InvalidPlaylist < StandardError; end;
@@ -100,22 +95,23 @@ module HLSpider
     def dive(urls = [])
       playlists = []
             
-      responses = download(urls)              
-      responses.each do |resp|
-        p = Playlist.new(resp.response, resp.req.uri.to_s)
+      responses = download(urls) 
+                   
+      responses.each do |response|
+        playlist = Playlist.new(response.body, response.url)
               
-        if p.valid?
-          if p.variable_playlist?
-            playlists << dive(p.playlists)
+        if playlist.valid?
+          if playlist.variable_playlist?
+            playlists << dive(playlist.playlists)
           else
-            playlists << p
+            playlists << playlist
           end 
         else
-          raise InvalidPlaylist, "#{p.source} was an invalid playlist."
+          raise InvalidPlaylist, "#{playlist.source} was an invalid playlist."
         end  
       end
       
       playlists.flatten  
     end     
   end  
-end
+end

data/lib/hlspider/version.rb

@@ -1,3 +1,3 @@
 module HLSpider
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'minitest/autorun'
+require 'hlspider'
 
-require 'lib/hlspider'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hlspider
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - brookemckim
@@ -15,46 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-06 00:00:00 Z
+date: 2012-11-13 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 62196363
-        segments: 
-        - 1
-        - 0
-        - 0
-        - beta
-        - 4
-        version: 1.0.0.beta.4
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,8 +32,8 @@ dependencies:
         - 0
         version: 2.7.0
   type: :development
-  version_requirements: *id003
-description: Asynchronously downloads .m3u8 playlists and reports back on whether or not the playlists are aligned in time.
+  version_requirements: *id001
+description: Downloads .m3u8 playlists and reports back on whether or not the playlists are aligned in time.
 email: 
 - brooke.mckim@gmail.com
 executables: 
@@ -79,6 +45,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rbenv-version
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -89,6 +56,7 @@ files:
 - lib/hlspider/downloader.rb
 - lib/hlspider/playlist.rb
 - lib/hlspider/playlist_line.rb
+- lib/hlspider/response.rb
 - lib/hlspider/spider.rb
 - lib/hlspider/version.rb
 - spec/hlspider/playlist_line_spec.rb
@@ -127,7 +95,7 @@ rubyforge_project: hlspider
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Asynchronously download and parse .m3u8 playlists.
+summary: Download and parse .m3u8 playlists.
 test_files: 
 - spec/hlspider/playlist_line_spec.rb
 - spec/hlspider/spider_spec.rb