suby 0.1.1 → 0.1.2

data/lib/suby/downloader.rb

@@ -71,13 +71,21 @@ module Suby
       extract download_url
     end
 
-    def extract(url)
-      contents = get(url)
+    def subtitles(url_or_response = download_url)
+      if Net::HTTPSuccess === url_or_response
+        url_or_response.body
+      else
+        get(url_or_response)
+      end
+    end
+
+    def extract(url_or_response)
+      contents = subtitles(url_or_response)
       http.finish
       format = self.class::FORMAT
       case format
       when :file
-        open(sub_name(url), 'wb') { |f| f.write contents }
+        open(sub_name(contents), 'wb') { |f| f.write contents }
       when :zip
         open(TEMP_ARCHIVE_NAME, 'wb') { |f| f.write contents }
         Suby.extract_sub_from_archive(TEMP_ARCHIVE_NAME, format, basename)
@@ -90,8 +98,16 @@ module Suby
       File.basename(file, File.extname(file))
     end
 
-    def sub_name(sub)
-      basename + File.extname(sub)
+    def sub_name(contents)
+      basename + sub_extension(contents)
+    end
+
+    def sub_extension(contents)
+      if contents[0..10] =~ /1\r?\n/
+        '.srt'
+      else
+        '.sub'
+      end
     end
   end
 end

data/lib/suby/downloader/addic7ed.rb

@@ -36,11 +36,17 @@ module Suby
 
     def redirected_url download_url
       header = { 'Referer' => "http://#{SITE}#{subtitles_url}" }
-      location = get_redirection download_url, header # They check Referer
-      if location == '/downloadexceeded.php'
-        raise NotFoundError, "download exceeded"
+      response = get download_url, header, false
+      case response
+      when Net::HTTPSuccess
+        response
+      when Net::HTTPFound
+        location = response['Location']
+        if location == '/downloadexceeded.php'
+          raise NotFoundError, "download exceeded"
+        end
+        URI.escape location
       end
-      URI.escape location
     end
 
     def download_url

data/suby.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'rubyzip2'
   s.add_dependency 'term-ansicolor'
 
-  s.version = '0.1.1'
+  s.version = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-21 00:00:00.000000000 Z
+date: 2011-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2156836860 !ruby/object:Gem::Requirement
+  requirement: &2153922380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156836860
+  version_requirements: *2153922380
 - !ruby/object:Gem::Dependency
   name: rubyzip2
-  requirement: &2156836400 !ruby/object:Gem::Requirement
+  requirement: &2153921780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156836400
+  version_requirements: *2153921780
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2156835980 !ruby/object:Gem::Requirement
+  requirement: &2153920880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156835980
+  version_requirements: *2153920880
 description: Find and download subtitles
 email: eregontp@gmail.com
 executables:
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Subtitles' downloader