sekitori-search 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4151497db56b2016e3ff98b92dcf60e0ddff9a69
-  data.tar.gz: 74273905190ad2608147e23b78a7fccf9fa3baf3
+  metadata.gz: 1e964322f72e242a5d04261ae3a74a106d858c1f
+  data.tar.gz: d692531cf43b0fd607e8bf6318b21b78f2db9944
 SHA512:
-  metadata.gz: 29faee7a7ec2ed02875af82747f52b7917a46321cabc3be6687386d17d67fd635959199923ce26856400887e2bd5bff22690f8d9a8d4eb52d1b8a73b38476684
-  data.tar.gz: 0a2387528d550a0da77ef6047c56caa24852d8ce12b7fc95de57c6718e4f13e9a7b912df428ccb6365f3c48dee7a368a282f9e4124b28e2269aafc688b0d13dc
+  metadata.gz: 59abe1fd3490ddec4194590092452af5e2be27ad267bce31c9ed4f7cb43172e08b415630fcc0975da6e13ee12c2bc1959ce4c61afffb7ce78234b53a384b5437
+  data.tar.gz: be8d609f4b4b6c3a739ad9702ba87458fd9a7b54297e9482949ef758f5be842323f06aed86cb377d80acca4eeb30a7ceb682fe4c551fe6274b890a70c9a452f0

data/lib/sekitori/generators/juryo_list_generator.rb

@@ -1,16 +1,18 @@
 require 'sekitori/generators/list_generator.rb'
 
-module Sekitori::Generators
-  class JuryoListGenerator < ListGenerator
-    BANZUKE = "前頭(十両)"
-    URL = "https://ja.wikipedia.org/wiki/大相撲力士一覧"
+module Sekitori
+  module Generators
+    class JuryoListGenerator < ListGenerator
+      BANZUKE = '前頭(十両)'.freeze
+      URL = 'https://ja.wikipedia.org/wiki/大相撲力士一覧'.freeze
 
-    TARGET_XPATH_LIST = [
-      '//h2[contains(span/text(), "十両（十枚目）")]/following-sibling::div/ul/li/a'
-    ]
+      TARGET_XPATH_LIST = [
+        '//h2[contains(span/text(), "十両（十枚目）")]/following-sibling::div/ul/li/a'
+      ].freeze
 
-    IGNORE_XPATH_LIST = [
-      '//h2[contains(span/text(), "幕下以下")]/following-sibling::div/ul/li/a'
-    ]
+      IGNORE_XPATH_LIST = [
+        '//h2[contains(span/text(), "幕下以下")]/following-sibling::div/ul/li/a'
+      ].freeze
+    end
   end
 end

data/lib/sekitori/generators/komusubi_list_generator.rb

@@ -1,17 +1,19 @@
 require_relative './list_generator.rb'
 
-module Sekitori::Generators
-  class KomusubiListGenerator < ListGenerator
-    BANZUKE = "小結"
-    URL = "https://ja.wikipedia.org/wiki/小結一覧"
-  
-    TARGET_XPATH_LIST = [
-      '//h2[contains(span/text(), "現役力士")]/following-sibling::ul/li//a',
-      '//h2[contains(span/text(), "引退・廃業した力士")]/following-sibling::div/ul/li/a'
-    ]
-  
-    IGNORE_XPATH_LIST = [
-      '//h2[contains(span/text(), "関連項目")]/following-sibling::ul/li//a',
-    ]
+module Sekitori
+  module Generators
+    class KomusubiListGenerator < ListGenerator
+      BANZUKE = '小結'.freeze
+      URL = 'https://ja.wikipedia.org/wiki/小結一覧'.freeze
+
+      TARGET_XPATH_LIST = [
+        '//h2[contains(span/text(), "現役力士")]/following-sibling::ul/li//a',
+        '//h2[contains(span/text(), "引退・廃業した力士")]/following-sibling::div/ul/li/a'
+      ].freeze
+
+      IGNORE_XPATH_LIST = [
+        '//h2[contains(span/text(), "関連項目")]/following-sibling::ul/li//a'
+      ].freeze
+    end
   end
-end
+end

data/lib/sekitori/generators/list_generator.rb

@@ -5,67 +5,65 @@ require 'tmpdir'
 require 'nokogiri'
 require 'active_support/all'
 
-module Sekitori::Generators
-  class ListGenerator
-    CACHE_DIR=File.join(Dir.tmpdir, "sekitori_checker")
-  
-    TARGET_XPATH_LIST=[]
-    IGNORE_XPATH_LIST=[]
-  
-    def execute
-      return @list if @list.present?
-      url = self.class::URL
-      target_xpaths = self.class::TARGET_XPATH_LIST
-      ignore_xpath = self.class::IGNORE_XPATH_LIST
-  
-      html = ListGenerator.get url
-      list = ListGenerator.parse html, url, target_xpaths
-      ignore_list = ListGenerator.parse html, url, ignore_xpath
-      @list = list - ignore_list
-      @list
-    end
-  
-    def list
-      execute
-    end
-  
-    def to_h
-      { self.class::BANZUKE => execute }
-    end
-  
-    def self.get url
-      file_name = url.split('/').last
-      path = File.join(CACHE_DIR, file_name)
-      cache = get_from_file(path)
-      return cache if cache
-  
-      puts "Creating cache for #{file_name}"
-      html = get_from_http(url)
-      FileUtils.mkdir_p CACHE_DIR
-      open(path, "w") {|file| file.write html }
-      html
-    end
-  
-    def self.get_from_file path
-      if File.exist? path
-        File.read path
-      else
-        nil
+module Sekitori
+  module Generators
+    class ListGenerator
+      CACHE_DIR = File.join(Dir.tmpdir, 'sekitori_checker')
+
+      TARGET_XPATH_LIST = [].freeze
+      IGNORE_XPATH_LIST = [].freeze
+
+      def execute
+        return @list if @list.present?
+        url = self.class::URL
+        target_xpaths = self.class::TARGET_XPATH_LIST
+        ignore_xpath = self.class::IGNORE_XPATH_LIST
+
+        html = ListGenerator.get url
+        list = ListGenerator.parse html, url, target_xpaths
+        ignore_list = ListGenerator.parse html, url, ignore_xpath
+        @list = list - ignore_list
+        @list
+      end
+
+      def list
+        execute
+      end
+
+      def to_h
+        { self.class::BANZUKE => execute }
+      end
+
+      def self.get(url)
+        file_name = url.split('/').last
+        path = File.join(CACHE_DIR, file_name)
+        cache = get_from_file(path)
+        return cache if cache
+
+        puts "Creating cache for #{file_name}"
+        html = get_from_http(url)
+        FileUtils.mkdir_p CACHE_DIR
+        open(path, 'w') { |file| file.write html }
+        html
+      end
+
+      def self.get_from_file(path)
+        File.read path if File.exist? path
+      end
+
+      def self.get_from_http(url)
+        encode_url = URI.escape(url)
+        html = open(encode_url).read
+      end
+
+      def self.parse(html, url, xpath_list)
+        document = Nokogiri::HTML(html, url)
+        xpath_list.flat_map { |xpath| document.xpath(xpath).map(&:text) }
+      end
+
+      def self.clean(path = CACHE_DIR)
+        FileUtils.rm_rf(path, secure: true)
       end
-    end
-  
-    def self.get_from_http url
-      encode_url = URI.escape(url)
-      html = open(encode_url).read
-    end
-  
-    def self.parse html, url, xpath_list
-      document = Nokogiri::HTML(html, url)
-      xpath_list.flat_map{|xpath| document.xpath(xpath).map(&:text)}
-    end
-  
-    def self.clean path=CACHE_DIR
-      FileUtils.rm_rf(path, secure: true)
     end
   end
 end

data/lib/sekitori/generators/makushita_list_generator.rb

@@ -1,12 +1,14 @@
 require 'sekitori/generators/list_generator.rb'
 
-module Sekitori::Generators
-  class MakushitaListGenerator < ListGenerator
-    BANZUKE = "前頭(幕下)"
-    URL = "https://ja.wikipedia.org/wiki/大相撲力士一覧"
-  
-    TARGET_XPATH_LIST = [
-      '//h2[contains(span/text(), "幕下以下")]/following-sibling::div/ul/li/a'
-    ]
+module Sekitori
+  module Generators
+    class MakushitaListGenerator < ListGenerator
+      BANZUKE = '前頭(幕下)'.freeze
+      URL = 'https://ja.wikipedia.org/wiki/大相撲力士一覧'.freeze
+
+      TARGET_XPATH_LIST = [
+        '//h2[contains(span/text(), "幕下以下")]/following-sibling::div/ul/li/a'
+      ].freeze
+    end
   end
 end

data/lib/sekitori/generators/makuuchi_list_generator.rb

@@ -1,16 +1,18 @@
 require 'sekitori/generators/list_generator.rb'
 
-module Sekitori::Generators
-  class MakuuchiListGenerator < ListGenerator
-    BANZUKE = "前頭(幕内)"
-    URL = "https://ja.wikipedia.org/wiki/大相撲力士一覧"
-  
-    TARGET_XPATH_LIST = [
-      '//h2[contains(span/text(), "幕内")]/following-sibling::div/ul/li/a'
-    ]
-  
-    IGNORE_XPATH_LIST = [
-      '//h2[contains(span/text(), "十両（十枚目）")]/following-sibling::div/ul/li/a'
-    ]
+module Sekitori
+  module Generators
+    class MakuuchiListGenerator < ListGenerator
+      BANZUKE = '前頭(幕内)'.freeze
+      URL = 'https://ja.wikipedia.org/wiki/大相撲力士一覧'.freeze
+
+      TARGET_XPATH_LIST = [
+        '//h2[contains(span/text(), "幕内")]/following-sibling::div/ul/li/a'
+      ].freeze
+
+      IGNORE_XPATH_LIST = [
+        '//h2[contains(span/text(), "十両（十枚目）")]/following-sibling::div/ul/li/a'
+      ].freeze
+    end
   end
 end

data/lib/sekitori/generators/oozeki_list_generator.rb

@@ -1,13 +1,15 @@
 require 'sekitori/generators/list_generator.rb'
 
-module Sekitori::Generators
-  class OozekiListGenerator < ListGenerator
-    BANZUKE = "大関"
-    URL = "https://ja.wikipedia.org/wiki/大関一覧"
-  
-    TARGET_XPATH_LIST = [
-      '//h2[contains(span/text(), "現役力士")]/following-sibling::ul[1]/li//a',
-      '//h2[contains(span/text(), "引退した力士")]/following-sibling::div/ul/li/a'
-    ]
+module Sekitori
+  module Generators
+    class OozekiListGenerator < ListGenerator
+      BANZUKE = '大関'.freeze
+      URL = 'https://ja.wikipedia.org/wiki/大関一覧'.freeze
+
+      TARGET_XPATH_LIST = [
+        '//h2[contains(span/text(), "現役力士")]/following-sibling::ul[1]/li//a',
+        '//h2[contains(span/text(), "引退した力士")]/following-sibling::div/ul/li/a'
+      ].freeze
+    end
   end
 end

data/lib/sekitori/generators/sekiwake_list_generator.rb

@@ -1,17 +1,19 @@
 require 'sekitori/generators/list_generator.rb'
 
-module Sekitori::Generators
-  class SekiwakeListGenerator < ListGenerator
-    BANZUKE = "関脇"
-    URL = "https://ja.wikipedia.org/wiki/関脇一覧"
-  
-    TARGET_XPATH_LIST = [
-      '//h2[contains(span/text(), "現役力士")]/following-sibling::ul/li//a',
-      '//h2[contains(span/text(), "引退・廃業した力士")]/following-sibling::div/ul/li/a'
-    ]
-  
-    IGNORE_XPATH_LIST = [
-      '//h2[contains(span/text(), "関連項目")]/following-sibling::ul/li//a',
-    ]
+module Sekitori
+  module Generators
+    class SekiwakeListGenerator < ListGenerator
+      BANZUKE = '関脇'.freeze
+      URL = 'https://ja.wikipedia.org/wiki/関脇一覧'.freeze
+
+      TARGET_XPATH_LIST = [
+        '//h2[contains(span/text(), "現役力士")]/following-sibling::ul/li//a',
+        '//h2[contains(span/text(), "引退・廃業した力士")]/following-sibling::div/ul/li/a'
+      ].freeze
+
+      IGNORE_XPATH_LIST = [
+        '//h2[contains(span/text(), "関連項目")]/following-sibling::ul/li//a'
+      ].freeze
+    end
   end
 end

data/lib/sekitori/generators/yokozuna_list_generator.rb

@@ -1,10 +1,12 @@
 require 'sekitori/generators/list_generator.rb'
 
-module Sekitori::Generators
-  class YokozunaListGenerator < ListGenerator
-    BANZUKE = "横綱"
-    URL = "https://ja.wikipedia.org/wiki/横綱一覧"
-  
-    TARGET_XPATH_LIST = ['//h2[contains(span/text(), "歴代横綱")]/following-sibling::table[1]//td[1]//a']
+module Sekitori
+  module Generators
+    class YokozunaListGenerator < ListGenerator
+      BANZUKE = '横綱'.freeze
+      URL = 'https://ja.wikipedia.org/wiki/横綱一覧'.freeze
+
+      TARGET_XPATH_LIST = ['//h2[contains(span/text(), "歴代横綱")]/following-sibling::table[1]//td[1]//a'].freeze
+    end
   end
 end

data/lib/sekitori/search.rb

@@ -1,4 +1,4 @@
-require "sekitori/search/version"
+require 'sekitori/search/version'
 
 module Sekitori
   module Search

data/lib/sekitori/search/operator.rb

@@ -2,7 +2,6 @@ require 'sekitori/generators/all'
 
 module Sekitori::Search
   class Operator
-
     def initialize
       @yokozuna_generator = Sekitori::Generators::YokozunaListGenerator.new
       @oozeki_generator = Sekitori::Generators::OozekiListGenerator.new
@@ -19,33 +18,32 @@ module Sekitori::Search
         @komusubi_generator,
         @makuuchi_generator,
         @juryo_generator,
-        @makuuchi_generator,
+        @makuuchi_generator
       ]
 
       @rikishi_generators = @sekitori_generators + [@makushita_generator]
     end
 
-    def sekitori_search_from word
+    def sekitori_search_from(word)
       search_from word, sekitori_hash
     end
 
-    def rikishi_search_from word
+    def rikishi_search_from(word)
       search_from word, rikishi_hash
     end
 
-    def sekitori_detail_search_from name
+    def sekitori_detail_search_from(name)
       detail_search_from name, sekitori_list
     end
 
-    def rikishi_detail_search_from name
+    def rikishi_detail_search_from(name)
       detail_search_from name, rikishi_list
     end
 
-
     private
 
     def sekitori_hash
-      @sekitori_generators.reduce({}) {|work, item| work.merge item.to_h }
+      @sekitori_generators.reduce({}) { |work, item| work.merge item.to_h }
     end
 
     def sekitori_list
@@ -53,26 +51,26 @@ module Sekitori::Search
     end
 
     def rikishi_hash
-      @rikishi_generators.reduce({}) {|work, item| work.merge item.to_h }
+      @rikishi_generators.reduce({}) { |work, item| work.merge item.to_h }
     end
 
     def rikishi_list
       @rikishi_generators.map(&:list).flatten
     end
 
-    def search_from word, hash
+    def search_from(word, hash)
       sekitori_result = hash.map do |key, list|
-        filterd_list = list.select {|name| name.include? word }
+        filterd_list = list.select { |name| name.include? word }
         [key, filterd_list]
       end.to_h
     end
 
-    def detail_search_from name, list
-      result = list.find{|rikishi| rikishi == name }
+    def detail_search_from(name, list)
+      result = list.find { |rikishi| rikishi == name }
       if result
-        "https://ja.wikipedia.org/wiki/#{result.gsub(' ', '_')}"
+        "https://ja.wikipedia.org/wiki/#{result.tr(' ', '_')}"
       else
-        puts "見つかりませんでした"
+        puts '見つかりませんでした'
       end
     end
   end

data/lib/sekitori/search/version.rb

@@ -1,5 +1,5 @@
 module Sekitori
   module Search
-    VERSION = "0.1.0"
+    VERSION = '0.1.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sekitori-search
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - passol78