media_types-serialization 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d00191a59e5d1c2df575e66ade4f41fcf525cb4c1ea5878eeeb8a8cc2b86b3a5
-  data.tar.gz: 27c6b628de9e717955a1d3f9fcc548ac5f3d253cc392ea7cf5d1ed50a1b851fe
+  metadata.gz: 3a1225815ea23d47af5c71f2dd37d409c01f0ed8d89cdb19749293b69f97f36d
+  data.tar.gz: 2461ce3d3411bcffe257388d6664f923e7e08254c85a4cfa25515d0120afce81
 SHA512:
-  metadata.gz: 7486b226c973e8e2aba5b3ed4c1b0054530717dec192fecd17412a10def1436718337d851dac0defeaae58cd95e1f494811b4bd42faa967c8fba1f8ce27984ee
-  data.tar.gz: 0c88f619c963cc0feb0a8dea38cc567bbd2c541211b245a06fa48a55f6aac221e0d8885ab7253a227f0f90d9f29e9d0791e2d285b0afb7799164416098c30d4a
+  metadata.gz: 69bfd29c4c01120ea65ef06a6cb0d5814004a390affcf310b89fb4114f43d8f07888dd14162ebb41b07a681bda20b394ad83db14e758b6d648ddea5841785239
+  data.tar.gz: 7eeafca27e995fad16bd1f0a9e3e9a5f655b977765e73bb66ae7ed42dae4dc6350864e0376bf061039fc532ea0756761622ee43334a218c1fec5d28f57a1d2e1

data/.gitignore

@@ -1,12 +1,12 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-.idea/workspace.xml
-.idea/usage.statistics.xml
-.idea/tasks.xml
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+.idea/workspace.xml
+.idea/usage.statistics.xml
+.idea/tasks.xml

data/.idea/.rakeTasks

@@ -4,4 +4,4 @@ You are allowed to:
 1. Remove rake task
 2. Add existing rake tasks
 To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build media_types-serialization-0.1.0.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install media_types-serialization-0.1.0.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install media_types-serialization-0.1.0.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.1.0 and build and push media_types-serialization-0.1.0.gem to TODO: Set to 'http://mygemserver.com'" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run tests" fullCmd="test" taksId="test" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>
+--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build media_types-serialization-0.3.1.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install media_types-serialization-0.3.1.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install media_types-serialization-0.3.1.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.3.1 and build and push media_types-serialization-0.3.1.gem to rubygems.org" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run tests" fullCmd="test" taksId="test" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>

data/.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

data/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +1,6 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
 </component>

data/.idea/runConfigurations/test.xml

@@ -1,20 +1,20 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="test" type="RakeRunConfigurationType" factoryName="Rake">
-    <module name="media_types-serialization" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
-    <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
-    <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
-    <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="test" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":test_unit " />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
-    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
-    <method v="2" />
-  </configuration>
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="test" type="RakeRunConfigurationType" factoryName="Rake">
+    <module name="media_types-serialization" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
+    <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
+    <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
+    <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="test" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE=":test_unit " />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
+    <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
+    <method v="2" />
+  </configuration>
 </component>

data/.travis.yml

@@ -1,17 +1,17 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.5
-  - 2.6
-  - ruby-head
-before_install:
-  - gem install bundler -v 2.0.1
-  - gem update --system
-  - gem --version
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-install:
-  - bundle install --with development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
+---
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+  - 2.5
+  - 2.6
+  - ruby-head
+before_install:
+  - gem install bundler -v 2.0.1
+  - gem update --system
+  - gem --version
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+install:
+  - bundle install --with development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.3.1
+
+- Fix classes sharing `media_type_constructable`, `serializes_html_flag` and `media_type_versions`
+- Change `instance_methods(false)` check to `instance_methods` check in `MimeTypeSupport`
+- Add `view` to `header_links` call
+- Add `collect_links_for_index` option to collect links for index views
+- Add `collect_links_for_collection` option to collect links for collection views
+
 ## 0.3.0
 
 - Change `to_link_header` to return a string ready to be used as header

data/CODE_OF_CONDUCT.md

@@ -1,74 +1,74 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at derk-jan+github@karrenbeld.info. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at derk-jan+github@karrenbeld.info. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
-
-# Specify your gem's dependencies in media_types-serialization.gemspec
-gemspec
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in media_types-serialization.gemspec
+gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    media_types-serialization (0.3.0)
+    media_types-serialization (0.3.1)
       actionpack (>= 4.0.0)
       activesupport (>= 4.0.0)
       http_headers-accept (< 1.0.0)

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 Derk-Jan Karrenbeld
-
-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.
+The MIT License (MIT)
+
+Copyright (c) 2019 Derk-Jan Karrenbeld
+
+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,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task :default => :test
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
+
+task :default => :test

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "media_types/serialization"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "media_types/serialization"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/media_types/serialization/base.rb

@@ -25,7 +25,7 @@ module MediaTypes
       end
 
       def to_link_header
-        entries = header_links.each_with_index.map do |(rel, opts), index|
+        entries = header_links(view: current_view).each_with_index.map do |(rel, opts), index|
           href = opts.is_a?(String) ? opts : opts.delete(:href)
           parameters =  { rel: rel }.merge(opts.is_a?(String) ? {} : opts)
           HttpHeaders::Link::Entry.new("<#{href}>", index: index, parameters: parameters)
@@ -68,7 +68,8 @@ module MediaTypes
         {}
       end
 
-      def header_links
+      # noinspection RubyUnusedLocalVariable
+      def header_links(view: current_view)
         extract_links
       end
 

data/lib/media_types/serialization/migrations_support.rb

@@ -9,7 +9,16 @@ module MediaTypes
       extend ActiveSupport::Concern
 
       included do
-        mattr_accessor :migrations
+        # This is the same as doing matrr_accessor but have it isolated to the class. Subclass changes to change these
+        # values, but this allows for definition as a concern.
+
+        class << self
+          attr_accessor :migrations
+        end
+
+        delegate :migrations,
+                 :migrations=,
+                 to: :class
       end
 
       class_methods do

data/lib/media_types/serialization/mime_type_support.rb

@@ -8,7 +8,16 @@ module MediaTypes
       extend ActiveSupport::Concern
 
       included do
-        mattr_accessor :media_type_constructable, :serializes_html_flag, :media_type_versions
+        # This is the same as doing matrr_accessor but have it isolated to the class. Subclass changes to change these
+        # values, but this allows for definition as a concern.
+
+        class << self
+          attr_accessor :media_type_constructable, :serializes_html_flag, :media_type_versions
+        end
+
+        delegate :media_type_constructable, :serializes_html_flag, :media_type_versions,
+                 :media_type_constructable=, :serializes_html_flag=, :media_type_versions=,
+                 to: :class
       end
 
       class_methods do
@@ -20,20 +29,20 @@ module MediaTypes
           media_type_view = current_mime_type(view: view)
 
           suffixes = [].tap do |result|
-            result << :json if self.instance_methods(false).include?(:to_json)
-            result << :xml if self.instance_methods(false).include?(:to_xml)
+            result << :json if instance_methods.include?(:to_json)
+            result << :xml if instance_methods.include?(:to_xml)
           end
 
           additionals = [].tap do |result|
-            result << 'text/html' if serializes_html_flag || self.instance_methods(false).include?(:to_html)
+            result << 'text/html' if serializes_html_flag || instance_methods.include?(:to_html)
           end
 
           [media_type_view].concat(
-            media_type_versions.map { |version| media_type_view&.version(version) },
-            media_type_versions.flat_map do |version|
-              (suffixes).map { |suffix| media_type_view&.suffix(suffix)&.version(version) }
-            end,
-            additionals
+              media_type_versions.map { |version| media_type_view&.version(version) },
+              media_type_versions.flat_map do |version|
+                (suffixes).map { |suffix| media_type_view&.suffix(suffix)&.version(version) }
+              end,
+              additionals
           ).compact.uniq
         end
 

data/lib/media_types/serialization/version.rb

@@ -1,5 +1,5 @@
-module MediaTypes
-  module Serialization
-    VERSION = '0.3.0'
-  end
-end
+module MediaTypes
+  module Serialization
+    VERSION = '0.3.1'
+  end
+end

data/lib/media_types/serialization/wrapper/media_collection_wrapper.rb

@@ -28,7 +28,11 @@ module MediaTypes
         alias to_h to_hash
 
         def collect_links
-          {}
+          if serializable && ::MediaTypes::Serialization.collect_links_for_collection
+            __getobj__.send(:header_links)
+          else
+            {}
+          end
         end
 
         private

data/lib/media_types/serialization/wrapper/media_index_wrapper.rb

@@ -28,7 +28,11 @@ module MediaTypes
         alias to_h to_hash
 
         def collect_links
-          {}
+          if serializable && ::MediaTypes::Serialization.collect_links_for_index
+            __getobj__.send(:header_links)
+          else
+            {}
+          end
         end
 
         private

data/lib/media_types/serialization/wrapper/media_object_wrapper.rb

@@ -5,7 +5,6 @@ require 'delegate'
 require 'active_support/core_ext/string/inflections'
 
 require 'media_types/serialization/base'
-require 'media_types/serialization/wrapper/media_wrapper'
 require 'media_types/serialization/wrapper/root_key'
 
 module MediaTypes

data/lib/media_types/serialization.rb

@@ -1,194 +1,194 @@
-require 'media_types/serialization/version'
-
-require 'abstract_controller'
-require 'action_controller/metal/mime_responds'
-require 'action_dispatch/http/mime_type'
-require 'active_support/concern'
-require 'active_support/core_ext/module/attribute_accessors'
-
-require 'http_headers/accept'
-
-require 'media_types/serialization/no_media_type_serializers'
-require 'media_types/serialization/no_serializer_for_content_type'
-require 'media_types/serialization/wrapper/html_wrapper'
-require 'media_types/serialization/wrapper/media_wrapper'
-
-module MediaTypes
-  module Serialization
-
-    mattr_accessor :common_suffix
-
-    extend ActiveSupport::Concern
-
-    HEADER_ACCEPT = 'HTTP_ACCEPT'
-    MEDIA_TYPE_HTML = 'text/html'
-
-    # rubocop:disable Metrics/BlockLength
-    class_methods do
-      # @see #freeze_accepted_media!
-      #
-      def accept_serialization(serializer, view: [nil], accept_html: true, **filter_opts)
-        before_action(**filter_opts) do
-          self.serializers = resolved_media_types(serializer, view: view) do |media_type, media_view, res|
-            opts = { media_type: media_type, media_view: media_view }
-
-            res[MEDIA_TYPE_HTML] = wrap_html(serializer, **opts) if accept_html && !res[MEDIA_TYPE_HTML]
-            res[String(media_type)] = wrap_media(serializer, **opts) if media_type != MEDIA_TYPE_HTML
-          end
-        end
-      end
-
-      def accept_html(serializer, **filter_opts)
-        before_action(**filter_opts) do
-          self.serializers = resolved_media_types(serializer, view: nil) do |_, media_view, res|
-            res[MEDIA_TYPE_HTML] = wrap_html(serializer, media_view: media_view, media_type: MEDIA_TYPE_HTML)
-            break
-          end
-        end
-      end
-
-      ##
-      # Register a mime type, but explicitly notify that it can't be serialized.
-      # This is done for file serving and redirects.
-      #
-      # @param [Symbol] mimes takes a list of symbols that should resolve through Mime::Type
-      #
-      # @see #freeze_accepted_media!
-      #
-      # @example fingerpint binary format
-      #
-      #   no_serializer_for :fingerprint_bin, :fingerprint_deprecated_bin
-      #
-      def accept_without_serialization(*mimes, **filter_opts)
-        before_action(**filter_opts) do
-          self.serializers = Array(mimes).each_with_object(Hash(serializers)) do |mime, res|
-            res[(Mime::Type.lookup_by_extension(mime) || mime).to_s] = nil
-          end
-        end
-      end
-
-      ##
-      # Freezes additions to the serializes and notifies the controller what it will be able to respond to.
-      #
-      def freeze_accepted_media!
-        before_action do
-          # If the responders gem is available, this freezes what a controller can respond to
-          if self.class.respond_to?(:respond_to)
-            self.class.respond_to(*Hash(serializers).keys.map { |type| Mime::Type.lookup(type) })
-          end
-          serializers.freeze
-        end
-      end
-    end
-    # rubocop:enable Metrics/BlockLength
-
-    included do
-      protected
-
-      attr_accessor :serializers
-    end
-
-    protected
-
-    def media_type_serializer
-      @media_type_serializer ||= resolve_media_type_serializer
-    end
-
-    def serialize_media(media, serializer: media_type_serializer)
-      @last_serialize_media = media
-      @last_media_serializer = serializer.call(media, context: self)
-    end
-
-    def media_type_json_root
-      String(request.format.symbol).sub(/_json$/, '')
-    end
-
-    def respond_to_matching(matcher, &block)
-      respond_to do |format|
-        serializers.each_key do |mime|
-          next unless matcher.call(mime: mime, format: format)
-          format.custom(mime, &block)
-        end
-      end
-    end
-
-    def respond_to_accept(&block)
-      respond_to do |format|
-        serializers.each_key do |mime|
-          format.custom(mime, &block)
-        end
-
-        format.any { raise_no_accept_serializer }
-      end
-    end
-
-    def request_accept
-      @request_accept ||= HttpHeaders::Accept.new(request.get_header(HEADER_ACCEPT) || '')
-    end
-
-    def raise_no_accept_serializer
-      raise NoSerializerForContentType.new(request_accept, serializers.keys)
-    end
-
-    private
-
-    def extract_synonym_version(synonym)
-      synonym.rpartition('.').last[1..-1]
-    end
-
-    def resolve_media_type_serializer
-      raise NoMediaTypeSerializers unless serializers
-
-      # Rails negotiation
-      if serializers[request.format.to_s]
-        return serializers[request.format.to_s]
-      end
-
-      # Ruby negotiation
-      request.accepts.each do |mime_type|
-        next unless serializers.key?(mime_type.to_s)
-        # Override Rails selected format
-        request.set_header("action_dispatch.request.formats", [mime_type])
-        return serializers[mime_type.to_s]
-      end
-
-      raise_no_accept_serializer
-    end
-
-    def resolved_media_types(serializer, view:)
-      Array(view).each_with_object(Hash(serializers)) do |media_view, res|
-        media_view = String(media_view)
-        Array(serializer.media_type(view: media_view)).each do |media_type|
-          yield media_type, media_view, res
-        end
-      end
-    end
-
-    def wrap_media(serializer, media_view:, media_type:)
-      lambda do |*args, **opts|
-        Wrapper::MediaWrapper.new(
-          serializer.new(*args, media_type: media_type, view: media_view, **opts),
-          view: media_view
-        )
-      end
-    end
-
-    def wrap_html(serializer, media_view:, media_type:)
-      lambda do |*args, **opts|
-        media_serializer = wrap_media(
-          serializer,
-          media_view: media_view,
-          media_type: media_type
-        ).call(*args, **opts)
-
-        Wrapper::HtmlWrapper.new(
-          media_serializer,
-          view: media_view,
-          mime_type: media_type.to_s,
-          representations: serializers.keys,
-          url_context: request.original_fullpath.chomp(".#{request.format.symbol}")
-        )
-      end
-    end
-  end
-end
+require 'media_types/serialization/version'
+
+require 'abstract_controller'
+require 'action_controller/metal/mime_responds'
+require 'action_dispatch/http/mime_type'
+require 'active_support/concern'
+require 'active_support/core_ext/module/attribute_accessors'
+
+require 'http_headers/accept'
+
+require 'media_types/serialization/no_media_type_serializers'
+require 'media_types/serialization/no_serializer_for_content_type'
+require 'media_types/serialization/wrapper/html_wrapper'
+require 'media_types/serialization/wrapper/media_wrapper'
+
+module MediaTypes
+  module Serialization
+
+    mattr_accessor :common_suffix, :collect_links_for_collection, :collect_links_for_index
+
+    extend ActiveSupport::Concern
+
+    HEADER_ACCEPT = 'HTTP_ACCEPT'
+    MEDIA_TYPE_HTML = 'text/html'
+
+    # rubocop:disable Metrics/BlockLength
+    class_methods do
+      # @see #freeze_accepted_media!
+      #
+      def accept_serialization(serializer, view: [nil], accept_html: true, **filter_opts)
+        before_action(**filter_opts) do
+          self.serializers = resolved_media_types(serializer, view: view) do |media_type, media_view, res|
+            opts = { media_type: media_type, media_view: media_view }
+
+            res[MEDIA_TYPE_HTML] = wrap_html(serializer, **opts) if accept_html && !res[MEDIA_TYPE_HTML]
+            res[String(media_type)] = wrap_media(serializer, **opts) if media_type != MEDIA_TYPE_HTML
+          end
+        end
+      end
+
+      def accept_html(serializer, **filter_opts)
+        before_action(**filter_opts) do
+          self.serializers = resolved_media_types(serializer, view: nil) do |_, media_view, res|
+            res[MEDIA_TYPE_HTML] = wrap_html(serializer, media_view: media_view, media_type: MEDIA_TYPE_HTML)
+            break
+          end
+        end
+      end
+
+      ##
+      # Register a mime type, but explicitly notify that it can't be serialized.
+      # This is done for file serving and redirects.
+      #
+      # @param [Symbol] mimes takes a list of symbols that should resolve through Mime::Type
+      #
+      # @see #freeze_accepted_media!
+      #
+      # @example fingerpint binary format
+      #
+      #   no_serializer_for :fingerprint_bin, :fingerprint_deprecated_bin
+      #
+      def accept_without_serialization(*mimes, **filter_opts)
+        before_action(**filter_opts) do
+          self.serializers = Array(mimes).each_with_object(Hash(serializers)) do |mime, res|
+            res[(Mime::Type.lookup_by_extension(mime) || mime).to_s] = nil
+          end
+        end
+      end
+
+      ##
+      # Freezes additions to the serializes and notifies the controller what it will be able to respond to.
+      #
+      def freeze_accepted_media!
+        before_action do
+          # If the responders gem is available, this freezes what a controller can respond to
+          if self.class.respond_to?(:respond_to)
+            self.class.respond_to(*Hash(serializers).keys.map { |type| Mime::Type.lookup(type) })
+          end
+          serializers.freeze
+        end
+      end
+    end
+    # rubocop:enable Metrics/BlockLength
+
+    included do
+      protected
+
+      attr_accessor :serializers
+    end
+
+    protected
+
+    def media_type_serializer
+      @media_type_serializer ||= resolve_media_type_serializer
+    end
+
+    def serialize_media(media, serializer: media_type_serializer)
+      @last_serialize_media = media
+      @last_media_serializer = serializer.call(media, context: self)
+    end
+
+    def media_type_json_root
+      String(request.format.symbol).sub(/_json$/, '')
+    end
+
+    def respond_to_matching(matcher, &block)
+      respond_to do |format|
+        serializers.each_key do |mime|
+          next unless matcher.call(mime: mime, format: format)
+          format.custom(mime, &block)
+        end
+      end
+    end
+
+    def respond_to_accept(&block)
+      respond_to do |format|
+        serializers.each_key do |mime|
+          format.custom(mime, &block)
+        end
+
+        format.any { raise_no_accept_serializer }
+      end
+    end
+
+    def request_accept
+      @request_accept ||= HttpHeaders::Accept.new(request.get_header(HEADER_ACCEPT) || '')
+    end
+
+    def raise_no_accept_serializer
+      raise NoSerializerForContentType.new(request_accept, serializers.keys)
+    end
+
+    private
+
+    def extract_synonym_version(synonym)
+      synonym.rpartition('.').last[1..-1]
+    end
+
+    def resolve_media_type_serializer
+      raise NoMediaTypeSerializers unless serializers
+
+      # Rails negotiation
+      if serializers[request.format.to_s]
+        return serializers[request.format.to_s]
+      end
+
+      # Ruby negotiation
+      request.accepts.each do |mime_type|
+        next unless serializers.key?(mime_type.to_s)
+        # Override Rails selected format
+        request.set_header("action_dispatch.request.formats", [mime_type])
+        return serializers[mime_type.to_s]
+      end
+
+      raise_no_accept_serializer
+    end
+
+    def resolved_media_types(serializer, view:)
+      Array(view).each_with_object(Hash(serializers)) do |media_view, res|
+        media_view = String(media_view)
+        Array(serializer.media_type(view: media_view)).each do |media_type|
+          yield media_type, media_view, res
+        end
+      end
+    end
+
+    def wrap_media(serializer, media_view:, media_type:)
+      lambda do |*args, **opts|
+        Wrapper::MediaWrapper.new(
+          serializer.new(*args, media_type: media_type, view: media_view, **opts),
+          view: media_view
+        )
+      end
+    end
+
+    def wrap_html(serializer, media_view:, media_type:)
+      lambda do |*args, **opts|
+        media_serializer = wrap_media(
+          serializer,
+          media_view: media_view,
+          media_type: media_type
+        ).call(*args, **opts)
+
+        Wrapper::HtmlWrapper.new(
+          media_serializer,
+          view: media_view,
+          mime_type: media_type.to_s,
+          representations: serializers.keys,
+          url_context: request.original_fullpath.chomp(".#{request.format.symbol}")
+        )
+      end
+    end
+  end
+end

data/media_types-serialization.gemspec

@@ -1,48 +1,48 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "media_types/serialization/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "media_types-serialization"
-  spec.version       = MediaTypes::Serialization::VERSION
-  spec.authors       = ["Derk-Jan Karrenbeld"]
-  spec.email         = ["derk-jan@xpbytes.com"]
-
-  spec.summary       = 'Add media types supported serialization using your favourite serializer'
-  spec.homepage      = 'https://github.com/XPBytes/media_types-serialization'
-  spec.license       = 'MIT'
-
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-
-    spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = spec.homepage
-    spec.metadata["changelog_uri"] = spec.homepage + '/CHANGELOG.md'
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency 'actionpack', '>= 4.0.0'
-  spec.add_dependency 'activesupport', '>= 4.0.0'
-  spec.add_dependency 'media_types', '>= 0.6.0'
-  spec.add_dependency 'oj', '>= 3.5.0'
-  spec.add_dependency 'http_headers-accept', '< 1.0.0'
-  spec.add_dependency 'http_headers-link', '< 1.0.0'
-
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-end
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "media_types/serialization/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "media_types-serialization"
+  spec.version       = MediaTypes::Serialization::VERSION
+  spec.authors       = ["Derk-Jan Karrenbeld"]
+  spec.email         = ["derk-jan@xpbytes.com"]
+
+  spec.summary       = 'Add media types supported serialization using your favourite serializer'
+  spec.homepage      = 'https://github.com/XPBytes/media_types-serialization'
+  spec.license       = 'MIT'
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if spec.respond_to?(:metadata)
+    # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
+
+    spec.metadata["homepage_uri"] = spec.homepage
+    spec.metadata["source_code_uri"] = spec.homepage
+    spec.metadata["changelog_uri"] = spec.homepage + '/CHANGELOG.md'
+  else
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
+  end
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'actionpack', '>= 4.0.0'
+  spec.add_dependency 'activesupport', '>= 4.0.0'
+  spec.add_dependency 'media_types', '>= 0.6.0'
+  spec.add_dependency 'oj', '>= 3.5.0'
+  spec.add_dependency 'http_headers-accept', '< 1.0.0'
+  spec.add_dependency 'http_headers-link', '< 1.0.0'
+
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest", "~> 5.0"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: media_types-serialization
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld
@@ -146,6 +146,7 @@ files:
 - ".gitignore"
 - ".idea/.rakeTasks"
 - ".idea/dictionaries/Derk_Jan.xml"
+- ".idea/encodings.xml"
 - ".idea/inspectionProfiles/Project_Default.xml"
 - ".idea/media_types-serialization.iml"
 - ".idea/misc.xml"
@@ -204,8 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Add media types supported serialization using your favourite serializer