tf2r 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cda160e8773382ca326bd42ad5f6469cbf63fd57
-  data.tar.gz: 3a43402a23424491b50559b27fbde5f2c72fd2a0
+  metadata.gz: 53baabcfbcb2844a14bd53e3e37a7d5d82d80894
+  data.tar.gz: 0085e3ec2ef5d5f51f1b5172cff907f5752a199f
 SHA512:
-  metadata.gz: 5a76b5c1c173ca4190a1c4e6197feacfe0a00d4304aa11d07d3de6e5e0f6c9eb9e8a5e335f4b93a594d4adbc50b150c6a9111fdd0f8f683ac9c571ae67cd632d
-  data.tar.gz: 5d1aa559bcb08c0b1479b99d56301987289732c15431056dfab4e458814bb39767a2e149577ec4e862fc3a5e129920e519472909ef44863e17a2f30b0cf472cf
+  metadata.gz: 380c2b12de5cf17a5152f32aca08d0a7fc3962339abcb318a8e6669bcdb370f283c155a3dd6ad916fe888a8910415c1f8838fe76cb41b750b55410b85540987f
+  data.tar.gz: 0b3e807888dff2cff5501a132418d8bfefb6b19745b0647736ee64d3eaa366317b2ec476c20692908745f90d20bb0f9426b47bb5b60063a75e41d13139e6073b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tf2r (0.1.0)
+    tf2r (0.1.1)
       mechanize (~> 2.7)
 
 GEM

data/lib/tf2r.rb

@@ -1,6 +1,7 @@
 require 'mechanize'
 require 'pry'
 
+require 'tf2r/api'
 require 'tf2r/scraper'
 require 'tf2r/version'
 

data/lib/tf2r/api.rb

@@ -0,0 +1,26 @@
+module TF2R
+  class API
+    HOST = 'http://tf2r.com'
+    ENDPOINT = '/job.php'
+
+    def self.get_raffle_info(link_snippet)
+      params = {checkraffle: true, rid: link_snippet[1..-1],
+                lastentrys: 0, lastchat: 0}
+      response = request(params).body
+      JSON.parse(response)['message']
+    end
+
+    private
+
+    # Make this sane with something like httparty
+    def self.request(params)
+      uri = URI.parse(HOST)
+      http = Net::HTTP.new(uri.host, uri.port)
+
+      request = Net::HTTP::Post.new(ENDPOINT)
+      request.body = URI.encode_www_form(params)
+
+      response = http.request(request)
+    end
+  end
+end

data/lib/tf2r/scraper.rb

@@ -58,6 +58,19 @@ module TF2R
       raffle_links.reverse!
     end
 
+    # Scrapes a raffle for all available information.
+    #
+    # @param page [Mechanize::Page] the raffle page.
+    # @return [Array]
+    #   * the raffle Hash from scrape_raffle_for_raffle
+    #   * the creator Hash from scrape_raffle_for_creator
+    #   * the participants Array from scrape_raffle_for_participants
+    def scrape_raffle(page)
+      [scrape_raffle_for_raffle(page),
+       scrape_raffle_for_creator(page),
+       scrape_raffle_for_participants(page)]
+    end
+
     # Scrapes a raffle page for information about the creator.
     #
     # @example
@@ -137,21 +150,28 @@ module TF2R
       title = infos[0].text.split('Title: ')[-1]
       description = raffle_tds[1].text
 
+      # This doesn't work right now, because Miz just displays "10%" in the
+      # page HTML and updates it with JS after a call to the API.
+      # win_chance = /(.+)%/.match(infos.css('#winc').text)[1].to_f / 100
+
+      # This is actually horrible. Scraper should not know about API.
+      win_chance = get_win_chance(link_snippet)
+
       start_time = raffle_tds[9].attribute('data-rstart-unix').to_s
       start_time = DateTime.strptime(start_time, '%s').to_time
       end_time = raffle_tds[11].attribute('data-rsend-unix').to_s
       end_time= DateTime.strptime(end_time, '%s').to_time
 
-      win_chance = /(.+)%/.match(infos.css('#winc').text)[1].to_f / 100
-
       entries = /(\d+)\/(\d+)/.match(infos.css('#entry').text)
       current_entries = entries[1].to_i
       max_entries = entries[2].to_i
 
       text = page.parser.css('.welcome_font').css('div')[3..-1].text
-      is_done = end_time < Time.now ||
+      is_done = end_time <= Time.now ||
         current_entries == max_entries ||
-        page.parser.css('.welcome_font')[5..-1].text.downcase.include?('winner')
+        (page.parser.css('.welcome_font').size > 5 &&
+         page.parser.css('.welcome_font')[5..-1].text.downcase.include?('winner')
+        )
 
       {link_snippet: link_snippet, title: title, description: description,
        start_time: start_time, end_time: end_time, win_chance: win_chance,
@@ -287,5 +307,16 @@ module TF2R
     def extract_hex_colour(str)
       /#(\w+)\s*;/.match(str)[1].downcase
     end
+
+    # Gets the win_chance for a raffle as reported by job.php.
+    #
+    # @example
+    #   get_win_chance('kabc123') => 0.05
+    #
+    # @param link_snippet [String] the link snippet of the raffle.
+    # @return [Float] the win chance.
+    def get_win_chance(link_snippet)
+      TF2R::API.get_raffle_info(link_snippet)['wc'] / 100.0
+    end
   end
 end

data/lib/tf2r/version.rb

@@ -1,3 +1,3 @@
 module TF2R
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/scraper_spec.rb

@@ -59,6 +59,25 @@ describe TF2R::Scraper do
     end
   end
 
+  describe '#scrape_raffle' do
+    let(:page) {
+      VCR.use_cassette('scrape_raffle_for_raffle') do
+        scraper.fetch('http://tf2r.com/kstzcbd.html')
+      end
+    }
+    let(:result) { scraper.scrape_raffle(page) }
+
+    it 'returns an Array' do
+      expect(result).to be_an(Array)
+    end
+
+    it 'returns the same as its child methods' do
+      expect(result[0]).to eql(scraper.scrape_raffle_for_raffle(page))
+      expect(result[1]).to eql(scraper.scrape_raffle_for_creator(page))
+      expect(result[2]).to eql(scraper.scrape_raffle_for_participants(page))
+    end
+  end
+
   describe '#scrape_main_page' do
     let(:result) { scraper.scrape_main_page }
 

data/spec/spec_helper.rb

@@ -13,6 +13,9 @@ VCR.configure do |c|
   c.cassette_library_dir = 'spec/vcr/cassettes'
   c.hook_into :webmock
   c.ignore_localhost = true
+  c.ignore_request do |request|
+    URI(request.uri).path == '/job.php'
+  end
 end
 
 WebMock.disable_net_connect!(allow_localhost: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tf2r
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Justin Kim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -154,6 +154,7 @@ files:
 - README.md
 - Rakefile
 - lib/tf2r.rb
+- lib/tf2r/api.rb
 - lib/tf2r/scraper.rb
 - lib/tf2r/version.rb
 - spec/raffles.html