relaton-itu 1.7.9 → 1.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b1e5e668d61b87b432757af973484271e9c36d509e1a18b2e28b9989af178c7
-  data.tar.gz: 0f58ebbe769409d733e036e9e49f248590fc40a0bdacebdea27b7443c37a161a
+  metadata.gz: 2f6c98c70c690f45d82159a4225bdd5cafe84e4e8fe170f1dc79e4dbae232a66
+  data.tar.gz: 7e08f450152af6f8cfc7778b7dc3598ac462ece4e1211e3d833510f90b34840a
 SHA512:
-  metadata.gz: c12e668eb24ebb6691677652d87ecf3d3aae8d3f82cf2d99693896bc55bc77395c51bca0049d5c3c8d12e1cd58321d98e16ae3b42f8a2d38a945955255ccbb25
-  data.tar.gz: 8a1335624162c8e0c9cf4db764a3d1dec58e735f15d4fde2410d742f7e622d4e4185e31bbb87c838d2eab0d16e984167797b29ebc29a3b405914aeb04c158015
+  metadata.gz: 503c67ce3ec4d6ca257cd04f1ee5c00a26a6468df4f7466be2b8d735e84043605fa72f9304338dc5a9cd9f9ff2845fb66b4cfb59a32d3c6eca4e6eedbea45b8c
+  data.tar.gz: 7cd2cd6444c7654a448f929e81d00ed9bb01bc36d6e24afcea7552b067ac53ca18301bbd7eb07fd7521e127ed80af6fd5b1c6d455426908d326904455854d181

data/lib/relaton_itu/hit_collection.rb

@@ -17,37 +17,50 @@ module RelatonItu
 
     # @param ref [String]
     # @param year [String]
-    def initialize(ref, year = nil) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    def initialize(ref, year = nil) # rubocop:todo Metrics/MethodLength
       text = ref.sub /(?<=\.)Imp\s?(?=\d)/, ""
       super text, year
       @agent = Mechanize.new
       agent.user_agent_alias = "Mac Safari"
       @gi_imp = /\.Imp\d/.match?(ref)
-      if ref.match? /^(ITU-T|ITU-R\sRR)/
-        url = "#{DOMAIN}/net4/ITU-T/search/GlobalSearch/Search"
-        data = { json: params.to_json }
-        resp = agent.post url, data.to_json, "Content-Type" => "application/json"
-        @array = hits JSON.parse(resp.body)
-      elsif ref.match? /^ITU-R/
-        rf = ref.sub(/^ITU-R\s/, "").upcase
-        url = "https://raw.githubusercontent.com/relaton/relaton-data-itu-r/master/data/#{rf}.yaml"
-        resp = Net::HTTP.get_response(URI(url))
-        if resp.code == "404"
-          @array = []
-          return
-        end
 
-        hash = YAML.safe_load resp.body
-        item_hash = HashConverter.hash_to_bib(hash)
-        item = ItuBibliographicItem.new **item_hash
-        hit = Hit.new({ url: url }, self)
-        hit.fetch = item
-        @array = [hit]
+      case ref
+      when /^(ITU-T|ITU-R\sRR)/
+        request_search
+      when /^ITU-R\s([-_.\w]+)$/
+        request_document($1.upcase)
       end
     end
 
     private
 
+    def request_search
+      url = "#{DOMAIN}/net4/ITU-T/search/GlobalSearch/Search"
+      data = { json: params.to_json }
+      resp = agent.post url, data.to_json, "Content-Type" => "application/json"
+      @array = hits JSON.parse(resp.body)
+    end
+
+    # @param ref [String] a document ref
+    def request_document(ref) # rubocop:todo Metrics/MethodLength
+      uri = URI::HTTPS.build(
+        host: "raw.githubusercontent.com",
+        path: "/relaton/relaton-data-itu-r/master/data/#{ref}.yaml"
+      )
+      resp = Net::HTTP.get_response(uri)
+      if resp.code == "404"
+        @array = []
+        return
+      end
+
+      hash = YAML.safe_load resp.body
+      item_hash = HashConverter.hash_to_bib(hash)
+      item = ItuBibliographicItem.new **item_hash
+      hit = Hit.new({ url: uri.to_s }, self)
+      hit.fetch = item
+      @array = [hit]
+    end
+
     # @return [String]
     def group
       @group ||= case text
@@ -57,10 +70,8 @@ module RelatonItu
                  end
     end
 
-    # rubocop:disable Metrics/MethodLength
-
     # @return [Hash]
-    def params
+    def params # rubocop:disable Metrics/MethodLength
       {
         "Input" => text,
         "Start" => 0,
@@ -107,7 +118,6 @@ module RelatonItu
         "SearchType" => "All",
       }
     end
-    # rubocop:enable Metrics/MethodLength
 
     # @param data [Hash]
     # @return [Array<RelatonItu::Hit>]

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "1.7.9".freeze
+  VERSION = "1.7.10".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.7.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml