manga-tools 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00e79a7d0c8e37ab036decdaba2d9cd556d97256a523a59d6af0c1c63c07d2b5
-  data.tar.gz: 46a97ec12c433b9ce51ee222d82df047edc3b8f311304149dd8d3e9a946b27d3
+  metadata.gz: da4ed03340c47790056a5ffeaa86a4f986010d8dfcb7c8fd87568300c9f66e30
+  data.tar.gz: a4f1644d7fca880a904463bf10376c86aaac49aac3a2233ec323ee8d0287bc42
 SHA512:
-  metadata.gz: 3635bfe7dd5cd5c4093fb8281d8137e34c4a3c551c4e377e7332f6712a933190f0515d1159e56bfb78bc6ea917226b6561f1d053afdc5d1b805e4a5e417e9454
-  data.tar.gz: 6170c78319d8e7a74ed93860dde010b87b23c9281385bb65bfeec4af5eb2c9c51f02ceb771797126c9365f9b3295d8d5b4db5b812e16dc3af3e022f33cba45bd
+  metadata.gz: 94e0f51017fd81f30360f03ec4c29cf82318401e507dc267cc354e6e4cba43278b5161e3b12f3af4f0ecfdc2e4dc21af6e8f0c10c0f0ea5b4fd22fb96f06e4dc
+  data.tar.gz: 45d686425259594ae0e45114f8e7d70970df515db271f3c3c6dee8c6316c83deaa8d844a6be9b199abe7fe1854032a127a56eed64e2da785245281b8dafbca15

data/Gemfile

@@ -6,7 +6,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'faraday'
-gem 'nokogiri'
 gem 'pry'
 gem 'rake', require: false
 gem 'rspec'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    manga-tools (0.1.1)
+    manga-tools (0.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -14,10 +14,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     json (2.3.1)
     method_source (1.0.0)
-    mini_portile2 (2.4.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
     parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
@@ -67,7 +64,6 @@ PLATFORMS
 DEPENDENCIES
   faraday
   manga-tools!
-  nokogiri
   pry
   rake
   rspec

data/README.md

@@ -1,13 +1,10 @@
 # Manga::Tools
 
+[![Gem Version](https://badge.fury.io/rb/manga-tools.svg)](https://badge.fury.io/rb/manga-tools)
 ![Ruby](https://github.com/yagihiro/manga-tools/workflows/Ruby/badge.svg)
 [![Maintainability](https://api.codeclimate.com/v1/badges/e2797c91a0bd6f521905/maintainability)](https://codeclimate.com/github/yagihiro/manga-tools/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/e2797c91a0bd6f521905/test_coverage)](https://codeclimate.com/github/yagihiro/manga-tools/test_coverage)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/manga/tools`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -26,7 +23,11 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+* A search command to find out the release date of a manga
+
+```
+$ manga-tools search "ONE PIECE"
+```
 
 ## Development
 

data/lib/manga/tools.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'tools/cache'
 require_relative 'tools/cli'
 require_relative 'tools/http'
 require_relative 'tools/version'

data/lib/manga/tools/cli.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'nokogiri'
-require 'stringio'
 require 'thor'
+require_relative 'http'
 
 module Manga
   module Tools
@@ -13,150 +12,18 @@ module Manga
         true
       end
 
-      # desc "pub {name}", "publication date of {name}"
-      # def pub(name)
-      #   doc = Nokogiri::HTML(
-      #     URI.open('https://tsutaya.tsite.jp/feature/book/release/comic/index', 'User-Agent' => UserAgent)
-      #   )
-      #
-      #   File.open('.index.txt', 'w') {|f| f.write doc }
-      #
-      #   results = {}
-      #
-      #   current_date = ''
-      #   state = :title
-      #   current_data = {}
-      #   doc.css('h3, div.comic_list div.c_cols-1of3 span').each do |element|
-      #     case element.name
-      #     when 'h3'
-      #       results[element.content] = []
-      #       current_date = element.content
-      #     when 'span'
-      #       current_data[state] = element.content
-      #       case state
-      #       when :title
-      #         state = :author
-      #       when :author
-      #         state = :label
-      #       when :label
-      #         state = :title
-      #         results[current_date] << current_data
-      #         current_data = {}
-      #       end
-      #     end
-      #   end
-      #
-      #   puts JSON.pretty_generate(results)
-      # end
-
-      desc 'search WORD', 'Search for a given WORD'
+      desc 'search WORD', 'Search titles for a given WORD'
       def search(word)
-        Manga::Tools::Cache.init
-
-        t = Time.now
-        url = "https://calendar.gameiroiro.com/manga.php?year=#{t.year}&month=#{t.month}"
-        data = Manga::Tools::Cache.fetch(key: url) do |cache|
-          res = Manga::Tools::Http.get(url)
-          cache.expires_in = Manga::Tools::Http.seconds_to_cache(res)
-          results = generate_internal_data(t, res.body)
-          results.to_json
-        end
-
-        hash = JSON.parse(data)
+        url = "https://manga-tools-server.herokuapp.com/publications?keyword=#{CGI.escape(word)}"
+        res = Manga::Tools::Http.get(url)
+        results = JSON.parse(res.body)
 
         puts "Searching '#{word}' ..."
-        hash.each do |date, items|
-          next if items.empty?
-
-          items.each do |item|
-            puts "Found: #{date}, #{item['title']}" if item['title'].index(word)
-          end
+        results.each do |item|
+          puts "#{item['published_at']}: #{item['title']}"
         end
         puts 'Finished.'
       end
-
-      private
-
-      # @param time [Time] a target time
-      # @param data [String] a string of HTTP response body.
-      def generate_internal_data(time, data)
-        doc = Nokogiri::HTML(StringIO.open(data))
-
-        results = {}
-        current_date = nil
-        state = :genre
-        data = {}
-        doc.css(targets.join(', ')).each do |element|
-          value = rm_spaces(element.content)
-          case element.name
-          when 'td'
-            current_date = format('%<ym>s/%<day>02d', ym: time.strftime('%Y/%m'), day: value.to_i)
-            results[current_date] = []
-          when 'p', 'a'
-            case state
-            when :genre
-              guard_genre(element)
-              data[state] = value
-              state = :title
-            when :title
-              guard_title(element)
-              data[state] = value
-              data[:link] = element['href']
-              state = :company
-            when :company
-              guard_company(element)
-              data[state] = value
-              state = :authors
-            when :authors
-              guard_authors(element)
-              data[state] = value
-              state = :genre
-              results[current_date] << data
-              data = {}
-            end
-          end
-        rescue StandardError
-          # when authors, authors may not be present.
-          if state == :authors
-            data[state] = ''
-            state = :genre
-            results[current_date] << data
-            data = {}
-          end
-          retry
-        end
-
-        results
-      end
-
-      def targets
-        @targets ||= [
-          'td.day-td',
-          'div.product-description-right p.p-genre',
-          'div.product-description-right a',
-          'div.product-description-right p.p-company'
-        ]
-      end
-
-      # Remove HTML spaces (&nbsp;) and white spaces.
-      # @param str [String] a string
-      def rm_spaces(str)
-        str.gsub("\u00A0", '').strip
-      end
-
-      def guard_genre(element)
-        raise 'invalid state' unless element.name == 'p' && element['class'] == 'p-genre'
-      end
-
-      def guard_title(element)
-        raise 'invalid state' unless element.name == 'a'
-      end
-
-      def guard_company(element)
-        raise 'invalid state' unless element.name == 'p' && element['class'] == 'p-company'
-      end
-
-      alias guard_authors guard_company
     end
   end
 end

data/lib/manga/tools/http.rb

@@ -2,23 +2,20 @@
 
 require 'faraday'
 require 'uri'
+require_relative 'version'
 
 module Manga
   module Tools
     # HTTP client class
     module Http
-      # rubocop:disable Layout/LineLength
-      UA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.105 Safari/537.36'
-      # rubocop:enable Layout/LineLength
-
       # @param url [String] an url string, eg: `https://example.com`
       # @return [Faraday::Connection] a connection object
       def self.connection(url)
         @connection ||= Faraday.new(
           url: url,
-          headers: { 'User-Agent' => UA }
+          headers: { 'User-Agent' => user_agent }
         ) do |f|
-          f.response :logger
+          # f.response :logger
         end
       end
 
@@ -40,6 +37,10 @@ module Manga
 
         Regexp.last_match(1).to_i
       end
+
+      def self.user_agent
+        @user_agent ||= "manga-tools #{Manga::Tools::VERSION}"
+      end
     end
   end
 end

data/lib/manga/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Manga
   module Tools
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manga-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Hiroki Yagita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-09 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies: []
 description: Tools to support the automation of daily manga-related activities.
 email:
@@ -34,7 +34,6 @@ files:
 - bin/setup
 - exe/manga-tools
 - lib/manga/tools.rb
-- lib/manga/tools/cache.rb
 - lib/manga/tools/cli.rb
 - lib/manga/tools/http.rb
 - lib/manga/tools/version.rb

data/lib/manga/tools/cache.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-require 'digest/md5'
-require 'fileutils'
-
-module Manga
-  module Tools
-    # Cache class
-    class Cache
-      class << self
-        # Initialize cache
-        def init
-          FileUtils.mkdir_p(cache_current_year_dir)
-        end
-
-        def root_dir
-          @root_dir ||= "#{Dir.home}/.manga-tools"
-        end
-
-        def cache_root_dir
-          @cache_root_dir ||= "#{root_dir}/cache"
-        end
-
-        def cache_current_year_dir
-          @cache_current_year_dir ||= "#{cache_root_dir}/#{Time.now.year}"
-        end
-
-        # @return [Integer] default expires in seconds (1day)
-        def default_expires_in
-          @default_expires_in ||= 1 * 24 * 60 * 60
-        end
-
-        # @param key [String] A key to generate a key for the cache
-        # @return [String] string of cached data
-        def fetch(key:)
-          raise ArgumentError, 'mast pass a block' unless block_given?
-
-          cache = new(key)
-          # cache.clear
-          return cache.load_data if cache.available?
-
-          result = yield(cache)
-          cache.save_meta_data
-          cache.save_data(result)
-          result
-        end
-      end
-
-      # @return [Integer|nil] A cache deadline in seconds.
-      attr_accessor :expires_in
-      # @return [String] A key to generate a key for the cache.
-      attr_reader :key
-      # @return [String] A key for the cache.
-      attr_reader :cache_key
-      # @return [String] A path to the cache metadata file.
-      attr_reader :meta_file_path
-      # @return [String] A path to the cached data file.
-      attr_reader :data_file_path
-
-      # @param key [String] A key to generate a key for the cache.
-      def initialize(key)
-        raise ArgumentError, 'mast pass the key param' unless key
-
-        @expires_in = self.class.default_expires_in
-        @key = key
-        @cache_key = Digest::MD5.hexdigest(key)
-        @meta_file_path = "#{self.class.cache_current_year_dir}/#{@cache_key}"
-        @data_file_path = "#{@meta_file_path}.data"
-      end
-
-      # @return [Boolean] True if a cache is available, otherwise return false.
-      def available?
-        t = File.mtime(meta_file_path)
-        saved_expires_in = File.read(meta_file_path).strip.to_i
-
-        Time.now <= (t + saved_expires_in)
-      rescue StandardError
-        false
-      end
-
-      # @return [String] Reads and returns the cache data.
-      def load_data
-        File.read(data_file_path)
-      end
-
-      # Save the metadata for the cache.
-      def save_meta_data
-        @expires_in = self.class.default_expires_in unless expires_in
-
-        File.open(meta_file_path, 'w') do |f|
-          f.write(expires_in.to_s)
-        end
-
-        self
-      end
-
-      # @param str [String] Save the specified cache data
-      def save_data(str)
-        File.open(data_file_path, 'w') do |f|
-          f.write(str.force_encoding('utf-8'))
-        end
-
-        self
-      end
-
-      # for debug
-      def clear
-        File.delete(meta_file_path) if File.exist?(meta_file_path)
-        File.delete(data_file_path) if File.exist?(data_file_path)
-      end
-    end
-  end
-end