nnmClub_api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c6f9b3f6aea0859c2788fb207456e31c55c47fd
-  data.tar.gz: 3ac33f004d439412cefbad1caf8360bf50f58ace
+  metadata.gz: 4bbb50fc2b0ad999c914a706c40c85ddc9a26ccb
+  data.tar.gz: 31a2c9a906ffe9867654a8768bfca844f0165d57
 SHA512:
-  metadata.gz: 34791c3ecccc2b80dd15077487061733f5dd2d024ff572fafd38d98e1e86d72ba125c774b968d9df7a36deac03488f610e346e6b62c75a9aad87d29d3df97258
-  data.tar.gz: fcbc23208435222de5433b0bed3876b98b0050b57ba5c7290dfeb7476c5213a89a38392713c463fc4a96c816fbe7f6bac48b7c7536524a73504a45b288db9bc3
+  metadata.gz: 8f0bbdee7d092bc664b5ab298b88354d1925444a3c460a31f900261da17654ae7466c8793c10bc66091edeb9f9fe681c143d2dbd3db2b0cba16cdb661540b1db
+  data.tar.gz: 960f2f698b7eb177eef51faf97508409df7e8bf6dd9f29c3f25238c188b1c1b5ed5d2025c251c5099a288b2beff97564bc83f30e7557c91b25afd5eb55c6dcf7

data/README.md

@@ -22,26 +22,36 @@ Or install it yourself as:
   
 ### Example:Search
 
-    NnmClub::Search("Noize MC").torrents
+    NnmClub::Search("noize mc").torrents
 
 returns an Array of Hashes
 
-    {  :title    => the title of the distribution,
+    { 
+      :title    => the title of the distribution,
       :size       => size,
       :seeders    => seeders,
-      :leechers   => leechers,
       :torrent_id => torrent_id,
-      :tracker    => NnmClub::ID
     }
     
 ### Example:Torrent
 
-    NnmClub::Torrent.find "728159"
+    NnmClub::Torrent.find "97600"
     
 returns an Hash
 
-    {   :content    => "HTML"
-        :image      => "UTL"
+    {   
+        :content    => "HTML",
+        :image      => "URL",
+        :magnet     => magnet-link or none
+    }
+    
+### Example:NnmClub_api
+
+    api = NnmClub:NnmClub_api.new
+    api.search("noize mc")
+    #=> Array of Hashes { :title => ..., }
+    api.find("97600")
+    #=> Hash { :content => ..., }
 
 
 ## Contributing

data/lib/nnmClub_api.rb

@@ -1,4 +1,36 @@
+require "mechanize"
 require "nnmClub_api/version"
 require "nnmClub_api/tracker"
 require "nnmClub_api/search"
-require "nnmClub_api/torrent"
+require "nnmClub_api/torrent"
+
+class Mechanize
+  def login
+    self.post(
+      NnmClub::LOGIN_PAGE,
+      username: NnmClub::USERNAME,
+      password: NnmClub::PASSWORD,
+      login: ""
+    )
+  end
+end
+
+module NnmClub
+  class NnmClub_api
+    attr_reader :agent
+    def initialize
+      @agent = Mechanize.new
+      @agent.get(NnmClub::LOGIN_PAGE)
+      @agent.login
+      true
+    end
+
+    def search query
+      NnmClub::Search.new(query, @agent).torrents
+    end
+
+    def find id
+      NnmClub::Torrent.find(id, @agent)
+    end
+  end
+end

data/lib/nnmClub_api/search.rb

@@ -1,7 +1,3 @@
-require "uri"
-require "open-uri"
-require "nokogiri"
-
 class Hash
   def any_nil?
     @result = false
@@ -13,35 +9,25 @@ class Hash
   end 
 end
 
-
 module NnmClub
-
   class Search
-    attr_reader :torrents, :url
-    def initialize(query, category = nil)
-      torrents = []
-      query = URI.escape(query)
-      @url = NnmClub::URL+"nm=#{query}"+(!category.nil? ? "&c=#{category}" : "")
-
-      document = Nokogiri::HTML(open(@url))
-      document.css("table.forumline.tablesorter").css(".prow1",".prow2").each { |row|
-
-        size          = row.at("td[6]/u").nil? ? nil : row.at("td[6]/u").text.to_i
-        title         = row.css(".topictitle").empty? ? nil : row.css(".topictitle").text.strip
-        seeders       = row.css(".seedmed").empty? ? nil : row.css(".seedmed").text.to_i
-        leechers      = row.css(".leechmed").empty? ? nil : row.css(".leechmed").text.to_i
-        torrent_id    = row.css(".topictitle").empty? ? nil : row.css(".topictitle").first[:href].split("=").last
-    
-        torrent = { :title      => title,
-                    :size       => size,
-                    :seeders    => seeders,
-                    :leechers   => leechers,
-                    :torrent_id => torrent_id,
-                    :tracker    => NnmClub::ID
+    attr_reader :torrents
+    def initialize(query, agent = Mechanize.new)
+      form = agent.get(NnmClub::URL).forms.last
+      form.field("nm").value = query
+      form.checkbox("sd").check
+      form.checkbox("a").check
+      torrents = form.submit.search(".prow1",".prow2").collect { |row|
+        torrent = { 
+          :title      => row.css(".topictitle").empty? ? (nil and status=true)  : row.css(".topictitle").text.strip,
+          :size       => row.at("td[6]/u").nil? ? nil : row.at("td[6]/u").text.to_i,
+          :seeders    => row.css(".seedmed").empty? ? nil : row.css(".seedmed").text.to_i,
+          :torrent_id => status ? nil : row.css(".topictitle").first[:href].split("=").last
         }
-        torrents.push(torrent) unless torrent.any_nil?
+        torrent unless torrent.any_nil?
       }
       @torrents = torrents
+
     end
   end
 end

data/lib/nnmClub_api/torrent.rb

@@ -1,16 +1,17 @@
-require "uri"
-require "open-uri"
-require "nokogiri"
-
 module NnmClub
   class Torrent
-    def self.find(torrent_id)
-      document = Nokogiri::HTML(open(NnmClub::TorrentURL+torrent_id))
-      postbody = document.css('.postbody').first
-      info = {:content  => postbody.to_html( encoding: "UTF-8" ),
-              :image    => postbody.css('var.postImg').empty? ? "nil" : postbody.css('var.postImg').first['title']
+    def self.find(torrent_id, agent = Mechanize.new)
+      document      = agent.get(NnmClub::TorrentURL+torrent_id)
+      content_xpath = "/html/body/div[@class='wrap']/table//tr[2]/td/table//tr/td/table[@class='forumline']//tr[@class='row1']/td[@class='row1'][2]/table//tr[3]/td"
+      link_xpath    = "/html/body/div[2]/table//tr[2]/td/table//tr/td/table[5]//tr[2]/td[2]/table//tr[4]/td/table[2]//tr[2]/td[3]/a"
+      content       = document.search(content_xpath)
+      content.search(".//img",".//a").remove
+      return {
+        :content  => content.to_html(encoding: "UTF-8"),
+        :magnet   => document.search(link_xpath).empty? ? "none" : document.search(link_xpath).first[:href],
+        :image    => document.search('var.postImg').first[:title]
       }
-      return info
     end
   end
-end
+end
+

data/lib/nnmClub_api/tracker.rb

@@ -1,6 +1,10 @@
 module NnmClub
   ID          = "nnmclub"
   IMG         = "http://nnm-club.me/favicon.ico"
-  URL         = "http://nnm-club.me/forum/tracker.php?"
+  URL         = "http://nnm-club.me/forum/tracker.php"
   TorrentURL  = "http://nnm-club.me/forum/viewtopic.php?t="
+  DownloadURL = "http://nnm-club.me/forum/"
+  LOGIN_PAGE  = "http://nnm-club.me/forum/login.php"
+  USERNAME    = "gettornet"
+  PASSWORD    = "gettornet"
 end

data/lib/nnmClub_api/version.rb

@@ -1,3 +1,3 @@
 module NnmClubApi
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/nnmClub_api.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'nnmClub_api/version'
+require "nnmClub_api/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "nnmClub_api"
@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "guard-rspec"
 
-  spec.add_dependency "nokogiri"
+  spec.add_dependency "mechanize", "2.7.3"
 end

data/spec/nnmclub_spec.rb

@@ -0,0 +1,20 @@
+require "nnmClub_api"
+
+describe "NnmClub" do
+  describe "NmmClub_api" do
+    before {
+      @api    = NnmClub::NnmClub_api.new
+      @query  = "ruby on rails"
+      @id     = "97600"
+    }
+    it "should not be bad login" do
+      expect(@api.nil?).to eq(false)
+    end
+    it "should return results Array" do
+      expect(@api.search(@query).class).to eq([].class)
+    end
+    it "should return results Array" do
+      expect(@api.find(@id).class).to eq({}.class)
+    end
+  end
+end

data/spec/nnmcluv_api_spec.rb

@@ -1,26 +1,12 @@
 require "nnmClub_api"
+require "mechanize"
 
 describe "NnmClub" do
-  describe "Search" do
-    before {
-      @query = "ruby on rails"
-      @search = NnmClub::Search.new @query
-      @url = NnmClub::URL
-    }
-    it "should return correct url without category" do
-      expect(@search.url).to eq(@url+"nm=#{URI.escape(@query)}")
-    end
-
-    it "should return correct url with category" do
-      @search = NnmClub::Search.new(@query,17)
-      expect(@search.url).to eq(@url+"nm=#{URI.escape(@query)}"+"&c=17")
-    end
-  end
-
   describe "#torrents" do
     before {
       @query = "ruby on rails"
-      @search = NnmClub::Search.new @query
+      agent = NnmClub::NnmClub_api.new.agent
+      @search = NnmClub::Search.new(@query,agent)
     }
 
     it "should return array" do
@@ -34,12 +20,21 @@ describe "NnmClub" do
 
   describe "Torrent" do
     before {
-      @torrent_id = "97600"
-      @torrent    = NnmClub::Torrent.find @torrent_id
+      @torrent_id = "728159"
+      agent = NnmClub::NnmClub_api.new.agent
+      @torrent    = NnmClub::Torrent.find(@torrent_id,agent)
     }
     it "should return @description" do
       expect(@torrent.class).to eq({}.class)
     end
+    it "should return image" do
+      expect(@torrent[:image].empty?).to eq(false)
+    end
+    it "should return content" do
+      expect(@torrent[:content].empty?).to eq(false)
+    end
+    it "should return link" do
+      expect(@torrent[:magnet].empty?).to eq(false)
+    end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nnmClub_api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Baranov Sergey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.3
 description: Gem for parsing NoNaMe Club torrent-tracker.
 email:
 - sergey@drummer.ru
@@ -100,6 +100,7 @@ files:
 - lib/nnmClub_api/tracker.rb
 - lib/nnmClub_api/version.rb
 - nnmClub_api.gemspec
+- spec/nnmclub_spec.rb
 - spec/nnmcluv_api_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/gemoroy/nnmClub_api
@@ -127,5 +128,6 @@ signing_key:
 specification_version: 4
 summary: NNM-Club torrent-tacker parser.
 test_files:
+- spec/nnmclub_spec.rb
 - spec/nnmcluv_api_spec.rb
 - spec/spec_helper.rb