suby 0.1.3 → 0.1.4

data/lib/suby.rb

@@ -1,25 +1,26 @@
-require_relative 'suby/downloader_error'
-require_relative 'suby/not_found_error'
+require 'epath'
+require 'zip/zip'
+
 require_relative 'suby/filename_parser'
 require_relative 'suby/downloader'
 require_relative 'suby/interface'
 
-gem 'rubyzip2'
-require 'zip'
-
 module Suby
-  SUB_EXTENSIONS = %w[srt sub].map { |ext| ".#{ext}" }
-  TEMP_ARCHIVE_NAME = '__archive__'
+  NotFoundError = Class.new StandardError
+  DownloaderError = Class.new StandardError
+
+  SUB_EXTENSIONS = %w[srt sub]
+  TEMP_ARCHIVE = Path('__archive__')
 
   class << self
     include Interface
 
     def download_subtitles(files, options = {})
       files.each { |file|
-        next if File.directory?(file) or SUB_EXTENSIONS.include?(File.extname(file))
+        file = Path(file)
+        next if file.directory? or SUB_EXTENSIONS.include?(file.ext)
         next puts "Skipping: #{file}" if SUB_EXTENSIONS.any? { |ext|
-          st = File.basename(file, File.extname(file)) + ext
-          File.exist? st and File.size(st) > 0
+          f = file.sub_ext(ext) and f.exist? and !f.empty?
         }
         download_subtitles_for_file(file, options)
       }
@@ -56,23 +57,22 @@ module Suby
       end
     end
 
-    def extract_sub_from_archive(archive, format, basename)
+    def extract_sub_from_archive(archive, format, file)
       case format
       when :zip
-        Zip::ZipFile.open(archive) { |zip|
+        Zip::ZipFile.open(archive.to_s) { |zip|
           sub = zip.entries.find { |entry|
-            entry.to_s =~ /#{Regexp.union SUB_EXTENSIONS}$/
+            entry.to_s =~ /\.#{Regexp.union SUB_EXTENSIONS}$/
           }
           raise "no subtitles in #{archive}" unless sub
-          name = basename + File.extname(sub.to_s)
-          sub.extract(name)
+          name = file.sub_ext(Path(sub).ext)
+          sub.extract(name.to_s)
         }
       else
         raise "unknown archive type (#{archive})"
       end
     ensure
-      # Cleaning
-      File.unlink archive if File.exist? archive
+      archive.unlink if archive.exist?
     end
   end
 end

data/lib/suby/downloader.rb

@@ -5,7 +5,7 @@ require 'nokogiri'
 module Suby
   class Downloader
     DOWNLOADERS = []
-    def self.add(downloader)
+    def self.inherited(downloader)
       DOWNLOADERS << downloader
     end
 
@@ -85,28 +85,24 @@ module Suby
       format = self.class::FORMAT
       case format
       when :file
-        open(sub_name(contents), 'wb') { |f| f.write contents }
+        sub_name(contents).write contents
       when :zip
-        open(TEMP_ARCHIVE_NAME, 'wb') { |f| f.write contents }
-        Suby.extract_sub_from_archive(TEMP_ARCHIVE_NAME, format, basename)
+        TEMP_ARCHIVE.write contents
+        Suby.extract_sub_from_archive(TEMP_ARCHIVE, format, file)
       else
         raise "unknown subtitles format: #{format}"
       end
     end
 
-    def basename
-      File.basename(file, File.extname(file))
-    end
-
     def sub_name(contents)
-      basename + sub_extension(contents)
+      file.sub_ext sub_extension(contents)
     end
 
     def sub_extension(contents)
       if contents[0..10] =~ /1\r?\n/
-        '.srt'
+        'srt'
       else
-        '.sub'
+        'sub'
       end
     end
   end

data/lib/suby/downloader/addic7ed.rb

@@ -1,7 +1,5 @@
 module Suby
   class Downloader::Addic7ed < Downloader
-    Downloader.add(self)
-
     SITE = 'www.addic7ed.com'
     FORMAT = :file
     LANG_IDS = {

data/lib/suby/downloader/tvsubtitles.rb

@@ -1,7 +1,5 @@
 module Suby
   class Downloader::TVSubtitles < Downloader
-    Downloader.add(self)
-
     SITE = 'www.tvsubtitles.net'
     FORMAT = :zip
     SEARCH_URL = '/search.php'

data/lib/suby/filename_parser.rb

@@ -78,7 +78,7 @@ module Suby
     ]
 
     def parse(file)
-      filename = File.basename(file)
+      filename = file.basename.to_s
       found = FILENAME_PATTERNS.find { |pattern|
         pattern =~ filename
       }

data/suby.gemspec

@@ -10,9 +10,10 @@ Gem::Specification.new do |s|
   s.executables = ['suby']
 
   s.required_ruby_version = '>= 1.9.2'
+  s.add_dependency 'epath', '>= 0.1.0'
   s.add_dependency 'nokogiri'
-  s.add_dependency 'rubyzip2'
+  s.add_dependency 'rubyzip'
   s.add_dependency 'term-ansicolor'
 
-  s.version = '0.1.3'
+  s.version = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: suby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-12 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: epath
+  requirement: &2152477380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2152477380
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2151909200 !ruby/object:Gem::Requirement
+  requirement: &2152476880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151909200
+  version_requirements: *2152476880
 - !ruby/object:Gem::Dependency
-  name: rubyzip2
-  requirement: &2151908380 !ruby/object:Gem::Requirement
+  name: rubyzip
+  requirement: &2152476000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151908380
+  version_requirements: *2152476000
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2151907540 !ruby/object:Gem::Requirement
+  requirement: &2152475540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151907540
+  version_requirements: *2152475540
 description: Find and download subtitles
 email: eregontp@gmail.com
 executables:
@@ -55,10 +66,8 @@ files:
 - lib/suby/downloader/addic7ed.rb
 - lib/suby/downloader/tvsubtitles.rb
 - lib/suby/downloader.rb
-- lib/suby/downloader_error.rb
 - lib/suby/filename_parser.rb
 - lib/suby/interface.rb
-- lib/suby/not_found_error.rb
 - lib/suby.rb
 - .gitignore
 - README.md

data/lib/suby/downloader_error.rb

@@ -1,4 +0,0 @@
-module Suby
-  class DownloaderError < StandardError
-  end
-end

data/lib/suby/not_found_error.rb

@@ -1,4 +0,0 @@
-module Suby
-  class NotFoundError < StandardError
-  end
-end