ogc 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe92f7d04b411d1f43de0809e658f3468fefaf2a
-  data.tar.gz: 50540d467838d5bf50fd87a71591356b63df1139
+  metadata.gz: 8f7d9616808aaf51444ddebc1e4c74708406ad59
+  data.tar.gz: ab9d14e38cc52bd883037b0d1c58261aa44ccf13
 SHA512:
-  metadata.gz: 287ba94ff194c88ec9393801f1ab8f7e5999178ae5c66a378d75c5934e385c08e3b636ed36fb356546b1a3e41baef349ea92ce0d44e6a01be916e05ad36b94cf
-  data.tar.gz: 735cdfa8c041d5e94cab69aef738cf63432da395992a1f48c7d65a395952f7d39736458263e0f5594b196fdd87cc9a086f1b6ca8a6ed94ef29b45bfdcb32ec62
+  metadata.gz: 4d7c8c41ea813e3800008bdc2f9d4714c754d11793b16abed18a3960d7c1ce18812733187b7d1f45672228b6669d2a17350ee687a01d32cbbe10a3a6d2484fbb
+  data.tar.gz: eafd33772ebafa0658d1d2efe0a3d42ff17c47f0657ddde86981feac530c30a9b1187462a0c8d300f89ad6c12d516c86116b3e0767cf3fec9f9693d0459a09a9

data/lib/ogc.rb

@@ -1,9 +1,7 @@
 module Ogc; end
 
-# Refinements:
-require 'ogc/clean_xml'
-require 'ogc/query'
-
-require 'ogc/exceptions'
+require 'ogc/core_ext'
+require 'ogc/errors'
 require 'ogc/version'
 require 'ogc/web_feature_service'
+require 'ogc/web_processing_service'

data/lib/ogc/abstract_base.rb

@@ -0,0 +1,94 @@
+require 'ogc/errors'
+
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/string/inflections'
+require 'nokogiri'
+
+module Ogc
+  class AbstractBase
+    include Errors
+
+    attr_reader :params, :response, :url
+
+    class_attribute :default_params
+
+    class << self
+      def request_name
+        @request_name ||= to_s.demodulize
+      end
+    end
+
+    def initialize(url, params = nil)
+      @url    = url
+      @params = params.is_a?(Hash) ? params.stringify_keys : {}
+      @params.merge!(default_params) if default_params.is_a?(Hash)
+    end
+
+    def get(extra_params, &block)
+      params = extra_params ? extra_params.merge(@params) : @params
+      fetch(:get, params, &block)
+    end
+
+    def post(body, &block)
+      fetch(:post, body.respond_to?(:to_xml) ? body.to_xml : body, &block)
+    end
+
+    def http
+      @http ||= Net::HTTP.new(uri.host, uri.port)
+    end
+
+  private
+
+    def fetch(type, content, &block)
+      request = request(type, content)
+      block.call(request) if block
+      handle_response(request)
+    end
+
+    def handle_response(request)
+      case (response = http.request(request))
+      when Net::HTTPSuccess
+        @response = Nokogiri::XML(response.body.clean_xml!).tap do |xml|
+          # rubocop:disable Style/RaiseArgs
+          raise ExceptionReport.new(xml) if ExceptionReport.exception?(xml)
+          # rubocop:enable Style/RaiseArgs
+        end
+      else
+        # rubocop:disable Style/RaiseArgs
+        raise ServiceError.new(response)
+        # rubocop:enable Style/RaiseArgs
+      end
+    rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
+           Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
+           Net::ProtocolError
+      raise RequestError
+    end
+
+    def request(type, content)
+      case type
+      when :get then Net::HTTP::Get.new(uri_with_params(content))
+      when :post
+        Net::HTTP::Post.new(uri_without_params).tap do |req|
+          req.body = content
+        end
+      end
+    end
+
+    def uri_with_params(extra_params)
+      return uri_without_params if extra_params.blank?
+
+      uri_without_params.dup.tap do |uri|
+        www_form  = Hash[URI.decode_www_form(uri.query.to_s)]
+        uri.query = www_form.merge!(extra_params).to_query
+      end
+    end
+
+    def uri_without_params
+      @uri ||= URI(@url)
+    end
+    alias_method :uri, :uri_without_params
+  end
+end

data/lib/ogc/core_ext.rb

@@ -0,0 +1 @@
+require 'ogc/core_ext/string'

data/lib/ogc/core_ext/string.rb

@@ -0,0 +1,9 @@
+require 'active_support/core_ext/string/filters'
+
+class String
+  def clean_xml!
+    self.gsub!(/>\n+ *\t*</, '><')
+    self.squish!
+    self
+  end
+end

data/lib/ogc/errors.rb

@@ -0,0 +1,8 @@
+module Ogc
+  module Errors; end
+end
+
+require 'ogc/errors/exception_report'
+require 'ogc/errors/ogc_error'
+require 'ogc/errors/request_error'
+require 'ogc/errors/service_error'

data/lib/ogc/{exceptions → errors}/exception_report.rb

@@ -1,8 +1,8 @@
-require 'ogc/exceptions/ogc_exception'
+require 'ogc/errors/ogc_error'
 
 module Ogc
-  module Exceptions
-    class ExceptionReport < OgcException
+  module Errors
+    class ExceptionReport < OgcError
       ROOTS = %w( ServiceExceptionReport ExceptionReport ).freeze
 
       attr_reader :report

data/lib/ogc/errors/ogc_error.rb

@@ -0,0 +1,5 @@
+module Ogc
+  module Errors
+    class OgcError < StandardError; end
+  end
+end

data/lib/ogc/errors/request_error.rb

@@ -0,0 +1,7 @@
+require 'ogc/errors/ogc_error'
+
+module Ogc
+  module Errors
+    class RequestError < OgcError; end
+  end
+end

data/lib/ogc/{exceptions/request_failed_exception.rb → errors/service_error.rb}

@@ -1,6 +1,8 @@
+require 'ogc/errors/ogc_error'
+
 module Ogc
-  module Exceptions
-    class RequestFailedException < OgcException
+  module Errors
+    class ServiceError < OgcError
       attr_reader :code
 
       def initialize(http_error)

data/lib/ogc/version.rb

@@ -1,3 +1,3 @@
 module Ogc
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/ogc/web_feature_service/base.rb

@@ -1,96 +1,11 @@
-require 'ogc/exceptions'
+require 'ogc/abstract_base'
 
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/object/to_query'
-require 'active_support/core_ext/string/inflections'
-require 'nokogiri'
+require 'active_support/core_ext/module/introspection'
 
 module Ogc
   module WebFeatureService
-    class Base
-      include Exceptions
-
-      using CleanXML
-      using Query
-
-      attr_reader :params, :response, :url
-
-      DEFAULT_PARAMS = { 'service' => 'wfs' }.freeze
-
-      class << self
-        def request_name
-          @request_name ||= to_s.demodulize
-        end
-      end
-
-      def initialize(url, params = nil)
-        @url    = url
-        @params = (params ? params.stringify_keys : {}).merge!(DEFAULT_PARAMS)
-      end
-
-      def get(extra_params, &block)
-        params = extra_params ? extra_params.merge(@params) : @params
-        fetch(:get, params, &block)
-      end
-
-      def post(body, &block)
-        fetch(:post, body.respond_to?(:to_xml) ? body.to_xml : body, &block)
-      end
-
-      def http
-        @http ||= Net::HTTP.new(uri.host, uri.port)
-      end
-
-    private
-
-      def fetch(type, content, &block)
-        request = request(type, content)
-        block.call(request) if block
-        handle_response(request)
-      end
-
-      def handle_response(request)
-        case (response = http.request(request))
-        when Net::HTTPSuccess
-          @response = Nokogiri::XML(response.body.clean_xml!).tap do |xml|
-            # rubocop:disable Style/RaiseArgs
-            raise ExceptionReport.new(xml) if ExceptionReport.exception?(xml)
-            # rubocop:enable Style/RaiseArgs
-          end
-        else
-          # rubocop:disable Style/RaiseArgs
-          raise RequestFailedException.new(response)
-          # rubocop:enable Style/RaiseArgs
-        end
-      rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-             Net::ProtocolError
-        raise RequestErrorException
-      end
-
-      def request(type, content)
-        case type
-        when :get then Net::HTTP::Get.new(uri_with_params(content))
-        when :post
-          Net::HTTP::Post.new(uri_without_params).tap do |req|
-            req.body = content
-          end
-        end
-      end
-
-      def uri_with_params(extra_params)
-        return uri_without_params if extra_params.blank?
-
-        uri_without_params.dup.tap do |uri|
-          uri.query = Hash.from_query(uri.query).merge!(extra_params).to_query
-        end
-      end
-
-      def uri_without_params
-        @uri ||= URI(@url)
-      end
-      alias_method :uri, :uri_without_params
+    class Base < AbstractBase
+      self.default_params = { 'service' => 'wfs' }.freeze
     end
   end
 end

data/lib/ogc/web_feature_service/get_capabilities.rb

@@ -1,3 +1,5 @@
+require 'ogc/web_feature_service/base'
+
 module Ogc
   module WebFeatureService
     class GetCapabilities < Base

data/lib/ogc/web_feature_service/get_feature.rb

@@ -1,6 +1,9 @@
+require 'ogc/web_feature_service/base'
+
 module Ogc
   module WebFeatureService
     class GetFeature < Base
+
       def get(type_name, extra_params = {}, &block)
         params = {
           'request'  => self.class.request_name,

data/lib/ogc/web_processing_service.rb

@@ -0,0 +1,16 @@
+require 'ogc/web_processing_service/base'
+require 'ogc/web_processing_service/execute'
+
+require 'active_support/core_ext/string/inflections'
+
+module Ogc
+  module WebProcessingService
+    SUPPORTED_METHODS = %i( execute ).freeze
+
+    class << self
+      def execute(*args)
+        Execute.new(*args)
+      end
+    end
+  end
+end

data/lib/ogc/web_processing_service/base.rb

@@ -0,0 +1,9 @@
+require 'ogc/abstract_base'
+
+module Ogc
+  module WebProcessingService
+    class Base < AbstractBase
+      self.default_params = { 'service' => 'wps' }.freeze
+    end
+  end
+end

data/lib/ogc/web_processing_service/execute.rb

@@ -0,0 +1,16 @@
+require 'ogc/web_processing_service/base'
+
+module Ogc
+  module WebProcessingService
+    class Execute < Base
+      def get(type_name, extra_params = {}, &block)
+        params = {
+          'request'  => self.class.request_name,
+          'identifier' => type_name
+        }.merge!(extra_params)
+
+        super(params, &block)
+      end
+    end
+  end
+end

data/test/ogc/abstract_base_test.rb

@@ -0,0 +1,137 @@
+require 'test_helper'
+
+module Ogc
+  class AbstractBaseTest < TestCase
+    include Errors
+
+    URL    = 'http://localhost/wfs'
+    PARAMS = { 'version' => '1.0.0', 'key' => 'ABCDE' }
+
+    # Fake exception
+    CalledBlockException = Class.new(StandardError)
+
+    setup do
+      @base = AbstractBase.new(URL, PARAMS)
+
+      # XML files
+      @request   = read_file('wfs/get_capabilities_request')
+      @response  = read_file('wfs/get_capabilities_response')
+      @exception = read_file('wfs/exception_report')
+
+      query = PARAMS.merge(request: :hello).to_query
+
+      # Get method returns xml response:
+      stub_request(:get, "#{URL}?#{query}").to_return(body: @response)
+
+      # Get method returns xml exception:
+      stub_request(:get, "#{URL}?ex=xml&#{query}")
+        .to_return(body: @exception)
+
+      # Get method returns Timeout exception:
+      stub_request(:get, "#{URL}?ex=timeout&#{query}")
+        .to_raise(Timeout::Error)
+
+      # Get method returns NotFound return:
+      stub_request(:get, "#{URL}?ex=notFound&#{query}")
+        .to_return(status: [404, 'Not Found'])
+
+      # Post method returns xml response:
+      stub_request(:post, "#{URL}").with(body: @request)
+        .to_return(body: @response)
+    end
+
+    test 'request_name class method returns the name of the class' do
+      assert_equal 'AbstractBase', AbstractBase.request_name
+      assert_same AbstractBase.request_name, AbstractBase.request_name
+
+      FakeService = Class.new(AbstractBase)
+      assert_equal 'FakeService', FakeService.request_name
+    end
+
+    test 'constructor takes an url and some params as arguments' do
+      assert_equal URL, @base.url
+      refute_same PARAMS, @base.params
+      assert_equal PARAMS, @base.params
+    end
+
+    test 'constructor stringifies the keys of params' do
+      base = AbstractBase.new(URL, PARAMS.symbolize_keys)
+      assert_equal PARAMS, base.params
+    end
+
+    test 'http method exposes the http object' do
+      assert_instance_of Net::HTTP, @base.http
+    end
+
+    test 'get method returns xml response' do
+      xml = Nokogiri::XML(@response.clean_xml!).to_xml
+      assert_equal xml, @base.get(request: 'hello').to_xml
+    end
+
+    test 'get method takes a block to overload the request' do
+      assert_raises CalledBlockException do
+        @base.get(request: 'hello') do |_|
+          raise CalledBlockException
+        end
+      end
+    end
+
+    test 'get method takes a block which exposes the request' do
+      @base.get(request: :hello) do |request|
+        assert_instance_of Net::HTTP::Get, request
+      end
+    end
+
+    test 'post method returns xml response' do
+      xml = Nokogiri::XML(@response.clean_xml!).to_xml
+      assert_equal xml, @base.post(@request).to_xml
+    end
+
+    test 'post method takes a block to overload the request' do
+      assert_raises CalledBlockException do
+        @base.post(@request) do |_|
+          raise CalledBlockException
+        end
+      end
+    end
+
+    test 'post method takes a block which exposes the request' do
+      @base.post(@request) do |request|
+        assert_instance_of Net::HTTP::Post, request
+      end
+    end
+
+    test 'exception is raised if WFS returns exception' do
+      assert_raises ExceptionReport do
+        @base.get(request: :hello, ex: :xml)
+      end
+    end
+
+    test 'exception is raised if Timeout is raised' do
+      assert_raises RequestError do
+        @base.get(request: :hello, ex: :timeout)
+      end
+    end
+
+    test 'exception raised has a cause' do
+      begin
+        @base.get(request: :hello, ex: :timeout)
+        assert false # In case where the exception is not raised.
+      rescue RequestError => ex
+        assert_instance_of Timeout::Error, ex.cause
+      end
+    end
+
+    test 'request error raises ServiceError exception' do
+      assert_raises ServiceError do
+        @base.get(request: :hello, ex: :notFound)
+      end
+    end
+
+    test 'response is cached' do
+      assert_nil @base.response
+      @base.get(request: 'hello')
+      refute_nil @base.response
+    end
+  end
+end

data/test/ogc/{clean_xml_test.rb → core_ext/string_test.rb}

@@ -2,8 +2,7 @@ require 'test_helper'
 require 'active_support/core_ext/string/strip'
 
 module Ogc
-  class CleanXMLTest < TestCase
-    using CleanXML
+  class StringTest < TestCase
 
     setup do
       @xml = <<-XML.strip_heredoc

data/test/ogc/{exceptions → errors}/exception_report_test.rb

@@ -1,10 +1,8 @@
 require 'test_helper'
 
 module Ogc
-  module Exceptions
+  module Errors
     class ExceptionReportTest < TestCase
-      using CleanXML
-
       setup do
         @xml_100    = read_xml('wfs/service_exception_report')
         @report_100 = ExceptionReport.new(@xml_100)
@@ -15,8 +13,8 @@ module Ogc
         @xml_fake = read_xml('wfs/fake_report')
       end
 
-      test 'class inherits from OgcException' do
-        assert ExceptionReport < OgcException
+      test 'class inherits from OgcError' do
+        assert ExceptionReport < OgcError
       end
 
       test 'ROOTS constant is a frozen array of string' do

data/test/ogc/{exceptions/ogc_exception_test.rb → errors/ogc_error_test.rb}

@@ -1,10 +1,10 @@
 require 'test_helper'
 
 module Ogc
-  module Exceptions
-    class OgcExceptionTest < TestCase
+  module Errors
+    class OgcErrorTest < TestCase
       test 'class inherits from StandardError' do
-        assert OgcException < StandardError
+        assert OgcError < StandardError
       end
     end
   end

data/test/ogc/errors/request_error_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+module Ogc
+  module Errors
+    class RequestErrorTest < TestCase
+      test 'class inherits from OgcError' do
+        assert RequestError < OgcError
+      end
+    end
+  end
+end

data/test/ogc/{exceptions/request_failed_exception_test.rb → errors/service_error_test.rb}

@@ -2,20 +2,20 @@ require 'test_helper'
 require 'minitest/mock'
 
 module Ogc
-  module Exceptions
-    class RequestFailedExceptionTest < TestCase
+  module Errors
+    class ServiceErrorTest < TestCase
       setup do
         @mock = Minitest::Mock.new
         @mock.expect :code, 666
         @mock.expect :message, 'Hello Wolrd'
       end
 
-      test 'class inherits from OgcException' do
-        assert RequestFailedException < OgcException
+      test 'class inherits from OgcError' do
+        assert ServiceError < OgcError
       end
 
       test 'constructor takes a HTTP error' do
-        ex = RequestFailedException.new(@mock)
+        ex = ServiceError.new(@mock)
         assert 666, ex.code
         assert 'Hello World', ex.message
         @mock.verify

data/test/ogc/errors_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module Ogc
+  class ErrorsTest < TestCase
+    test 'Errors module is defined' do
+      refute_nil Errors
+    end
+  end
+end

data/test/ogc/web_feature_service/base_test.rb

@@ -3,142 +3,9 @@ require 'test_helper'
 module Ogc
   module WebFeatureService
     class BaseTest < TestCase
-      include Exceptions
-      using CleanXML
-
-      URL         = 'http://localhost/wfs'
-      PARAMS      = { 'version' => '1.0.0', 'key' => 'ABCDE' }
-      FULL_PARAMS = PARAMS.merge(Base::DEFAULT_PARAMS)
-
-      # Fake exception
-      CalledBlockException = Class.new(StandardError)
-
-      setup do
-        @base = Base.new(URL, PARAMS)
-
-        # XML files
-        @request   = read_file('wfs/get_capabilities_request')
-        @response  = read_file('wfs/get_capabilities_response')
-        @exception = read_file('wfs/exception_report')
-
-        query = FULL_PARAMS.merge(request: :hello).to_query
-
-        # Get method returns xml response:
-        stub_request(:get, "#{URL}?#{query}").to_return(body: @response)
-
-        # Get method returns xml exception:
-        stub_request(:get, "#{URL}?ex=xml&#{query}")
-          .to_return(body: @exception)
-
-        # Get method returns Timeout exception:
-        stub_request(:get, "#{URL}?ex=timeout&#{query}")
-          .to_raise(Timeout::Error)
-
-        # Get method returns NotFound return:
-        stub_request(:get, "#{URL}?ex=notFound&#{query}")
-          .to_return(status: [404, 'Not Found'])
-
-        # Post method returns xml response:
-        stub_request(:post, "#{URL}").with(body: @request)
-          .to_return(body: @response)
-      end
-
-      test 'DEFAULT_PARAMS constant is frozen' do
-        assert Base::DEFAULT_PARAMS.frozen?
-      end
-
-      test 'request_name class method returns the name of the class' do
-        assert_equal 'Base', Base.request_name
-        assert_same Base.request_name, Base.request_name
-
-        FakeService = Class.new(Base)
-        assert_equal 'FakeService', FakeService.request_name
-      end
-
-      test 'constructor takes an url and some params as arguments' do
-        assert_equal URL, @base.url
-        refute_same PARAMS, @base.params
-        assert_equal FULL_PARAMS, @base.params
-      end
-
-      test 'constructor stringifies the keys of params' do
-        base = Base.new(URL, PARAMS.symbolize_keys)
-        assert_equal FULL_PARAMS, base.params
-      end
-
-      test 'http method exposes the http object' do
-        assert_instance_of Net::HTTP, @base.http
-      end
-
-      test 'get method returns xml response' do
-        xml = Nokogiri::XML(@response.clean_xml!).to_xml
-        assert_equal xml, @base.get(request: 'hello').to_xml
-      end
-
-      test 'get method takes a block to overload the request' do
-        assert_raises CalledBlockException do
-          @base.get(request: 'hello') do |_|
-            raise CalledBlockException
-          end
-        end
-      end
-
-      test 'get method takes a block which exposes the request' do
-        @base.get(request: :hello) do |request|
-          assert_instance_of Net::HTTP::Get, request
-        end
-      end
-
-      test 'post method returns xml response' do
-        xml = Nokogiri::XML(@response.clean_xml!).to_xml
-        assert_equal xml, @base.post(@request).to_xml
-      end
-
-      test 'post method takes a block to overload the request' do
-        assert_raises CalledBlockException do
-          @base.post(@request) do |_|
-            raise CalledBlockException
-          end
-        end
-      end
-
-      test 'post method takes a block which exposes the request' do
-        @base.post(@request) do |request|
-          assert_instance_of Net::HTTP::Post, request
-        end
-      end
-
-      test 'exception is raised if WFS returns exception' do
-        assert_raises ExceptionReport do
-          @base.get(request: :hello, ex: :xml)
-        end
-      end
-
-      test 'exception is raised if Timeout is raised' do
-        assert_raises RequestErrorException do
-          @base.get(request: :hello, ex: :timeout)
-        end
-      end
-
-      test 'exception raised has a cause' do
-        begin
-          @base.get(request: :hello, ex: :timeout)
-          assert false # In case where the exception is not raised.
-        rescue RequestErrorException => ex
-          assert_instance_of Timeout::Error, ex.cause
-        end
-      end
-
-      test 'request error raises RequestFailedException exception' do
-        assert_raises RequestFailedException do
-          @base.get(request: :hello, ex: :notFound)
-        end
-      end
-
-      test 'response is cached' do
-        assert_nil @base.response
-        @base.get(request: 'hello')
-        refute_nil @base.response
+      test 'default_params class attribute is frozen' do
+        assert_instance_of Hash, Base.default_params
+        assert Base.default_params.frozen?
       end
     end
   end

data/test/ogc/web_feature_service/get_capabilities_test.rb

@@ -3,11 +3,9 @@ require 'test_helper'
 module Ogc
   module WebFeatureService
     class GetCapabilitiesTest < TestCase
-      using CleanXML
-
       URL         = 'http://localhost/wfs'
       PARAMS      = { 'version' => '1.0.0', 'key' => 'ABCDE' }
-      FULL_PARAMS = PARAMS.merge(Base::DEFAULT_PARAMS)
+      FULL_PARAMS = PARAMS.merge(Base.default_params)
 
       setup do
         @base = GetCapabilities.new(URL, PARAMS)

data/test/ogc/web_feature_service/get_feature_test.rb

@@ -3,15 +3,13 @@ require 'test_helper'
 module Ogc
   module WebFeatureService
     class GetFeatureTest < TestCase
-      using CleanXML
-
       URL    = 'http://localhost/wfs'
       PARAMS = {
         'version'  => '1.0.0',
         'key'      => 'ABCDE',
         'typeName' => 'HYDROGRAPHY'
       }
-      FULL_PARAMS = PARAMS.merge(Base::DEFAULT_PARAMS)
+      FULL_PARAMS = PARAMS.merge(Base.default_params)
 
       setup do
         @base = GetFeature.new(URL, PARAMS)

data/test/ogc/web_processing_service/base_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+module Ogc
+  module WebProcessingService
+    class BaseTest < TestCase
+      test 'default_params class attribute is frozen' do
+        assert_instance_of Hash, Base.default_params
+        assert Base.default_params.frozen?
+      end
+    end
+  end
+end

data/test/ogc/web_processing_service/execute_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+module Ogc
+  module WebProcessingService
+    class ExecuteTest < TestCase
+      URL    = 'http://localhost/wfs'
+      PARAMS = {
+        'version'    => '1.0.0',
+        'key'        => 'ABCDE',
+        'identifier' => 'HYDROGRAPHY'
+      }
+      FULL_PARAMS = PARAMS.merge(Base.default_params)
+
+      setup do
+        @base = Execute.new(URL, PARAMS)
+
+        # XML files
+        @response = read_file('wps/execute_response')
+
+        query = FULL_PARAMS.merge(request: Execute.request_name).to_query
+
+        # Get method returns xml response:
+        stub_request(:get, "#{URL}?#{query}").to_return(body: @response)
+      end
+
+      test 'class inherits from Base' do
+        assert Execute < Base
+      end
+
+      test 'get method returns xml response' do
+        xml = Nokogiri::XML(@response.clean_xml!).to_xml
+        assert_equal xml, @base.get(:HYDROGRAPHY).to_xml
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -10,8 +10,6 @@ require 'minitest/autorun'
 
 module Ogc
   class TestCase < Minitest::Test
-    using CleanXML
-
     class << self
       def setup(&block)
         define_method(:setup, &block)

data/test/xml/wps/execute_response.xml

@@ -0,0 +1,35 @@
+<wps:ExecuteResponse xmlns:wps="http://www.opengis.net/wps/1.0.0" xmlns:ows="http://www.opengis.net/ows/1.1" xmlns:ogc="http://www.opengis.net/ogc" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gml="http://www.opengis.net/gml" xmlns:cub="http://data.bordeaux-metropole.fr" service="WPS" version="1.0.0" xml:lang="fr" xsi:schemaLocation="http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsExecuteResponse_response.xsd" serviceInstance="http://data.bordeaux-metropole.fr/wps?key=27Y2TBGE91&amp;service=WPS&amp;version=1.0.0&amp;request=getcapabilities">
+  <wps:Process wps:processVersion="1.0.0">
+    <ows:Identifier>SV_HORAI_A</ows:Identifier>
+    <ows:Title>Horaire de bus</ows:Title>
+    <ows:Abstract>Retourne les horaires sur SAEIV Bus - Tram</ows:Abstract>
+  </wps:Process>
+  <wps:Status creationTime="2015-12-01T14:26:26+01:00">
+    <wps:ProcessSucceeded>Traitement terminé</wps:ProcessSucceeded>
+  </wps:Status>
+  <wps:ProcessOutputs>
+    <wps:Output>
+      <ows:Identifier>result</ows:Identifier>
+      <ows:Title>Tous les objets de la couche</ows:Title>
+      <ows:Abstract>Tous les objets de la couche</ows:Abstract>
+      <wps:Data>
+        <wps:ComplexData mimeType="text/xml">
+          <gml:featureMember>
+            <cub:SV_HORAI_A>
+              <cub:GID>267436295</cub:GID>
+              <cub:HOR_THEO>2015-12-01T08:18:57</cub:HOR_THEO>
+              <cub:HOR_APP>2015-12-01T08:18:57</cub:HOR_APP>
+              <cub:HOR_REAL/>
+              <cub:ETAT>REALISE</cub:ETAT>
+              <cub:TYPE>REGULIER</cub:TYPE>
+              <cub:CDATE>2015-12-01T08:40:09</cub:CDATE>
+              <cub:MDATE>2015-12-01T08:40:09</cub:MDATE>
+              <cub:RS_SV_ARRET_P>592</cub:RS_SV_ARRET_P>
+              <cub:RS_SV_COURS_A>258470616</cub:RS_SV_COURS_A>
+            </cub:SV_HORAI_A>
+          </gml:featureMember>
+        </wps:ComplexData>
+      </wps:Data>
+    </wps:Output>
+  </wps:ProcessOutputs>
+</wps:ExecuteResponse>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ogc
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Geoffrey Roguelon
@@ -170,31 +170,37 @@ files:
 - bin/guard
 - bin/setup
 - lib/ogc.rb
-- lib/ogc/clean_xml.rb
-- lib/ogc/exceptions.rb
-- lib/ogc/exceptions/exception_report.rb
-- lib/ogc/exceptions/ogc_exception.rb
-- lib/ogc/exceptions/request_error_exception.rb
-- lib/ogc/exceptions/request_failed_exception.rb
-- lib/ogc/query.rb
+- lib/ogc/abstract_base.rb
+- lib/ogc/core_ext.rb
+- lib/ogc/core_ext/string.rb
+- lib/ogc/errors.rb
+- lib/ogc/errors/exception_report.rb
+- lib/ogc/errors/ogc_error.rb
+- lib/ogc/errors/request_error.rb
+- lib/ogc/errors/service_error.rb
 - lib/ogc/version.rb
 - lib/ogc/web_feature_service.rb
 - lib/ogc/web_feature_service/base.rb
 - lib/ogc/web_feature_service/get_capabilities.rb
 - lib/ogc/web_feature_service/get_feature.rb
+- lib/ogc/web_processing_service.rb
+- lib/ogc/web_processing_service/base.rb
+- lib/ogc/web_processing_service/execute.rb
 - ogc.gemspec
-- test/ogc/clean_xml_test.rb
-- test/ogc/exceptions/exception_report_test.rb
-- test/ogc/exceptions/ogc_exception_test.rb
-- test/ogc/exceptions/request_error_exception_test.rb
-- test/ogc/exceptions/request_failed_exception_test.rb
-- test/ogc/exceptions_test.rb
-- test/ogc/query_test.rb
+- test/ogc/abstract_base_test.rb
+- test/ogc/core_ext/string_test.rb
+- test/ogc/errors/exception_report_test.rb
+- test/ogc/errors/ogc_error_test.rb
+- test/ogc/errors/request_error_test.rb
+- test/ogc/errors/service_error_test.rb
+- test/ogc/errors_test.rb
 - test/ogc/version_test.rb
 - test/ogc/web_feature_service/base_test.rb
 - test/ogc/web_feature_service/get_capabilities_test.rb
 - test/ogc/web_feature_service/get_feature_test.rb
 - test/ogc/web_feature_service_test.rb
+- test/ogc/web_processing_service/base_test.rb
+- test/ogc/web_processing_service/execute_test.rb
 - test/ogc_test.rb
 - test/test_helper.rb
 - test/xml/wfs/exception_report.xml
@@ -203,6 +209,7 @@ files:
 - test/xml/wfs/get_capabilities_response.xml
 - test/xml/wfs/get_feature_response.xml
 - test/xml/wfs/service_exception_report.xml
+- test/xml/wps/execute_response.xml
 homepage: https://github.com/GRoguelon/ogc
 licenses:
 - MIT

data/lib/ogc/clean_xml.rb

@@ -1,13 +0,0 @@
-require 'active_support/core_ext/string/filters'
-
-module Ogc
-  module CleanXML
-    refine String do
-      def clean_xml!
-        self.gsub!(/>\n+ *\t*</, '><')
-        self.squish!
-        self
-      end
-    end
-  end
-end

data/lib/ogc/exceptions.rb

@@ -1,8 +0,0 @@
-module Ogc
-  module Exceptions; end
-end
-
-require 'ogc/exceptions/ogc_exception'
-require 'ogc/exceptions/exception_report'
-require 'ogc/exceptions/request_error_exception'
-require 'ogc/exceptions/request_failed_exception'

data/lib/ogc/exceptions/ogc_exception.rb

@@ -1,5 +0,0 @@
-module Ogc
-  module Exceptions
-    class OgcException < StandardError; end
-  end
-end

data/lib/ogc/exceptions/request_error_exception.rb

@@ -1,7 +0,0 @@
-require 'ogc/exceptions/ogc_exception'
-
-module Ogc
-  module Exceptions
-    class RequestErrorException < OgcException; end
-  end
-end

data/lib/ogc/query.rb

@@ -1,11 +0,0 @@
-require 'uri'
-
-module Ogc
-  module Query
-    refine Hash.singleton_class do
-      def from_query(query)
-        Hash[URI.decode_www_form(query.to_s)]
-      end
-    end
-  end
-end

data/test/ogc/exceptions/request_error_exception_test.rb

@@ -1,11 +0,0 @@
-require 'test_helper'
-
-module Ogc
-  module Exceptions
-    class RequestErrorExceptionTest < TestCase
-      test 'class inherits from OgcException' do
-        assert RequestErrorException < OgcException
-      end
-    end
-  end
-end

data/test/ogc/exceptions_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-
-module Ogc
-  class ExceptionsTest < TestCase
-    test 'Exceptions module is defined' do
-      refute_nil Exceptions
-    end
-  end
-end

data/test/ogc/query_test.rb

@@ -1,21 +0,0 @@
-require 'test_helper'
-require 'active_support/core_ext/object/to_query'
-
-module Ogc
-  class QueryTest < TestCase
-    using Query
-
-    setup do
-      @hash = {
-        'service' => 'wfs',
-        'srsname' => 'epsg:4326',
-        'version' => '1.0.0'
-      }
-      @query = @hash.to_query
-    end
-
-    test 'query method converts a query to hash' do
-      assert_equal @hash, Hash.from_query(@query)
-    end
-  end
-end