grape-roar 0.4.1 → 0.5.0

data/spec/extensions/relations/validations/active_record_spec.rb

@@ -1,45 +1,48 @@
 # frozen_string_literal: true
-describe Grape::Roar::Extensions::Relations::Validations::ActiveRecord, active_record: true do
-  let(:model_klass) { double }
 
-  subject do
-    klass = Class.new do
-      def initialize(klass)
-        @klass = klass
+if defined?(ActiveRecord)
+  describe Grape::Roar::Extensions::Relations::Validations::ActiveRecord, :activerecord do
+    let(:model_klass) { double }
+
+    subject do
+      klass = Class.new do
+        def initialize(klass)
+          @klass = klass
+        end
+
+        attr_reader :klass
       end
 
-      attr_reader :klass
+      klass.include(described_class)
+      klass.new(model_klass)
     end
 
-    klass.include(described_class)
-    klass.new(model_klass)
-  end
-
-  before do
-    expect(model_klass).to receive(:reflections).twice
-                                                .and_return(reflections)
-  end
+    before do
+      expect(model_klass).to receive(:reflections).twice
+                                                  .and_return(reflections)
+    end
 
-  %w[
-    belongs_to
-    has_many
-    has_one
-    has_and_belongs_to_many
-  ].each do |relation|
-    context "##{relation}_valid?" do
-      let(:relation_klass) do
-        "::ActiveRecord::Reflection::#{relation.camelize}"\
+    %w[
+      belongs_to
+      has_many
+      has_one
+      has_and_belongs_to_many
+    ].each do |relation|
+      describe "##{relation}_valid?" do
+        let(:relation_klass) do
+          "::ActiveRecord::Reflection::#{relation.camelize}" \
           'Reflection'.constantize.allocate
-      end
+        end
 
-      let(:reflections) { { test: relation_klass, fail: Class.new } }
+        let(:reflections) { { test: relation_klass, fail: Class.new } }
 
-      it 'properly validates the relation' do
-        expect(subject.send("#{relation}_valid?", :test)).to eql(true)
-        expect { subject.send("#{relation}_valid?", :fail) }.to raise_error(
-          Grape::Roar::Extensions::Relations::\
-          Exceptions::InvalidRelationError
-        )
+        it 'properly validates the relation' do
+          expect(subject.send("#{relation}_valid?", :test)).to eql(true)
+          expect { subject.send("#{relation}_valid?", :fail) }.to raise_error(
+            Grape::Roar::Extensions::Relations::
+            Exceptions::InvalidRelationError
+          )
+        end
       end
     end
   end

data/spec/extensions/relations/validations/mongoid_spec.rb

@@ -1,86 +1,89 @@
 # frozen_string_literal: true
-describe Grape::Roar::Extensions::Relations::Validations::Mongoid, mongoid: true do
-  let(:model_klass) { double }
 
-  subject do
-    klass = Class.new do
-      def initialize(klass)
-        @klass = klass
+if defined?(Mongoid)
+  describe Grape::Roar::Extensions::Relations::Validations::Mongoid, :mongoid do
+    let(:model_klass) { double }
+    let(:map_reflection) do
+      proc do |r|
+        case r
+        when /and/     then 'ManyToMany'
+        when /many/    then 'Many'
+        when /one/     then 'One'
+        when /belongs/ then 'In'
+        end
       end
-
-      attr_reader :klass
     end
 
-    klass.include(described_class)
-    klass.new(model_klass)
-  end
+    subject do
+      klass = Class.new do
+        def initialize(klass)
+          @klass = klass
+        end
 
-  let(:map_reflection) do
-    proc do |r|
-      case r
-      when /and/     then 'ManyToMany'
-      when /many/    then 'Many'
-      when /one/     then 'One'
-      when /belongs/ then 'In'
+        attr_reader :klass
       end
+
+      klass.include(described_class)
+      klass.new(model_klass)
     end
-  end
 
-  before do
-    expect(model_klass).to receive(:reflect_on_association).twice do |r|
-      if r == :test_rel
-        {
-          relation: "Mongoid::Relations::#{relation_klass}"\
-                    "::#{map_reflection.call(test_method)}".constantize
-        }
-      else
-        { relation: double }
+    before do
+      expect(model_klass).to receive(:reflect_on_association).twice do |r|
+        if r == :test_rel
+          if Gem::Version.new(Mongoid::VERSION) < Gem::Version.new('7')
+            { relation: "Mongoid::Relations::#{relation_klass}::#{map_reflection.call(test_method)}".constantize }
+          else
+            { relation: "Mongoid::Association::#{relation_klass}::#{test_method.to_s.camelize}".constantize }
+          end
+        else
+          { relation: double }
+        end
       end
     end
-  end
 
-  context 'referenced' do
-    let(:relation_klass) { 'Referenced' }
+    context 'referenced' do
+      let(:relation_klass) { 'Referenced' }
 
-    %i[
-      belongs_to
-      has_and_belongs_to_many
-      has_many
-      has_one
-    ].each do |test_method|
-      context "##{test_method}_valid? validates the relation" do
-        let(:test_method) { test_method }
+      %i[
+        belongs_to
+        has_and_belongs_to_many
+        has_many
+        has_one
+      ].each do |test_method|
+        describe "##{test_method}_valid? validates the relation" do
+          let(:test_method) { test_method }
 
-        it 'properly validates the relation' do
-          expect(subject.send("#{test_method}_valid?", :test_rel)).to eql(true)
+          it 'properly validates the relation' do
+            expect(subject.send("#{test_method}_valid?", :test_rel)).to eql(true)
 
-          expect do
-            subject.send("#{test_method}_valid?", :fail)
-          end.to raise_error(
-            Grape::Roar::Extensions::Relations::\
-            Exceptions::InvalidRelationError
-          )
+            expect do
+              subject.send("#{test_method}_valid?", :fail)
+            end.to raise_error(
+              Grape::Roar::Extensions::Relations::
+              Exceptions::InvalidRelationError
+            )
+          end
         end
       end
     end
-  end
 
-  context 'referenced' do
-    let(:relation_klass) { 'Embedded' }
+    context 'embedded' do
+      let(:relation_klass) { 'Embedded' }
 
-    %i[embeds_one embeds_many].each do |test_method|
-      context "##{test_method}_valid? validates the relation" do
-        let(:test_method) { test_method }
+      %i[embeds_one embeds_many].each do |test_method|
+        describe "##{test_method}_valid? validates the relation" do
+          let(:test_method) { test_method }
 
-        it 'properly validates the relation' do
-          expect(subject.send("#{test_method}_valid?", :test_rel)).to eql(true)
+          it 'properly validates the relation' do
+            expect(subject.send("#{test_method}_valid?", :test_rel)).to eql(true)
 
-          expect do
-            subject.send("#{test_method}_valid?", :fail)
-          end.to raise_error(
-            Grape::Roar::Extensions::Relations::\
-            Exceptions::InvalidRelationError
-          )
+            expect do
+              subject.send("#{test_method}_valid?", :fail)
+            end.to raise_error(
+              Grape::Roar::Extensions::Relations::
+              Exceptions::InvalidRelationError
+            )
+          end
         end
       end
     end

data/spec/nested_representer_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-
-
 describe Grape::Roar do
   context 'nested representer' do
     include_context 'Grape API App'

data/spec/present_with_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-
-
 describe Grape::Roar do
   include_context 'Grape API App'
 

data/spec/relations_spec.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 describe Grape::Roar::Extensions::Relations do
-  context '.included' do
+  describe '.included' do
     subject { Class.new }
+
     after { subject.include(described_class) }
 
     it 'mixes DSLMethods into the singleton class of its target' do
@@ -12,11 +13,11 @@ describe Grape::Roar::Extensions::Relations do
     end
   end
 
-  context 'with mongoid', mongoid: true do
+  context 'with mongoid', :mongoid do
     include_context 'Grape API App'
 
     # Make sure Mongo is empty
-    before(:each) { Mongoid::Config.purge! }
+    before { Mongoid::Config.purge! }
 
     let(:result) { JSON.parse(last_response.body) }
 
@@ -39,7 +40,7 @@ describe Grape::Roar::Extensions::Relations do
 
       it 'correctly generates links for items' do
         expect(result['_links']['items'].map { |l| l['href'] }).to all(
-          match(/^http:\/\/example\.org\/items\/[A-Za-z0-9]*$/)
+          match(%r{^http://example\.org/items/[A-Za-z0-9]*$})
         )
       end
     end
@@ -64,7 +65,7 @@ describe Grape::Roar::Extensions::Relations do
 
       it 'correctly represents the embedded cart' do
         expect(result['_embedded']['cart']['_links']['self']['href'])
-          .to match(/^http:\/\/example\.org\/carts\/[A-Za-z0-9]*$/)
+          .to match(%r{^http://example\.org/carts/[A-Za-z0-9]*$})
 
         expect(result['_embedded']['cart']['_links']['items'].count).to eql(1)
         expect(result['_embedded']['cart']['_links']['items'].first).to eql(

data/spec/representer_spec.rb

@@ -1,20 +1,46 @@
 # frozen_string_literal: true
 
-
-
 describe Grape::Roar do
   include_context 'Grape API App'
 
   context 'representer' do
-    before do
-      subject.get('/article/:id') do
-        Article.new(title: 'Lonestar', id: params[:id])
+    context 'with a known model' do
+      before do
+        subject.get('/article/:id') do
+          Article.new(title: 'Lonestar', id: params[:id])
+        end
+      end
+
+      it 'returns a hypermedia representation' do
+        get '/article/666'
+        expect(last_response.body).to eq '{"title":"Lonestar","id":"666","links":[{"rel":"self","href":"/article/666"}]}'
       end
     end
 
-    it 'returns a hypermedia representation' do
-      get '/article/666'
-      expect(last_response.body).to eq '{"title":"Lonestar","id":"666","links":[{"rel":"self","href":"/article/666"}]}'
+    context 'without an instance singleton' do
+      context 'as nil' do
+        before do
+          subject.get('/article/:id') do
+            present(nil, with: ArticleRepresenter)
+          end
+        end
+
+        it 'raises TypeError' do
+          expect { get '/article/666' }.to raise_error(TypeError)
+        end
+      end
+
+      context 'as another immediate value' do
+        before do
+          subject.get('/article/:id') do
+            present(5, with: ArticleRepresenter)
+          end
+        end
+
+        it 'raises TypeError' do
+          expect { get '/article/666' }.to raise_error(TypeError)
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,11 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+require 'ostruct'
+require 'bigdecimal'
+require 'base64'
+require 'logger'
+
 require 'bundler'
 Bundler.setup :default, :test
 Bundler.require
@@ -15,13 +20,12 @@ require 'roar/hypermedia'
 
 require 'grape/roar'
 require 'rack/test'
-
 require 'rspec'
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.filter_run_excluding(
-    active_record: true, mongoid: true
+    activerecord: true, mongoid: true
   )
 end
 

data/spec/support/all/article_representer.rb

@@ -3,6 +3,7 @@
 module ArticleRepresenter
   include Roar::JSON
   include Roar::Hypermedia
+  include Grape::Roar::Representer
 
   property :title
   property :id

data/spec/support/all/grape_app_context.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-
-
 shared_context 'Grape API App' do
   subject do
     Class.new(Grape::API)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-roar
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2025-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -59,22 +59,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/danger.yml"
+- ".github/workflows/lint.yml"
+- ".github/workflows/test-activerecord.yml"
+- ".github/workflows/test-mongodb.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
-- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Dangerfile
 - Gemfile
+- Gemfile.danger
 - LICENSE
 - README.md
 - RELEASING.md
 - Rakefile
 - UPGRADING.md
-- gemfiles/with_activerecord.gemfile
-- gemfiles/with_mongoid.gemfile
 - grape-roar.gemspec
 - lib/grape-roar.rb
 - lib/grape/roar.rb
@@ -92,6 +97,8 @@ files:
 - lib/grape/roar/extensions/relations/validations/active_record.rb
 - lib/grape/roar/extensions/relations/validations/misc.rb
 - lib/grape/roar/extensions/relations/validations/mongoid.rb
+- lib/grape/roar/extensions/relations/validations/mongoid/6.rb
+- lib/grape/roar/extensions/relations/validations/mongoid/7.rb
 - lib/grape/roar/formatter.rb
 - lib/grape/roar/representer.rb
 - lib/grape/roar/version.rb
@@ -125,8 +132,9 @@ files:
 homepage: http://github.com/ruby-grape/grape-roar
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,9 +149,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Enable Resource-Oriented Architectures in Grape API DSL
 test_files: []

data/.travis.yml

@@ -1,36 +0,0 @@
-sudo: false
-
-language: ruby
-
-cache: bundler
-
-rvm:
-  - 2.4.1
-  - 2.3.4
-
-gemfile:
-  - Gemfile
-  - gemfiles/with_activerecord.gemfile
-  - gemfiles/with_mongoid.gemfile
-
-services:
-  - mongodb
-  - pg
-
-matrix:
-  include:
-    - env: SPEC_OPTS="--tag active_record"
-      gemfile: gemfiles/with_activerecord.gemfile
-      rvm: 2.4.1
-    - env: SPEC_OPTS="--tag mongoid"
-      gemfile: gemfiles/with_mongoid.gemfile
-      rvm: 2.4.1
-    - env: SPEC_OPTS="--tag active_record"
-      gemfile: gemfiles/with_activerecord.gemfile
-      rvm: 2.3.4
-    - env: SPEC_OPTS="--tag mongoid"
-      gemfile: gemfiles/with_mongoid.gemfile
-      rvm: 2.3.4
-
-
-script: bundle exec rake

data/Appraisals

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-appraise 'with-activerecord' do
-  gem 'activerecord', '>= 4.0.0', require: 'active_record'
-end
-
-appraise 'with-mongoid' do
-  gem 'mongoid', '>= 5.0.0', require: 'mongoid'
-end

data/gemfiles/with_activerecord.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "activerecord", ">= 4.0.0", require: "active_record"
-
-group :development do
-  gem "appraisal", "2.2.0"
-end
-
-group :test do
-  gem "rack-test"
-  gem "rspec", "~> 3.1"
-end
-
-group :development, :test do
-  gem "nokogiri", "1.6.3.1"
-  gem "rake", "~> 10.5.0"
-  gem "rubocop", "0.49.1"
-end
-
-gemspec path: "../"

data/gemfiles/with_mongoid.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mongoid", ">= 5.0.0", require: "mongoid"
-
-group :development do
-  gem "appraisal", "2.2.0"
-end
-
-group :test do
-  gem "rack-test"
-  gem "rspec", "~> 3.1"
-end
-
-group :development, :test do
-  gem "nokogiri", "1.6.3.1"
-  gem "rake", "~> 10.5.0"
-  gem "rubocop", "0.49.1"
-end
-
-gemspec path: "../"