relaton-iec 1.5.0 → 1.6.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 585ff20a58cd576335e184b6e8e420222d03e51dcfd9299f3625755ffe2316cf
-  data.tar.gz: 7c3a6eb9a9ff6594186680e96d8b12bcec51019d27b349239c4a085f8c0d032b
+  metadata.gz: 99612dcda07b9d860e087ecc3990a275b165539e2eefc83d4e5486feeb94ca4b
+  data.tar.gz: b15b0d2aa3860580697eb9ec009e68e96715be3e0debd9dc286b5527a250af02
 SHA512:
-  metadata.gz: 262028dca7496435b233c1ec77b4b8fcbde6e93eca0276f9469835a063b0e3d0f8823cbe118af042516d90ab347560a4e2a963b6a0d6ad1a21333fb4b821dc8d
-  data.tar.gz: 99e68fa99988635c239ed7ecd07a458dbb1a8007f1d8e912a0a2576f1cf0f36af3e873e7eadaa0a27c30d4d4c7e765cebfa8d14e21b8c078d345e3575192baf1
+  metadata.gz: 15403a2fac73cfede74532468718a1c3a704d26b14cc54f2eabb7ea9f3451079003f62d4d22498809480c4ff64d84f6ab3e82689617dac3a082f348323abb0b7
+  data.tar.gz: 8ea1575201a593e580b39bcfe6205dd81f832116c967b88ec6608537b18e94410fab417eb9d1d2def971e996e7f35d16c43f53fe4641f7be2b0fb9b722a02fa2

data/.github/workflows/macos.yml

@@ -26,6 +26,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/README.adoc

@@ -18,7 +18,7 @@ Add this line to your application's Gemfile:
 
 [source,ruby]
 ----
-gem 'relaton_iec'
+gem 'relaton-iec'
 ----
 
 And then execute:
@@ -27,7 +27,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install relaton_iec
+    $ gem install relaton-iec
 
 == Usage
 

data/lib/relaton_iec/hit_collection.rb

@@ -10,22 +10,42 @@ module RelatonIec
 
     # @param ref_nbr [String]
     # @param year [String]
-    def initialize(ref_nbr, year = nil) #(text, hit_pages = nil)
+    def initialize(ref_nbr, year = nil)
       super
+      @array = hits ref_nbr, year
+    end
+
+    private
+
+    def hits(ref, year)
       from, to = nil
       if year
         from = Date.strptime year, "%Y"
         to   = from.next_year.prev_day
       end
-      url  = "#{DOMAIN}/searchkey&RefNbr=#{ref_nbr}&From=#{from}&To=#{to}&start=1"
-      doc  = Nokogiri::HTML OpenURI.open_uri(::Addressable::URI.parse(url).normalize)
-      @array = doc.css("ul.search-results > li").map do |h|
-        link  = h.at('a[@href!="#"]')
-        code  = link.text.tr [194, 160].pack("c*").force_encoding("UTF-8"), ""
-        title = h.xpath("text()").text.gsub(/[\r\n]/, "")
-        url   = DOMAIN + link[:href]
-        Hit.new({ code: code, title: title, url: url }, self)
+      get_results ref, from, to
+    end
+
+    def get_results(ref, from,to)
+      [nil, "trf", "wr"].reduce([]) do |m, t|
+        url = "#{DOMAIN}/searchkey"
+        url += "&type=#{t}" if t
+        url += "&RefNbr=#{ref}&From=#{from}&To=#{to}&start=1"
+        m + results(Addressable::URI.parse(url).normalize)
       end
     end
+
+    def results(uri)
+      Nokogiri::HTML(OpenURI.open_uri(uri)).css(
+        "//body/li", "ul.search-results > li", "ul.morethesame > li"
+      ).map { |h| make_hit h }
+    end
+
+    def make_hit(hit)
+      link  = hit.at('a[@href!="#"]')
+      code  = link.text.tr [194, 160].pack("c*").force_encoding("UTF-8"), ""
+      title = hit.xpath("text()").text.gsub(/[\r\n]/, "")
+      Hit.new({ code: code, title: title, url: DOMAIN + link[:href] }, self)
+    end
   end
 end

data/lib/relaton_iec/iec_bibliography.rb

@@ -136,9 +136,9 @@ module RelatonIec
             return { ret: r } if !year
 
             r.date.select { |d| d.type == "published" }.each do |d|
-              return { ret: r } if year.to_i == d.on.year
+              return { ret: r } if year.to_i == d.on(:year)
 
-              missed_years << d.on.year
+              missed_years << d.on(:year)
             end
           end
         end

data/lib/relaton_iec/scrapper.rb

@@ -223,8 +223,7 @@ module RelatonIec
       def fetch_status_relations(url)
         pubid = url.match(/\d+$/).to_s
         uri = URI DOMAIN + "/webstore/webstore.nsf/AjaxRequestXML?"\
-        "Openagent&url=http://www.iec.ch/dyn/www/f?"\
-        "p=103:390:::::P390_PUBLICATION_ID:" + pubid
+        "Openagent&url=" + pubid
         resp = Net::HTTP.get_response uri
         doc = Nokogiri::XML resp.body
         status = fetch_status doc

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.5.0".freeze
+  VERSION = "1.6.pre1".freeze
 end

data/relaton_iec.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "addressable"
-  spec.add_dependency "relaton-iso-bib", "~> 1.5.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.6.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.pre1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2020-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.pre
 description: 'RelatonIec: retrieve IEC Standards for bibliographic use using the IecBibliographicItem
   model'
 email:
@@ -231,9 +231,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
 signing_key: