kat 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d11aee9f32fb16ec8fc1c4927eeeb2561bab56f1
-  data.tar.gz: 9e2a9bc6ffa80b85424ee74f2617da798c1e6ba4
+  metadata.gz: ef9cbd9bc5edfd5bcbbab270423445df0e0ffec2
+  data.tar.gz: 57b4de26084d944ad5e369f38e8727442bad663a
 SHA512:
-  metadata.gz: 1ccc89e6bcfd9e9a9e88a0cc97b210a79b5a9250e72071aa4a1e23a3203275d3d9785f870be21da77adea98cca34cb55c63efd8835ffec3259b6c87a57786454
-  data.tar.gz: a7cf13cf4d2300a6d4616e49c17afe7688089109ee0d346de8f5ba8d60a48cccb5399da78e5d69b9e5491f828974a4cf5c788a1cd9ac957c8c6027c96631f7dd
+  metadata.gz: 509efe18911af40dfdaf17f3c86196d4990f833a500ebc2c68925d6fc0710fa86690beb266343dbb7d1134c6e171d2c578a31ded5830a2eb837378178663a135
+  data.tar.gz: 588d18d574b744c7f026d51fcfb2da40e8e0689dc64a94bf9f2ca9722ed3c8fac230281ee0c59007d30d2eadc9b2c65f74c97465ee6044ea3ac0ac3ed0e719b7

data/Rakefile

@@ -1,7 +1,7 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
-task :default => :test
+task default: :test
 
 Rake::TestTask.new do |t|
   t.libs.push 'lib'

data/kat.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.summary       = 'Kickass Torrents Interface'
   s.description   = 'A Ruby interface to Kickass Torrents'
 
-  s.files         = `git ls-files`.split $/
-  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename f }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.files         = `git ls-files`.split "\n"
+  s.executables   = s.files.grep(/^bin\//) { |f| File.basename f }
+  s.test_files    = s.files.grep(/^(test|spec|features)\//)
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'nokogiri', '~> 1.6'

data/lib/kat/app.rb

@@ -6,14 +6,11 @@ require 'highline'
 require 'yaml'
 
 module Kat
-
-  class << self
-    #
-    # Convenience method for the App class
-    #
-    def app(args = ARGV)
-      App.new(args).main
-    end
+  #
+  # Convenience method for the App class
+  #
+  def self.app(args = ARGV)
+    App.new(args).main
   end
 
   class App
@@ -48,16 +45,16 @@ module Kat
     #
     def init_options(args = nil)
       @args = case args
-      when nil    then []
-      when String then args.split
-      else             args
-      end
+              when nil    then []
+              when String then args.split
+              else             args
+              end
 
       @options = load_config || {}
 
-      Kat.options(@args).tap { |o|
+      Kat.options(@args).tap do |o|
         @options.merge!(o) { |k, ov, nv| o["#{ k }_given".intern] ? nv : ov }
-      }
+      end
 
       Kat::Colour.colour = @options[:colour]
     rescue NoMethodError => e
@@ -82,16 +79,16 @@ module Kat
     def main
       puts VERSION_STR
 
-      Kat::Search.selects.select { |k, v| @options[v[:select]] }.tap { |lists|
+      Kat::Search.selects.select { |k, v| @options[v[:select]] }.tap do |lists|
         if lists.empty?
           while running; end
         else
           puts format_lists lists
         end
-      }
+      end
     end
 
-  private
+    private
 
     #
     # Get the width of the terminal window
@@ -139,7 +136,7 @@ module Kat
 
         -> {
           i = 0
-          while searching do
+          while searching
             print "\rSearching...".yellow + '\\|/-'[i % 4]
             i += 1
             sleep 0.1
@@ -147,7 +144,7 @@ module Kat
         }
       ].map { |w| Thread.new { w.call } }.each(&:join)
 
-      puts (res = format_results)
+      puts((res = format_results))
 
       if res.size > 1
         case (answer = prompt)
@@ -156,7 +153,7 @@ module Kat
         when 'p' then @page -= 1 if prev?
         when 'q' then return false
         else
-          if (1..@kat.results[@page].size).include? (answer = answer.to_i)
+          if (1..@kat.results[@page].size).include?((answer = answer.to_i))
             print "\nDownloading".yellow <<
                   ": #{ @kat.results[@page][answer - 1][:title] }... "
             puts download @kat.results[@page][answer - 1]
@@ -173,21 +170,21 @@ module Kat
     # Format a list of options
     #
     def format_lists(lists)
-      lists.inject([nil]) { |buf, (k, v)|
-        opts = Kat::Search.send(v[:select])
-        buf << v[:select].to_s.capitalize
-        buf << nil unless Array === opts.values.first
+      lists.inject([nil]) do |buf, (_, val)|
+        opts = Kat::Search.send(val[:select])
+        buf << val[:select].to_s.capitalize
+        buf << nil unless opts.values.first.is_a? Array
         width = opts.keys.sort { |a, b| b.size <=> a.size }.first.size
-        opts.each { |k, v|
-          buf += if Array === v
-            [nil, "%#{ width }s => #{ v.shift }" % k] +
-            v.map { |e| ' ' * (width + 4) + e }
-          else
-            ["%-#{ width }s => #{ v }" % k]
-          end
-        }
+        opts.each do |k, v|
+          buf += if v.is_a? Array
+                   [nil, "%#{ width }s => #{ v.shift }" % k] +
+                     v.map { |e| ' ' * (width + 4) + e }
+                 else
+                   ["%-#{ width }s => #{ v }" % k]
+                 end
+        end
         buf << nil
-      }
+      end
     end
 
     #
@@ -208,14 +205,14 @@ module Kat
       buf << ("\r%-#{ main_width + 5 }s#{ '      Size     Age      Seeds Leeches' if !hide_info? || @show_info }" %
         ["Page #{ page + 1 } of #{ @kat.pages }", nil]).yellow
 
-      @kat.results[@page].each_with_index { |t, i|
+      @kat.results[@page].each_with_index do |t, i|
         age = t[:age].split "\xC2\xA0"
-        age = "%3d %-6s" % age
+        age = '%3d %-6s' % age
         # Filter out the crap that invariably infests torrent names
         title = t[:title].codepoints.map { |c| c > 31 && c < 127 ? c.chr : '?' }.join[0...main_width]
         buf << ("%2d. %-#{ main_width }s#{ ' %10s %10s %7d %7d' if !hide_info? or @show_info }" %
           [i + 1, title, t[:size], age, t[:seeds], t[:leeches]]).tap { |s| s.red! if t[:seeds] == 0 }
-      }
+      end
 
       buf << nil
     end
@@ -242,12 +239,12 @@ module Kat
              "#{ ', ' << '(n)'.cyan(true) << 'ext' if next? }" <<
              "#{ ', ' << '(p)'.cyan(true) << 'rev' if prev? }" <<
              "#{ ", #{ @show_info ? 'hide' : 'show' } " << '(i)'.cyan(true) << 'nfo' if hide_info? }" <<
-             ', ' << '(q)'.cyan(true) << 'uit: ') { |q|
+             ', ' << '(q)'.cyan(true) << 'uit: ') do |q|
         q.responses[:not_valid] = 'Invalid option.'
         q.validate = validation_regex
-      }
-    rescue RegexpError => e
-      puts (@kat.pages > 0 ? "Error reading the page\n" : "Could not connect to the site\n").red
+      end
+    rescue RegexpError
+      puts((@kat.pages > 0 ? "Error reading the page\n" : "Could not connect to the site\n").red)
 
       return 'q'
     end
@@ -260,12 +257,12 @@ module Kat
 
       uri = URI(URI.encode torrent[:download])
       uri.query = nil
-      file = "#{ @options[:output] || '.' }/" <<
+      file = "#{ @options[:output] || '.' }/" \
              "#{ torrent[:title].tr(' ', ?.).gsub(/[^a-z0-9()_.-]/i, '') }.torrent"
 
-      fail '404 File Not Found' if (res = Net::HTTP.start(uri.host) { |http|
+      fail '404 File Not Found' if (res = Net::HTTP.start(uri.host) do |http|
         http.get uri
-      }).code == '404'
+      end).code == '404'
 
       File.open(File.expand_path(file), 'w') { |f| f.write res.body }
 
@@ -278,13 +275,11 @@ module Kat
     # Load options from CONFIG if it exists
     #
     def load_config
-      (symbolise = -> h {
-        Hash === h ? Hash[h.map { |k, v| [k.intern, symbolise[v]] }] : h
-      })[YAML.load_file CONFIG] if File.readable? CONFIG
+      (symbolise = lambda do |h|
+        h.is_a?(Hash) ? Hash[h.map { |k, v| [k.intern, symbolise[v]] }] : h
+      end)[YAML.load_file CONFIG] if File.readable? CONFIG
     rescue => e
       warn "Failed to load #{ CONFIG }: #{ e }"
     end
-
   end
-
 end

data/lib/kat/colour.rb

@@ -1,23 +1,19 @@
 module Kat
-
   module Colour
-
     COLOURS = %w(black red green yellow blue magenta cyan white)
 
-    class << self
-      # From AwesomePrint.colorize? by Michael Dvorkin
-      # https://github.com/michaeldv/awesome_print/blob/master/lib/awesome_print/inspector.rb
-      def capable?
-        STDOUT.tty? && (ENV['TERM'] && ENV['TERM'] != 'dumb' || ENV['ANSICON'])
-      end
+    # From AwesomePrint.colorize? by Michael Dvorkin
+    # https://github.com/michaeldv/awesome_print/blob/master/lib/awesome_print/inspector.rb
+    def self.capable?
+      STDOUT.tty? && (ENV['TERM'] && ENV['TERM'] != 'dumb' || ENV['ANSICON'])
+    end
 
-      def colour=(f)
-        @@colour = f && capable?
-      end
+    def self.colour=(f)
+      @@colour = f && capable?
+    end
 
-      def colour?
-        @@colour
-      end
+    def self.colour?
+      @@colour
     end
 
     @@colour = capable?
@@ -26,14 +22,14 @@ module Kat
       @@colour
     end
 
-    COLOURS.each { |c|
+    COLOURS.each do |c|
       define_method(c) { |*args| colour c, args[0] }
       define_method("#{ c }!") { |*args| colour! c, args[0] }
-    }
+    end
 
     def uncolour
       case self
-      when String then gsub /\e\[[0-9;]+?m(.*?)\e\[0m/, '\\1'
+      when String then gsub(/\e\[[0-9;]+?m(.*?)\e\[0m/, '\\1')
       when Array  then map { |e| e.uncolour if e }
       else self
       end
@@ -48,12 +44,15 @@ module Kat
       self
     end
 
-  private
+    private
 
     def colour(name, intense = false)
       return case self
-             when String, Symbol then "\e[#{ intense ? 1 : 0 };#{ 30 + COLOURS.index(name) }m#{ self }\e[0m"
-             when Array          then map { |e| e.send name.to_s, intense if e }
+             when String, Symbol
+               "\e[#{ intense ? 1 : 0 };" \
+               "#{ 30 + COLOURS.index(name) }m#{ self }\e[0m"
+             when Array
+               map { |e| e.send name.to_s, intense if e }
              end if colour?
 
       self
@@ -62,14 +61,12 @@ module Kat
     def colour!(name, intense = false)
       case self
       when String then replace send(name.to_s, intense)
-      when Array  then each { |e| e.send "#{ name.to_s }!", intense if e }
+      when Array  then each { |e| e.send "#{ name }!", intense if e }
       end if colour?
 
       self
     end
-
   end
-
 end
 
 class String; include Kat::Colour end

data/lib/kat/field_map.rb

@@ -1,5 +1,4 @@
 module Kat
-
   FIELD_MAP = {
     exact:    { type: :string, desc: 'Exact phrase' },
     or:       { type: :string, desc: 'Optional words',    multi: true },
@@ -29,5 +28,4 @@ module Kat
     output:   { type: :string, desc: 'Directory to save torrents in', short: :o },
     colour:   {                desc: 'Output with colour',            short: :none }
   }.freeze
-
 end

data/lib/kat/options.rb

@@ -3,57 +3,50 @@ require File.dirname(__FILE__) + '/version'
 require 'trollop'
 
 module Kat
-
-  class << self
-    #
-    # Convenience method for the Options class
-    #
-    def options(args)
-      Options.parse args
-    end
+  #
+  # Convenience method for the Options class
+  #
+  def self.options(args)
+    Options.parse args
   end
 
   class Options
+    #
+    # Pick out the invocation options from the field map
+    #
+    def self.options_map
+      fields = %i(desc type multi select short)
 
-    class << self
-      #
-      # Pick out the invocation options from the field map
-      #
-      def options_map
-        fields = %i(desc type multi select short)
-
-        FIELD_MAP.inject({}) { |hash, (k, v)|
-          hash.tap { |h| h[k] = v.select { |f| fields.include? f } if v[:desc] }
-        }
+      FIELD_MAP.reduce({}) do |hash, (k, v)|
+        hash.tap { |h| h[k] = v.select { |f| fields.include? f } if v[:desc] }
       end
+    end
 
-      def parse(args)
-        Trollop::options(args) {
-          version VERSION_STR
-          banner <<-USAGE.gsub /^\s+\|/, ''
-            |#{ VERSION_STR }
-            |
-            |Usage: #{ File.basename __FILE__ } [options] <query>+
-            |
-            |  Options:
-          USAGE
-
-          Options.options_map.each { |k, v|
-            opt k,
-                v[:desc],
-                { type:  v[:type] || :boolean,
-                  multi: v[:multi],
-                  short: v[:short] }
-          }
-
-          Options.options_map.each { |k, v|
-            opt v[:select],
-                "List the #{ v[:select] } that may be used with --#{ k }",
-                short: :none if v[:select]
-          }
-        }
+    def self.parse(args)
+      Trollop.options(args) do
+        version VERSION_STR
+        banner <<-USAGE.gsub(/^\s+\|/, '')
+          |#{ VERSION_STR }
+          |
+          |Usage: #{ File.basename __FILE__ } [options] <query>+
+          |
+          |  Options:
+        USAGE
+
+        Options.options_map.each do |k, v|
+          opt k,
+              v[:desc],
+              type:  v[:type] || :boolean,
+              multi: v[:multi],
+              short: v[:short]
+        end
+
+        Options.options_map.each do |k, v|
+          opt v[:select],
+              "List the #{ v[:select] } that may be used with --#{ k }",
+              short: :none if v[:select]
+        end
       end
     end
-
   end
 end

data/lib/kat/search.rb

@@ -5,23 +5,20 @@ require 'net/http'
 require 'andand'
 
 module Kat
-
   BASE_URL     = 'http://kickass.to'
   RECENT_PATH  = 'new'
   SEARCH_PATH  = 'usearch'
   ADVANCED_URL = "#{ BASE_URL }/torrents/search/advanced/"
 
-  class << self
-    #
-    # Convenience methods for the Search class
-    #
-    def search(search_term = nil, opts = {})
-      Search.new search_term, opts
-    end
+  #
+  # Convenience methods for the Search class
+  #
+  def self.search(search_term = nil, opts = {})
+    Search.new search_term, opts
+  end
 
-    def quick_search(search_term = nil)
-      Search.quick_search search_term
-    end
+  def self.quick_search(search_term = nil)
+    Search.quick_search search_term
   end
 
   class Search
@@ -35,86 +32,35 @@ module Kat
 
     @@doc = nil
 
-    class << self
-
-      #
-      # Kat.quick_search will do a quick search and return the results
-      #
-      def quick_search(search_term = nil)
-        new(search_term).search
-      end
-
-      def field_map(type = nil)
-        return FIELD_MAP.dup unless type
-
-        FIELD_MAP.inject({}) { |hash, (k, v)|
-          hash.tap { |h|
-            case type
-            when :select then h[k] = { select: v[:select], id: v[:id] || k }
-            when :sort   then h[k] = v[:sort] and h[v[:sort]] = v[:sort]
-                              h[v[:id]] = v[:sort] if v[:id]
-            else              h[k] = v[type]
-            end if v[type]
-          }
-        }
-      end
-
-      def checks;  field_map :check  end
-      def inputs;  field_map :input  end
-      def selects; field_map :select end
-      def sorts;   field_map :sort   end
-
-    private
+    #
+    # Kat.quick_search will do a quick search and return the results
+    #
+    def self.quick_search(search_term = nil)
+      new(search_term).search
+    end
 
-      #
-      # Get a list of options for a particular selection field from the advanced search form
-      #
-      def field_options(label)
-        fail 'Unknown search field' unless selects.find { |k, v| k == label.intern }
-
-        url = URI(ADVANCED_URL)
-
-        @@doc ||= Nokogiri::HTML(Net::HTTP.start(url.host) { |http| http.get url }.body)
-
-        opts = @@doc.css('table.formtable td').find { |e|
-          e.text[/#{ label }/i]
-        }.next_element.first_element_child.children
-
-        unless (group = opts.css('optgroup')).empty?
-          # Categories
-          group.inject({}) { |cat, og|
-            cat.tap { |c|
-              c[og.attributes['label'].value] = og.children.map { |o|
-                o.attributes['value'].value
-              }
-            }
-          }
-        else
-          # Times, languages, platforms
-          opts.reject { |o| o.attributes.empty? }.inject({}) { |p, o|
-            p.tap { |p| p[o.text] = o.attributes['value'].value }
-          }
+    def self.field_map(type = nil)
+      return FIELD_MAP.dup unless type
+
+      FIELD_MAP.reduce({}) do |hash, (k, v)|
+        hash.tap do |h|
+          case type
+          when :select
+            h[k] = { select: v[:select], id: v[:id] || k }
+          when :sort
+            h[k] = v[:sort] && h[v[:sort]] = v[:sort]
+            h[v[:id]] = v[:sort] if v[:id]
+          else
+            h[k] = v[type]
+          end if v[type]
         end
-      rescue => e
-        { error: e }
-      end
-
-      #
-      # If method is a field name in SELECT_FIELDS, fetch the list of values.
-      #
-      def method_missing(method, *args, &block)
-        return super unless respond_to? method
-        field_options selects.find { |k, v| v[:select] == method }.first
-      end
-
-      #
-      # If method is a field name in SELECT_FIELDS, we can fetch the list of values
-      #
-      def respond_to_missing?(method, include_private = false)
-        !!selects.find { |k, v| v[:select] == method } || super
       end
+    end
 
-    end # class methods
+    def self.checks;  field_map :check  end
+    def self.inputs;  field_map :input  end
+    def self.selects; field_map :select end
+    def self.sorts;   field_map :sort   end
 
     #
     # Create a new +Kat::Search+ object to search Kickass Torrents.
@@ -139,9 +85,9 @@ module Kat
       str = [RECENT_PATH] if str[1].empty?
       str << page + 1 if page > 0
 
-      sorts.find { |k, v| @options[:sort] && k == @options[:sort].intern }.tap { |k, v|
+      sorts.detect { |k, v| @options[:sort] && k == @options[:sort].intern }.tap do |k, v|
         str << (k ? "?field=#{ v }&sorder=#{ options[:asc] ? 'asc' : 'desc' }" : '')
-      }
+      end
 
       str.join '/'
     end
@@ -152,13 +98,14 @@ module Kat
     # Raises ArgumentError if search_term is not a String, Symbol or Array
     #
     def query=(search_term)
-      @search_term = case search_term
+      @search_term =
+        case search_term
         when nil, ''        then []
         when String, Symbol then [search_term]
         when Array          then search_term.flatten.select { |e| [String, Symbol].include? e.class }
-        else fail ArgumentError, "search_term must be a String, Symbol or Array. " <<
+        else fail ArgumentError, 'search_term must be a String, Symbol or Array. ' \
                                  "#{ search_term.inspect } given."
-      end
+        end
 
       build_query
     end
@@ -177,8 +124,8 @@ module Kat
     # Raises ArgumentError if options is not a Hash
     #
     def options=(options)
-      fail ArgumentError, "options must be a Hash. " <<
-                          "#{ options.inspect } given." unless Hash === options
+      fail ArgumentError, 'options must be a Hash. ' \
+                          "#{ options.inspect } given." unless options.is_a?(Hash)
 
       @options.merge! options
 
@@ -194,13 +141,13 @@ module Kat
     # a result set limited to the 25 results Kickass Torrents returns itself. Will
     # cache results for subsequent calls of search with the same query string.
     #
-    def search(page = 0)
+    def search(page_num = 0)
       @error = nil
       @message = nil
 
-      search_proc = -> page {
+      search_proc = lambda do |page|
         begin
-          uri = URI(URI::encode(to_s page))
+          uri = URI(URI.encode(to_s page))
           res = Net::HTTP.get_response(uri)
           if res.code == '301'
             path = Net::HTTP::Get.new(res.header['location'])
@@ -212,7 +159,7 @@ module Kat
 
           doc = Nokogiri::HTML(res.body)
 
-          @results[page] = doc.xpath('//table[@class="data"]/tr[position()>1]/td[1]').map { |node|
+          @results[page] = doc.xpath('//table[@class="data"]/tr[position()>1]/td[1]').map do |node|
             { path:     node.css('a.torType').first.andand.attr('href'),
               title:    node.css('a.cellMainLink').text,
               magnet:   node.css('a.imagnet').first.andand.attr('href'),
@@ -221,8 +168,8 @@ module Kat
               files:    (node = node.next_element).text.to_i,
               age:      (node = node.next_element).text,
               seeds:    (node = node.next_element).text.to_i,
-              leeches:  (node = node.next_element).text.to_i }
-          }
+              leeches:  node.next_element.text.to_i }
+          end
 
           # If we haven't previously performed a search with this query string, get the
           # number of pages from the pagination bar at the bottom of the results page.
@@ -234,16 +181,16 @@ module Kat
         rescue => e
           @error = { error: e }
         end unless @results[page] || (@pages > -1 && page >= @pages)
-      }
+      end
 
       # Make sure we do a query for the first page of results before getting
       # subsequent pages in order to correctly figure out the total number of
       # pages of results.
-      pages = (Range === page ? page.to_a : [page])
+      pages = (page_num.is_a?(Range) ? page_num.to_a : [page_num])
       pages.unshift(0) if @pages == -1 && !pages.include?(0)
       pages.each { |i| search_proc.call i }
 
-      results[Range === page ? page.max : page]
+      results[page_num.is_a?(Range) ? page_num.max : page_num]
     end
 
     #
@@ -276,7 +223,61 @@ module Kat
       "#{ BASE_URL }/#{ query_str page }"
     end
 
-  private
+    private
+
+    #
+    # Get a list of options for a particular selection field from the advanced search form
+    #
+    def self.field_options(label)
+      fail 'Unknown search field' unless selects.detect do |k, v|
+        k == label.intern
+      end
+
+      url = URI(ADVANCED_URL)
+
+      req = Net::HTTP.start(url.host) { |http| http.get url }
+      @@doc ||= Nokogiri::HTML(req.body)
+
+      opts = @@doc.css('table.formtable td').detect do |e|
+        e.text[/#{ label }/i]
+      end
+
+      opts = opts.next_element.first_element_child.children
+
+      if (group = opts.css('optgroup')).empty?
+        # Times, languages, platforms
+        opts.reject { |o| o.attributes.empty? }.reduce({}) do |p, o|
+          p.tap { |p1| p1[o.text] = o.attributes['value'].value }
+        end
+      else
+        # Categories
+        group.reduce({}) do |cat, og|
+          cat.tap do |c|
+            c[og.attributes['label'].value] = og.children.map do |o|
+              o.attributes['value'].value
+            end
+          end
+        end
+      end
+    rescue => e
+      { error: e }
+    end
+
+    #
+    # If method is a field name in SELECT_FIELDS, fetch the list of values.
+    #
+    def self.method_missing(method, *args, &block)
+      return super unless respond_to? method
+      field_options selects.detect { |k, v| v[:select] == method }.first
+    end
+
+    #
+    # If method is a field name in SELECT_FIELDS,
+    # we can fetch the list of values
+    #
+    def self.respond_to_missing?(method, include_private = false)
+      !!selects.detect { |k, v| v[:select] == method } || super
+    end
 
     #
     # Clear out the query and rebuild it from the various stored options. Also clears out the
@@ -293,17 +294,22 @@ module Kat
 
       @query += inputs.select  { |k, v| @options[k] }.map { |k, v| "#{ k }:#{ @options[k] }" }
       @query += checks.select  { |k, v| @options[k] }.map { |k, v| "#{ k }:1" }
-      @query += selects.select { |k, v|
+
+      byzantine = selects.select do |k, v|
         (v[:id].to_s[/^.*_id$/] && @options[k].to_s.to_i > 0) ||
         (v[:id].to_s[/^[^_]+$/] && @options[k])
-      }.map { |k, v| "#{ v[:id] }:#{ @options[k] }" }
+      end
+
+      @query += byzantine.map { |k, v| "#{ v[:id] }:#{ @options[k] }" }
     end
 
     #
     # Fetch a list of values from the results set given by name
     #
     def results_column(name)
-      @results.compact.map { |rs| rs.map { |r| r[name] || r[name[0...-1].intern] } }.flatten
+      @results.compact.map do |rs|
+        rs.map { |r| r[name] || r[name[0...-1].intern] }
+      end.flatten
     end
 
     #
@@ -318,7 +324,5 @@ module Kat
       !(@results.empty? || @results.first.empty?) &&
         (@results.first.first[method] || @results.first.first[method[0..-2].intern]) || super
     end
-
   end
-
 end

data/lib/kat/version.rb

@@ -1,6 +1,6 @@
 module Kat
   NAME = 'Kickass Torrents Search'
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
   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

@@ -23,7 +23,7 @@ describe Kat::App do
 
     it 'creates a validation regex' do
       app.page.must_equal 0
-      app.instance_exec {
+      app.instance_exec do
         @window_width = 80
 
         prev?.wont_equal true
@@ -42,8 +42,9 @@ describe Kat::App do
 
         prev?.must_equal true
         next?.wont_equal true
-        # Skip the test if there's no results. We really only want to test in ideal
-        # network conditions and no results here are an indication that's not the case
+        # Skip the test if there's no results. We really only want to test in
+        # ideal network conditions and no results here are an indication that's
+        # not the case
         validation_regex.must_equal(
           /^([pq]|[1-#{ [9, n].min }]#{
           "|1[0-#{ [9, n - 10].min }]" if n > 9
@@ -51,19 +52,19 @@ describe Kat::App do
         ) if n > 0
 
         @page = 0
-      }
+      end
     end
 
     it 'deals with terminal width' do
-      app.instance_exec {
+      app.instance_exec do
         set_window_width
-        hide_info?.must_equal (@window_width < 81)
-      }
+        hide_info?.must_equal(@window_width < 81)
+      end
     end
 
     it 'formats a list of options' do
-      app.instance_exec {
-        %i(category added platform language).each { |s|
+      app.instance_exec do
+        %i(category added platform language).each do |s|
           list = format_lists(s => Kat::Search.selects[s])
 
           list.must_be_instance_of Array
@@ -71,22 +72,28 @@ describe Kat::App do
 
           [0, 2, list.size - 1].each { |i| list[i].must_be_nil }
 
-          list[1].must_equal case s
-          when :added    then 'Times'
-          when :category then 'Categories'
-          else                s.to_s.capitalize << 's'
-          end
-
-          3.upto(list.size - 2) { |i| list[i].must_be_instance_of String } unless s == :category
-          3.upto(list.size - 2) { |i| list[i].must_match(/^\s*([A-Z]+ => )?[a-z0-9-]+/) if list[i] } if s == :category
-        }
-      }
+          str = case s
+                when :added    then 'Times'
+                when :category then 'Categories'
+                else                s.to_s.capitalize << 's'
+                end
+          list[1].must_equal str
+
+          3.upto(list.size - 2) do |i|
+            list[i].must_be_instance_of String
+          end unless s == :category
+
+          3.upto(list.size - 2) do |i|
+            list[i].must_match(/^\s*([A-Z]+ => )?[a-z0-9-]+/) if list[i]
+          end if s == :category
+        end
+      end
     end
 
     it 'formats a list of torrents' do
       Kat::Colour.colour = false
 
-      app.instance_exec {
+      app.instance_exec do
         set_window_width
         list = format_results
 
@@ -95,33 +102,33 @@ describe Kat::App do
 
         list.last.must_be_nil
 
-        (2..list.size - 2).each { |i|
-          list[i].must_match /^(\s[1-9]|[12][0-9])\. .*/
-        }
-      }
+        (2..list.size - 2).each do |i|
+          list[i].must_match(/^(\s[1-9]|[12][0-9])\. .*/)
+        end
+      end
     end
 
     it 'downloads data from a URL' do
       Kat::Colour.colour = false
 
-      app.instance_exec {
+      app.instance_exec do
         s = 'foobar'
-        result = download({ download: 'http://google.com', title: s })
+        result = download(download: 'http://google.com', title: s)
         result.must_equal :done
-        File.exists?(File.expand_path "./#{ s }.torrent").must_equal true
+        File.exist?(File.expand_path "./#{ s }.torrent").must_equal true
         File.delete(File.expand_path "./#{ s }.torrent")
-      }
+      end
     end
 
     it 'returns an error message when a download fails' do
       Kat::Colour.colour = false
 
-      app.instance_exec {
-        result = download({ download: 'http://foo.bar', title: 'foobar' })
+      app.instance_exec do
+        result = download(download: 'http://foo.bar', title: 'foobar')
         result.must_be_instance_of Array
         result.first.must_equal :failed
-        result.last.must_match /^getaddrinfo/
-      }
+        result.last.must_match(/^getaddrinfo/)
+      end
     end
   end
 end

data/test/kat/test_colour.rb

@@ -14,18 +14,18 @@ describe Kat::Colour do
     end
 
     it 'has colour methods' do
-      colours.each { |c|
+      colours.each do |c|
         ''.respond_to?(c).must_equal true
         :s.respond_to?(c).must_equal true
         [].respond_to?(c).must_equal true
         {}.respond_to?(c).wont_equal true
-      }
+      end
     end
 
     it 'colours strings' do
       Kat::Colour.colour = true
 
-      colours.each_with_index { |c, i|
+      colours.each_with_index do |c, i|
         str = 'foobar'
         result = "\e[0;#{ 30 + i }mfoobar\e[0m"
         intense_result = "\e[1;#{ 30 + i }mfoobar\e[0m"
@@ -42,7 +42,7 @@ describe Kat::Colour do
         str = 'foobar'
         str.send("#{ c }!", true).must_equal intense_result
         str.must_equal intense_result
-      }
+      end
     end
 
     it 'uncolour strings' do
@@ -59,7 +59,7 @@ describe Kat::Colour do
     it 'colours symbols' do
       Kat::Colour.colour = true
 
-      colours.each_with_index { |c, i|
+      colours.each_with_index do |c, i|
         sym = :foobar
         result = "\e[0;#{ 30 + i }mfoobar\e[0m"
         intense_result = "\e[1;#{ 30 + i }mfoobar\e[0m"
@@ -75,7 +75,7 @@ describe Kat::Colour do
 
         sym.send("#{ c }!", true).must_equal :foobar
         sym.must_equal :foobar
-      }
+      end
     end
 
     it 'does not uncolour symbols' do
@@ -91,7 +91,7 @@ describe Kat::Colour do
     it 'colours arrays of strings and symbols' do
       Kat::Colour.colour = true
 
-      colours.each_with_index { |c, i|
+      colours.each_with_index do |c, i|
         s = ['foobar', :foobar, nil, ['foobar', :foobar, nil]]
         t = ['foobar', :foobar, nil, ['foobar', :foobar, nil]]
         result = [
@@ -110,7 +110,7 @@ describe Kat::Colour do
         result[3][1] = :foobar
         s.send("#{ c }!").must_equal result
         s.must_equal result
-      }
+      end
     end
 
     it 'uncolours arrays of strings' do

data/test/kat/test_options.rb

@@ -13,22 +13,22 @@ describe Kat::Options do
     end
 
     it 'has symbolised keys' do
-      opts.keys.each { |key|
+      opts.keys.each do |key|
         key.must_be_instance_of Symbol
         key.wont_equal :size
-      }
+      end
     end
 
     it 'has a hash for values, each with a description' do
-      opts.values.each { |value|
+      opts.values.each do |value|
         value.must_be_instance_of Hash
         value.keys.must_include :desc
-      }
+      end
     end
 
     it 'has symbolised keys in each value' do
-      opts.each { |key, value|
-        value.each { |k, v|
+      opts.each do |key, value|
+        value.each do |k, v|
           k.must_be_instance_of Symbol
           case k
           when :desc
@@ -37,12 +37,12 @@ describe Kat::Options do
             v.must_equal true
           when :short
             v.must_be_instance_of Symbol
-            v.must_match /\A([a-z]|none)\Z/
+            v.must_match(/\A([a-z]|none)\Z/)
           else
             v.must_be_instance_of Symbol
           end
-        }
-      }
+        end
+      end
     end
   end
 
@@ -55,9 +55,9 @@ describe Kat::Options do
 
       opts.must_be_instance_of Hash
       opts.wont_be_empty
-      opts.values.each { |value|
+      opts.values.each do |value|
         [[], nil, false].must_include value
-      }
+      end
     end
 
     it 'returns an options hash with some options switched on' do
@@ -68,9 +68,9 @@ describe Kat::Options do
 
       opts[:or].must_equal %w(baz)
       opts[:sort].must_equal 'age'
-      %i(colour colour_given or_given sort_given).each { |key|
+      %i(colour colour_given or_given sort_given).each do |key|
         opts[key].must_equal true
-      }
+      end
     end
   end
 

data/test/kat/test_search.rb

@@ -7,7 +7,7 @@ blue_peter.go.go 1
 describe Kat::Search do
 
   let(:kat) { Kat.search 'test' }
-  let(:kat_opts) { Kat.search 'test', { category: 'books' } }
+  let(:kat_opts) { Kat.search 'test', category: 'books' }
 
   describe 'basic search' do
     it 'returns a full result set' do
@@ -33,15 +33,15 @@ describe Kat::Search do
     end
 
     it 'wont respond to result fields before a search' do
-      %i(titles files).each { |s|
+      %i(titles files).each do |s|
         kat.respond_to?(s).must_equal false
-      }
+      end
     end
 
     it 'responds to result fields after a search' do
-      %i(titles files).each { |s|
+      %i(titles files).each do |s|
         blue_peter.respond_to?(s).must_equal true
-      }
+      end
     end
 
     it 'returns identical result sets' do
@@ -56,7 +56,7 @@ describe Kat::Search do
     it 'returns a valid query string with options' do
       bp = blue_peter.dup
       bp.options = { user: :foobar }
-      bp.options.must_equal({ user: :foobar })
+      bp.options.must_equal(user: :foobar)
       bp.query_str(1).must_equal 'usearch/user:foobar/2/'
       bp.results.must_be_empty
       bp.pages.must_equal(-1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kat
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Fission Xuiptz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Kickass Torrents Interface