kat 2.0.7 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6336ceffa5cab8bb90a2da89817ef8fa0dbde1a
-  data.tar.gz: 29c43873af002dc18a1851ec2eeb40cbe27a6643
+  metadata.gz: 02227de36b428b2074dc46c055988ed4a7616814
+  data.tar.gz: 35ce5e20a8cc5daa1625a426250e198f3bf2eb38
 SHA512:
-  metadata.gz: 103598e8673733f1cab5bf2431aebb1c4378b4ddf52c51feac5c0b2e61b0d4cfba8927107bfad7494325033770f4928c8cda3c6ced8d0099f7520f8672c49e51
-  data.tar.gz: c9f4120a505e4e17829e5d038ccfe14c4dc7b3c06afa13c76e2f7ba6552f1211f4c3379d19329d29a2dd58ac6ac0b5299251475a1bb687948c699b980db75757
+  metadata.gz: b0d6a7a02378661db65b1d8637ca7fdafa04c9656dc087840f1f6515cafb8b794c4fac653f65b8a8eba5551653dfc38a4e43b828652d2c3aa72334b6e40c443e
+  data.tar.gz: f466f1d2a7f7fc39451c8f30f35c2a7cfb72c3db93e92fd20d7b9642ea6cbab860a556d586275445053a2ee43ec3ff1335bcbb56a851aa690d508c46827f3029

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 2.0.0
+  - 2.2.0

data/bin/kat

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/kat/app'
+require_relative '../lib/kat/app'
 
 Kat.app

data/kat.gemspec

@@ -23,5 +23,4 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'nokogiri', '~> 1.6'
   s.add_runtime_dependency 'highline', '~> 1.6'
   s.add_runtime_dependency 'trollop', '~> 2.0'
-  s.add_runtime_dependency 'andand', '~> 1.3'
 end

data/lib/kat.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/kat/search'
+require_relative 'kat/search'

data/lib/kat/app.rb

@@ -1,9 +1,10 @@
-require File.dirname(__FILE__) + '/../kat'
-require File.dirname(__FILE__) + '/options'
-require File.dirname(__FILE__) + '/colour'
+require_relative '../kat'
+require_relative 'options'
+require_relative 'colour'
 
 require 'highline'
 require 'yaml'
+require 'io/console'
 
 module Kat
   #
@@ -94,7 +95,9 @@ module Kat
     # Get the width of the terminal window
     #
     def set_window_width
-      @window_width = @h.terminal_size[0]
+      # Highline 1.7's terminal_size cannot be trusted to return the values in
+      # the correct order so just use IO.console.winsize directly
+      @window_width = IO.console.winsize[1]
     end
 
     #

data/lib/kat/options.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/field_map'
-require File.dirname(__FILE__) + '/version'
+require_relative 'field_map'
+require_relative 'version'
 require 'trollop'
 
 module Kat

data/lib/kat/search.rb

@@ -1,8 +1,7 @@
-require File.dirname(__FILE__) + '/version'
-require File.dirname(__FILE__) + '/field_map'
+require_relative 'version'
+require_relative 'field_map'
 require 'nokogiri'
 require 'net/http'
-require 'andand'
 
 module Kat
   BASE_URL     = 'http://kickass.to'
@@ -130,10 +129,6 @@ module Kat
       build_query
     end
 
-    def sort?
-      sorts.any? { |k, v| @options[:sort] && k == @options[:sort].intern }
-    end
-
     #
     # Perform the search, supplying an optional page number to search on. Returns
     # a result set limited to the 25 results Kickass Torrents returns itself. Will
@@ -150,7 +145,6 @@ module Kat
           if res.code == '301'
             path = Net::HTTP::Get.new(res.header['location'])
             res = Net::HTTP.start(uri.host) { |http| http.request path }
-            @message = { message: 'Sort is not functioning' } if sort?
           end
 
           @pages = 0 and return if res.code == '404'
@@ -158,10 +152,10 @@ module Kat
           doc = Nokogiri::HTML(res.body)
 
           @results[page] = doc.xpath('//table[@class="data"]/tr[position()>1]/td[1]').map do |node|
-            { path:     node.css('a.torType').first.andand.attr('href'),
+            { path:     href_of(node, 'a.torType'),
               title:    node.css('a.cellMainLink').text,
-              magnet:   node.css('a.imagnet').first.andand.attr('href'),
-              download: node.css('a.idownload').last.andand.attr('href'),
+              magnet:   href_of(node, 'a.imagnet'),
+              download: href_of(node, 'a.idownload'),
               size:     (node = node.next_element).text,
               files:    (node = node.next_element).text.to_i,
               age:      (node = node.next_element).text,
@@ -320,5 +314,15 @@ module Kat
       !(@results.empty? || @results.first.empty?) &&
         (@results.first.first[method] || @results.first.first[method[0..-2].intern]) || super
     end
+
+    #
+    # tries to find the first <selector> in <scope> and read its href
+    # attribute, returns nil elsewise
+    #
+    def href_of(scope, selector)
+      if node = scope.css(selector).first
+        node.attr('href')
+      end
+    end
   end
 end

data/lib/kat/version.rb

@@ -1,6 +1,6 @@
 module Kat
   NAME = 'Kickass Torrents Search'
-  VERSION = '2.0.7'
+  VERSION = '2.0.9'
   MALEVOLENT_DICTATOR_FOR_LIFE = 'Fission Xuiptz'
   AUTHOR = MALEVOLENT_DICTATOR_FOR_LIFE
   VERSION_STR = "#{ NAME } #{ VERSION } (c) 2013 #{ MALEVOLENT_DICTATOR_FOR_LIFE }"

data/test/kat/test_app.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require File.dirname(__FILE__) + '/../../lib/kat/app'
+require_relative '../../lib/kat/app'
 
 app = Kat::App.new %w(aliens -c movies -o .)
 app.kat.go(1).go(app.kat.pages - 1)

data/test/kat/test_colour.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require File.dirname(__FILE__) + '/../../lib/kat/colour'
+require_relative '../../lib/kat/colour'
 
 describe Kat::Colour do
   let(:colours) { %i(black red green yellow blue magenta cyan white) }

data/test/kat/test_options.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require File.dirname(__FILE__) + '/../../lib/kat/options'
+require_relative '../../lib/kat/options'
 
 describe Kat::Options do
 

data/test/kat/test_search.rb

@@ -1,10 +1,12 @@
 require 'minitest/autorun'
-require File.dirname(__FILE__) + '/../../lib/kat/search'
-
-blue_peter = Kat.search
-blue_peter.go.go 1
+require_relative '../../lib/kat/search'
 
 describe Kat::Search do
+  let(:blue_peter) do
+    Kat.search do |k|
+      k.go.go 1
+    end
+  end
 
   let(:kat) { Kat.search 'test' }
   let(:kat_opts) { Kat.search 'test', category: 'books' }
@@ -39,13 +41,16 @@ describe Kat::Search do
     end
 
     it 'responds to result fields after a search' do
+      blue_peter.search # trigger page parse?
       %i(titles files).each do |s|
         blue_peter.respond_to?(s).must_equal true
       end
     end
 
     it 'returns identical result sets' do
-      blue_peter.results[0].must_equal blue_peter.search
+      called = blue_peter.search
+      first_page = blue_peter.results[0]
+      first_page.must_equal called
     end
 
     it 'returns a full result set' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kat
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.9
 platform: ruby
 authors:
 - Fission Xuiptz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: andand
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 description: A Ruby interface to Kickass Torrents
 email: fissionxuiptz@softwaremojo.com
 executables:
@@ -112,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Kickass Torrents Interface