jok 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14f5aab7e070be756a1ed011042507b4c1484a37
-  data.tar.gz: 4d10e1be850ee77f6afb7003e0ed34aa40cbc5d5
+  metadata.gz: 8eb62706f8c5f1ff330fa23a150b91df64e7192a
+  data.tar.gz: e0471797d1efb07439209e48d3c5117f333941a4
 SHA512:
-  metadata.gz: 17fde72b45b618fcac4c49223e3b8c10d7e0e2a7dcd0ffa23d966af00b58d084f849df67e873318fb7761a6897892c8d3692797c2fb2dccde1afcc3642dc3c30
-  data.tar.gz: 6b4a213e41f3e90e9a957580248e350c33ce6eae94408663e6a259d2666f2fe0c9839a08860a8155feae8442d19478842b68d6a18b0df2e7c0345930cc9e805f
+  metadata.gz: 64385a60d184fb7d5dc5b224a7512468d846015ad1901142591649fa92864350ad0a80a0f89b5ae58708ff97e5eb1f5d327e2e4676e7904968825216cbc92804
+  data.tar.gz: 9ba83c4eeeffb8460119f6db5585a1dd46515e408174d407df90c8137121daea03ba54fc70e3b896e609e49647c45e222d499a78c84d25d974087a5244dd0a2d

data/lib/jok/joke_factory.rb

@@ -4,7 +4,7 @@ module Jok
 
     def list
       @list ||= begin
-        dom.xpath('//div[@class="left-nav"]/ul/li/a').map(&:text)
+        Nokogiri::HTML(HTTParty.get(BASE_URI)).xpath('//div[@class="left-nav"]/ul/li/a').map(&:text)
       end
     end
 
@@ -38,27 +38,33 @@ module Jok
 
     private
 
-    def dom(method="")
-      topic = "#{BASE_URI}/#{method.gsub("_", "-")}"
+    # Cautious: Randomness!!!
+    def parse_uri(method="")
+      topic = "#{BASE_URI}#{method.gsub("_", "-")}"
       response_body = HTTParty.get(topic)
-      dom_tree = Nokogiri::HTML(response_body)
 
-      return dom_tree if method == ""
+      return topic if method == ""
+
+      dom_tree = Nokogiri::HTML(response_body)
 
       pagination_items = dom_tree.xpath('//div[@class="pagination"]/ul/li').map(&:text).map(&:strip)
 
       if pagination_items.length > 0
         selected_item = pagination_items[srand % (pagination_items.length - 1)]
-
-        response_body = HTTParty::get("#{topic}/#{selected_item}")
-        Nokogiri::HTML(response_body)
+        "#{topic}/#{selected_item}"
       else
-        dom_tree
+        topic
       end
     end
 
     def joke(topic="")
-      dom(topic).xpath('//div[@class="joke3-pop-box"]/p[substring-before(@id, "_") = "joke"]').map(&:text).map(&:strip)
+      uri = parse_uri(topic)
+      response_body = HTTParty.get(uri)
+      dom = Nokogiri::HTML(response_body).xpath('//div[@class="joke3-pop-box"]/p[substring-before(@id, "_") = "joke"]')
+
+      dom.map do |child|
+        OpenStruct.new(content: child.text.strip, link: "#{uri}##{child.attributes["id"].value}")
+      end
     end
   end
 end

data/lib/jok/version.rb

@@ -1,3 +1,3 @@
 module Jok
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/jok_test.rb

@@ -6,6 +6,9 @@ describe Jok, "Hello world" do
   end
 
   it "#da" do
-    Jok.da.must_be_instance_of String
+    joke = Jok.da
+    joke.must_be_instance_of OpenStruct
+    joke.content.must_be_instance_of String
+    joke.link.must_be_instance_of String
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jok
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jingkai He
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-30 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Bring you a good laugh.