ruboty-dmm 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e505b94b8376f49d0f95673a28555ef61233591c
-  data.tar.gz: c6aab02be506d8cfe8eb7939fa26e1ed9c0da765
+  metadata.gz: 5150e290a2ec496a47f2abaa933c2512ae86bd27
+  data.tar.gz: '096a75eb137ea573087b41f361a4378d210694bf'
 SHA512:
-  metadata.gz: 30f6cb11d2f90a7382359d7b937fd573e36d41794fb56d64d4561564ca8d9f146b9cae0607a1d14a177a4a80b92c28beff3380ff2efa731700043b9423ba2a81
-  data.tar.gz: 968096c59894deb746e33af93b85c058e83ae91b67fe533873eda98fd0d00e5ff6bb3dc82a62e49da15a7b3a2130d8dc670970bb2952628a6eeaed6fecb0fe6b
+  metadata.gz: 0b79707ccbfc4661df22b36d617188a278740fa02746e4e692bd8db0d039c429fb51e290d8777f062f046b2eb8f3a5993a5ae1cf715476f9c1207ce1db245447
+  data.tar.gz: ac92ae594fa3dc6d17c8c60640da7f6e65377824e66ae3b99bfb052446774198a235fa6ab46f1d3ac7d2ea8c1725ffa179bf7c7eccf17d4478e8e25732e354bd

data/.travis.yml

@@ -1,8 +1,10 @@
 language: ruby
 
 rvm:
+  - ruby-2.2.2
+  - ruby-2.3.0
   - ruby-2.4.0
-  - 2.3.0
+  - ruby-2.4.1
 
 before_install:
   - gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.0.5
+- Add Ruby versions to `.travis.yml`.
+- Replace owned crawler with dmm-crawler gem.
+
 # v0.0.4
 - Fix a sentence `"#{term}の本日のランキングです。"` -> `"#{term}のランキングです。"`.
 - Add periods to at the end of the sentence.

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    ruboty-dmm (0.0.4)
-      mechanize
+    ruboty-dmm (0.0.5)
+      dmm-crawler (= 0.0.4)
       ruboty
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.2)
+    activesupport (5.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -17,9 +17,11 @@ GEM
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
-    domain_name (0.5.20170223)
+    dmm-crawler (0.0.4)
+      mechanize
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.2.0)
+    dotenv (2.2.1)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     i18n (0.8.1)
@@ -38,10 +40,10 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     net-http-digest_auth (1.4.1)
     net-http-persistent (2.9.4)
-    nokogiri (1.7.0.1)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
     ntlm-http (0.1.1)
     parser (2.4.0.0)
@@ -81,11 +83,11 @@ GEM
     ruby-progressbar (1.8.1)
     slop (3.6.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.4)
     unicode-display_width (1.1.3)
     webrobots (0.1.2)
 

data/doc/ja/README.md

@@ -4,7 +4,7 @@
 
 ## Ruboty DMMとは
 Ruboty DMMはDMM.R18のランキングをSlackに通知するためのボットです。
-現在は同人誌のみになっています。
+現在は同人のみになっています。
 
 ## インストール
 使っているボットのGemfileに以下を追記してください。

data/lib/ruboty/dmm.rb

@@ -1,6 +1,5 @@
-require 'mechanize'
+require 'dmm-crawler'
 
-require 'ruboty/dmm/agent'
 require 'ruboty/dmm/ranking'
 require 'ruboty/dmm/actions/messenger'
 require 'ruboty/dmm/version'

data/lib/ruboty/dmm/actions/messenger.rb

@@ -3,9 +3,9 @@ module Ruboty
     module Actions
       class Messenger < Ruboty::Actions::Base
         def call
-          attachments = Ruboty::DMM::Ranking.new(submedia: message.match_data[:submedia], term: message.match_data[:term]).books
+          attachments = Ruboty::DMM::Ranking.new(message.match_data).arts
           term = term_converter(message.match_data[:term])
-          message.reply("#{term}のランキングです。", attachments: attachments)
+          message.reply("#{term}のランキングです。", attachments: attachments) # temporary ignoring tags. I have to add interface for tags
         rescue => exception
           message.reply("Failed by #{exception.class}")
         end
@@ -22,6 +22,8 @@ module Ruboty
             '月間'
           when 'total'
             '全体'
+          else
+            raise TypeError
           end
         end
       end

data/lib/ruboty/dmm/ranking.rb

@@ -1,49 +1,29 @@
 module Ruboty
   module DMM
     class Ranking
-      BASE_URL = 'http://www.dmm.co.jp'.freeze
       COLORS = %w(7acc28 9dcc28 cc2828 cc6e28 28a9cc 3428cc cc28b4 c0cc28 2886cc 28cca9).map { |hex| "##{hex}" }.freeze
 
-      def initialize(arguments)
-        @term = discriminate_term(arguments[:term])
-        @submedia = discriminate_submedia(arguments[:submedia])
-        @url = "#{BASE_URL}/dc/doujin/-/ranking-all/=/sort=popular/submedia=#{@submedia}/term=#{@term}"
-        @agent = Agent.new.agent
-      end
+       def initialize(arguments)
+         @submedia = arguments[:submedia]
+         @term = arguments[:term]
+       end
 
-      def books
-        books = page.search('.rank-rankListItem.fn-setPurchaseChange').map do |element|
-          [
-            element.search('.rank-name').first.text.strip,
-            element.search('img').last.attributes['src'].value,
-            "#{BASE_URL}#{element.search('.rank-name').first.search('a').first.attributes.first[1].value}"
-          ]
-        end
-        books.take(10).zip(COLORS).map.with_index(1) { |((title, image, url), color), rank| { title: "#{rank}位: #{title}", title_link: url, image_url: image, color: color } }
-      end
+       def arts
+         arts = DMMCrawler::Ranking.new(submedia: submedia, term: term).arts.take(10)
+         arts.zip(COLORS).map { |art, color| art.merge(color: color) }
+       end
 
-      private
+       private
 
-      def credentials
-        {
-          api_id:       ENV['API_ID'],
-          affiliate_id: ENV['AFFILIATE_ID']
-        }
-      end
+       def term
+         return @term if %w(24 weekly monthly total).include?(@term)
+         raise TypeError
+       end
 
-      def page
-        @agent.get(@url)
-      end
-
-      def discriminate_term(term)
-        return term if %w(24 weekly monthly total).include?(term)
-        raise TypeError
-      end
-
-      def discriminate_submedia(submedia)
-        return submedia if %w(all weekly cg game voice).include?(submedia)
-        raise TypeError
-      end
+       def submedia
+         return @submedia if %w(all comic cg game voice).include?(@submedia)
+         raise TypeError
+       end
     end
   end
 end

data/lib/ruboty/dmm/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module DMM
-    VERSION = '0.0.4'.freeze
+    VERSION = '0.0.5'.freeze
   end
 end

data/ruboty-dmm.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['sachin21dev@gmail.com']
 
   spec.summary       = "A bot for DMM R18's rankings"
-  spec.description   = "A bot for DMM R18's rankings, 24, weeks, months"
+  spec.description   = "A bot for DMM R18's rankings for 24, weeks, months"
   spec.homepage      = 'https://github.com/sachin21/ruboty-dmm'
   spec.license       = 'MIT'
 
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'ruboty'
-  spec.add_runtime_dependency 'mechanize'
+  spec.add_runtime_dependency 'dmm-crawler', '0.0.4'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'

data/spec/ruboty/dmm/ranking_spec.rb

@@ -1,23 +1,33 @@
 describe Ruboty::DMM::Ranking do
-  let(:attachments) { described_class.new(arguments).books }
+  let(:attachments) { described_class.new(arguments).arts }
 
-  let(:submedia) { 'cg' }
   let(:arguments) { { submedia: submedia, term: term } }
 
-  describe '#books' do
-    context 'with 24 argument' do
+  describe '#arts' do
+    context 'with registered arguments' do
       subject { attachments }
 
       let(:term) { '24' }
+      let(:submedia) { 'cg' }
 
       it { is_expected.not_to be_empty }
-      it { is_expected.to all(include(:title, :title_link, :image_url, :color)) }
+      it { is_expected.to all(include(:title, :title_link, :image_url, :tags, :color)) }
     end
 
-    context 'with not registered argument' do
+    context 'with not registered term' do
       subject { -> { attachments } }
 
-      let(:term) { 'hoge' }
+      let(:term) { 'foobaz' }
+      let(:submedia) { 'cg' }
+
+      it { is_expected.to raise_error(TypeError) }
+    end
+
+    context 'with not registered submedia' do
+      subject { -> { attachments } }
+
+      let(:term) { '24' }
+      let(:submedia) { 'foobaz' }
 
       it { is_expected.to raise_error(TypeError) }
     end

data/spec/ruboty/handlers/dmm_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe Ruboty::Handlers::RubotyDMM do
+  let(:robot) { Ruboty::Robot.new }
+
+  let(:channel) { '#bot_test' }
+
+  let(:sender) { 'mikoto-sister' }
+
+  let(:body) { %(ruboty dmm #{submedia} #{term}) }
+
+  before { sleep 2 }
+
+  describe '#messenger' do
+
+    subject { -> { robot.receive(body: body, from: sender, to: channel) } }
+
+    context 'with valid arguments' do
+      let(:submedia) { 'cg' }
+      let(:term) { '24' }
+
+      it { is_expected.to output("24時間のランキングです。\n").to_stdout }
+    end
+
+    context 'with invalid submedia' do
+      let(:submedia) { 'foobaz' }
+      let(:term) { '24' }
+
+      it { is_expected.to output("Failed by TypeError\n").to_stdout }
+    end
+
+    context 'with invalid term' do
+      let(:submedia) { 'cg' }
+      let(:term) { 'foobaz' }
+
+      it { is_expected.to output("Failed by TypeError\n").to_stdout }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -4,8 +4,14 @@
 require 'ruboty'
 require 'ruboty/dmm'
 
+require 'pry'
+
 RSpec.configure do |config|
   config.order = 'random'
+
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+
   config.expect_with :rspec do |rspec|
     rspec.syntax = :expect
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-dmm
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Satoshi Ohmori
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-09 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: dmm-crawler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.5.0
-description: A bot for DMM R18's rankings, 24, weeks, months
+description: A bot for DMM R18's rankings for 24, weeks, months
 email:
 - sachin21dev@gmail.com
 executables: []
@@ -128,12 +128,12 @@ files:
 - doc/ja/README.md
 - lib/ruboty/dmm.rb
 - lib/ruboty/dmm/actions/messenger.rb
-- lib/ruboty/dmm/agent.rb
 - lib/ruboty/dmm/ranking.rb
 - lib/ruboty/dmm/version.rb
 - lib/ruboty/handlers/dmm.rb
 - ruboty-dmm.gemspec
 - spec/ruboty/dmm/ranking_spec.rb
+- spec/ruboty/handlers/dmm_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sachin21/ruboty-dmm
 licenses:
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A bot for DMM R18's rankings

data/lib/ruboty/dmm/agent.rb

@@ -1,13 +0,0 @@
-module Ruboty
-  module DMM
-    class Agent
-      attr_accessor :agent
-
-      def initialize
-        @agent = ::Mechanize.new
-        @agent.request_headers = { 'Accept-Encoding' => '' }
-        @agent.ignore_bad_chunking = true
-      end
-    end
-  end
-end