sanger-jsonapi-resources 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41ebb993c7cbfaceff000cffb66c33e03242eb93f32f898676b78cf633fa835c
-  data.tar.gz: 334f92079b8036bcafcc12647965bc82181a609f3773bd54e88f1041e533f9de
+  metadata.gz: a55bda6cecda0ea196dec77943a8e2506af7bd15bd581cabcfbc996b3792aeb6
+  data.tar.gz: 84fe7e09db2944f6891037f838e751c7daf49ebd095bb08de43c1ab5a5010853
 SHA512:
-  metadata.gz: 8f82eb2c975059c4f0745f08bcf6d9243a48440ae430d9b1f2855386e59d3404dbde639776c114a5e6449788c5be0af766d3d6b4569af2903b1d65fb95169e55
-  data.tar.gz: a423295e281436746d3eecc5edd6ead5377d1ab1ec71ff6322500314eaa45761fc1d5a4b028e4ec18d6b989b33a5c6e240c14b210a1db8c690f61eb11b46cb0d
+  metadata.gz: '09651520c32728f3a6835aa77d83dc3b212426fc1154a7f49bc017f2f758aa8435c94954a6df5d3009fec99605fc8445ce4f636b6b2ce7f5b60d9758e061c1ed'
+  data.tar.gz: d7f53c0c0f23c6c1e6ec7e3f535e0e9481bf900682a93a5b1672ecfb5f53c642d74a4a754140b7daaf962a4cbe1c4eb2dc34e5b31763e0c631d0b7d0554c849c

data/README.md

@@ -56,8 +56,10 @@ Check which versions we have published at https://rubygems.org/gems/sanger-jsona
 - Change version number in `lib/jsonapi/resources/version.rb` . This file is read by the gemspec during publication.
 - Test Sequencescape with the gem from the branch.
 - Merge the branch into develop.
+- Create a release from the develop branch with the new version number as the tag. Set Release label to _None_.
 <!-- list separator -->
-- Checkout the develop branch.
+- Checkout the newly-created tag on develop.
+- Execute `bundle install` to ensure the gemspec is up to date.
 - Execute `gem build jsonapi-resources.gemspec` which builds sanger-jsonapi-resources-0.1.x.gem in this case.
 - Execute `gem push sanger-jsonapi-resources-0.1.x.gem` which publishes the gem.
 
@@ -67,8 +69,10 @@ Check which versions we have published at https://rubygems.org/gems/sanger-jsona
 - Change version number in `lib/jsonapi/resources/version.rb` . This file is read by the gemspec during publication.
 - Test Traction with the gem from the branch.
 - Merge the branch into master.
+- Create a release from the master branch with the new version number as the tag. Set Release label to _Latest_.
 <!-- list separator -->
-- Checkout the master branch.
+- Checkout the newly-created tag on master.
+- Execute `bundle install` to ensure the gemspec is up to date.
 - Execute `gem build jsonapi-resources.gemspec` which builds sanger-jsonapi-resources-0.2.x.gem in this case.
 - Execute `gem push sanger-jsonapi-resources-0.2.x.gem` which publishes the gem.
 
@@ -76,15 +80,9 @@ Check which versions we have published at https://rubygems.org/gems/sanger-jsona
 
 You will be notified by email for each. You will also receive one email for API key setup. The first push will ask email and password for the account, which are in KeePass (search for "gem").
 
-> [!TIP]
-> The process above can be improved by creating new releases first and then publish gems from those releases (tags) rather than publications from master (0.2) and develop (0.1) branches. Still create the releases to make tags in this work though.
-
 > [!NOTE]
 > The email and password for gem publication is a recent addition to the credentials database. Pull latest changes in the credentials repo.
 
-> [!IMPORTANT]
-> Developers need to execute `bundle install`.
-
 ## Contributing
 
 See CONTRIBUTING.md for details.

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.1.3'
+    VERSION = '0.1.4'
   end
 end

data/lib/jsonapi/routing_ext.rb

@@ -38,28 +38,14 @@ module ActionDispatch
             options[:except] << :destroy unless options[:except].include?(:destroy) || options[:except].include?('destroy')
           end
 
-          resource @resource_type, options do
-            # :nocov:
-            if @scope.respond_to? :[]=
-              # Rails 4
-              @scope[:jsonapi_resource] = @resource_type
-
+          resource @resource_type, **options do
+            jsonapi_resource_scope(SingletonResource.new(@resource_type, api_only?, @scope[:shallow], **options), @resource_type) do
               if block_given?
                 yield
               else
                 jsonapi_relationships
               end
-            else
-              # Rails 5
-              jsonapi_resource_scope(SingletonResource.new(@resource_type, api_only?, @scope[:shallow], options), @resource_type) do
-                if block_given?
-                  yield
-                else
-                  jsonapi_relationships
-                end
-              end
             end
-            # :nocov:
           end
         end
 
@@ -107,27 +93,14 @@ module ActionDispatch
             options[:except] << :destroy unless options[:except].include?(:destroy) || options[:except].include?('destroy')
           end
 
-          resources @resource_type, options do
-            # :nocov:
-            if @scope.respond_to? :[]=
-              # Rails 4
-              @scope[:jsonapi_resource] = @resource_type
+          resources @resource_type, **options do
+            jsonapi_resource_scope(Resource.new(@resource_type, api_only?, @scope[:shallow], **options), @resource_type) do
               if block_given?
                 yield
               else
                 jsonapi_relationships
               end
-            else
-              # Rails 5
-              jsonapi_resource_scope(Resource.new(@resource_type, api_only?, @scope[:shallow], options), @resource_type) do
-                if block_given?
-                  yield
-                else
-                  jsonapi_relationships
-                end
-              end
             end
-            # :nocov:
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sanger-jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - PSD Team - Wellcome Trust Sanger Institute
@@ -147,40 +147,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement