patentscope 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b523ee313b0b12c65cb68e78290344465927835
-  data.tar.gz: ba4a83db30178a6b82c356749732ff8850d96289
+  metadata.gz: 8c3ff619f0ad1778c36dbb2d04a945ad4c3e3cce
+  data.tar.gz: 5736b0e818ed2823b0dd5e3d6f180902c9e25796
 SHA512:
-  metadata.gz: 4671bda95ce98bdb5258b33e65b8a2919e1489b8173d8a8d3cc167d9fab95af416e5de334344b551fa93a4e28df8c97621395998326bf56e60a74dd36c44a759
-  data.tar.gz: b0d0a48b09c52f15b0d75c4763dc67981ce89d3c28049dad29d1accc74cbb840b471e4f10b7749ac282a36ee6963855bea8df96fde4328dd32f30dbf6a8a848b
+  metadata.gz: 77ca863b3c8b598318503938c7d4596b1836585d353adee688452cd4a9dce669c41cbb7adb799bc9608876323e8735989fe780d5a7bb9ef8a5e032924b44717d
+  data.tar.gz: fd374c7216250fe7b8f37ac998188be5b9c32290351e70aff277fd31f7eed3861716720ca3c8c86529b07aae142110651471876d0da40f1aef140f0a50665000

data/.gitignore

@@ -20,7 +20,7 @@ test/version_tmp
 tmp
 
 # Ignore gems vendored by bundle install --path
-/vendor/ruby
+/vendor
 
 # Ignore binstubs generated by bundle install --binstubs
 /bin

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.4.2

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+ruby '2.4.2'
+
 # Specify your gem's dependencies in patentscope.gemspec
 gemspec

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2014 Chong-Yee Khoo
+Copyright (c) 2013-2017 Chong-Yee Khoo
 
 MIT License
 

data/README.md

@@ -218,7 +218,7 @@ For support on the PATENTSCOPE Web Service, please see the resources in the sect
 
 ### PATENTSCOPE Search System
 * [PATENTSCOPE](http://www.wipo.int/patentscope/en/)
-* [Search Interface] (http://patentscope.wipo.int/search/)
+* [Search Interface](http://patentscope.wipo.int/search/)
 * [Webinars](http://www.wipo.int/patentscope/en/webinar/)
 * [Forum](http://wipo-patentscope-forum.2944828.n2.nabble.com)
 
@@ -240,7 +240,7 @@ More details on how to contribute can be found at this great Thoughtbot blogpost
 
 ## License
 
-Copyright (c) 2013-2014 Chong-Yee Khoo. All rights reserved.
+Copyright (c) 2013-2016 Chong-Yee Khoo. All rights reserved.
 
 MIT License
 

data/lib/patentscope.rb

@@ -5,6 +5,7 @@ module Patentscope
   require 'patentscope/configuration'
   require 'patentscope/webservice'
   require 'patentscope/webservice_soap_builder'
+  require 'patentscope/webservice_soap_stripper'
   require 'patentscope/pct_doc_number'
 
   class NoCredentialsError < StandardError; end

data/lib/patentscope/client.rb

@@ -18,15 +18,21 @@ module Patentscope
     end
 
     def post_url(url, content_type = 'text/html', body = '')
-      uri                     = URI.parse(url)
-      http                    = Net::HTTP.new(uri.host, uri.port)
-      request                 = Net::HTTP::Post.new(uri.request_uri)
+      uri                     = URI(url)
+      request                 = Net::HTTP::Post.new(uri)
       request.basic_auth(username, password)
       request["User-Agent"]   = USER_AGENT_STRING
       request["Content-Type"] = content_type
       request.body            = body
-      response                = http.request(request)
-      response.body
+
+      Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+        response = http.request(request)
+        if response.header["Content-Type"].include? "text/html"
+          response.body
+        elsif response.header["Content-Type"].include? "multipart/related"
+          response.body.split("\r\n\r\n")[1].split("\r\n")[0]
+        end
+      end
     end
   end
 end

data/lib/patentscope/version.rb

@@ -1,5 +1,5 @@
 module Patentscope
 
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 
 end

data/lib/patentscope/webservice.rb

@@ -2,7 +2,7 @@ module Patentscope
 
   class Webservice
 
-    PATENTSCOPE_WEBSERVICE_LOCATION = "http://www.wipo.int/patentscope-webservice/servicesPatentScope"
+    PATENTSCOPE_WEBSERVICE_LOCATION = "https://patentscope.wipo.int/patentscope-webservice/servicesPatentScope"
 
     def wsdl
       send_wsdl_request
@@ -44,12 +44,12 @@ module Patentscope
     def perform_operation(operation, options_hash)
       soap_envelope = soapbuilder.build_envelope(operation, options_hash)
       response = send_soap_request(soap_envelope)
-      if response.include?('This request requires HTTP authentication')
+      if response.include?('Error') && response.include?('Unauthorized')
         raise WrongCredentialsError
       elsif response.include?('Business error during the execution of service')
         raise BusinessError
       else
-        soapbuilder.strip_envelope(response, operation)
+        soapstripper.strip_envelope(response, operation)
       end
     end
 
@@ -70,5 +70,9 @@ module Patentscope
     def soapbuilder
       WebserviceSoapBuilder.new
     end
+
+    def soapstripper
+      WebserviceSoapStripper.new
+    end
   end
 end

data/lib/patentscope/webservice_soap_builder.rb

@@ -17,27 +17,5 @@ module Patentscope
         end
       end.to_xml
     end
-
-    def strip_envelope(response, operation)
-      case operation
-      when :getAvailableDocuments
-        result_tag = 'doc'
-      when :getDocumentContent
-        result_tag = 'documentContent'
-      when :getDocumentOcrContent
-        result_tag = 'documentContent'
-      when :getIASR
-        result_tag = 'wo-international-application-status'
-      when :getDocumentTableOfContents
-        result_tag = 'content'
-      when :getDocumentContentPage
-        result_tag = 'pageContent'
-      end
-      doc = Nokogiri::XML(response)
-      stripped_response = doc.xpath("//iasr:#{result_tag}", 'iasr' => "http://www.wipo.org/wsdl/ps").to_xml
-      # this seems to be the only way to add back the XML declaration to the XML!
-      stripped_response_with_declaration = Nokogiri::XML(stripped_response).to_s
-      stripped_response_with_declaration
-    end
   end
 end

data/lib/patentscope/webservice_soap_stripper.rb

@@ -0,0 +1,34 @@
+module Patentscope
+
+  class WebserviceSoapStripper
+
+    def strip_envelope(response, operation)
+      case operation
+      when :getAvailableDocuments
+        result_tag = 'getAvailableDocumentsResponse'
+      when :getDocumentContent
+        result_tag = 'getDocumentContentResponse'
+      when :getDocumentOcrContent
+        result_tag = 'getDocumentOcrContentResponse'
+      when :getIASR
+        result_tag = 'getIASRResponse'
+      when :getDocumentTableOfContents
+        result_tag = 'getDocumentTableOfContentsResponse'
+      when :getDocumentContentPage
+        result_tag = 'getDocumentContentPageResponse'
+      end
+
+      doc = Nokogiri::XML(response)
+      stripped_response = doc.xpath("//iasr:#{result_tag}", 'iasr' => "http://www.wipo.org/wsdl/ps").children
+
+      # add back the XML declaration to the XML with a namespace
+      stripped_response_with_declaration = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
+        xml.send(result_tag, "xmlns" => "http://www.wipo.org/wsdl/ps") do
+          xml.parent << stripped_response
+        end
+      end.to_xml
+
+      stripped_response_with_declaration
+    end
+  end
+end

data/patentscope.gemspec

@@ -1,28 +1,32 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'patentscope/version'
 
-Gem::Specification.new do |gem|
-  gem.name          = "patentscope"
-  gem.version       = Patentscope::VERSION
-  gem.authors       = ["Chong-Yee Khoo"]
-  gem.email         = ["mail@cykhoo.com"]
-  gem.description   = %q{Ruby interface to the PATENTSCOPE Web Service provided by the World Intellectual Property Organisation. Requires a subscription to the Patentscope Web Service}
-  gem.summary       = %q{Ruby interface with WIPO PATENTSCOPE Web Service}
-  gem.homepage      = "http://www.cantab-ip.com"
+Gem::Specification.new do |spec|
+  spec.name          = "patentscope"
+  spec.version       = Patentscope::VERSION
+  spec.licenses      = "MIT"
+  spec.authors       = ["Chong-Yee Khoo"]
+  spec.email         = ["mail@cykhoo.com"]
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  spec.summary       = %q{Ruby interface with WIPO PATENTSCOPE Web Service}
+  spec.description   = %q{Ruby interface to the PATENTSCOPE Web Service provided by the World Intellectual Property Organisation. Requires a subscription to the Patentscope Web Service}
+  spec.homepage      = "http://www.cantab-ip.com"
 
-  gem.add_development_dependency 'dotenv', '~> 1.0'
-  gem.add_development_dependency 'rake', '~> 10.3'
-  gem.add_development_dependency 'rspec', '~> 3.1'
-  gem.add_development_dependency 'vcr', '~> 2.9.2'
-  gem.add_development_dependency 'webmock', '~> 1.19'
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'nokogiri'
-  gem.add_runtime_dependency 'unicode_titlecase'
+  spec.add_development_dependency 'dotenv', '~> 2.2'
+  spec.add_development_dependency 'rake', '~> 12.2'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'vcr', '~> 3.0'
+  spec.add_development_dependency 'webmock', '~> 3.1'
+
+  spec.add_runtime_dependency 'nokogiri', '~> 1.8'
+  spec.add_runtime_dependency 'unicode_titlecase', '~> 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patentscope
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Chong-Yee Khoo
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -16,96 +16,96 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '12.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: unicode_titlecase
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby interface to the PATENTSCOPE Web Service provided by the World Intellectual
@@ -131,20 +131,11 @@ files:
 - lib/patentscope/version.rb
 - lib/patentscope/webservice.rb
 - lib/patentscope/webservice_soap_builder.rb
+- lib/patentscope/webservice_soap_stripper.rb
 - patentscope.gemspec
-- spec/client_spec.rb
-- spec/configuration_spec.rb
-- spec/patentscope_spec.rb
-- spec/pct_app_number_spec.rb
-- spec/pct_pub_number_spec.rb
-- spec/spec_helper.rb
-- spec/webservice_soap_builder_spec.rb
-- spec/webservice_spec.rb
-- spec/wipo_test_suite_doc_id_examples.yaml
-- spec/wipo_test_suite_ia_number_examples.yaml
-- spec/wipo_test_suite_spec.rb
 homepage: http://www.cantab-ip.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -162,19 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby interface with WIPO PATENTSCOPE Web Service
-test_files:
-- spec/client_spec.rb
-- spec/configuration_spec.rb
-- spec/patentscope_spec.rb
-- spec/pct_app_number_spec.rb
-- spec/pct_pub_number_spec.rb
-- spec/spec_helper.rb
-- spec/webservice_soap_builder_spec.rb
-- spec/webservice_spec.rb
-- spec/wipo_test_suite_doc_id_examples.yaml
-- spec/wipo_test_suite_ia_number_examples.yaml
-- spec/wipo_test_suite_spec.rb
+test_files: []

data/spec/client_spec.rb

@@ -1,75 +0,0 @@
-require 'spec_helper'
-
-module Patentscope
-
-  describe Client, :core, :vcr do
-
-    before { Patentscope.configure_from_env}
-
-    let(:client) { Client.new(username: Patentscope.configuration.username, password: Patentscope.configuration.password) }
-
-    it "exists" do
-      expect(client).to_not be_nil
-    end
-
-    describe "methods" do
-
-      it "has its own attribute reader methods" do
-        expect(client).to respond_to(:username)
-        expect(client).to respond_to(:password)
-      end
-
-      it "has other methods" do
-        expect(client).to respond_to(:get_url)
-        expect(client).to respond_to(:post_url)
-      end
-    end
-
-    describe "attribute reader methods" do
-
-      describe "username method" do
-        it "returns the right username" do
-          expect(client.username).to eq(Patentscope.configuration.username)
-        end
-      end
-
-      describe "password method" do
-        it "returns the right password" do
-          expect(client.password).to eq(Patentscope.configuration.password)
-        end
-      end
-    end
-
-    describe "attribute writer methods" do
-
-      it "is not possible to set username" do
-        expect { client.username = 'foo' }.to raise_error()
-      end
-
-      it "is not possible to set password" do
-        expect { client.password = 'foo' }.to raise_error()
-      end
-    end
-
-    describe "get_url method" do
-      it "fetches the Cantab website by GET" do
-        site = client.get_url('http://www.cantab-ip.com')
-        expect(site).to include('<html')
-      end
-
-      it "fetches the Patentscope WSDL by GET" do
-        site = client.get_url('http://www.wipo.int/patentscope-webservice/servicesPatentScope?wsdl')
-        expect(site).to include('<?xml')
-      end
-    end
-
-    describe "post_url method" do
-      it "fetches a URL by POST" do
-        Patentscope.configure_from_env
-        soap_envelope_xml = '<?xml version="1.0"?><S:Envelope xmlns:S="http://schemas.xmlsoap.org/soap/envelope/"><S:Body><getIASR xmlns="http://www.wipo.org/wsdl/ps"><iaNumber>SG2009000062</iaNumber></getIASR></S:Body></S:Envelope>'
-        site = client.post_url('http://www.wipo.int/patentscope-webservice/servicesPatentScope', 'text/xml', soap_envelope_xml)
-        expect(site).to include('<?xml')
-      end
-    end
-  end
-end