roar 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a9315b89b6aa93848741828ab6a94e338677e397
-  data.tar.gz: c373cdb3f85a40560502cd9ef09ad88363499394
+SHA256:
+  metadata.gz: 2860c24f7eedfa3e4f1f0863055f3914f6ace36ba34cf6ae51fcfcd7c5178c2b
+  data.tar.gz: 3a6ce9a686e587093781eaa0b35618a7573198d4d42092aca23e1a4309e7c8c2
 SHA512:
-  metadata.gz: 059ab5ab647e9ec273976d485715dfed04895dc1538e8331025cea005995a1b9cf9cdb16c7e0ed34441f338594976e09c9ba48ccd071a2846aed5697a81f742c
-  data.tar.gz: 93101c0816d59b8ffe8465eddb7d5882f132322b1c00f4e44dd960c4b840ac0ce52f4d647245ebdec52682fccfb88c0716ee1c1b4d998c46e5edc6d92753cd4a
+  metadata.gz: '0733953718778b1724d81d547ed9b870740417fe77295694615f2af4af31aaf4cf3004988d120d560e311dacc5ab00e1d0dff82468614c7424087e950067f058'
+  data.tar.gz: aa179e38257da2b60502d72b93f1c41fcfa33feb7891308b27d2464180e345a358970e39c1f353428bdcea42af6af54df75a7d51403159e47a0c152563c075ee

data/.github/workflows/ci.yml

@@ -0,0 +1,19 @@
+## This file is managed by Terraform.
+## Do not modify this file directly, as it may be overwritten.
+## Please open an issue instead.
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.7, '3.0', '3.1', '3.2']
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/.github/workflows/ci_jruby.yml

@@ -0,0 +1,19 @@
+## This file is managed by Terraform.
+## Do not modify this file directly, as it may be overwritten.
+## Please open an issue instead.
+name: CI JRuby
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [jruby, jruby-head]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/.github/workflows/ci_legacy.yml

@@ -0,0 +1,19 @@
+## This file is managed by Terraform.
+## Do not modify this file directly, as it may be overwritten.
+## Please open an issue instead.
+name: CI with EOL ruby versions
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/.github/workflows/ci_truffleruby.yml

@@ -0,0 +1,19 @@
+## This file is managed by Terraform.
+## Do not modify this file directly, as it may be overwritten.
+## Please open an issue instead.
+name: CI TruffleRuby
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [truffleruby, truffleruby-head]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/CHANGES.markdown

@@ -1,3 +1,14 @@
+# Next
+
+# 1.2.0
+
+* Allow Representable `>= 3.1`
+* Replace `Virtus` with `Dry-Types`
+
+# 1.1.1
+
+* Allow Representable 3.x.
+
 # 1.1.0
 
 * Require Representable 3.0.x

data/Gemfile

@@ -1,17 +1,10 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in roar.gemspec
-gemspec
+ruby RUBY_VERSION
 
-install_if -> { RUBY_VERSION > '2.2.2' } do
-  gem 'sinatra',          '~> 2.0.0.beta2'
-  gem 'sinatra-contrib',  github: 'sinatra/sinatra'
-end
+gemspec
 
-gem 'nokogiri', '~> 1.6.8'
+gem "nokogiri", ">= 1.8.5"
 
-# gem "representable", path: "../representable"
-# gem "representable", github: "apotonick/representable"
-# gem "declarative", path: "../declarative"
 gem "minitest-line"
 gem "pry"

data/README.markdown

@@ -4,7 +4,7 @@ _Resource-Oriented Architectures in Ruby._
 
 [![Gitter Chat](https://badges.gitter.im/trailblazer/chat.svg)](https://gitter.im/trailblazer/chat)
 [![TRB Newsletter](https://img.shields.io/badge/TRB-newsletter-lightgrey.svg)](http://trailblazer.to/newsletter/)
-[![Build Status](https://travis-ci.org/trailblazer/roar.svg?branch=master)](https://travis-ci.org/trailblazer/roar)
+[![Build Status](https://github.com/trailblazer/roar/actions/workflows/ci.yml/badge.svg)](https://github.com/trailblazer/roar/actions)
 [![Gem Version](https://badge.fury.io/rb/roar.svg)](http://badge.fury.io/rb/roar)
 
 ## Table of Contents
@@ -67,6 +67,12 @@ The roar gem runs with all Ruby versions >= 1.9.3.
 gem 'roar'
 ```
 
+To use roar with Ruby versions < 2.2.0, add a version pin to your Gemfile:
+
+```ruby
+gem 'sinatra', '~> 1.4'
+```
+
 ### Dependencies
 
 Roar does not bundle dependencies for JSON and XML.
@@ -290,7 +296,7 @@ We're currently [working on](https://github.com/trailblazer/roar/issues/85) bett
 
 ## Coercion
 
-Roar provides coercion with the [virtus](https://github.com/solnic/virtus) gem.
+Roar provides coercion with the [dry-types](https://dry-rb.org/gems/dry-types/) gem.
 
 ```ruby
 require 'roar/coercion'
@@ -301,11 +307,11 @@ class SongRepresenter < Roar::Decorator
   include Roar::Coercion
 
   property :title
-  property :released_at, type: DateTime
+  property :released_at, type: Types::DateTime
 end
 ```
 
-The `:type` option allows to set a virtus-compatible type.
+The `:type` option allows to set a dry-types-compatible type.
 
 ```ruby
 song = Song.new

data/lib/roar/coercion.rb

@@ -1,8 +1,10 @@
-gem 'virtus'
-require 'virtus'
-require 'representable/coercion'
+gem "dry-types", ">= 1.0.0"
+require "dry-types"
+require "representable/coercion"
 
 module Roar
+  Types = Representable::Coercion::Types
+
   # Use the +:type+ option to specify the conversion type.
   # class ImmigrantSong
   #   include Roar::JSON

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/roar.gemspec

@@ -17,14 +17,17 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "representable", "~> 3.0.0"
+  s.required_ruby_version = '>= 1.9.3'
 
-  s.add_development_dependency "rake", ">= 0.10.1"
+  s.add_runtime_dependency "representable", "~> 3.1"
+
+  s.add_development_dependency "rake"
   s.add_development_dependency "test_xml", "0.1.6"
   s.add_development_dependency 'minitest', '>= 5.10'
-  s.add_development_dependency "sinatra", '>= 2.0.0'
-  s.add_development_dependency "sinatra-contrib", '>= 2.0.0'
-  s.add_development_dependency "virtus", ">= 1.0.0"
+  s.add_development_dependency "sinatra"
+  s.add_development_dependency "sinatra-contrib"
+  s.add_development_dependency "webrick"
   s.add_development_dependency "faraday"
   s.add_development_dependency "multi_json"
+  s.add_development_dependency "dry-types", ">= 1.0.0"
 end

data/test/coercion_feature_test.rb

@@ -8,7 +8,7 @@ class CoercionFeatureTest < MiniTest::Spec
       include Roar::JSON
       include Roar::Coercion
 
-      property :composed_at, :type => DateTime, :default => "May 12th, 2012"
+      property :composed_at, type: Types::JSON::DateTime, default: "May 12th, 2012"
     end
 
     class ImmigrantSong

data/test/integration/faraday_http_transport_test.rb

@@ -35,25 +35,25 @@ class FaradayHttpTransportTest < MiniTest::Spec
       let(:not_found_url) { 'http://localhost:4567/missing-resource' }
 
       it '#get_uri raises a ResourceNotFound error' do
-        assert_raises(Faraday::Error::ResourceNotFound) do
+        assert_raises(Faraday::ResourceNotFound) do
           @transport.get_uri(uri: not_found_url, as: as).body
         end
       end
 
       it '#post_uri raises a ResourceNotFound error' do
-        assert_raises(Faraday::Error::ResourceNotFound) do
+        assert_raises(Faraday::ResourceNotFound) do
           @transport.post_uri(uri: not_found_url, body: body, as: as).body
         end
       end
 
       it '#post_uri raises a ResourceNotFound error' do
-        assert_raises(Faraday::Error::ResourceNotFound) do
+        assert_raises(Faraday::ResourceNotFound) do
           @transport.post_uri(uri: not_found_url, body: body, as: as).body
         end
       end
 
       it '#delete_uri raises a ResourceNotFound error' do
-        assert_raises(Faraday::Error::ResourceNotFound) do
+        assert_raises(Faraday::ResourceNotFound) do
           @transport.delete_uri(uri: not_found_url, body: body, as: as).body
         end
       end
@@ -61,7 +61,7 @@ class FaradayHttpTransportTest < MiniTest::Spec
 
     describe 'server errors (500 Internal Server Error)' do
       it '#get_uri raises a ClientError' do
-        assert_raises(Faraday::Error::ClientError) do
+        assert_raises(Faraday::ServerError) do
           @transport.get_uri(uri: 'http://localhost:4567/deliberate-error', as: as).body
         end
       end

data/test/integration/http_verbs_test.rb

@@ -54,7 +54,7 @@ class HttpVerbsTest < MiniTest::Spec
       describe 'a non-existent resource' do
         it 'handles HTTP errors and raises a ResourceNotFound error with FaradayHttpTransport' do
           @band.transport_engine = Roar::Transport::Faraday
-          assert_raises(::Faraday::Error::ResourceNotFound) do
+          assert_raises(::Faraday::ResourceNotFound) do
             @band.get(uri: 'http://localhost:4567/bands/anthrax', as: "application/json")
           end
         end

data/test/integration/ssl_server.rb

@@ -6,7 +6,7 @@ require 'sinatra/multi_route'
 
 name = "/C=US/ST=SomeState/L=SomeCity/O=Organization/OU=Unit/CN=localhost"
 ca   = OpenSSL::X509::Name.parse(name)
-key = OpenSSL::PKey::RSA.new(1024)
+key = OpenSSL::PKey::RSA.new(2048)
 crt = OpenSSL::X509::Certificate.new
 crt.version = 2
 crt.serial  = 1
@@ -58,4 +58,4 @@ class SslServer < Sinatra::Base
 end
 server = ::Rack::Handler::WEBrick
 
-server.run(SslServer, webrick_options)
+server.run(SslServer, **webrick_options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Nick Sutterer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test_xml
   requirement: !ruby/object:Gem::Requirement
@@ -72,42 +72,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Object-oriented representers help you defining nested REST API documents
   which can then be rendered and parsed using one and the same concept.
 email:
@@ -144,12 +158,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/ci.yml"
+- ".github/workflows/ci_jruby.yml"
+- ".github/workflows/ci_legacy.yml"
+- ".github/workflows/ci_truffleruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGES.markdown
 - CONTRIBUTING.md
 - Gemfile
-- ISSUE_TEMPLATE.md
 - LICENSE
 - README.markdown
 - Rakefile
@@ -200,7 +217,7 @@ homepage: http://trailblazer.to/gems/roar
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -208,16 +225,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.18
+signing_key:
 specification_version: 4
 summary: Parse and render REST API documents using representers.
 test_files: []

data/.travis.yml

@@ -1,17 +0,0 @@
-sudo: false
-rvm:
-  - 1.9.3
-  - 2.1
-  - 2.2.6
-  - 2.3.1
-  - 2.4.0
-  - jruby-9.1.6.0
-  - ruby-head
-gemfile:
-  - Gemfile
-  # - gemfiles/Gemfile.representable-2.4
-before_install:
-  - gem install bundler
-matrix:
-  allow_failures:
-    - rvm: ruby-head