osdb 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d5c8afe4f667570f34fc70eb58f92fc18b8992
-  data.tar.gz: e9d13b0eef33b5575c8c3e7cf0e63f856331587e
+  metadata.gz: 979dfb4d31ea0378b76781add14375369b33845d
+  data.tar.gz: 7f0ad3167832f4bb0ae34b2ecdb32d2d60620627
 SHA512:
-  metadata.gz: 5ab8e63b010b4351cbf20b678456d5ae68a41e240eafc6ee6444d5102b8378b19886374b8ea342a6d9398f8a40401dce341e608dc25e8df8310aa37a06e9a80d
-  data.tar.gz: 4d3db1f8c1e04e7adc99e490f7d8bba4d5df4d889ef76f310649f85f105e8e1fbbc17c3a31a75d7ff417c86bd9044fac63189e858f6eacbf4af2aca29e400432
+  metadata.gz: 82f15527f5291e19ec795775e27609e8664508f49fa97bd7751635073df2936babe06a278f302251fe59a4007c6c70cc55f32a91998040942489534bc1592b3a
+  data.tar.gz: c1bd1ce6031cfcb2da4ab1d427bc413762115afac38c674390c9ae4b669704f4208275818938b0035f008b2819fde6eefb5cd9799bdf068fcbcb30d0cefda4da

data/.travis.yml

@@ -1,9 +1,9 @@
 rvm:
-  - 1.8.7 # (current default)
+  - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - rbx
   - jruby
-  - ruby-head
   - ree
 

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Jean Boussier
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -4,6 +4,7 @@ Client library for the [OSDb protocol](http://trac.opensubtitles.org/projects/op
 Currently the implentation is limited to movie identification and subtitles search
 
 [![Build Status](https://secure.travis-ci.org/byroot/ruby-osdb.png)](http://travis-ci.org/byroot/ruby-osdb)
+[![Gem Version](https://badge.fury.io/rb/osdb.png)](http://badge.fury.io/rb/osdb)
 
 ## Examples
 

data/bin/getsub

@@ -8,7 +8,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'osdb'))
 class GetSub
 
   def initialize
-    @options = {:language => env_lang.to_iso639_2b, :force => false, :dir => nil, :methods => 'h'}
+    @options = {:language => OSDb.default_language.to_iso639_2b, :force => false, :dir => nil, :methods => 'h', :language_extension => false }
     @parser ||= OptionParser.new do |opts|
       opts.banner = "Automatically download subs for your video files using opensubtitle.org"
       opts.separator ""
@@ -18,7 +18,7 @@ class GetSub
 
       opts.on("-a", "--auto", "Do not ask user to resolve hash conflicts.") { @options[:auto] = true }
 
-      opts.on("-l", "--language LANGUAGE", "Sub language ISO 639-2 code like fre or eng. Default: env $LANG (#{env_lang.to_iso639_2b})") do |language|
+      opts.on("-l", "--language LANGUAGE", "Sub language ISO 639-2 code like fre or eng. Default: env $LANG (#{OSDb.default_language.to_iso639_2b})") do |language|
         if language.to_s.length != 3
           STDERR.puts "Invalid argument: Language should specified as ISO 639-2 (ie, 3 letters, like 'eng' or 'fre')"
           exit 1
@@ -30,6 +30,8 @@ class GetSub
 
       opts.on("-t", "--type FORMATS", "Select only subtitles in specified formats. e.g -t srt,sub") { |formats| @options[:formats] = formats.to_s.split(',') }
 
+      opts.on("-L", "--language-extension", "Add the ISO 639-2 in the subtitle's file extension. e.g filename.eng.srt" ) { @options[:language_extension] = true }
+
       methods_help = "Ordered list of search methods. h: by movie hash, i: by name on IMDB, n: by name on OSDb, p: by filename on OSDb. e.g -s hi . Default: h"
       opts.on("-s", "--search-by METHODS", methods_help) do |methods|
         unless methods =~ /^[hinp]+$/
@@ -42,14 +44,11 @@ class GetSub
     end
   end
 
-  def env_lang
-    OSDb::Language.from_locale(ENV['LANG'])
-  end
-
   def run!(files)
     @parser.parse!
+    language = @options[:language] if @options[:language_extension]
 
-    movie_files = glob(files).map{ |path| OSDb::MovieFile.new(path) }
+    movie_files = glob(files).map{ |path| OSDb::MovieFile.new(path, language) }
 
     movie_files.each do |movie_file|
       begin

data/lib/osdb.rb

@@ -13,4 +13,9 @@ module OSDb
   autoload :Server,         "#{base_path}/server"
   autoload :Sub,            "#{base_path}/sub"
   autoload :SubtitleFinder, "#{base_path}/subtitle_finder"
+
+  def self.default_language
+    OSDb::Language.from_locale(ENV['LANG'] || 'en_US.UTF-8')
+  end
+
 end

data/lib/osdb/movie_file.rb

@@ -3,20 +3,26 @@ module OSDb
 
     EXTENSIONS = %w(avi mpg m4v mkv mov ogv mp4)
 
-    attr_reader :path
+    attr_reader :path, :language
 
-    def initialize(path)
+    def initialize(path, language = OSDb.default_language)
       @path = path
+      @language = language
     end
 
     def has_sub?
       exist = false
-      %w(.srt .sub).each{ |ext| exist ||= File.exist?(path.gsub(File.extname(path), ext)) }
+      %w(srt sub).each{ |ext| exist ||= File.exist?(sub_path(ext)) }
       exist
     end
 
     def sub_path(format)
-      path.gsub(File.extname(path), ".#{format}")
+      extension = if @language
+        ".#{@language}.#{format}"
+      else
+        ".#{format}"
+      end
+      path.gsub(File.extname(path), extension)
     end
     
     def hash

data/lib/osdb/version.rb

@@ -1,3 +1,3 @@
 module OSDb
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

data/osdb.gemspec

@@ -16,9 +16,11 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.license       = 'MIT'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'webmock', '~> 1.8.11'
   s.add_development_dependency 'vcr', '~> 2.3.0'
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/../lib/osdb'
 require 'rspec'
+require 'rspec/its'
 
 require 'webmock/rspec'
 require 'vcr'

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: osdb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.11
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
 description: 
@@ -74,10 +88,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/getsub
@@ -118,7 +133,8 @@ files:
 - spec/osdb/sub_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/byroot/ruby-osdb
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -126,17 +142,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: osdb
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby library to access OSDb services like OpenSubtitles.org