ruby-hackernews 1.3.6 → 1.3.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzI2MGUxMzBjOWQxN2I1ODExNTU4ZDkxZmE3NTgxMDMwMWZjNDhkNw==
-  data.tar.gz: !binary |-
-    Njg3MWZhYjFlODNkY2VlNDZiY2U2NWYxZTkyYTIwOTg4MDdjZTUyYg==
+SHA1:
+  metadata.gz: a75ae2b32c9d840dd595bb25dfde7ca86364fecd
+  data.tar.gz: 3b125a1e73964ed58d0c1f7c51c105c667f08a2c
 SHA512:
-  metadata.gz: !binary |-
-    MmU2YWFmYmNlZDEwZGYxMTE2OWJkMTk5MWM3NDRmNTQzZGYwMDgxYTEwNzY1
-    MzJhYjU4YTUyZjgyMWYxZGFlZDViNjMyOGYzODBkZTE0ZjM4NGNmOGVkODNk
-    YjI5ZjU2MDJlYjM4YTQzZDhmN2YyMzIyMjdmNGRmNTVlMGFmOTQ=
-  data.tar.gz: !binary |-
-    N2RmNmNlNjIwYjNjOTg1MmJlNzE4Y2I4MWUwNWFkZjBiNjQzOTYyODQ5ZTYx
-    MjYwYzQ0ZDUxYTZjNGExYjM3YmUyZDE4NGZkYTczNWFiNzFiY2VlZmE4MDdl
-    NWE2NDZiY2Q3ZGNmYzJhYzI1YTVlZTYwOTgyNDg1NmMwZjE5Nzc=
+  metadata.gz: e014746411f77467c3f4bd70a82acfab27d93b5e5713c5552029ed3f9df85db1dac81f8a97cb6189501d0ec1053a7b6033bbee2586a59fcf36805003f61fba7d
+  data.tar.gz: 8132a51491bf5b966810d5cf7ec00a203f2c54dece9d5dd9b3209ea89426bd6637ab81fe405671e57fe7b4cc8e409707bde1609848fef75801fc21ede64f268d

data/README.rdoc

@@ -172,3 +172,5 @@ Will return the HN comment url of the last submitted story of that user
 - Daniel Da Cunha ( http://github.com/ddacunha ) for a fix on Entry#comments_count
 - Nathan Campos ( http://github.com/nathanpc) for adding #text to Entry
 - Girish Sonawane ( https://github.com/girishso) for adding Entry#shows and Entry#new_shows methods
+- Niels Van Aken ( https://github.com/nvaken ) for a bugfix in EntryPageParser
+- Pedro Lambert ( https://github.com/p-lambert ) for fixing bugs and improving structure of CommentInfoParser, TimeInfoParser and UserInfoParser

data/lib/ruby-hackernews/services/comment_service.rb

@@ -65,10 +65,7 @@ module RubyHackernews
     end
 
     def parse_comment(element)
-      text_html = ""
-      element.search("span.comment").first.children.each do |ch|
-        text_html = ch.inner_html
-      end
+      text_html = element.search("span.comment").first.search("font").children.map { |x| x.inner_text }.join("\n")
       header = element.search("span.comhead").first
       voting = VotingInfoParser.new(element.search("td/center/a"), header).parse
       user_info = UserInfoParser.new(header).parse

data/lib/ruby-hackernews/services/parsers/comments_info_parser.rb

@@ -2,18 +2,27 @@ module RubyHackernews
 
   class CommentsInfoParser
 
-    def initialize(comments_element)
-      @element = comments_element.search("a")[1]
+    def initialize(second_line)
+      @second_line = second_line
     end
 
     def parse
-      comments_info = nil
-      if @element && @element['href'] =~ /id/
-        comments      = @element.inner_html.split[0].to_i
-        comments_page = @element['href']
-        comments_info = CommentsInfo.new(comments, comments_page)
-      end
-      return comments_info
+      return unless comments_link
+
+      comments      = comments_link.text.split[0].to_i
+      comments_page = comments_link['href']
+
+      CommentsInfo.new(comments, comments_page)
+    end
+
+    private
+
+    def comments_link
+      links.find { |link| link.text =~ /comment|discuss/ }
+    end
+
+    def links
+      @second_line.css('a')
     end
 
   end

data/lib/ruby-hackernews/services/parsers/entry_parser.rb

@@ -20,12 +20,12 @@ module RubyHackernews
       number   = number_segment.inner_html.sub(".","").to_i if number_segment
       link     = LinkInfoParser.new(link_segment).parse
       voting   = VotingInfoParser.new(@first_line.search("td/center/a"), @second_line.search("[@class='subtext']")[0]).parse
-      user     = UserInfoParser.new(@second_line.search("[@class='subtext']")[0]).parse
-      comments = CommentsInfoParser.new(@second_line.search("[@class='subtext']")[0]).parse
-      time     = TimeInfoParser.new(@second_line.search("[@class='subtext']").children[3]).parse
+      user     = UserInfoParser.new(@second_line).parse
+      comments = CommentsInfoParser.new(@second_line).parse
+      time     = TimeInfoParser.new(@second_line).parse
       return Entry.new(number, link, voting, user, comments, time)
     end
-    
+
   end
 
 end

data/lib/ruby-hackernews/services/parsers/time_info_parser.rb

@@ -2,18 +2,28 @@ module RubyHackernews
 
   class TimeInfoParser
 
-    def initialize(time_element)
-      @element = time_element
+    def initialize(second_line)
+      @second_line = second_line
     end
 
     def parse
-      if @element
-        value           = @element.text.strip.split[0].to_i
-        unit_of_measure = @element.text.strip.split[1]
-      end
-      return TimeInfo.new(value, unit_of_measure)
+      return unless time_link
+
+      value           = time_link.text.strip.split[0].to_i
+      unit_of_measure = time_link.text.strip.split[1]
+
+      TimeInfo.new(value, unit_of_measure)
+    end
+
+    private
+
+    def time_link
+      links.find { |link| link.text =~ /\sago/ }
     end
 
+    def links
+      @second_line.css('a')
+    end
   end
 
 end

data/lib/ruby-hackernews/services/parsers/user_info_parser.rb

@@ -2,17 +2,27 @@ module RubyHackernews
 
   class UserInfoParser
 
-    def initialize(user_element)
-      @element = user_element
+    def initialize(second_line)
+      @second_line = second_line
     end
 
     def parse
-      user_element = @element.search("a")[0]
-      if user_element
-        user_name = user_element.inner_html
-        user_page = user_element['href']
-      end
-      return UserInfo.new(user_name, user_page)
+      return unless user_link
+
+      user_name = user_link.inner_html
+      user_page = user_link['href']
+
+      UserInfo.new(user_name, user_page)
+    end
+
+    private
+
+    def user_link
+      links.find { |link| link['href'] =~ /user\?id=/ }
+    end
+
+    def links
+      @second_line.css('a')
     end
 
   end

data/lib/ruby-hackernews/version.rb

@@ -1,3 +1,3 @@
 module RubyHackernews
-  VERSION = "1.3.6"
+  VERSION = "1.3.7"
 end

data/spec/HNAPI/services/entries/entry_service_spec.rb

@@ -7,41 +7,39 @@ module RubyHackernews
     describe :get_entries do
 
       it "should always call EntryPageParser with current agent" do
-        parser = stub()
-        parser.should_receive(:get_lines).and_return([])
-        parser.should_receive(:get_next_url).and_return(nil)
-        agent = stub()
-        agent.should_receive(:get).any_number_of_times.and_return(:page)
-        MechanizeContext.create(:default, agent)
+        parser = Object.new
+        allow(parser).to receive_messages(:get_lines => [], :get_next_url => nil)
+        agent = Object.new
+        allow(agent).to receive_messages(:get => :page)
+        MechanizeContext.send(:class_variable_set, :@@contexts, {:default => agent})
         service = EntryService.new
-        EntryPageParser.should_receive(:new).any_number_of_times.with(:page).and_return(parser)
+        expect(EntryPageParser).to receive(:new).at_least(1).with(:page).and_return(parser)
         service.get_entries
       end
 
       it "should always call get_lines 'pages' number of times" do
         pages  = 5
-        parser = stub()
-        parser.should_receive(:get_lines).exactly(pages).times.and_return([])
-        parser.should_receive(:get_next_url).any_number_of_times.and_return(nil)
-        agent = stub()
-        agent.should_receive(:get).any_number_of_times.and_return(:page)
-        MechanizeContext.create(:default, agent)
+        parser = Object.new
+        expect(parser).to receive(:get_lines).and_return([])
+        allow(parser).to receive(:get_next_url).and_return(nil)
+        agent = Object.new
+        allow(agent).to receive_messages(:get => :page)
+        MechanizeContext.send(:class_variable_set, :@@contexts, {:default => agent})
         service = EntryService.new
-        EntryPageParser.should_receive(:new).any_number_of_times.with(:page).and_return(parser)
-        service.get_entries(pages)
+        allow(EntryPageParser).to receive(:new).with(:page).and_return(parser)
+        service.get_entries
       end
 
       it "should always call get_next_url 'pages' number of times" do
-        pages  = 5
-        parser = stub()
-        parser.should_receive(:get_lines).any_number_of_times.and_return([])
-        parser.should_receive(:get_next_url).exactly(pages).times.and_return(nil)
-        agent = stub()
-        agent.should_receive(:get).any_number_of_times.and_return(:page)
-        MechanizeContext.create(:default, agent)
+        parser = Object.new
+        allow(parser).to receive(:get_lines).and_return([])
+        expect(parser).to receive(:get_next_url).and_return(nil)
+        agent = Object.new
+        allow(agent).to receive_messages(:get => :page)
+        MechanizeContext.send(:class_variable_set, :@@contexts, {:default => agent})
         service = EntryService.new
-        EntryPageParser.should_receive(:new).any_number_of_times.with(:page).and_return(parser)
-        service.get_entries(pages)
+        allow(EntryPageParser).to receive(:new).with(:page).and_return(parser)
+        service.get_entries
       end
 
     end

data/spec/HNAPI/services/entries/parsers/parser_helper.rb

@@ -21,14 +21,14 @@ class ParserHelper
     return Nokogiri::HTML.fragment('<a id=up_1645686 href="vote?for=1645686&dir=up&whence=%6e%65%77%73"><img src="http://ycombinator.com/images/grayarrow.gif" border=0 vspace=3 hspace=2></a><a id=down_1645686 href="vote?for=1645686&dir=up&whence=%6e%65%77%73"><img src="http://ycombinator.com/images/grayarrow.gif" border=0 vspace=3 hspace=2></a>'
     ).children
   end
-  
+
   #username     : johnthedebs
   #user page    : user?id=johnthedebs
   #score        : 17
   #comments     : 2
   #comment_page : item?id=1645686
   def self.second_line
-    return Nokogiri::HTML.fragment('<td class="subtext"><span id=score_1645686>17 points</span> by <a href="user?id=johnthedebs">johnthedebs</a> 4 hours ago  | <a href="item?id=1645686">2 comments</a></td>')
+    return Nokogiri::HTML.fragment('<td class="subtext"><span class="score" id="score_1645686">17 points</span> by <a href="user?id=johnthedebs">johnthedebs</a> <a href="item?id=1645686">4 hours ago</a> | <a href="item?id=1645686">2 comments</a></td>')
   end
 
   #username     : johnthedebs
@@ -36,7 +36,7 @@ class ParserHelper
   #score        : 17
   #comment_page : item?id=1645686
   def self.second_line_no_comments_yet
-    return Nokogiri::HTML.fragment('<td class="subtext"><span id=score_1645686>17 points</span> by <a href="user?id=johnthedebs">johnthedebs</a> 4 hours ago  | <a href="item?id=1645686">discuss</a></td>')
+    return Nokogiri::HTML.fragment('<td colspan="2"></td><td class="subtext"><span class="score" id="score_1645686">17 points</span> by <a href="user?id=johnthedebs">johnthedebs</a> <a href="item?id=1645686">4 hours ago</a> | <a href="item?id=1645686">discuss</a></td>')
   end
 
   #username     : johnthedebs
@@ -64,14 +64,14 @@ class ParserHelper
   end
 
   def self.second_line_full
-    return Nokogiri::HTML('<tr><td colspan=2></td><td class="subtext"><span id=score_1645745>59 points</span> by <a href="user?id=dhotson">dhotson</a> 4 hours ago  | <a href="item?id=1645745">5 comments</a></td></tr>')
+    Nokogiri::HTML.fragment('<tr><td colspan=2></td><td class="subtext"><span class="score" id="score_1645745">59 points</span> by <a href="user?id=dhotson">dhotson</a> <a href="item?id=1645745">4 hours ago</a> | <a href="item?id=1645745">5 comments</a></td></tr>')
   end
 
   def self.full_page
     File.open(File.join(File.dirname(__FILE__), 'hn_test_page.html'), 'r') do |file|
       return Nokogiri::HTML(file)
     end
-    
+
   end
 
 end

data/spec/HNAPI/services/entries/parsers/time_info_parser_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
+require File.join(File.dirname(__FILE__), 'parser_helper')
 
 module RubyHackernews
   describe TimeInfoParser do
 
     before :each do
-      @parser = TimeInfoParser.new(stub(:text => " 4 hours ago  | "))
+      @parser = TimeInfoParser.new(ParserHelper.second_line)
     end
 
     describe :parse do
@@ -22,4 +23,3 @@ module RubyHackernews
     end
   end
 end
-

data/spec/HNAPI/services/mechanize_context_spec.rb

@@ -8,25 +8,6 @@ module RubyHackernews
       MechanizeContext.send(:class_variable_set, :@@default, nil)
     end
 
-    describe "create" do
-
-      it "should instantiate class variable on use" do
-        MechanizeContext.create()
-        MechanizeContext.send(:class_variable_get, :@@contexts).should_not be_nil
-      end
-
-      it "should assign new agent to hash[key]" do
-        MechanizeContext.create(:test_key)
-        MechanizeContext.send(:class_variable_get, :@@contexts)[:test_key].should be_kind_of Mechanize
-      end
-
-      it "should assign new agent to default if no key passed" do
-        MechanizeContext.create
-        MechanizeContext.send(:class_variable_get, :@@contexts)[:default].should be_kind_of Mechanize
-      end
-
-    end
-
     describe "agent=" do
 
       it "should set @@default as passed key" do

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ruby-hackernews
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Andrea Dallera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: An interface to Hacker News
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -129,17 +129,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: An interface to Hacker News