jsonapi-resources 0.10.0.beta5 → 0.10.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59bf56567199fc023e62eb521bfab9887346b0b1201a89915de98edb56bb2455
-  data.tar.gz: 3321b686ec96c9828e68595ced3a9e82600605cc0ce24d36eb70905141feaa74
+  metadata.gz: 0ac7e65d3c40e15413e9d5a7552a8f871a2313c9f9d41f4cd520ab62f8e3c7d8
+  data.tar.gz: 7ba4da6469f82a35eee2df2e3475d6fb28f6b229bc78863f57c5c1576cf9973e
 SHA512:
-  metadata.gz: 53a6d23df106df92c12c4c7df292c330ed285550d2c61a88eec3e078884a7d565522e84d70464afa1084c741b472c4eda5de308227a0138b89c11bb4479a304f
-  data.tar.gz: 8a4fc235a30de87a892010b822a3d9f6e6b27b5fcb9da453fafafc700b99edd3dca128e2965532c40eba6493befba33ca73730bc374ae0502c1242b378a292bf
+  metadata.gz: a2ee268639e83ea3f490258f85ba8fe13785f31fd85d3a5b46cc92d7c340f3ba95f3316ca1dfcf2f33a92f31e17c023aa093d39d53b39d3c48cf8c9af22cd7ad
+  data.tar.gz: 76a30f8af5d5569cf40f979f296dc90e95a83f5f57b178c977ba8067755e20d5ac5e46f588f3bed4dddaf587faf7d6081e04b7116657af4d65faa6f858472a0f

data/lib/jsonapi/acts_as_resource_controller.rb

@@ -102,7 +102,8 @@ module JSONAPI
                   base_url: base_url,
                   key_formatter: key_formatter,
                   route_formatter: route_formatter,
-                  serialization_options: serialization_options
+                  serialization_options: serialization_options,
+                  controller: self
               )
               op.options[:cache_serializer_output] = !JSONAPI.configuration.resource_cache.nil?
 

data/lib/jsonapi/basic_resource.rb

@@ -365,7 +365,7 @@ module JSONAPI
 
         @reload_needed = true
       else
-        @model.public_send(relationship.relation_name(context: @context)).destroy(key)
+        @model.public_send(relationship.relation_name(context: @context)).delete(key)
       end
 
       :completed
@@ -448,6 +448,9 @@ module JSONAPI
         end
 
         check_reserved_resource_name(subclass._type, subclass.name)
+
+        subclass._routed = false
+        subclass._warned_missing_route = false
       end
 
       def rebuild_relationships(relationships)
@@ -494,7 +497,7 @@ module JSONAPI
         end
       end
 
-      attr_accessor :_attributes, :_relationships, :_type, :_model_hints
+      attr_accessor :_attributes, :_relationships, :_type, :_model_hints, :_routed, :_warned_missing_route
       attr_writer :_allowed_filters, :_paginator, :_allowed_sort
 
       def create(context)
@@ -960,21 +963,25 @@ module JSONAPI
         !@immutable
       end
 
-      def exclude_links(exclude)
+      def parse_exclude_links(exclude)
         case exclude
           when :default, "default"
-            @_exclude_links = [:self]
+            [:self]
           when :none, "none"
-            @_exclude_links = []
+            []
           when Array
-            @_exclude_links = exclude.collect {|link| link.to_sym}
+            exclude.collect {|link| link.to_sym}
           else
             fail "Invalid exclude_links"
         end
       end
 
+      def exclude_links(exclude)
+        @_exclude_links = parse_exclude_links(exclude)
+      end
+
       def _exclude_links
-        @_exclude_links ||= []
+        @_exclude_links ||= parse_exclude_links(JSONAPI.configuration.default_exclude_links)
       end
 
       def exclude_link?(link)

data/lib/jsonapi/configuration.rb

@@ -37,7 +37,8 @@ module JSONAPI
                 :default_caching,
                 :default_resource_cache_field,
                 :resource_cache_digest_function,
-                :resource_cache_usage_report_function
+                :resource_cache_usage_report_function,
+                :default_exclude_links
 
     def initialize
       #:underscored_key, :camelized_key, :dasherized_key, or custom
@@ -149,6 +150,12 @@ module JSONAPI
       # Optionally provide a callable which JSONAPI will call with information about cache
       # performance. Should accept three arguments: resource name, hits count, misses count.
       self.resource_cache_usage_report_function = nil
+
+      # Global configuration for links exclusion
+      # Controls whether to generate links like `self`, `related` with all the resources
+      # and relationships. Accepts either `:default`, `:none`, or array containing the
+      # specific default links to exclude, which may be `:self` and `:related`.
+      self.default_exclude_links = :none
     end
 
     def cache_formatters=(bool)
@@ -276,6 +283,8 @@ module JSONAPI
     attr_writer :resource_cache_digest_function
 
     attr_writer :resource_cache_usage_report_function
+
+    attr_writer :default_exclude_links
   end
 
   class << self

data/lib/jsonapi/link_builder.rb

@@ -2,23 +2,24 @@ module JSONAPI
   class LinkBuilder
     attr_reader :base_url,
                 :primary_resource_klass,
+                :route_formatter,
                 :engine,
-                :routes
+                :engine_mount_point,
+                :url_helpers
+
+    @@url_helper_methods = {}
 
     def initialize(config = {})
-      @base_url               = config[:base_url]
+      @base_url = config[:base_url]
       @primary_resource_klass = config[:primary_resource_klass]
-      @engine                 = build_engine
-
-      if engine?
-        @routes = @engine.routes
-      else
-        @routes = Rails.application.routes
-      end
+      @route_formatter = config[:route_formatter]
+      @engine = build_engine
+      @engine_mount_point = @engine ? @engine.routes.find_script_name({}) : ""
 
-      # ToDo: Use NaiveCache for values. For this we need to not return nils and create composite keys which work
-      # as efficient cache lookups. This could be an array of the [source.identifier, relationship] since the
-      # ResourceIdentity will compare equality correctly
+      # url_helpers may be either a controller which has the route helper methods, or the application router's
+      # url helpers module, `Rails.application.routes.url_helpers`. Because the method no longer behaves as a
+      # singleton, and it's expensive to generate the module, the controller is preferred.
+      @url_helpers = config[:url_helpers]
     end
 
     def engine?
@@ -26,50 +27,60 @@ module JSONAPI
     end
 
     def primary_resources_url
-      @primary_resources_url_cached ||= "#{ base_url }#{ primary_resources_path }"
-    rescue NoMethodError
-      warn "primary_resources_url for #{@primary_resource_klass} could not be generated" if JSONAPI.configuration.warn_on_missing_routes
+      if @primary_resource_klass._routed
+        primary_resources_path = resources_path(primary_resource_klass)
+        @primary_resources_url_cached ||= "#{ base_url }#{ engine_mount_point }#{ primary_resources_path }"
+      else
+        if JSONAPI.configuration.warn_on_missing_routes && !@primary_resource_klass._warned_missing_route
+          warn "primary_resources_url for #{@primary_resource_klass} could not be generated"
+          @primary_resource_klass._warned_missing_route = true
+        end
+        nil
+      end
     end
 
     def query_link(query_params)
-      "#{ primary_resources_url }?#{ query_params.to_query }"
+      url = primary_resources_url
+      return url if url.nil?
+      "#{ url }?#{ query_params.to_query }"
     end
 
     def relationships_related_link(source, relationship, query_params = {})
-      if relationship.parent_resource.singleton?
-        url_helper_name = singleton_related_url_helper_name(relationship)
-        url = call_url_helper(url_helper_name)
+      if relationship._routed
+        url = "#{ self_link(source) }/#{ route_for_relationship(relationship) }"
+        url = "#{ url }?#{ query_params.to_query }" if query_params.present?
+        url
       else
-        url_helper_name = related_url_helper_name(relationship)
-        url = call_url_helper(url_helper_name, source.id)
+        if JSONAPI.configuration.warn_on_missing_routes && !relationship._warned_missing_route
+          warn "related_link for #{relationship} could not be generated"
+          relationship._warned_missing_route = true
+        end
+        nil
       end
-
-      url = "#{ base_url }#{ url }"
-      url = "#{ url }?#{ query_params.to_query }" if query_params.present?
-      url
-    rescue NoMethodError
-      warn "related_link for #{relationship} could not be generated" if JSONAPI.configuration.warn_on_missing_routes
     end
 
     def relationships_self_link(source, relationship)
-      if relationship.parent_resource.singleton?
-        url_helper_name = singleton_relationship_self_url_helper_name(relationship)
-        url = call_url_helper(url_helper_name)
+      if relationship._routed
+        "#{ self_link(source) }/relationships/#{ route_for_relationship(relationship) }"
       else
-        url_helper_name = relationship_self_url_helper_name(relationship)
-        url = call_url_helper(url_helper_name, source.id)
+        if JSONAPI.configuration.warn_on_missing_routes && !relationship._warned_missing_route
+          warn "self_link for #{relationship} could not be generated"
+          relationship._warned_missing_route = true
+        end
+        nil
       end
-
-      url = "#{ base_url }#{ url }"
-      url
-    rescue NoMethodError
-      warn "self_link for #{relationship} could not be generated" if JSONAPI.configuration.warn_on_missing_routes
     end
 
     def self_link(source)
-      "#{ base_url }#{ resource_path(source) }"
-    rescue NoMethodError
-      warn "self_link for #{source.class} could not be generated" if JSONAPI.configuration.warn_on_missing_routes
+      if source.class._routed
+        resource_url(source)
+      else
+        if JSONAPI.configuration.warn_on_missing_routes && !source.class._warned_missing_route
+          warn "self_link for #{source.class} could not be generated"
+          source.class._warned_missing_route = true
+        end
+        nil
+      end
     end
 
     private
@@ -81,105 +92,55 @@ module JSONAPI
         unless scopes.empty?
           "#{ scopes.first.to_s.camelize }::Engine".safe_constantize
         end
-      # :nocov:
+
+          # :nocov:
       rescue LoadError => _e
         nil
-      # :nocov:
+        # :nocov:
       end
     end
 
-    def call_url_helper(method, *args)
-      routes.url_helpers.public_send(method, args)
-    rescue NoMethodError => e
-      raise e
+    def format_route(route)
+      route_formatter.format(route)
     end
 
-    def path_from_resource_class(klass)
-      url_helper_name = resources_url_helper_name_from_class(klass)
-      call_url_helper(url_helper_name)
-    end
+    def formatted_module_path_from_class(klass)
+      scopes = if @engine
+                 module_scopes_from_class(klass)[1..-1]
+               else
+                 module_scopes_from_class(klass)
+               end
 
-    def resource_path(source)
-      url_helper_name = resource_url_helper_name_from_source(source)
-      if source.class.singleton?
-        call_url_helper(url_helper_name)
+      unless scopes.empty?
+        "/#{ scopes.map {|scope| format_route(scope.to_s.underscore)}.compact.join('/') }/"
       else
-        call_url_helper(url_helper_name, source.id)
+        "/"
       end
     end
 
-    def primary_resources_path
-      path_from_resource_class(primary_resource_klass)
+    def module_scopes_from_class(klass)
+      klass.name.to_s.split("::")[0...-1]
     end
 
-    def url_helper_name_from_parts(parts)
-      (parts << "path").reject(&:blank?).join("_")
+    def resources_path(source_klass)
+      formatted_module_path_from_class(source_klass) + format_route(source_klass._type.to_s)
     end
 
-    def resources_path_parts_from_class(klass)
-      if engine?
-        scopes = module_scopes_from_class(klass)[1..-1]
-      else
-        scopes = module_scopes_from_class(klass)
-      end
-
-      base_path_name = scopes.map { |scope| scope.underscore }.join("_")
-      end_path_name  = klass._type.to_s
-      [base_path_name, end_path_name]
-    end
-
-    def resources_url_helper_name_from_class(klass)
-      url_helper_name_from_parts(resources_path_parts_from_class(klass))
-    end
+    def resource_path(source)
+      url = "#{resources_path(source.class)}"
 
-    def resource_path_parts_from_class(klass)
-      if engine?
-        scopes = module_scopes_from_class(klass)[1..-1]
-      else
-        scopes = module_scopes_from_class(klass)
+      unless source.class.singleton?
+        url = "#{url}/#{source.id}"
       end
-
-      base_path_name = scopes.map { |scope| scope.underscore }.join("_")
-      end_path_name  = klass._type.to_s.singularize
-      [base_path_name, end_path_name]
-    end
-
-    def resource_url_helper_name_from_source(source)
-       url_helper_name_from_parts(resource_path_parts_from_class(source.class))
-    end
-
-    def related_url_helper_name(relationship)
-      relationship_parts = resource_path_parts_from_class(relationship.parent_resource)
-      relationship_parts << "related"
-      relationship_parts << relationship.name
-      url_helper_name_from_parts(relationship_parts)
-    end
-
-    def singleton_related_url_helper_name(relationship)
-      relationship_parts = []
-      relationship_parts << "related"
-      relationship_parts << relationship.name
-      relationship_parts += resource_path_parts_from_class(relationship.parent_resource)
-      url_helper_name_from_parts(relationship_parts)
-    end
-
-    def relationship_self_url_helper_name(relationship)
-      relationship_parts = resource_path_parts_from_class(relationship.parent_resource)
-      relationship_parts << "relationships"
-      relationship_parts << relationship.name
-      url_helper_name_from_parts(relationship_parts)
+      url
     end
 
-    def singleton_relationship_self_url_helper_name(relationship)
-      relationship_parts = []
-      relationship_parts << "relationships"
-      relationship_parts << relationship.name
-      relationship_parts += resource_path_parts_from_class(relationship.parent_resource)
-      url_helper_name_from_parts(relationship_parts)
+    def resource_url(source)
+      "#{ base_url }#{ engine_mount_point }#{ resource_path(source) }"
     end
 
-    def module_scopes_from_class(klass)
-      klass.name.to_s.split("::")[0...-1]
+    def route_for_relationship(relationship)
+      format_route(relationship.name)
     end
   end
 end

data/lib/jsonapi/relationship.rb

@@ -7,6 +7,8 @@ module JSONAPI
 
     attr_writer :allow_include
 
+    attr_accessor :_routed, :_warned_missing_route
+
     def initialize(name, options = {})
       @name = name.to_s
       @options = options
@@ -27,7 +29,10 @@ module JSONAPI
       @class_name = nil
       @inverse_relationship = nil
 
-      exclude_links(options.fetch(:exclude_links, :none))
+      @_routed = false
+      @_warned_missing_route = false
+
+      exclude_links(options.fetch(:exclude_links, JSONAPI.configuration.default_exclude_links))
 
       # Custom methods are reserved for future use
       @custom_methods = options.fetch(:custom_methods, {})

data/lib/jsonapi/resource_controller_metal.rb

@@ -10,6 +10,9 @@ module JSONAPI
       JSONAPI::ActsAsResourceController
     ].freeze
 
+    # Note, the url_helpers are not loaded. This will prevent links from being generated for resources, and warnings
+    # will be emitted. Link support can be added by including `Rails.application.routes.url_helpers`, and links
+    # can be disabled, and warning suppressed, for a resource with `exclude_links :default`
     MODULES.each do |mod|
       include mod
     end

data/lib/jsonapi/resource_serializer.rb

@@ -381,6 +381,8 @@ module JSONAPI
       LinkBuilder.new(
         base_url: options.fetch(:base_url, ''),
         primary_resource_klass: primary_resource_klass,
+        route_formatter: options.fetch(:route_formatter, JSONAPI.configuration.route_formatter),
+        url_helpers: options.fetch(:url_helpers, options[:controller]),
       )
     end
   end

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.10.0.beta5'
+    VERSION = '0.10.0.beta6'
   end
 end

data/lib/jsonapi/routing_ext.rb

@@ -20,6 +20,8 @@ module ActionDispatch
           @resource_type = resources.first
           res = JSONAPI::Resource.resource_klass_for(resource_type_with_module_prefix(@resource_type))
 
+          res._routed = true
+
           unless res.singleton?
             warn "Singleton routes created for non singleton resource #{res}. Links may not be generated correctly."
           end
@@ -84,6 +86,8 @@ module ActionDispatch
           @resource_type = resources.first
           res = JSONAPI::Resource.resource_klass_for(resource_type_with_module_prefix(@resource_type))
 
+          res._routed = true
+
           if res.singleton?
             warn "Singleton resource #{res} should use `jsonapi_resource` instead."
           end
@@ -220,6 +224,8 @@ module ActionDispatch
           relationship_name = relationship.first
           relationship = source._relationships[relationship_name]
 
+          relationship._routed = true
+
           formatted_relationship_name = format_route(relationship.name)
 
           if relationship.polymorphic?
@@ -242,6 +248,8 @@ module ActionDispatch
           relationship_name = relationship.first
           relationship = source._relationships[relationship_name]
 
+          relationship._routed = true
+
           formatted_relationship_name = format_route(relationship.name)
           related_resource = JSONAPI::Resource.resource_klass_for(resource_type_with_module_prefix(relationship.class_name.underscore))
           options[:controller] ||= related_resource._type.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.10.0.beta5
+  version: 0.10.0.beta6
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler