rom-http 0.7.0 → 0.9.0

data/lib/rom/http/relation.rb

@@ -1,32 +1,34 @@
-require 'dry/core/cache'
-require 'rom/initializer'
-require 'rom/http/transformer'
+# frozen_string_literal: true
+
+require "rom/initializer"
+
+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
+              :with_request_method, :with_query_params, :add_query_params,
+              :with_body_params, :add_body_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 +36,7 @@ module ROM
       end
 
       def exclude(*names)
-        with(schema: schema.exclude(*names.flatten))
+        with(schema: schema.exclude(*names))
       end
 
       def rename(mapping)
@@ -45,67 +47,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/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/schema.rb

@@ -0,0 +1,40 @@
+# 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
+
+      # To maintain compatibility with other adapters
+      #
+      # @api private
+      def qualified
+        self
+      end
+
+      # Internal hook used during setup process
+      #
+      # @see Schema#finalize_associations!
+      #
+      # @api private
+      def finalize_associations!(relations:)
+        super do
+          associations.map do |definition|
+            HTTP::Associations.const_get(definition.type).new(definition, relations)
+          end
+        end
+      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.9.0"
   end
 end

data/lib/rom/http.rb

@@ -1,8 +1,11 @@
-require 'rom'
-require 'rom/http/error'
-require 'rom/http/commands'
-require 'rom/http/gateway'
-require 'rom/http/relation'
-require 'rom/http/version'
+# frozen_string_literal: true
+
+require "rom"
+require "rom/http/error"
+require "rom/http/commands"
+require "rom/http/associations"
+require "rom/http/gateway"
+require "rom/http/relation"
+require "rom/http/version"
 
 ROM.register_adapter(:http, ROM::HTTP)

data/lib/rom-http.rb

@@ -1 +1,3 @@
-require 'rom/http'
+# frozen_string_literal: true
+
+require "rom/http"

metadata

@@ -1,79 +1,79 @@
 --- !ruby/object:Gem::Specification
 name: rom-http
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Piotr Solnica
 - Andy Holland
 - Chris Flipse
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2022-09-27 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
   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
@@ -94,70 +94,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.13'
 description: HTTP support for ROM
 email:
 - piotr.solnica@gmail.com
@@ -167,48 +111,37 @@ 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/associations.rb
+- lib/rom/http/associations/many_to_many.rb
+- lib/rom/http/associations/many_to_one.rb
+- lib/rom/http/associations/one_to_many.rb
+- lib/rom/http/associations/one_to_one.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: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,27 +149,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.1.2
+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: []

data/.gitignore

@@ -1,16 +0,0 @@
-/.bundle
-/.yardoc
-/_yardoc
-/coverage
-/vendor
-/doc
-/pkg
-/spec/reports
-/tmp
-Gemfile.lock
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-log/*.log

data/.rspec

@@ -1,3 +0,0 @@
---require=spec_helper
---color
---order random

data/.rubocop.yml

@@ -1,22 +0,0 @@
-# Generated by `rubocop --auto-gen-config`
-inherit_from: .rubocop_todo.yml
-
-Metrics/LineLength:
-  Max: 100
-
-Style/CaseEquality:
-  Enabled: false
-
-# No need to handle LoadError in Rakefile
-Lint/HandleExceptions:
-  Exclude:
-    - Rakefile
-    - rakelib/rubocop.rake
-
-# Documentation checked by Inch CI
-Style/Documentation:
-  Enabled: false
-
-# Allow rom-http
-Style/FileName:
-    Enabled: false

data/.rubocop_todo.yml

@@ -1,12 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2015-09-16 21:35:53 +0100 using RuboCop version 0.34.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 118

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-dist: trusty
-sudo: required
-cache: bundler
-bundler_args: --without sql benchmarks console tools
-script: "bundle exec rake ci"
-rvm:
-  - 2.3.4
-  - 2.4.1
-  - jruby-9.1.13.0
-env:
-  global:
-    - JRUBY_OPTS='--dev -J-Xmx1024M'
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/39e1225f489f38b0bd09
-    on_success: change
-    on_failure: always
-    on_start: false

data/Gemfile

@@ -1,24 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'rom-repository', '~> 2.0'
-
-group :test do
-  gem 'rom', '~> 4.0'
-  gem 'faraday'
-  gem 'inflecto'
-end
-
-group :tools do
-  gem 'byebug'
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-rubocop'
-  gem 'rubocop', '~> 0.28'
-
-  platform :mri do
-    gem 'mutant', '>= 0.8.0', github: 'mbj/mutant', branch: 'master'
-    gem 'mutant-rspec'
-  end
-end

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2015 Ruby Object Mapper Team
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,24 +0,0 @@
-#!/usr/bin/env rake
-require 'bundler/gem_tasks'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-task default: [:ci]
-
-desc 'Run CI tasks'
-task ci: [:spec]
-
-begin
-  require 'rubocop/rake_task'
-
-  Rake::Task[:default].enhance [:rubocop]
-
-  RuboCop::RakeTask.new do |task|
-    task.options << '--display-cop-names'
-  end
-rescue LoadError
-end