rom-http 0.7.0 → 0.8.0

data/lib/rom/http/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module HTTP
     Error = Class.new(StandardError)

data/lib/rom/http/gateway.rb

@@ -1,5 +1,10 @@
+# frozen_string_literal: true
+
 require 'concurrent'
+
 require 'rom/http/dataset'
+require 'rom/http/handlers'
+require 'rom/http/mapper_compiler'
 
 module ROM
   module HTTP
@@ -19,7 +24,6 @@ module ROM
       adapter :http
 
       attr_reader :datasets, :config
-      private :datasets, :config
 
       # HTTP gateway interface
       #
@@ -54,8 +58,7 @@ module ROM
       #
       # @api public
       def dataset(name)
-        dataset_klass = namespace.const_defined?(:Dataset) ? namespace.const_get(:Dataset) : Dataset
-        datasets[name] = dataset_klass.new(config.merge(name: name))
+        datasets[name] = dataset_class.new(dataset_options(name))
       end
 
       # Check if dataset exists
@@ -69,6 +72,44 @@ module ROM
 
       private
 
+      # Return Dataset class
+      #
+      # @return [Class]
+      #
+      # @api private
+      def dataset_class
+        namespace.const_defined?(:Dataset) ? namespace.const_get(:Dataset) : Dataset
+      end
+
+      # Return Dataset options
+      #
+      # @return [Class]
+      #
+      # @api private
+      def dataset_options(name)
+        config.merge(uri: uri, base_path: name, **default_handlers)
+      end
+
+      # Return default handlers registered in Handlers registry
+      #
+      # @return [Hash]
+      #
+      # @api private
+      def default_handlers
+        if handlers_key = config[:handlers]
+          Handlers[handlers_key]
+            .map { |key, value| [:"#{key}_handler", value] }.to_h
+        else
+          EMPTY_HASH
+        end
+      end
+
+      # @api private
+      def uri
+        config.fetch(:uri) { fail Error, '+uri+ configuration missing' }
+      end
+
+      # @api private
       def namespace
         self.class.to_s[/(.*)(?=::)/].split('::').inject(::Object) do |constant, const_name|
           constant.const_get(const_name)

data/lib/rom/http/handlers.rb

@@ -0,0 +1,14 @@
+require 'rom/http/handlers/json'
+
+module ROM
+  module HTTP
+    # Request/response handler registry
+    #
+    # @api public
+    class Handlers
+      extend Dry::Container::Mixin
+
+      register(:json, request: JSONRequest, response: JSONResponse)
+    end
+  end
+end

data/lib/rom/http/handlers/json.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+require 'uri'
+require 'net/http'
+require 'json'
+
+require 'rom/support/inflector'
+
+module ROM
+  module HTTP
+    # Default request/response handlers
+    #
+    # @api public
+    class Handlers
+      # Default handler for JSON requests
+      #
+      # @api public
+      class JSONRequest
+        # Handle JSON request for the provided dataset
+        #
+        # @param [Dataset] dataset
+        #
+        # @return [Array<Hash>]
+        #
+        # @api public
+        def self.call(dataset)
+          uri = URI(dataset.uri)
+
+          uri.path = dataset.absolute_path
+          uri.query = URI.encode_www_form(dataset.params)
+
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true if uri.scheme.eql?('https')
+
+          request_class = Net::HTTP.const_get(ROM::Inflector.classify(dataset.request_method))
+
+          request = request_class.new(uri.request_uri)
+
+          dataset.headers.each_with_object(request) do |(header, value), request|
+            request[header.to_s] = value
+          end
+
+          http.request(request)
+        end
+      end
+
+      # Default handler for JSON responses
+      #
+      # @api public
+      class JSONResponse
+        # Handle JSON responses
+        #
+        # @param [Net::HTTP::Response] response
+        # @param [Dataset] dataset
+        #
+        # @return [Array<Hash>]
+        #
+        # @api public
+        def self.call(response, dataset)
+          Array([JSON.parse(response.body)]).flatten(1)
+        end
+      end
+    end
+  end
+end

data/lib/rom/http/mapper_compiler.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'rom/mapper_compiler'
+
+module ROM
+  module HTTP
+    class MapperCompiler < ROM::MapperCompiler
+      mapper_options(reject_keys: true)
+    end
+  end
+end

data/lib/rom/http/relation.rb

@@ -1,32 +1,33 @@
-require 'dry/core/cache'
+# frozen_string_literal: true
+
 require 'rom/initializer'
-require 'rom/http/transformer'
+
+require 'rom/http/types'
+require 'rom/http/attribute'
+require 'rom/http/schema'
+require 'rom/http/schema/dsl'
 
 module ROM
   module HTTP
     # HTTP-specific relation extensions
     #
     class Relation < ROM::Relation
-      extend Dry::Core::Cache
-      extend ::ROM::Initializer
-      include Enumerable
+      include ROM::HTTP
 
       adapter :http
 
-      option :transformer, reader: true, default: proc { ::ROM::HTTP::Transformer }
+      schema_class HTTP::Schema
+      schema_dsl HTTP::Schema::DSL
+      schema_attr_class HTTP::Attribute
+
+      option :output_schema, default: -> { schema.to_output_hash }
 
       forward :with_headers, :add_header, :with_options,
               :with_base_path, :with_path, :append_path,
               :with_request_method, :with_params, :add_params
 
       def primary_key
-        attribute = schema.find(&:primary_key?)
-
-        if attribute
-          attribute.alias || attribute.name
-        else
-          :id
-        end
+        schema.primary_key_name
       end
 
       def project(*names)
@@ -34,7 +35,7 @@ module ROM
       end
 
       def exclude(*names)
-        with(schema: schema.exclude(*names.flatten))
+        with(schema: schema.exclude(*names))
       end
 
       def rename(mapping)
@@ -45,67 +46,21 @@ module ROM
         with(schema: schema.prefix(prefix))
       end
 
-      def wrap(prefix = dataset.name)
-        with(schema: schema.wrap(prefix))
-      end
-
-      def to_a
-        with_transformation { super }
-      end
-
       # @see Dataset#insert
-      def insert(*args)
-        with_transformation { dataset.insert(*args) }
+      def insert(*tuples)
+        dataset.insert(*tuples.map { |t| input_schema[t] })
       end
       alias_method :<<, :insert
 
       # @see Dataset#update
-      def update(*args)
-        with_transformation { dataset.update(*args) }
+      def update(*tuples)
+        dataset.update(*tuples.map { |t| input_schema[t] })
       end
 
       # @see Dataset#delete
       def delete
         dataset.delete
       end
-
-      private
-
-      def with_transformation
-        tuples = yield
-
-        transformed = with_schema_proc do |proc|
-          transformer_proc[Array([tuples]).flatten(1).map(&proc.method(:call))]
-        end
-
-        tuples.kind_of?(Array) ? transformed : transformed.first
-      end
-
-      def with_schema_proc
-        schema_proc = fetch_or_store(schema) do
-          Types::Coercible::Hash.schema(schema.to_h)
-        end
-
-        yield(schema_proc)
-      end
-
-      def transformer_proc
-        if mapped?
-          transformer[:map_array, transformer[:rename_keys, mapping]]
-        else
-          transformer[:identity]
-        end
-      end
-
-      def mapped?
-        mapping.any?
-      end
-
-      def mapping
-        schema.each_with_object({}) do |attr, mapping|
-          mapping[attr.name] = attr.alias if attr.alias
-        end
-      end
     end
   end
 end

data/lib/rom/http/schema.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'rom/schema'
+require 'rom/http/types'
+
+module ROM
+  module HTTP
+    class Schema < ROM::Schema
+      # Customized output hash constructor which symbolizes keys
+      # and optionally applies custom read-type coercions
+      #
+      # @api private
+      def to_output_hash
+        Types::Hash
+          .schema(map { |attr| [attr.key, attr.to_read_type] }.to_h)
+          .with_key_transform(&:to_sym)
+      end
+    end
+  end
+end

data/lib/rom/http/schema/dsl.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'rom/schema/dsl'
+
+module ROM
+  module HTTP
+    class Schema < ROM::Schema
+      class DSL < ROM::Schema::DSL
+      end
+    end
+  end
+end

data/lib/rom/http/transformer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module HTTP
     # Transformer

data/lib/rom/http/types.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'rom/types'
+
+module ROM
+  module HTTP
+    module Types
+      include ROM::Types
+
+      Path = Coercible::String.constructor { |s| s.sub(%r{\A/}, '') }
+    end
+  end
+end

data/lib/rom/http/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ROM
   module HTTP
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.8.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rom-http
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Piotr Solnica
@@ -10,70 +10,70 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: rom
+  name: rom-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
@@ -167,44 +167,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- examples/repository_with_combine.rb
 - lib/rom-http.rb
 - lib/rom/http.rb
+- lib/rom/http/attribute.rb
 - lib/rom/http/commands.rb
 - lib/rom/http/commands/create.rb
 - lib/rom/http/commands/delete.rb
 - lib/rom/http/commands/update.rb
 - lib/rom/http/dataset.rb
-- lib/rom/http/dataset/class_interface.rb
 - lib/rom/http/error.rb
 - lib/rom/http/gateway.rb
+- lib/rom/http/handlers.rb
+- lib/rom/http/handlers/json.rb
+- lib/rom/http/mapper_compiler.rb
 - lib/rom/http/relation.rb
+- lib/rom/http/schema.rb
+- lib/rom/http/schema/dsl.rb
 - lib/rom/http/transformer.rb
+- lib/rom/http/types.rb
 - lib/rom/http/version.rb
-- rakelib/rubocop.rake
-- rom-http.gemspec
-- spec/integration/abstract/commands/create_spec.rb
-- spec/integration/abstract/commands/delete_spec.rb
-- spec/integration/abstract/commands/update_spec.rb
-- spec/integration/abstract/relation_spec.rb
-- spec/shared/setup.rb
-- spec/shared/users_and_tasks.rb
-- spec/spec_helper.rb
-- spec/support/mutant.rb
-- spec/unit/rom/http/dataset_spec.rb
-- spec/unit/rom/http/gateway_spec.rb
-- spec/unit/rom/http/relation_spec.rb
-homepage: http://rom-rb.org
+homepage: https://rom-rb.org
 licenses:
 - MIT
 metadata: {}
@@ -216,27 +201,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: HTTP support for ROM
-test_files:
-- spec/integration/abstract/commands/create_spec.rb
-- spec/integration/abstract/commands/delete_spec.rb
-- spec/integration/abstract/commands/update_spec.rb
-- spec/integration/abstract/relation_spec.rb
-- spec/shared/setup.rb
-- spec/shared/users_and_tasks.rb
-- spec/spec_helper.rb
-- spec/support/mutant.rb
-- spec/unit/rom/http/dataset_spec.rb
-- spec/unit/rom/http/gateway_spec.rb
-- spec/unit/rom/http/relation_spec.rb
+test_files: []