undertexter 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    undertexterse (0.0.1)
+    undertexter (0.0.3)
       nokogiri
       rest-client
 
@@ -29,4 +29,4 @@ DEPENDENCIES
   nokogiri
   rest-client
   rspec
-  undertexterse!
+  undertexter!

data/README.markdown

@@ -0,0 +1,71 @@
+What is Undertexter?
+===============
+
+Undertexter provides a basic search client that makes it possible to search for swedish and english subtitles on [Undertexter.se](http://undertexter.se)
+
+How to use
+===============
+
+The find methods takes any string, including an IMDB id.
+This is how to use it in irb.
+
+    $ require 'undertexter'
+    # => true
+    $ subtite = Undertexter.find("tt0840361").first
+    => #<Subtitle:0x1020fff98 @downloads=8328, @movie_title="The Town", @title="The.Town.2010....BRRip", @url="http://www.undertexter.se/?p=undertext&id=23711", @cds=1>
+    $ subtitle.downloads
+    => 8328
+    $ subtitle.movie_title
+    => "The Town"
+    $ subtitle.title
+    => "The.Town.2010.EXTENDED.480p.BRRip.XviD-NYDIC"
+    $ subtitle.url
+    = "http://www.undertexter.se/utext.php?id=23711"
+    $ subtitle.details
+    => "http://www.undertexter.se/?p=undertext&id=23711"
+    $ Undertexter.find("die hard").count
+    => 41
+
+You can also provide an language option.
+    
+    $ Undertexter.find("tt0840361", :language => :english).count
+    => 48
+    $ Undertexter.find("tt0840361", :language => :swedish).count
+    => 8
+
+If no language option is being passed to find, it will fall back to swedish
+
+What is being returned from the find method?
+===============
+
+The find method returns an `Array` with zero or more subtitles. Every subtitle provides some basic accessors.
+
+- `movie_title` (String) The official name of the movie.
+- `cds` (Integer) The amount of cds that the release should contain.
+- `title` (String) The release name of the subtitle, should have the same name as the downloaded movie.
+- `downloads` (Integer) The amount of downloads for this particular subtitle.
+- `url` (String) A direct link to the subtitle file, a rar file for example
+- `details` (String) A link to the details page for the subtitle
+
+How to install
+===============
+
+    sudo gem install undertexter
+    
+How to use it in a rails 3 project
+===============
+
+Add `gem 'undertexter'` to your Gemfile and run `bundle`.
+
+How to help
+===============
+
+- Start by copying the project or make your own branch.
+- Navigate to the root path of the project and run `bundle`.
+- Start by running all tests using rspec, `rspec spec/undertexter_spec.rb`.
+- Implement your own code, write some tests, commit and do a pull request.
+
+Requirements
+===============
+
+Undertexter is tested in OS X 10.6.6 using Ruby 1.8.7.

data/lib/subtitle.rb

@@ -1,6 +1,16 @@
 class Subtitle
-  attr_accessor :url, :downloads, :cds, :title, :movie_title
+  attr_accessor :details, :downloads, :cds, :title, :movie_title, :url
+  
   def initialize(args)
     args.keys.each { |name| instance_variable_set "@" + name.to_s, args[name] }
   end
+  
+  def url
+    "http://www.undertexter.se/utext.php?id=#{id}"
+  end
+  
+  private
+    def id
+      @details.match(/id=(\d+)/)[1]
+    end
 end

data/lib/undertexter/version.rb

@@ -1,3 +1,3 @@
 module Undertexter
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/undertexter.rb

@@ -3,15 +3,25 @@ require 'subtitle'
 require 'nokogiri'
 
 class Undertexter
-  attr_accessor :raw_data, :base_url, :subtitles
+  attr_accessor :raw_data, :base_details, :subtitles
   
-  def initialize
-    @base_url = "http://www.undertexter.se/?p=soek&add=arkiv&str="
+  def initialize(options)
+    @options = {
+      :language => {
+        :swedish => 'soek',
+        :english => 'eng_search'
+      }
+    }
+    
+    # If a non existing language is being used, swedish will be the default
+    lang = @options[:language][options[:language]] || @options[:language][:swedish]
+    
+    @base_details = "http://www.undertexter.se/?p=#{lang}&add=arkiv&str="
     @subtitles = []
   end
   
-  def self.find(search_string)
-    this = self.new
+  def self.find(search_string, options = {:language => :swedish})
+    this = self.new(options)
     
     # Downloading the page
     this.get(search_string)
@@ -32,7 +42,7 @@ class Undertexter
     # Example output
     # [["(1 cd)", "Nedladdningar: 11891", "Avatar (2009) PROPER DVDSCR XviD-MAXSPEED", "http://www.undertexter.se/?p=undertext&id=19751"]]
     
-    [15,12].each do |id|
+    [12,15].each do |id|
       @block = noko.css("table:nth-child(#{id}) td").to_a.reject do |inner| 
         inner.content.empty? or ! inner.content.match(/Nedladdningar/i) 
       end.map do |inner| 
@@ -44,10 +54,12 @@ class Undertexter
       next if @block.nil?
       
       noko.css("table:nth-child(#{id}) a").to_a.reject do |inner| 
-        url = inner.attr('href')
-        inner.content.empty? or url.nil? or ! url.match(/p=undertext&id=\d+/i)
+        details = inner.attr('href')
+        inner.content.empty? or details.nil? or ! details.match(/(p=undertext&id=\d+)|(p=subtitle&id=\d+)/i)
       end.map do |y| 
         [y.attr('href'), y.content.strip]
+      end.reject do |list|
+        list.last.empty?
       end.each_with_index do |value, index|
         @block[index] << value.first
         @block[index] << value.last
@@ -66,13 +78,13 @@ class Undertexter
         :cds => movie[0].match(/\d+/)[0].to_i,
         :downloads => movie[1].match(/\d+$/)[0].to_i,
         :title => movie[2],
-        :url => movie[3],
+        :details => movie[3],
         :movie_title => movie[4]
       })
     end
   end
   
   def get(search_string)
-    @raw_data = RestClient.get(@base_url + CGI.escape(search_string), :timeout => 10) rescue nil
+    @raw_data = RestClient.get(@base_details + CGI.escape(search_string), :timeout => 10) rescue nil
   end
 end

data/spec/undertexter_spec.rb

@@ -33,8 +33,8 @@ describe Undertexter do
     @use.each {|subtitle| subtitle.title.should_not be_empty}
   end
   
-  it "should contain the right urls" do
-    @use.each {|subtitle| subtitle.url.should match(/^http:\/\/www\.undertexter\.se\/\?p=undertext&id=\d+$/)}
+  it "should contain the right detailss" do
+    @use.each {|subtitle| subtitle.details.should match(/^http:\/\/www\.undertexter\.se\/\?p=undertext&id=\d+$/)}
   end
 end
 
@@ -62,8 +62,8 @@ describe Undertexter, "trying to search for a movie using a title" do
     @use.each{|subtitle| subtitle.title.should match(/die.*hard/i)}
   end
   
-  it "should contain the right urls, again" do
-    @use.each {|subtitle| subtitle.url.should match(/^http:\/\/www\.undertexter\.se\/\?p=undertext&id=\d+$/i)}
+  it "should contain the right detailss, again" do
+    @use.each {|subtitle| subtitle.details.should match(/^http:\/\/www\.undertexter\.se\/\?p=undertext&id=\d+$/i)}
   end
   
   it "should have a movie title" do
@@ -77,4 +77,29 @@ describe Undertexter, "trying to search for a movie using a title" do
   it "should not contain movie title that starts or ends with whitespace" do
     @use.each {|subtitle| subtitle.movie_title.should_not match(/^\s+.+\s+$/)}
   end
+  
+  it "should return a direct link to the subtitle" do
+    @use.each{|subtitle| subtitle.url.should match(/http:\/\/www\.undertexter\.se\/utext\.php\?id=\d+/i)}
+  end
+  
+  it "should return the same id for every link" do
+    @use.each_with_index do |subtitle, index|
+      subtitle.url.match(/id=(\d+)/)[1].should eq(@use[index].details.match(/id=(\d+)/)[1])
+    end
+  end
+end
+
+describe Undertexter, "should work when trying to fetch some english subtitles" do  
+  it "should return at least 48 subtitles" do
+    Undertexter.should have_at_least(48).find("tt0840361", {:language => :english})
+  end
+  
+  it "should return at least 8 subtitles" do
+    Undertexter.should have_at_least(8).find("tt0840361", {:language => :swedish})
+  end
+  
+  it "should return at least 8 subtitles" do
+    Undertexter.should have_at_least(8).find("tt0840361", {:language => :strange})
+  end
+  # http://www.undertexter.se/www.php?www=http://engsub.net/?p=subtitle&id=92097
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: undertexter
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Linus Oleander
@@ -74,7 +74,7 @@ files:
 - .rspec
 - Gemfile
 - Gemfile.lock
-- README
+- README.markdown
 - Rakefile
 - lib/subtitle.rb
 - lib/undertexter.rb
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: undertexter
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: A subtitle search client for undertexter.se