strike_api 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f52d0ba495cca0b1700a7c530780d736087dd7a
-  data.tar.gz: 4436491a814f90e98d43247a2d1a4b89c69a517d
+  metadata.gz: 1031c8008c91709432a93f169653e93f09c73c00
+  data.tar.gz: 0da2024794b5751dde0d152abf7e3556cc7f7eb4
 SHA512:
-  metadata.gz: c0d48f748a531b55e35f69cbf764487eaba97361ecb1f21175e881752395bf6802340cb167e372527d36396194c152558200ddd9f6265191fe4518fa733c3bb9
-  data.tar.gz: db2f904919f5a2435f2d8471d04ae12dddc435eda5c6c3e23d98dc61bce81fee3b0d6309398545a7aa53eb27580ef9a3a60f8e5fe7f54fd4fd36b16fc8aef265
+  metadata.gz: 75b479f836b0a0adc14d486161d0152cf6072a32ce7797dbdb37256feed7dc95224b1b40872971edfbdce381f0dc7a14514960bb59b24a7e39687a05d97ccd37
+  data.tar.gz: 29eafb2d367c71687548f5368cfdc61c85339901ab5cbbc70a40db0019df98d0ed5c63eb0235d73d221ff8fb960755e11712ba9c6667b0962c6930d0e67091d4

data/.editorconfig

@@ -2,7 +2,8 @@
 root = true
 
 [*]
-indent_style = tab
+indent_style = space
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

data/README.md

@@ -27,7 +27,7 @@ Or install it yourself as:
 ```ruby
 # Param 1: torrent hash string or array of torrent hash strings
 # Returns: array of torrent objects (objects include file_info data)
-torrentInfoArray = StrikeApi::Torrent.find(yourTorrentHash)
+torrent_info_Array = StrikeAPI::Torrent.find(yourTorrentHash)
 ```
 
 ### Search
@@ -35,18 +35,18 @@ torrentInfoArray = StrikeApi::Torrent.find(yourTorrentHash)
 ```ruby
 # Param 1: search phrase, example: "ubuntu iso"
 # Returns: array of torrent objects
-searchResults = StrikeApi::Torrent.search(yourSearchPhrase)
+search_results = StrikeAPI::Torrent.search(search_phrase)
 
 # Param 1: search phrase, example: "ubuntu iso"
-# Param 2: category or sub category, examples: "Music", "Documentary"
+# Param 2: category or subcategory, examples: "Music", "Documentary"
 # Returns: array of torrent objects
-searchResults = StrikeApi::Torrent.search(yourSearchPhrase, yourCatagoryOrSubCategory)
+search_results = StrikeAPI::Torrent.search(search_phrase, category_or_subcategory)
 
 # Param 1: search phrase, example: "ubuntu iso"
 # Param 2: category, example: "Applications"
-# Param 3: sub category, example: "Windows"
+# Param 3: subcategory, example: "Windows"
 # Returns: array of torrent objects
-searchResults = StrikeApi::Torrent.search(yourSearchPhrase, yourCatagory, yourSubCategory)
+search_results = StrikeAPI::Torrent.search(search_phrase, category, subcategory)
 ```
 
 ### Top torrents
@@ -54,17 +54,17 @@ searchResults = StrikeApi::Torrent.search(yourSearchPhrase, yourCatagory, yourSu
 ```ruby
 # Param 1: category, examples: "Books", "all"
 # Returns: top 100 torrents
-topResults = StrikeApi::Torrent.top(yourCatagory)
+top_results = StrikeAPI::Torrent.top(category)
 ```
 
 ### Categories and sub categories
 
 ```ruby
 # Returns: array of valid categories
-categoryArray = StrikeApi::Torrent.catagoriesAvailable()
+category_array = StrikeAPI::Torrent.categories_available()
 
-# Returns: array of valid sub categories
-subCategoryArray = StrikeApi::Torrent.subCatagoriesAvailable()
+# Returns: array of valid subcategories
+subcategory_array = StrikeAPI::Torrent.subcategories_available()
 ```
 
 See tests for more usage examples.
@@ -74,6 +74,12 @@ See tests for more usage examples.
 1. Better commenting
 2. ~~Provide usage examples in readme~~
 
+## Testing
+
+```
+rake test
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/marshallford/strike_api/fork )

data/Rakefile

@@ -1,2 +1,8 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
+Rake::TestTask.new do |t|
+  t.pattern = 'test/**/*_test.rb'
+end
+
+task :default => [:test]

data/lib/strike_api/torrent.rb

@@ -2,133 +2,137 @@ require 'httparty'
 require 'json'
 require 'cgi'
 
-API_URL = "https://getstrike.net/api/v2/torrents"
+API_URL = 'https://getstrike.net/api/v2/torrents'
 
-module StrikeApi
-	class Torrent
-		attr_reader :hash, :title, :category, :sub_category, :seeds, :leeches, :file_count, :size, :download_count, :upload_date, :uploader_username, :magnet_uri, :file_info
+module StrikeAPI
+  class Torrent
+    attr_reader :hash, :title, :category, :subcategory, :seeds, :leeches, :file_count, :size, :download_count, :upload_date, :uploader_username, :magnet_uri, :file_info
 
-		# Constructor for torrent objects
-	    def initialize(attributes)
-		    @hash = attributes["torrent_hash"]
-		    @title = attributes["torrent_title"]
-		    @category = attributes["torrent_category"]
-		    @sub_category = attributes["sub_category"]
-		    @seeds = attributes["seeds"]
-		    @leeches = attributes["leeches"]
-		    @file_count = attributes["file_count"]
-			@size = attributes["size"]
-			# @download_count = attributes["download_count"] # Shown in documentation, not implemented in the API.
-		    @upload_date = attributes["upload_date"]
-		    @uploader_username = attributes["uploader_username"]
-		    @magnet_uri = attributes["magnet_uri"]
-		    if(attributes.has_key?("file_info")) # file info is only included in hash searches (the find method)
-		    	file_names = attributes["file_info"]["file_names"].to_a
-		    	file_lengths = attributes["file_info"]["file_lengths"].to_a
-		    	@file_info = Array.new
-		    	file_names.each_with_index do |item, i|
-		    		@file_info[i] = [file_names[i],file_lengths[i]]
-		    	end
-		    end
-		end
+    # Constructor for torrent objects
+    def initialize(attributes)
+      @hash = attributes['torrent_hash']
+      @title = attributes['torrent_title']
+      @category = attributes['torrent_category']
+      @subcategory = attributes['sub_category']
+      @seeds = attributes['seeds']
+      @leeches = attributes['leeches']
+      @file_count = attributes['file_count']
+      @size = attributes['size']
+      # @download_count = attributes['download_count'] # Shown in API documentation, not implemented in the API.
+      @upload_date = attributes['upload_date']
+      @uploader_username = attributes['uploader_username']
+      @magnet_uri = attributes['magnet_uri']
+      # file info is only included in hash searches (the find method)
+      if(attributes.has_key?('file_info'))
+        file_names = attributes['file_info']['file_names'].to_a
+        file_lengths = attributes['file_info']['file_lengths'].to_a
+        @file_info = Array.new
+        file_names.each_with_index do |item, i|
+          @file_info[i] = [file_names[i],file_lengths[i]]
+        end
+      end
+    end
 
-		# Allows for both a single torrentHash via a string and multiple via an array of torrentHash strings.
-		# Regardless of input, the output will be in the form of an array.
-	  	def self.find(torrentHash)
-  			hashListStr = ""
-  			torrentHash = Array(torrentHash)
-  			if(torrentHash.length > 50)
-  				raise "Strike API accepts a maximum of 50 hashes per query"
-  			end
-  			torrentHash.length.times do |i|
-  				hashListStr += torrentHash[i] + ","
-  			end
-			response =  HTTParty.get("#{API_URL}/info/?hashes=#{hashListStr}")
-			errorChecker(response)
-    		torrentsJSON = JSON.parse(response.body)
-      		torrentsJSON["torrents"].map { |attributes| new(attributes) }
-	    end
+    # Allows for both a single torrent_hash via a string and multiple via an array of torrent_hash strings.
+    # Regardless of input, the output will be in the form of an array.
+    def self.find(torrent_hash)
+      hash_list_str = ''
+      torrent_hash = Array(torrent_hash)
+      if(torrent_hash.length > 50)
+        raise 'Strike API accepts a maximum of 50 hashes per query'
+      end
+      torrent_hash.length.times do |i|
+        hash_list_str += torrent_hash[i] + ','
+      end
+      response =  HTTParty.get("#{API_URL}/info/?hashes=#{hash_list_str}")
+      error_checker(response)
+      torrents_json = JSON.parse(response.body)
+      torrents_json['torrents'].map { |attributes| new(attributes) }
+    end
 
-	    def self.search(*input)
-	    	searchPhrase = CGI::escape(input[0].strip)
-	    	case input.length
-	    	when 1
-	    		response = HTTParty.get("#{API_URL}/search/?phrase=#{searchPhrase}")
-	    	when 2
-	    		if(categoryChecker(input[1]) == "category") # second input is a category
-	    			response = HTTParty.get("#{API_URL}/search/?phrase=#{searchPhrase}&category=#{input[1]}")
-	    		elsif(categoryChecker(input[1]) == "subCategory") # second input is a sub category
-	    			response = HTTParty.get("#{API_URL}/search/?phrase=#{searchPhrase}&subcategory=#{input[1]}")
-	    		else # second input is neither a category or sub category
-	    			raise "The category/sub category entered is not valid"
-	    		end
-	    	when 3 # assumes order is searchPhrase,category,subCategory
-	    		if(categoryChecker(input[1]) != "category")
-	    			raise "The category is not valid"
-	    		elsif(categoryChecker(input[2]) != "subCategory")
-	    			raise "The sub category is not valid"
-	    		end
-	    		response = HTTParty.get("#{API_URL}/search/?phrase=#{searchPhrase}&category=#{input[1]}&subcategory=#{input[2]}")
-	    	else
-	    		raise "Invalid number of parameters: input <= 3"
-	    	end
-	      	errorChecker(response)
-	      	torrentsJSON = JSON.parse(response.body)
-	      	torrentsJSON["torrents"].map { |attributes| new(attributes) }
-	    end
+    def self.search(*input)
+      search_phrase = CGI::escape(input[0].strip)
+      case input.length
+      when 1
+        response = HTTParty.get("#{API_URL}/search/?phrase=#{search_phrase}")
+      when 2
+        if(category_checker(input[1]) == 'category') # second input is a category
+          response = HTTParty.get("#{API_URL}/search/?phrase=#{search_phrase}&category=#{input[1]}")
+        elsif(category_checker(input[1]) == 'subcategory') # second input is a sub category
+          response = HTTParty.get("#{API_URL}/search/?phrase=#{search_phrase}&subcategory=#{input[1]}")
+        else # second input is neither a category or sub category
+          raise 'The category/subcategory entered is not valid'
+        end
+      when 3 # assumes order is search_phrase,category,subcategory
+        if(category_checker(input[1]) != 'category')
+          raise 'The category is not valid'
+        elsif(category_checker(input[2]) != 'subcategory')
+          raise 'The subcategory is not valid'
+        end
+        response = HTTParty.get("#{API_URL}/search/?phrase=#{search_phrase}&category=#{input[1]}&subcategory=#{input[2]}")
+      else
+        raise 'Invalid number of parameters: input <= 3'
+      end
+      error_checker(response)
+      torrents_json = JSON.parse(response.body)
+      torrents_json['torrents'].map { |attributes| new(attributes) }
+    end
 
-	    def self.top(input)
-	    	searchPhrase = CGI::escape(input.strip)
-			if((categoryChecker(input) != "category") && input.strip.downcase != "all") # all is also a valid top category
-	   			raise "The category is not valid"
-	   		end
-			response = HTTParty.get("#{API_URL}/top/?category=#{input}")
-			errorChecker(response)
-	      	torrentsJSON = JSON.parse(response.body)
-	      	torrentsJSON["torrents"].map { |attributes| new(attributes) }
-	    end
+    def self.top(input)
+      search_phrase = CGI::escape(input.strip)
+      if((category_checker(input) != 'category') && input.strip.downcase != 'all') # all is also a valid top category
+        raise 'The category is not valid'
+      end
+      response = HTTParty.get("#{API_URL}/top/?category=#{input}")
+      error_checker(response)
+      torrents_json = JSON.parse(response.body)
+      torrents_json['torrents'].map { |attributes| new(attributes) }
+    end
 
-	    # Returns list of categories available
-	    def self.catagoriesAvailable
-	    	return ["Anime","Applications","Books","Games","Movies","Music","Other","TV","XXX"]
-	    end
+    # Returns list of categories available
+    def self.categories_available
+      return ['Anime','Applications','Books','Games','Movies','Music','Other','TV','XXX']
+    end
 
-	    # Returns list of sub categories available
-	    def self.subCatagoriesAvailable
-	    	return ["Highres Movies","Hentai","HD Video","Handheld","Games","Fiction","English-translated","Ebooks","Dubbed Movies","Documentary","Concerts","Comics","Books","Bollywood","Audio books","Asian","Anime Music Video","Animation","Android","Academic","AAC","3D Movies","XBOX360","Windows","Wii","Wallpapers","Video","Unsorted","UNIX","UltraHD","Tutorials","Transcode","Trailer","Textbooks","Subtitles","Soundtrack","Sound clips","Radio Shows","PSP","PS3","PS2","Poetry","Pictures","PC","Other XXX","Other TV","Other Music","Other Movies","Other Games","Other Books","Other Applications","Other Anime","Non-fiction","Newspapers","Music videos","Mp3","Movie clips","Magazines","Mac","Lossless","Linux","Karaoke","iOS"]
-	    end
+    # Returns list of sub categories available
+    def self.subcategories_available
+      return ['Highres Movies','Hentai','HD Video','Handheld','Games','Fiction','English-translated','Ebooks','Dubbed Movies','Documentary','Concerts','Comics','Books','Bollywood','Audio books','Asian','Anime Music Video','Animation','Android','Academic','AAC','3D Movies','XBOX360','Windows','Wii','Wallpapers','Video','Unsorted','UNIX','UltraHD','Tutorials','Transcode','Trailer','Textbooks','Subtitles','Soundtrack','Sound clips','Radio Shows','PSP','PS3','PS2','Poetry','Pictures','PC','Other XXX','Other TV','Other Music','Other Movies','Other Games','Other Books','Other Applications','Other Anime','Non-fiction','Newspapers','Music videos','Mp3','Movie clips','Magazines','Mac','Lossless','Linux','Karaoke','iOS']
+    end
 
-	    def self.categoryChecker(str)
-	    	downcasedCategories = catagoriesAvailable().map(&:downcase)
-	    	downcasedSubCategories = subCatagoriesAvailable().map(&:downcase)
-	    	if(downcasedCategories.include? str.strip.downcase)
-	    		return "category"
-	    	elsif(downcasedSubCategories.include? str.strip.downcase)
-	    		return "subCategory"
-	    	else
-	    		return -1
-	    	end
-	    end
-	    # Checks for 4XX errors and onward. Examples: 404, 502, 522
-	    def self.errorChecker(response)
-	    	code = response.code
-	    	message = response.message
-	    	if (valid_json?(response.body) && JSON.parse(response.body)["message"])
-	    		message = JSON.parse(response.body)["message"]
-	    	end
-	    	if(code >= 400)
-	    		raise "Strike API error: #{code} - #{message}"
-	    	end
-	    end
-	    # Checks for valid json
-	    def self.valid_json?(json)
-  			begin
-    			JSON.parse(json)
-    			return true
-  			rescue Exception => e
-    			return false
-  			end
-		end
-	   	private_class_method :errorChecker, :categoryChecker, :valid_json?
-	end
+    def self.category_checker(str)
+      downcased_categories = categories_available().map(&:downcase)
+      downcased_subcategories = subcategories_available().map(&:downcase)
+      if(downcased_categories.include? str.strip.downcase)
+        return 'category'
+      elsif(downcased_subcategories.include? str.strip.downcase)
+        return 'subcategory'
+      else
+        return -1
+      end
+    end
+
+    # Checks for 4XX errors and onward. Examples: 404, 502, 522
+    def self.error_checker(response)
+      code = response.code
+      message = response.message
+      if (valid_json?(response.body) && JSON.parse(response.body)['message'])
+        message = JSON.parse(response.body)['message']
+      end
+      if(code >= 400)
+        raise "Strike API error: #{code} - #{message}"
+      end
+    end
+
+    # Checks for valid json
+    def self.valid_json?(json)
+      begin
+        JSON.parse(json)
+        return true
+      rescue Exception => e
+        return false
+      end
+    end
+
+    private_class_method :error_checker, :category_checker, :valid_json?
+  end
 end

data/lib/strike_api/version.rb

@@ -1,3 +1,3 @@
-module StrikeApi
-	VERSION = "1.0.5"
+module StrikeAPI
+  VERSION = '1.0.6'
 end

data/lib/strike_api.rb

@@ -1,2 +1,2 @@
-require_relative "strike_api/version"
-require_relative "strike_api/torrent"
+require_relative 'strike_api/version'
+require_relative 'strike_api/torrent'

data/strike_api.gemspec

@@ -4,25 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'strike_api/version'
 
 Gem::Specification.new do |spec|
-	spec.name          = "strike_api"
-	spec.version       = StrikeApi::VERSION
-	spec.authors       = ["Marshall Ford","Brett Chastain"]
-	spec.email         = ["inbox@marshallford.me"]
+	spec.name          = 'strike_api'
+	spec.version       = StrikeAPI::VERSION
+	spec.authors       = ['Marshall Ford','Brett Chastain']
+	spec.email         = ['inbox@marshallford.me']
 	spec.summary       = %q{Wrapper for the Strike API.}
-	spec.description   = %q{API wrapper for the Strike Search website (https://getstrike.net/torrents/)}
-	spec.homepage      = "https://github.com/marshallford/strike_api"
-	spec.license       = "MIT"
+	spec.description   = %q{Wrapper for the Strike Search website/API (https://getstrike.net/torrents/)}
+	spec.homepage      = 'https://github.com/marshallford/strike_api'
+	spec.license       = 'MIT'
 
 	spec.files         = `git ls-files -z`.split("\x0")
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-	spec.require_paths = ["lib"]
+	spec.require_paths = ['lib']
 
-	spec.add_development_dependency "bundler"
-	spec.add_development_dependency "rake"
-	spec.add_development_dependency "minitest"
-	spec.add_development_dependency "vcr"
-	spec.add_development_dependency "webmock"
-	spec.add_dependency "httparty"
-	spec.add_dependency "json"
+	spec.add_development_dependency 'bundler'
+	spec.add_development_dependency 'rake'
+	spec.add_development_dependency 'minitest'
+	spec.add_development_dependency 'vcr'
+	spec.add_development_dependency 'webmock'
+	spec.add_dependency 'httparty'
+	spec.add_dependency 'json'
 end

data/test/test_helper.rb

@@ -4,6 +4,6 @@ require 'webmock/minitest'
 require 'vcr'
 
 VCR.configure do |c|
-	c.cassette_library_dir = "test/fixtures"
-  	c.hook_into :webmock
+	c.cassette_library_dir = 'test/fixtures'
+  c.hook_into :webmock
 end

data/test/torrent/torrent_test.rb

@@ -1,275 +1,274 @@
 require './test/test_helper'
 
 class StrikeTorrentTest < Minitest::Test
+  def test_exists
+    assert StrikeAPI::Torrent
+  end
 
-	def test_exists
-   		assert StrikeApi::Torrent
-  	end
+  def test_find_single_torrent
+    VCR.use_cassette('test_find_single_torrent') do
+      result = StrikeAPI::Torrent.find('156B69B8643BD11849A5D8F2122E13FBB61BD041')[0]
+      assert_equal StrikeAPI::Torrent, result.class
+      assert_equal '156B69B8643BD11849A5D8F2122E13FBB61BD041', result.hash
+      assert_equal 'Slackware 14.1 x86_64 DVD ISO', result.title
+      assert_equal 'Applications', result.category
+      assert_equal '', result.subcategory
+      assert_equal 192, result.seeds
+      assert_equal 9, result.leeches
+      assert_equal 4, result.file_count
+      assert_equal 2437393940, result.size
+      # assert_equal 40, result.download_count
+      assert_equal 'Feb 24, 2014', result.upload_date
+      assert_equal 'Nusantara', result.uploader_username
+      assert_equal 'magnet:?xt=urn:btih:156B69B8643BD11849A5D8F2122E13FBB61BD041&dn=Slackware+14.1+x86_64+DVD+ISO&tr=udp://open.demonii.com:1337&tr=udp://tracker.coppersurfer.tk:6969&tr=udp://tracker.leechers-paradise.org:6969&tr=udp://exodus.desync.com:6969', result.magnet_uri
+      assert_equal 'slackware64-14.1-iso\\slackware64-14.1-install-dvd.iso', result.file_info[0][0] # first file, filename
+      assert_equal 2438987776, result.file_info[0][1] # first file, file length
+    end
+  end
 
-  	def test_find_single_torrent
-	   	VCR.use_cassette('test_find_single_torrent') do
-	    	result = StrikeApi::Torrent.find("156B69B8643BD11849A5D8F2122E13FBB61BD041")[0]
-			assert_equal StrikeApi::Torrent, result.class
-			assert_equal "156B69B8643BD11849A5D8F2122E13FBB61BD041", result.hash
-			assert_equal "Slackware 14.1 x86_64 DVD ISO", result.title
-			assert_equal "Applications", result.category
-			assert_equal "", result.sub_category
-			assert_equal 192, result.seeds
-			assert_equal 9, result.leeches
-			assert_equal 4, result.file_count
-			assert_equal 2437393940, result.size
-			# assert_equal 40, result.download_count
-			assert_equal "Feb 24, 2014", result.upload_date
-			assert_equal "Nusantara", result.uploader_username
-			assert_equal "magnet:?xt=urn:btih:156B69B8643BD11849A5D8F2122E13FBB61BD041&dn=Slackware+14.1+x86_64+DVD+ISO&tr=udp:\/\/open.demonii.com:1337&tr=udp:\/\/tracker.coppersurfer.tk:6969&tr=udp:\/\/tracker.leechers-paradise.org:6969&tr=udp:\/\/exodus.desync.com:6969", result.magnet_uri
-			assert_equal "slackware64-14.1-iso\\slackware64-14.1-install-dvd.iso", result.file_info[0][0] # first file, filename
-			assert_equal 2438987776, result.file_info[0][1] # first file, file length
-	    end
-	end
+  def test_find_array
+    VCR.use_cassette('test_find_array') do
+      result = StrikeAPI::Torrent.find(['156B69B8643BD11849A5D8F2122E13FBB61BD041','B425907E5755031BDA4A8D1B6DCCACA97DA14C04'])
+      result1 = result[0]
+      result2 = result[1]
+      # Torrent 1: Slackware ISO
+      assert_equal StrikeAPI::Torrent, result1.class
+      assert_equal '156B69B8643BD11849A5D8F2122E13FBB61BD041', result1.hash
+      assert_equal 'Slackware 14.1 x86_64 DVD ISO', result1.title
+      assert_equal 'Applications', result1.category
+      assert_equal '', result1.subcategory
+      assert_equal 192, result1.seeds
+      assert_equal 9, result1.leeches
+      assert_equal 4, result1.file_count
+      assert_equal 2437393940, result1.size
+      # assert_equal 40, result1.download_count
+      assert_equal 'Feb 24, 2014', result1.upload_date
+      assert_equal 'Nusantara', result1.uploader_username
+      assert_equal 'magnet:?xt=urn:btih:156B69B8643BD11849A5D8F2122E13FBB61BD041&dn=Slackware+14.1+x86_64+DVD+ISO&tr=udp://open.demonii.com:1337&tr=udp://tracker.coppersurfer.tk:6969&tr=udp://tracker.leechers-paradise.org:6969&tr=udp://exodus.desync.com:6969', result1.magnet_uri
+      assert_equal 'slackware64-14.1-iso\\slackware64-14.1-install-dvd.iso', result1.file_info[0][0] # first file, filename
+      assert_equal 2438987776, result1.file_info[0][1] # first file, file length
+      # Torrent 2: Arch ISO
+      assert_equal StrikeAPI::Torrent, result2.class
+      assert_equal 'B425907E5755031BDA4A8D1B6DCCACA97DA14C04', result2.hash
+      assert_equal 'Arch Linux 2015.01.01 (x86/x64)', result2.title
+      assert_equal 'Applications', result2.category
+      assert_equal '', result2.subcategory
+      assert_equal 645, result2.seeds
+      assert_equal 13, result2.leeches
+      assert_equal 1, result2.file_count
+      assert_equal 615514112, result2.size
+      # assert_equal 40, result2.download_count
+      assert_equal 'Jan  6, 2015', result2.upload_date
+      assert_equal 'The_Doctor-', result2.uploader_username
+      assert_equal 'magnet:?xt=urn:btih:B425907E5755031BDA4A8D1B6DCCACA97DA14C04&dn=Arch+Linux+2015.01.01+%28x86%2Fx64%29&tr=udp://open.demonii.com:1337&tr=udp://tracker.coppersurfer.tk:6969&tr=udp://tracker.leechers-paradise.org:6969&tr=udp://exodus.desync.com:6969', result2.magnet_uri
+      assert_equal 'archlinux-2015.01.01-dual.iso', result2.file_info[0][0] # first file, filename
+      assert_equal 615514112, result2.file_info[0][1] # first file, file length
+    end
+  end
 
-	def test_find_array
-	   	VCR.use_cassette('test_find_array') do
-	    	result = StrikeApi::Torrent.find(["156B69B8643BD11849A5D8F2122E13FBB61BD041","B425907E5755031BDA4A8D1B6DCCACA97DA14C04"])
-	    	result1 = result[0]
-	    	result2 = result[1]
-	    	# Torrent 1: Slackware ISO
-			assert_equal StrikeApi::Torrent, result1.class
-			assert_equal "156B69B8643BD11849A5D8F2122E13FBB61BD041", result1.hash
-			assert_equal "Slackware 14.1 x86_64 DVD ISO", result1.title
-			assert_equal "Applications", result1.category
-			assert_equal "", result1.sub_category
-			assert_equal 192, result1.seeds
-			assert_equal 9, result1.leeches
-			assert_equal 4, result1.file_count
-			assert_equal 2437393940, result1.size
-			# assert_equal 40, result1.download_count
-			assert_equal "Feb 24, 2014", result1.upload_date
-			assert_equal "Nusantara", result1.uploader_username
-			assert_equal "magnet:?xt=urn:btih:156B69B8643BD11849A5D8F2122E13FBB61BD041&dn=Slackware+14.1+x86_64+DVD+ISO&tr=udp:\/\/open.demonii.com:1337&tr=udp:\/\/tracker.coppersurfer.tk:6969&tr=udp:\/\/tracker.leechers-paradise.org:6969&tr=udp:\/\/exodus.desync.com:6969", result1.magnet_uri
-			assert_equal "slackware64-14.1-iso\\slackware64-14.1-install-dvd.iso", result1.file_info[0][0] # first file, filename
-			assert_equal 2438987776, result1.file_info[0][1] # first file, file length
-			# Torrent 2: Arch ISO
-			assert_equal StrikeApi::Torrent, result2.class
-			assert_equal "B425907E5755031BDA4A8D1B6DCCACA97DA14C04", result2.hash
-			assert_equal "Arch Linux 2015.01.01 (x86\/x64)", result2.title
-			assert_equal "Applications", result2.category
-			assert_equal "", result2.sub_category
-			assert_equal 645, result2.seeds
-			assert_equal 13, result2.leeches
-			assert_equal 1, result2.file_count
-			assert_equal 615514112, result2.size
-			# assert_equal 40, result2.download_count
-			assert_equal "Jan  6, 2015", result2.upload_date
-			assert_equal "The_Doctor-", result2.uploader_username
-			assert_equal "magnet:?xt=urn:btih:B425907E5755031BDA4A8D1B6DCCACA97DA14C04&dn=Arch+Linux+2015.01.01+%28x86%2Fx64%29&tr=udp:\/\/open.demonii.com:1337&tr=udp:\/\/tracker.coppersurfer.tk:6969&tr=udp:\/\/tracker.leechers-paradise.org:6969&tr=udp:\/\/exodus.desync.com:6969", result2.magnet_uri
-	    	assert_equal "archlinux-2015.01.01-dual.iso", result2.file_info[0][0] # first file, filename
-			assert_equal 615514112, result2.file_info[0][1] # first file, file length
-	    end
-	end
+  def test_find_no_torrents
+    VCR.use_cassette('test_find_no_torrents') do
+      begin
+        result = StrikeAPI::Torrent.find('156B69B8643BD1184D041')[0]
+      rescue => e
+        assert_equal 'Strike API error: 404 - No torrents found with provided hashes', e.message
+      end
+    end
+  end
 
-  	def test_find_no_torrents
-   		VCR.use_cassette('test_find_no_torrents') do
-   			begin
-   				result = StrikeApi::Torrent.find("156B69B8643BD1184D041")[0]
-   			rescue => e
-   				assert_equal "Strike API error: 404 - No torrents found with provided hashes", e.message
-   			end
-    	end
-	end
+  def test_find_empty
+    VCR.use_cassette('test_find_empty') do
+      begin
+        result = StrikeAPI::Torrent.find('')[0]
+      rescue => e
+        assert_equal 'Strike API error: 404 - No torrents found with provided hashes', e.message
+      end
+    end
+  end
 
-	def test_find_empty
-   		VCR.use_cassette('test_find_empty') do
-   			begin
-   				result = StrikeApi::Torrent.find("")[0]
-   			rescue => e
-   				assert_equal "Strike API error: 404 - No torrents found with provided hashes", e.message
-   			end
-    	end
-	end
+  def test_search_no_torrents
+    VCR.use_cassette('test_search_no_torrents') do
+      begin
+        result = StrikeAPI::Torrent.search('123456789abcdefg')[0]
+      rescue => e
+        assert_equal 'Strike API error: 404 - No torrents found.', e.message
+      end
+    end
+  end
 
-	def test_search_no_torrents
-   		VCR.use_cassette('test_search_no_torrents') do
-   			begin
-   				result = StrikeApi::Torrent.search("123456789abcdefg")[0]
-   			rescue => e
-   				assert_equal "Strike API error: 404 - No torrents found.", e.message
-   			end
-    	end
-	end
+  def test_search_empty
+    VCR.use_cassette('test_search_empty') do
+      begin
+        result = StrikeAPI::Torrent.search('')[0]
+      rescue => e
+        assert_equal 'Strike API error: 404 - Please enter a phrease.', e.message
+      end
+    end
+  end
 
-	def test_search_empty
-   		VCR.use_cassette('test_search_empty') do
-   			begin
-   				result = StrikeApi::Torrent.search("")[0]
-   			rescue => e
-   				assert_equal "Strike API error: 404 - Please enter a phrease.", e.message
-   			end
-    	end
-	end
+  def test_search
+    VCR.use_cassette('test_search') do
+      result = StrikeAPI::Torrent.search('Slackware 14.1 x86_64 DVD ISO')
+      assert_equal 1, result.length
+      assert result.kind_of?(Array)
+      assert result.first.kind_of?(StrikeAPI::Torrent)
+      assert !result[0].file_info # file_info information is not given in search results
+    end
+  end
 
-    def test_search
-	    VCR.use_cassette('test_search') do
-	    	result = StrikeApi::Torrent.search("Slackware 14.1 x86_64 DVD ISO")
-	      	assert_equal 1, result.length
-	      	assert result.kind_of?(Array)
-	      	assert result.first.kind_of?(StrikeApi::Torrent)
-	      	assert !result[0].file_info # file_info information is not given in search results
-	    end
-  	end
+  def test_search_category
+    VCR.use_cassette('test_search_category') do
+      result = StrikeAPI::Torrent.search('windows', 'Applications')
+      assert_equal 100, result.length
+      assert result.kind_of?(Array)
+      assert result.first.kind_of?(StrikeAPI::Torrent)
+      assert !result[0].file_info # file_info information is not given in search results
+    end
+  end
 
-	def test_search_category
-	    VCR.use_cassette('test_search_category') do
-	    	result = StrikeApi::Torrent.search("windows", "Applications")
-	      	assert_equal 100, result.length
-	      	assert result.kind_of?(Array)
-	      	assert result.first.kind_of?(StrikeApi::Torrent)
-	      	assert !result[0].file_info # file_info information is not given in search results
-	    end
-  	end
+  def test_search_subcategory
+    VCR.use_cassette('test_search_subCategory') do
+      result = StrikeAPI::Torrent.search('windows', 'Windows')
+      assert_equal 100, result.length
+      assert result.kind_of?(Array)
+      assert result.first.kind_of?(StrikeAPI::Torrent)
+      assert !result[0].file_info # file_info information is not given in search results
+    end
+  end
 
-  	def test_search_subCategory
-	    VCR.use_cassette('test_search_subCategory') do
-	    	result = StrikeApi::Torrent.search("windows", "Windows")
-	      	assert_equal 100, result.length
-	      	assert result.kind_of?(Array)
-	      	assert result.first.kind_of?(StrikeApi::Torrent)
-	      	assert !result[0].file_info # file_info information is not given in search results
-	    end
-  	end
+  def test_search_category_subcategory
+    VCR.use_cassette('test_search_category_subCategory') do
+      result = StrikeAPI::Torrent.search('windows', 'Applications', 'Windows')
+      assert_equal 100, result.length
+      assert result.kind_of?(Array)
+      assert result.first.kind_of?(StrikeAPI::Torrent)
+      assert !result[0].file_info # file_info information is not given in search results
+    end
+  end
 
-  	def test_search_category_subCategory
-	    VCR.use_cassette('test_search_category_subCategory') do
-	    	result = StrikeApi::Torrent.search("windows", "Applications", "Windows")
-	      	assert_equal 100, result.length
-	      	assert result.kind_of?(Array)
-	      	assert result.first.kind_of?(StrikeApi::Torrent)
-	      	assert !result[0].file_info # file_info information is not given in search results
-	    end
-  	end
+  def test_search_more_than_three_params
+    VCR.use_cassette('test_search_more_than_three_params') do
+      begin
+        result = StrikeAPI::Torrent.search('windows', 'Applications', 'Windows','Test')
+      rescue => e
+        assert_equal 'Invalid number of parameters: input <= 3', e.message
+      end
+    end
+  end
 
-  	def test_search_more_than_three_params
-	    VCR.use_cassette('test_search_more_than_three_params') do
-	      	begin
-   				result = StrikeApi::Torrent.search("windows", "Applications", "Windows","Test")
-   			rescue => e
-   				assert_equal "Invalid number of parameters: input <= 3", e.message
-   			end
-	    end
-  	end
+  def test_search_invalid_two_inputs
+    VCR.use_cassette('test_search_invalid_two_inputs') do
+      begin
+        result = StrikeAPI::Torrent.search('windows', 'asdasdasd')
+      rescue => e
+        assert_equal 'The category/subcategory entered is not valid', e.message
+      end
+    end
+  end
 
-  	def test_search_invalid_two_inputs
-	    VCR.use_cassette('test_search_invalid_two_inputs') do
-	      	begin
-   				result = StrikeApi::Torrent.search("windows", "asdasdasd")
-   			rescue => e
-   				assert_equal "The category/sub category entered is not valid", e.message
-   			end
-	    end
-  	end
+  def test_search_invalid_category
+    VCR.use_cassette('test_search_invalid_category') do
+      begin
+        result = StrikeAPI::Torrent.search('windows', 'asdasdasd','Windows')
+      rescue => e
+        assert_equal 'The category is not valid', e.message
+      end
+    end
+  end
 
-  	def test_search_invalid_category
-	    VCR.use_cassette('test_search_invalid_category') do
-	      	begin
-   				result = StrikeApi::Torrent.search("windows", "asdasdasd","Windows")
-   			rescue => e
-   				assert_equal "The category is not valid", e.message
-   			end
-	    end
-  	end
+  def test_search_invalid_subcategory
+    VCR.use_cassette('test_search_invalid_subcategory') do
+      begin
+        result = StrikeAPI::Torrent.search('windows', 'Applications','asdasdsdsa')
+      rescue => e
+        assert_equal 'The subcategory is not valid', e.message
+      end
+    end
+  end
 
-  	def test_search_invalid_subcategory
-	    VCR.use_cassette('test_search_invalid_subcategory') do
-	      	begin
-   				result = StrikeApi::Torrent.search("windows", "Applications","asdasdsdsa")
-   			rescue => e
-   				assert_equal "The sub category is not valid", e.message
-   			end
-	    end
-  	end
+  def test_site_down_cloudflare
+    VCR.use_cassette('test_site_down_cloudflare') do
+      begin
+        result = StrikeAPI::Torrent.search('Slackware 14.1 x86_64 DVD ISO')
+      rescue => e
+        assert_equal 'Strike API error: 522 - Origin Connection Time-out', e.message
+      end
+    end
+  end
 
-  	def test_site_down_cloudflare
-	    VCR.use_cassette('test_site_down_cloudflare') do
-	      	begin
-   				result = StrikeApi::Torrent.search("Slackware 14.1 x86_64 DVD ISO")
-   			rescue => e
-   				assert_equal "Strike API error: 522 - Origin Connection Time-out", e.message
-   			end
-	    end
-  	end
+  def test_filter_string
+    VCR.use_cassette('test_filter_string') do
+      flag = true
+      result = StrikeAPI::Torrent.search('windows -windows8', 'Applications', 'Windows')
+      assert_equal 100, result.length
+      assert result.kind_of?(Array)
+      assert result.first.kind_of?(StrikeAPI::Torrent)
+      filteredStr = 'windows 8'
+      result.each do |torrent|
+        if(torrent.title.strip.downcase.include? filteredStr.strip.downcase)
+          flag = false
+        end
+      end
+      assert_equal true, flag
+    end
+  end
 
-  	def test_filter_string
-	    VCR.use_cassette('test_filter_string') do
-  			flag = true
-	    	result = StrikeApi::Torrent.search("windows -windows8", "Applications", "Windows")
-	      	assert_equal 100, result.length
-	      	assert result.kind_of?(Array)
-	      	assert result.first.kind_of?(StrikeApi::Torrent)
-	      	filteredStr = "windows 8"
-	      	result.each do |torrent|
-				if(torrent.title.strip.downcase.include? filteredStr.strip.downcase)
-					flag = false
-				end
-			end
-	       	assert_equal true, flag
-	    end
-  	end
+  def test_filter_string_no_filter
+    VCR.use_cassette('test_filter_string_no_filter') do
+      flag = true
+      result = StrikeAPI::Torrent.search('windows', 'Applications', 'Windows')
+      assert_equal 100, result.length
+      assert result.kind_of?(Array)
+      assert result.first.kind_of?(StrikeAPI::Torrent)
+      filteredStr = 'windows 8'
+      result.each do |torrent|
+        if(torrent.title.strip.downcase.include? filteredStr.strip.downcase)
+          flag = false
+        end
+      end
+      assert_equal false, flag
+    end
+  end
 
-  	def test_filter_string_no_filter
-		VCR.use_cassette('test_filter_string_no_filter') do
-  			flag = true
-	    	result = StrikeApi::Torrent.search("windows", "Applications", "Windows")
-	      	assert_equal 100, result.length
-	      	assert result.kind_of?(Array)
-	      	assert result.first.kind_of?(StrikeApi::Torrent)
-	      	filteredStr = "windows 8"
-	      	result.each do |torrent|
-				if(torrent.title.strip.downcase.include? filteredStr.strip.downcase)
-					flag = false
-				end
-			end
-	       	assert_equal false, flag
-	    end
-  	end
+  def test_top
+    VCR.use_cassette('test_top') do
+      result = StrikeAPI::Torrent.top('Books')
+      assert_equal 100, result.length
+      assert result.kind_of?(Array)
+      assert result.first.kind_of?(StrikeAPI::Torrent)
+      assert !result[0].file_info
+    end
+  end
 
-  	def test_top
-		VCR.use_cassette('test_top') do
-			result = StrikeApi::Torrent.top("Books")
-	      	assert_equal 100, result.length
-	      	assert result.kind_of?(Array)
-	      	assert result.first.kind_of?(StrikeApi::Torrent)
-	      	assert !result[0].file_info
-		end
-  	end
+  def test_top_invalid_category
+    VCR.use_cassette('test_top_invalid_category') do
+      begin
+        result = StrikeAPI::Torrent.top('abc123')
+      rescue => e
+        assert_equal 'The category is not valid', e.message
+      end
+    end
+  end
 
-  	def test_top_invalid_category
-		VCR.use_cassette('test_top_invalid_category') do
-			begin
-				result = StrikeApi::Torrent.top("abc123")
-   			rescue => e
-   				assert_equal "The category is not valid", e.message
-   			end
-		end
-  	end
+  def test_top_all_category
+    VCR.use_cassette('test_top_all_category') do
+      result = StrikeAPI::Torrent.top('all')
+      assert_equal 100, result.length
+      assert result.kind_of?(Array)
+      assert result.first.kind_of?(StrikeAPI::Torrent)
+      assert !result[0].file_info
+    end
+  end
 
-  	def test_top_all_category
-		VCR.use_cassette('test_top_all_category') do
-			result = StrikeApi::Torrent.top("all")
-	      	assert_equal 100, result.length
-	      	assert result.kind_of?(Array)
-	      	assert result.first.kind_of?(StrikeApi::Torrent)
-	      	assert !result[0].file_info
-		end
-  	end
+  def test_categories_available
+    result = StrikeAPI::Torrent.categories_available
+    assert result.kind_of?(Array)
+    assert result.first.kind_of?(String)
+  end
 
-	def test_catagoriesAvailable
-		result = StrikeApi::Torrent.catagoriesAvailable
-	    assert result.kind_of?(Array)
-	    assert result.first.kind_of?(String)
-	end
-
-	def test_subCatagoriesAvailable
-		result = StrikeApi::Torrent.subCatagoriesAvailable
-	    assert result.kind_of?(Array)
-	    assert result.first.kind_of?(String)
-	end
+  def test_subcategories_available
+    result = StrikeAPI::Torrent.subcategories_available
+    assert result.kind_of?(Array)
+    assert result.first.kind_of?(String)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strike_api
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Marshall Ford
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: API wrapper for the Strike Search website (https://getstrike.net/torrents/)
+description: Wrapper for the Strike Search website/API (https://getstrike.net/torrents/)
 email:
 - inbox@marshallford.me
 executables: []
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Wrapper for the Strike API.