ruboty-bokete 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6544c8b122280deebf01f0a342b3613668b7568e
-  data.tar.gz: 2035986702a98b650147b49d71870a94db8441a8
+  metadata.gz: 9f98edcf8358f16cdd3aaf186045b564ffdd87c6
+  data.tar.gz: 358ee77031f53d2c18bd97e950b0521e81561384
 SHA512:
-  metadata.gz: 37dd6ebc7bb3643fce701cf2ce89619487bdd10b90564a8cd192658c5717e0cf724ade98772fbf8e6436a29ecd3a501223a305233625f8bcc4989a96d4c45fec
-  data.tar.gz: 2df59c9df61898c661ae41ec034999065d25085adaee225dbf8350bea7482585b3480739823d43b3dc3caf81b685f8f06d8fb772df4a90aaaf8c849f751b5c09
+  metadata.gz: c589ffc54172226212e9c16fd62ce4f4277a727cabbcdb673099c4713adf6831c6c9203ea2421af03da33496b9c69e34380ea8b2b477a260119141d29cfea279
+  data.tar.gz: 3229a9e4169193e35ecf65c067bcc9c2cde0bd6d59c5bc9787da0bd336efbc3875d74a15789ecd7c9ba680a74c7faf05ea8a7128cc0ad3aa0e716fb5347bbb6d

data/lib/ruboty/bokete/client.rb

@@ -1,47 +1,50 @@
 require 'mechanize'
 
-class Client
-  BOKETE_URL = 'http://bokete.jp'
+module Ruboty
+  module Bokete
+    class Client
+      BOKETE_URL = 'http://bokete.jp'
+
+      def initialize(max_results: 30)
+        @max_results = max_results
+        @agent = Mechanize.new
+      end
 
-  def initialize(max_results: 30)
-    @max_results = max_results
-    @agent = Mechanize.new
-  end
+      def get(mode)
+        results = []
 
-  def get(mode)
-    results = []
+        @agent.get("#{BOKETE_URL}/boke/#{mode}") do |page|
+          target_page = page
 
-    @agent.get("#{BOKETE_URL}/boke/#{mode}") do |page|
-      target_page = page
+          while results.size < @max_results
+            images = scraping_from_page(target_page)
+            results.concat(images)
 
-      while results.size < @max_results
-        images = scraping_from_page(target_page)
-        results.concat(images)
+            target_page = get_next_page(target_page)
+            break if target_page.nil?
+          end
+        end
 
-        target_page = get_next_page(target_page)
-        break if target_page.nil?
+        results
       end
-    end
-
-    results
-  end
 
-  def scraping_from_page(page)
-    images = []
-
-    page.search('a>img').each do |node|
-      image = node.attribute('src').value rescue nil
-      alt = node.attribute('alt').value rescue nil
+      def scraping_from_page(page)
+        page.search('.boke').map do |node|
+          node.children.each_with_object({}) do |child, hash|
+            case child.name
+            when 'div'
+              img = child.children.children.children.detect {|o| o.name == 'img' }
+              hash[:url] ||= img.attribute('src').value rescue nil
+            when 'h3'
+              hash[:boke] = child.text
+            end
+          end
+        end
+      end
 
-      if image && alt && image.match(%r|\A//|)
-        images << "http:#{image}\n#{alt}"
+      def get_next_page(page)
+        page.links_with(href: /\?page/)[-1].click rescue nil
       end
     end
-
-    images
-  end
-
-  def get_next_page(page)
-    page.links_with(href: /\?page/)[-1].click rescue nil
   end
 end

data/lib/ruboty/bokete/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Bokete
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/ruboty/handlers/bokete.rb

@@ -11,9 +11,9 @@ module Ruboty
       on /bokete (?<mode>.+)/, name: 'bokete', description: 'Get a bokete'
 
       def initialize(*args)
-        super
+        super(*args)
 
-        @client = Client.new
+        @client = Ruboty::Bokete::Client.new
       end
 
       def bokete(message)
@@ -33,7 +33,7 @@ module Ruboty
         end
 
         result = JSON.parse(brain[mode]).sample
-        message.reply(result)
+        message.reply((result['url'].start_with?('//') ? 'http:' + result['url'] : result['url']) + "\n" + result['boke'])
       end
 
       def brain

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-bokete
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruboty handler to get a bokete.