relaton-iso 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ff396da8dad98ab886022064ab47bfe29d85f6a
-  data.tar.gz: b03ac90297c301edac42193e2d37119a24b7348f
+  metadata.gz: d39e9890ddcc1333a9430d8f149414e7049af523
+  data.tar.gz: b614ae1fe64ce2b1e7f72c83c6649f9e222346a5
 SHA512:
-  metadata.gz: 40dbc389dbee1e726b882944102eb674289d38b8e73d32f27f29dceeae875f40f3ec272b82a22eab23891f6732235531397e67001575d2e0922317fabbb70d15
-  data.tar.gz: fdacef79ca7cae29db9a2690b99c097c31fd241253176f3babb2bf3d2eb7113dd178fa7c01b0c7da232c86fa2831917af98b2165413cd512f8fb6feb0b9e5af7
+  metadata.gz: 8e958c6ce53f617d167a5059c772a6a4a469317d35d7444a41b6181879678149f2704306aed4fde38baa5d5771f3a8f46744b09c61549d23585b45a08539a07d
+  data.tar.gz: 531c10407c214307d4a0cca9758d4af2eaa94e5724ce2377510c5970f0a797f43b5b3d5e7aef0a59829c0dcd8c7504a112859de5ead6cbc56b7abbb607aceb6c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    relaton-iso (0.6.5)
+    relaton-iso (0.6.6)
       relaton-iec (~> 0.4.0)
       relaton-iso-bib (~> 0.3.0)
 
@@ -36,13 +36,13 @@ GEM
       pry (~> 0.10)
     public_suffix (4.0.1)
     rake (10.5.0)
-    relaton-bib (0.3.6)
+    relaton-bib (0.3.8)
       addressable
       nokogiri
-    relaton-iec (0.4.3)
+    relaton-iec (0.4.6)
       addressable
       relaton-iso-bib (~> 0.3.0)
-    relaton-iso-bib (0.3.5)
+    relaton-iso-bib (0.3.7)
       isoics (~> 0.1.6)
       relaton-bib (~> 0.3.0)
       ruby_deep_clone (~> 0.8.0)

data/lib/relaton_iso/hit.rb

@@ -2,41 +2,16 @@
 
 module RelatonIso
   # Hit.
-  class Hit
+  class Hit < RelatonBib::Hit
     # @return [RelatonIso::HitCollection]
     attr_reader :hit_collection
 
-    # @return [Array<Hash>]
-    attr_reader :hit
-
-    # @param hit [Hash]
-    # @param hit_collection [RelatonIso:HitCollection]
-    def initialize(hit, hit_collection = nil)
-      @hit            = hit
-      @hit_collection = hit_collection
-    end
-
     # Parse page.
     # @return [RelatonIso::IsoBibliographicItem]
     def fetch
       @fetch ||= Scrapper.parse_page @hit
     end
 
-    # @return [String]
-    def to_s
-      inspect
-    end
-
-    # @return [String]
-    def inspect
-      # matched_words = @hit["_highlightResult"].
-      #   reduce([]) { |a, (_k, v)| a + v["matchedWords"] }.uniq
-
-      "<#{self.class}:#{format('%#.14x', object_id << 1)} "\
-      "@text=\"#{@hit_collection&.ref}\" "\
-      "@reference=\"#{@hit["docRef"]}\""
-    end
-
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder = nil, **opts)
       if builder

data/lib/relaton_iso/hit_collection.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
+require "forwardable"
 require "relaton_iso/hit"
 
 module RelatonIso
   # Page of hit collection.
-  class HitCollection < Array
+  class HitCollection
+    extend Forwardable
+
+    def_delegators :@array, :<<, :[], :first, :empty?, :any?, :size
+
     # @return [TrueClass, FalseClass]
     # attr_reader :fetched
 
@@ -12,15 +17,13 @@ module RelatonIso
     # attr_reader :hit_pages
 
     # @return [String]
-    attr_reader :ref
+    attr_reader :text
 
     # @param hits [Array<Hash>]
-    def initialize(ref)
-      # concat(hits.map { |h| Hit.new(h, self) })
-      # @fetched = false
-      # @hit_pages = hit_pages
-      @ref = ref
-      %r{(?<num>\d+)(-(?<part>\d+))?} =~ ref
+    def initialize(text)
+      @array = []
+      @text = text
+      %r{(?<num>\d+)(-(?<part>\d+))?} =~ text
       http = Net::HTTP.new "www.iso.org", 443
       http.use_ssl = true
       search = ["status=ENT_ACTIVE,ENT_PROGRESS,ENT_INACTIVE,ENT_DELETED"]
@@ -28,12 +31,11 @@ module RelatonIso
       search << "docPartNo=#{part}" if part
       q = search.join "&"
       resp = http.get("/cms/render/live/en/sites/isoorg.advancedSearch.do?#{q}",
-        "Accept" => "application/json, text/plain, */*")
+                      "Accept" => "application/json, text/plain, */*")
       return if resp.body.empty?
 
       json = JSON.parse resp.body
-      concat(json["standards"].map { |h| Hit.new h, self })
-      sort! do |a, b|
+      @array = json["standards"].map { |h| Hit.new h, self }.sort! do |a, b|
         if a.sort_weight == b.sort_weight
           (parse_date(b.hit) - parse_date(a.hit)).to_i
         else
@@ -42,18 +44,59 @@ module RelatonIso
       end
     end
 
+    def select(&block)
+      me = DeepClone.clone self
+      me.instance_variable_get(:@array).select!(&block)
+      me
+    end
+
+    def reduce!(sum, &block)
+      @array = @array.reduce sum, &block
+      self
+    end
+
+    # @return [RelatonIso::HitCollection]
+    # def fetch
+    #   return self if @fetched
+
+    #   workers = RelatonBib::WorkersPool.new 4
+    #   workers.worker(&:fetch)
+    #   @array.each do |hit|
+    #     workers << hit
+    #   end
+    #   workers.end
+    #   workers.result
+    #   @fetched = true
+    #   self
+    # end
+
+    def to_all_parts
+      hit = @array.min_by { |h| h.hit["docPart"].to_i }
+      bibitem = hit.fetch
+      bibitem.to_all_parts
+      @array.reject { |h| h.hit["docRef"] == hit.hit["docRef"] }.each do |hi|
+        isobib = RelatonIsoBib::IsoBibliographicItem.new(
+          formattedref: RelatonBib::FormattedRef.new(content: hi.hit["docRef"]),
+        )
+        bibitem.relation << RelatonBib::DocumentRelation.new(
+          type: "partOf", bibitem: isobib,
+        )
+      end
+      bibitem
+    end
+
     def to_s
       inspect
     end
 
     def inspect
-      "<#{self.class}:#{format('%#.14x', object_id << 1)} @ref=#{@ref}>"
+      "<#{self.class}:#{format('%#.14x', object_id << 1)} @ref=#{@text}>"
     end
 
     def to_xml(**opts)
       builder = Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
         xml.documents do
-          each do |hit|
+          @array.each do |hit|
             hit.fetch
             hit.to_xml xml, **opts
           end

data/lib/relaton_iso/iso_bibliography.rb

@@ -46,14 +46,15 @@ module RelatonIso
             year = year1
           end
         end
-        code += "-1" if opts[:all_parts]
+        opts[:all_parts] ||= code !~ %r{^[^\s]+\s\d+-\d+} && opts[:all_parts].nil?
+        # code += "-1" if all_parts
         return RelatonIec::IecBibliography.get(code, year, opts) if %r[^ISO/IEC DIR] =~ code
 
-        ret = isobib_get1(code, year, corr)
+        ret = isobib_get1(code, year, corr, opts)
         return nil if ret.nil?
 
-        ret.to_most_recent_reference unless year || opts[:keep_year]
-        ret.to_all_parts if opts[:all_parts]
+        ret.to_most_recent_reference unless year || opts[:keep_year] || opts[:all_parts]
+        # ret.to_all_parts if all_parts
         ret
       end
 
@@ -89,20 +90,20 @@ module RelatonIso
       # @param code [String] reference without correction
       # @param corr [String] correction
       # @return [Array<RelatonIso::Hit>]
-      def isobib_search_filter(code, corr)
+      def isobib_search_filter(code, corr, opts)
         warn "fetching #{code}..."
         result = search(code)
-        res = search_code result, code, corr
+        res = search_code result, code, corr, opts
         return res unless res.empty?
 
         # try stages
         if %r{^\w+/[^/]+\s\d+} =~ code # code like ISO/IEC 123, ISO/IEC/IEE 123
-          res = try_stages(result, corr) do |st|
+          res = try_stages(result, corr, opts) do |st|
             code.sub(%r{^(?<pref>[^\s]+\s)}) { "#{$~[:pref]}#{st} " }
           end
           return res unless res.empty?
         elsif %r{^\w+\s\d+} =~ code # code like ISO 123
-          res = try_stages(result, corr) do |st|
+          res = try_stages(result, corr, opts) do |st|
             code.sub(%r{^(?<pref>\w+)}) { "#{$~[:pref]}/#{st}" }
           end
           return res unless res.empty?
@@ -111,24 +112,24 @@ module RelatonIso
         if %r{^ISO\s} =~ code # try ISO/IEC if ISO not found
           warn "Attempting ISO/IEC retrieval"
           c = code.sub "ISO", "ISO/IEC"
-          res = search_code result, c, corr
+          res = search_code result, c, corr, opts
         end
         res
       end
 
-      def try_stages(result, corr)
+      def try_stages(result, corr, opts)
         %w[NP WD CD DIS FDIS PRF IS AWI].each do |st| # try stages
           warn "Attempting #{st} stage retrieval"
           c = yield st
-          res = search_code result, c, corr
+          res = search_code result, c, corr, opts
           return res unless res.empty?
         end
-        []
+        result
       end
 
-      def search_code(result, code, corr)
+      def search_code(result, code, corr, opts)
         result.select do |i|
-          i.hit["docRef"] =~ %r{^#{code}(?!-)} && (
+          (opts[:all_parts] || i.hit["docRef"] =~ %r{^#{code}(?!-)}) && (
               corr && %r{^#{code}[\w-]*(:\d{4})?/#{corr}} =~ i.hit["docRef"] ||
               %r{^#{code}[\w-]*(:\d{4})?/} !~ i.hit["docRef"] && !corr
             )
@@ -141,24 +142,29 @@ module RelatonIso
       # Only expects the first page of results to be populated.
       # Does not match corrigenda etc (e.g. ISO 3166-1:2006/Cor 1:2007)
       # If no match, returns any years which caused mismatch, for error reporting
-      def isobib_results_filter(result, year)
+      def isobib_results_filter(result, year, opts)
         missed_years = []
-        result.each do |s|
-          next if !year && s.hit["publicationStatus"] == "Withdrawn"
-          return { ret: s.fetch } unless year
+        hits = result.reduce!([]) do |hts, h|
+          if !year && h.hit["publicationStatus"] == "Withdrawn"
+            hts
+          elsif !year || %r{:(?<iyear>\d{4})} =~ h.hit["docRef"] && iyear == year
+            hts << h
+          else
+            missed_years << iyear
+            hts
+          end
+        end
+        return { years: missed_years } unless hits.any?
 
-          %r{:(?<iyear>\d{4})} =~ s.hit["docRef"]
-          return { ret: s.fetch } if iyear == year
+        return { ret: hits.first.fetch } if !opts[:all_parts] || hits.size == 1
 
-          missed_years << iyear
-        end
-        { years: missed_years }
+        { ret: hits.to_all_parts }
       end
 
-      def isobib_get1(code, year, corr)
+      def isobib_get1(code, year, corr, opts)
         # return iev(code) if /^IEC 60050-/.match code
-        result = isobib_search_filter(code, corr) || return
-        ret = isobib_results_filter(result, year)
+        result = isobib_search_filter(code, corr, opts) || return
+        ret = isobib_results_filter(result, year, opts)
         return ret[:ret] if ret[:ret]
 
         fetch_ref_err(code, year, ret[:years])

data/lib/relaton_iso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIso
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler