subtitle_it 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba994bab78c7d2abcca319da9a1aeea70054119
-  data.tar.gz: 61b309ea11dd3a8280020f9730936a7eb4ec9e50
+  metadata.gz: e7e689a69c1ee1db901aa8c97651f1eaae2d40a0
+  data.tar.gz: b74b880955817937099c773f69bde83b5f61ff8e
 SHA512:
-  metadata.gz: cf011b00c3682d28a8756b07ae1e91871cb120d43c1a6cd567e0b63e96a31ebf8af46cddd5ae71964ce35888d5e2cb19dae39ded26e60c7ab3f538dc67c897dc
-  data.tar.gz: 3dd03b48ac2bf130f72159ff9fa1d6f7358eb4ad424a1e819ba0490f2fc43ea51cf4372cc9f9da99273c928473986110fa9b48f86d9b94fa7f2fbf65c35e1784
+  metadata.gz: 16c219776a8c22a05f9d4e14c0e6ccb4391b33d8323a6ff159058174f0171673f66ad227a45385a08b374985f15d35dcf5ecf5b57a690b722e5193934b67665b
+  data.tar.gz: 952cead4beaee7653cb729c26f7b53dbb51bda920f1b44348fe7cf4540f7f6dfcf3f69d157040b805c777b2b1c424b272d9e0c832e63eab807556ccacc1684a7

data/lib/subtitle_it/movie.rb

@@ -1,7 +1,11 @@
 module SubtitleIt
+  #
+  # Le Movie
+  #
   class Movie
     attr_reader :filename
     attr_accessor :info
+
     CHUNK_SIZE = 64 * 1024 # in bytes
 
     def initialize(filename)

data/lib/subtitle_it/subdown.rb

@@ -44,12 +44,12 @@ module SubtitleIt
       args = {
         'sublanguageid' => lang_name || '',
         'moviehash'     => movie.haxx,
-        'moviebytesize' => movie.size
+        #  'moviebytesize' => movie.size
       }
 
       result = request('SearchSubtitles', [args])
       return [] unless result['data'] # if no results result['data'] == false
-      result['data'].inject([]) do |subs, sub_info|
+      result['data'].reduce([]) do |subs, sub_info|
         subs << Subtitle.new(info: sub_info)
         subs
       end
@@ -95,7 +95,7 @@ module SubtitleIt
 
     def request(method, *args)
       unless NO_TOKEN.include? method
-        fail 'Need to be logged in for this.' unless logged_in?
+        raise 'Need to be logged in for this.' unless logged_in?
         args = [@token, *args]
       end
 
@@ -103,8 +103,8 @@ module SubtitleIt
 
       unless self.class.result_status_ok?(result)
         # 'status' of the form 'XXX Message'
-        fail XMLRPC::FaultException.new(result['status'].to_i,
-                                        result['status'][4..-1])
+        raise XMLRPC::FaultException.new(result['status'].to_i,
+                                         result['status'][4..-1])
       end
 
       result

data/lib/subtitle_it/subtitle.rb

@@ -9,20 +9,32 @@ require 'subtitle_it/formats/mpl'
 # http://www.opensubtitles.org/addons/export_languages.php
 
 module SubtitleIt
-  MOVIE_EXTS = %w(3g2 3gp 3gp2 3gpp 60d ajp asf asx avchd avi bik bix box cam dat divx dmf dv dvr-ms evo flc fli flic flv flx gvi gvp h264 m1v m2p m2ts m2v m4e m4v mjp mjpeg mjpg mkv moov mov movhd movie movx mp4 mpe mpeg mpg mpv mpv2 mxf nsv nut ogg ogm omf ps qt ram rm rmvb swf ts vfw vid video viv vivo vob vro wm wmv wmx wrap wvx wx x264 xvid)
-  SUB_EXTS = %w(srt sub smi txt ssa ass mpl xml yml rsb)
+  MOVIE_EXTS = %w(3g2 3gp 3gp2 3gpp 60d ajp asf asx avchd avi bik bix box cam
+                  dat divx dmf dv dvr-ms evo flc fli flic flv flx gvi gvp h264
+                  m1v m2p m2ts m2v m4e m4v mjp mjpeg mjpg mkv moov mov movhd
+                  movie movx mp4 mpe mpeg mpg mpv mpv2 mxf nsv nut ogg ogm omf
+                  ps qt ram rm rmvb swf ts vfw vid video viv vivo vob vro wm
+                  wmv wmx wrap wvx wx x264 xvid).freeze
 
+  SUB_EXTS = %w(srt sub smi txt ssa ass mpl xml yml rsb).freeze
+
+  #
+  # Le Subtitle pour le Movie
+  #
   class Subtitle
     include Comparable
     include Formats
-    attr_reader :id, :raw, :format, :lines, :style, :info, :filename, :rating, :language, :user, :release_name,
-                :osdb_id, :download_count, :download_url, :original_filename
+
+    attr_reader :id, :raw, :format, :lines, :style, :info, :filename, :rating,
+                :language, :user, :release_name, :osdb_id, :original_filename,
+                :download_count, :download_url
+
     attr_writer :style, :lines, :fps
 
     def initialize(args = {})
       # Looks like opensubtitle is the only provider around..
       # If a second one comes need big refactor...
-      if @info = args[:info]
+      if (@info = args[:info])
         # @osdb_info         = info
         @osdb_id           = @info['IDSubtitleFile'].to_s
         @original_filename = @info['SubFileName'].to_s
@@ -32,11 +44,11 @@ module SubtitleIt
         @release_name      = @info['MovieReleaseName'].to_s
         @download_count    = @info['SubDownloadsCnt'].to_i
         @rating            = @info['SubRating'].to_f
-        @uploaded_at       = @info['SubAddDate'].to_s # TODO: convert to time object?
+        @uploaded_at       = @info['SubAddDate'].to_s # TODO: convert to Date?
         @download_url      = @info['SubDownloadLink'].to_s
       end
       @fps = args[:fps] || 23.976
-      return unless dump = args[:dump]
+      return unless args[:dump]
       parse_dump(args[:dump], args[:format])
     end
 
@@ -52,7 +64,7 @@ module SubtitleIt
 
     # Force subtitles to be UTF-8
     def encode_dump(dump)
-      dump = dump.read unless dump.kind_of?(String)
+      dump = dump.read unless dump.is_a?(String)
 
       enc = CharlockHolmes::EncodingDetector.detect(dump)
       if enc[:encoding] != 'UTF-8'
@@ -63,7 +75,7 @@ module SubtitleIt
     end
 
     def parse_dump(dump, format)
-      fail unless SUB_EXTS.include?(format)
+      raise unless SUB_EXTS.include?(format)
       @raw = encode_dump(dump)
       @format = format
       parse_lines!

data/lib/subtitle_it/version.rb

@@ -1,3 +1,3 @@
 module SubtitleIt
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'.freeze
 end

data/subtitle_it.gemspec

@@ -6,10 +6,10 @@ Gem::Specification.new do |s|
   s.version     = SubtitleIt::VERSION
   s.platform    = Gem::Platform::RUBY
 
-  s.authors = ["Marcos Piccinini"]
+  s.authors = ['Marcos Piccinini']
   s.email = 'x@nofxx.com'
 
-  s.date = Time.now.strftime("%Y-%m-%d")
+  s.date = Time.now.strftime('%Y-%m-%d')
   s.default_executable = 'subtitle_it'
 
   s.homepage    = 'http://github.com/nofxx/subtitle_it'
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.executables  = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   # s.extra_rdoc_files = s.files.grep(%r{^(rdoc)/})
 
   s.add_dependency 'colorize'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subtitle_it
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize