sinja 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adc1346572a9c1a9ae1d2b85c70931cd329cdd1e
-  data.tar.gz: 73db963c1a496a98de718d1ea17ebda739d80ad9
+  metadata.gz: 4606d9daabb3be7a7aca0c603f36134f86cf2885
+  data.tar.gz: 210cc332302ab5b34140b14bd74e24c2a72fb93a
 SHA512:
-  metadata.gz: 55dc7ba3bc974625bb2cf65b943ccf8cf57541226f39eb0d66c7e56320c507cf3f8d76d0fddba5605698677f459958ede489477ebc9baed97d82a50c6a1e76f2
-  data.tar.gz: f75638978ade62140b1306644e4a81a62b18d1a8ce09b388ffa183c6c4a5859d531ce108b71299e5b82e39b3759e6d3c0b381799dc12be0f845a63784ec2280a
+  metadata.gz: c5627d6ea47b5a62945a49b42e69f165ca10b100723b17cd3efd9b04fdc1e8b67b84e334a98b8814b90961c38958287fb1c86fce5389f9250c72cf58c234d961
+  data.tar.gz: f1dda55b7f38c2e09f7ccb4d00fce2a09ef2342df085cd847e2937d58ccf5c5acfae2d9d004594bc12174ddf0abf0b8129e2823cbdc1124793395708e9850299

data/README.md

@@ -20,13 +20,14 @@ DSL to enable resource-, relationship-, and role-centric API development, and
 it configures Sinatra with the proper settings, MIME-types, filters,
 conditions, and error-handling.
 
-There are [many][31] parsing (deserializing) and rendering (serializing) and
-so-called "JSON API" libraries available for Ruby, but relatively few that
-attempt to correctly implement the entire {json:api} specification, including
+There are [many][31] parsing (deserializing), rendering (serializing), and
+other "JSON API" libraries available for Ruby, but relatively few that attempt
+to correctly implement the entire {json:api} server specification, including
 routing, request header and query parameter checking, and relationship
-side-loading. Sinja lets you focus on the business logic of your applications
+side-loading.  Sinja lets you focus on the business logic of your applications
 without worrying about the specification, and without pulling in a heavy
-framework like [Rails][16]. It's lightweight and ORM-agnostic!
+framework like [Rails][16]. It's lightweight, ORM-agnostic, and
+[Ember.js][32]-friendly!
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
@@ -224,7 +225,7 @@ class App < Sinatra::Base
     show do
       headers 'X-ISBN'=>resource.isbn
       last_modified resource.updated_at
-      next resource, include: %w[author]
+      next resource, include: ['author']
     end
 
     has_one :author do
@@ -318,12 +319,12 @@ configure_jsonapi do |c|
 
   # You can't set this directly; see "Query Parameters" below
   #c.query_params = {
-  #  :include=>[], :fields=>{}, :filter=>{}, :page=>{}, :sort=>[]
+  #  :include=>Array, :fields=>Hash, :filter=>Hash, :page=>Hash, :sort=>Array
   #}
 
   #c.page_using = {} # see "Paging" below
 
-  # Set the error logger used by Sinja
+  # Set the error logger used by Sinja (set to `nil' to disable)
   #c.error_logger = ->(error_hash) { logger.error('sinja') { error_hash } }
 
   # A hash of options to pass to JSONAPI::Serializer.serialize
@@ -394,6 +395,40 @@ simply returns `resource`.
 
 ### Action Helpers
 
+<table>
+<thead>
+<tr>
+  <th><a href="#resource"><code>resource</code></a></th>
+  <th><a href="#has_one"><code>has_one</code></a></th>
+  <th><a href="#has_many"><code>has_many</code></a></th>
+</tr>
+</thead>
+<tbody>
+<tr valign="top">
+  <td><ul>
+    <li><a href="#index---array"><code>index</code></a></li>
+    <li><code>show</code> <a href="#show---object">w/ resource locator</a> or <a href="#show-id---object">w/o</a></li>
+    <li><a href="#show_many-ids---array"><code>show_many</code></a></li>
+    <li><code>create</code> <a href="#create-attr-id---id-object">w/ client-generated IDs</a> or <a href="#create-attr---id-object">w/o</a></li>
+    <li><a href="#update-attr---object"><code>update</code></a></li>
+    <li><a href="#destroy-"><code>destroy</code></a></li>
+  </ul></td>
+  <td><ul>
+    <li><a href="#pluck---object"><code>pluck</code></a></li>
+    <li><a href="#prune---trueclass"><code>prune</code></a></li>
+    <li><a href="#graft-rio---trueclass"><code>graft</code></a></li>
+  </ul></td>
+  <td><ul>
+    <li><a href="#fetch---array"><code>fetch</code></a></li>
+    <li><a href="#clear---trueclass"><code>clear</code></a></li>
+    <li><a href="#replace-rios---trueclass"><code>replace</code></a></li>
+    <li><a href="#merge-rios---trueclass"><code>merge</code></a></li>
+    <li><a href="#subtract-rios---trueclass"><code>subtract</code></a></li>
+  </ul></td>
+</tr>
+</tbody>
+</table>
+
 Action helpers should be defined within the appropriate block contexts
 (`resource`, `has_one`, or `has_many`) using the given keywords and arguments
 below. Implicitly return the expected values as described below (as an array if
@@ -730,10 +765,8 @@ end
 resource :foos do
   helpers do
     def role
-      if resource&.owner == logged_in_user
-        [*super].push(:owner)
-      else
-        super
+      super.tap do |a|
+        a << :owner if resource&.owner == logged_in_user
       end
     end
   end
@@ -796,12 +829,6 @@ resource :posts do
   index(filter_by: [:title, :type]) do
     Foo # return a Sequel::Dataset (instead of an array of Sequel::Model instances)
   end
-
-  has_many :comments do
-    fetch(filter_by: :status) do
-      resource.comments_dataset # return a Sequel::Dataset
-    end
-  end
 end
 ```
 
@@ -1411,8 +1438,8 @@ Sinja applications might grow overly large with a block for each resource. I am
 still working on a better way to handle this (as well as a way to provide
 standalone resource controllers for e.g. cloud functions), but for the time
 being you can store each resource block as its own Proc, and pass it to the
-`resource` keyword in lieu of a block. The migration to some future solution
-should be relatively painless. For example:
+`resource` keyword as a block. The migration to some future solution should be
+relatively painless. For example:
 
 ```ruby
 # controllers/foo_controller.rb
@@ -1437,7 +1464,7 @@ require_relative 'controllers/foo_controller'
 class App < Sinatra::Base
   register Sinatra::JSONAPI
 
-  resource :foos, FooController
+  resource :foos, &FooController
 
   freeze_jsonapi
 end
@@ -1544,3 +1571,4 @@ License](http://opensource.org/licenses/MIT).
 [29]: https://github.com/brynary/rack-test
 [30]: https://github.com/mwpastore/sinja-sequel
 [31]: http://jsonapi.org/implementations/#server-libraries-ruby
+[32]: http://emberjs.com

data/demo-app/app.rb

@@ -21,16 +21,17 @@ helpers Sinja::Sequel::Helpers do
   end
 
   def role
-    [].tap do |a|
-      a << :logged_in if current_user
-      a << :superuser if current_user&.admin?
+    return unless current_user
+
+    [:logged_in].tap do |a|
+      a << :superuser if current_user.admin?
     end
   end
 end
 
-resource :authors, AuthorController
-resource :comments, CommentController
-resource :posts, PostController
-resource :tags, TagController
+resource :authors, &AuthorController
+resource :comments, &CommentController
+resource :posts, &PostController
+resource :tags, &TagController
 
 freeze_jsonapi

data/demo-app/classes/author.rb

@@ -40,7 +40,7 @@ AuthorController = proc do
     end
 
     def role
-      [*super].tap do |a|
+      Array(super).tap do |a|
         a << :myself if resource == current_user
       end
     end

data/demo-app/classes/comment.rb

@@ -36,7 +36,7 @@ CommentController = proc do
     end
 
     def role
-      [*super].tap do |a|
+      Array(super).tap do |a|
         a << :owner if resource&.author == current_user
       end
     end

data/demo-app/classes/post.rb

@@ -49,7 +49,7 @@ PostController = proc do
     end
 
     def role
-      [*super].tap do |a|
+      Array(super).tap do |a|
         a << :owner if resource&.author == current_user
       end
     end

data/lib/sinja.rb

@@ -48,7 +48,7 @@ module Sinja
         index.to_h.all? do |key, subkeys|
           key = key.to_s
 
-          Hash === params[key] && params[key].any? && [*subkeys].all? do |subkey|
+          params[key].is_a?(Hash) && params[key].any? && Array(subkeys).all? do |subkey|
             subkey = subkey.to_s
 
             # TODO: What if deleting one is successful, but not another?
@@ -75,29 +75,29 @@ module Sinja
           # Ignore interal Sinatra query parameters (e.g. :captures) and any
           # "known" query parameter set to `nil' in the configurable.
           next if !env['rack.request.query_hash'].key?(key.to_s) ||
-            settings._sinja.query_params.fetch(key, :__NOT_FOUND__).nil?
+            settings._sinja.query_params.fetch(key, BasicObject).nil?
 
           raise BadRequestError, "`#{key}' query parameter not allowed" \
             unless allow_params.include?(key)
 
           next if env['sinja.normalized'] == params.object_id
 
-          if !(String === settings._sinja.query_params[key]) && String === value
+          if value.instance_of?(String) && settings._sinja.query_params[key] != String
             params[key.to_s] = value.split(',')
-          elsif !(settings._sinja.query_params[key].class === value)
+          elsif !value.is_a?(settings._sinja.query_params[key])
             raise BadRequestError, "`#{key}' query parameter malformed"
           end
         end
 
         return true if env['sinja.normalized'] == params.object_id
 
-        settings._sinja.query_params.each do |key, default_value|
-          next if default_value.nil?
+        settings._sinja.query_params.each do |key, klass|
+          next if klass.nil?
 
           if respond_to?("normalize_#{key}_params")
-            params[key.to_s] = send("normalize_#{key}_params", default_value)
+            params[key.to_s] = send("normalize_#{key}_params")
           else
-            params[key.to_s] ||= default_value
+            params[key.to_s] ||= klass.new
           end
         end
 
@@ -118,7 +118,7 @@ module Sinja
       def allow(h={})
         s = Set.new
         h.each do |method, actions|
-          s << method if [*actions].all? { |action| respond_to?(action) }
+          s << method if Array(actions).all?(&method(:respond_to?))
         end
         headers 'Allow'=>s.map(&:upcase).join(',')
       end
@@ -128,7 +128,7 @@ module Sinja
       end
 
       if method_defined?(:bad_request?)
-        # This screws up our error-handling logic in Sinatra 2.0, so monkeypatch it.
+        # This screws up our error-handling logic in Sinatra 2.0, so override it.
         # https://github.com/sinatra/sinatra/issues/1211
         # https://github.com/sinatra/sinatra/pull/1212
         def bad_request?
@@ -138,7 +138,7 @@ module Sinja
 
       def can?(action)
         roles = settings._resource_config[:resource].fetch(action, {})[:roles]
-        roles.nil? || roles.empty? || roles === memoized_role
+        roles.nil? || roles.empty? || roles.intersect?(memoized_role)
       end
 
       def content?
@@ -154,8 +154,8 @@ module Sinja
         end
       end
 
-      def normalize_filter_params(default_value)
-        return default_value unless params[:filter]&.any?
+      def normalize_filter_params
+        return {} unless params[:filter]&.any?
 
         raise BadRequestError, "Unsupported `filter' query parameter(s)" \
           unless respond_to?(:filter)
@@ -175,7 +175,7 @@ module Sinja
         raise BadRequestError, "Invalid `filter' query parameter(s)"
       end
 
-      def normalize_sort_params(_default_value)
+      def normalize_sort_params
         return {} unless params[:sort]&.any?
 
         raise BadRequestError, "Unsupported `sort' query parameter(s)" \
@@ -197,8 +197,8 @@ module Sinja
         raise BadRequestError, "Invalid `sort' query parameter(s)"
       end
 
-      def normalize_page_params(default_value)
-        return default_value unless params[:page]&.any?
+      def normalize_page_params
+        return {} unless params[:page]&.any?
 
         raise BadRequestError, "Unsupported `page' query parameter(s)" \
           unless respond_to?(:page)
@@ -244,7 +244,7 @@ module Sinja
       end
 
       def memoized_role
-        @role ||= role
+        @role ||= Roles[*role]
       end
 
       def sideloaded?
@@ -256,7 +256,7 @@ module Sinja
       end
 
       def role?(*roles)
-        Roles[*roles] === memoized_role
+        Roles[*roles].intersect?(memoized_role)
       end
 
       def sanity_check!(resource_name, id=nil)
@@ -288,34 +288,37 @@ module Sinja
     end
 
     app.not_found do
-      serialize_errors(&settings._sinja.error_logger)
+      serialize_errors
     end
 
     app.error 400...600 do
-      serialize_errors(&settings._sinja.error_logger)
+      serialize_errors
     end
 
     app.error StandardError do
       env['sinatra.error'].tap do |e|
         boom =
-          if settings._sinja.not_found_exceptions.any? { |c| c === e }
-            NotFoundError.new(e.message) unless NotFoundError === e
-          elsif settings._sinja.conflict_exceptions.any? { |c| c === e }
-            ConflictError.new(e.message) unless ConflictError === e
-          elsif settings._sinja.validation_exceptions.any? { |c| c === e }
-            UnprocessibleEntityError.new(settings._sinja.validation_formatter.(e)) unless UnprocessibleEntityError === e
+          if settings._sinja.not_found_exceptions.any?(&e.method(:is_a?))
+            NotFoundError.new(e.message) unless e.instance_of?(NotFoundError)
+          elsif settings._sinja.conflict_exceptions.any?(&e.method(:is_a?))
+            ConflictError.new(e.message) unless e.instance_of?(ConflictError)
+          elsif settings._sinja.validation_exceptions.any?(&e.method(:is_a?))
+            UnprocessibleEntityError.new(settings._sinja.validation_formatter.(e)) unless e.instance_of?(UnprocessibleEntityError)
           end
 
         handle_exception!(boom) if boom # re-throw the re-packaged exception
       end
 
-      serialize_errors(&settings._sinja.error_logger)
+      serialize_errors
     end
   end
 
   def resource(resource_name, konst=nil, &block)
     abort "Must supply proc constant or block for `resource'" \
-      unless block = (konst if konst.is_a?(Proc)) || block
+      unless block = (konst if konst.instance_of?(Proc)) || block
+
+    warn "DEPRECATED: Pass a block to `resource'; the ability to pass a Proc " \
+      'will be removed in a future version of Sinja.' if konst.instance_of?(Proc)
 
     resource_name = resource_name.to_s
       .pluralize
@@ -352,7 +355,7 @@ module Sinja
     end
   end
 
-  alias_method :resources, :resource
+  alias resources resource
 
   def sinja
     if block_given?
@@ -362,7 +365,7 @@ module Sinja
     end
   end
 
-  alias_method :configure_jsonapi, :sinja
+  alias configure_jsonapi sinja
   def freeze_jsonapi
     _sinja.freeze
   end

data/lib/sinja/config.rb

@@ -21,8 +21,8 @@ module Sinja
       end
 
       if c.respond_to?(:values)
-        c.values.each do |i|
-          if Hash === i
+        c.each_value do |i|
+          if i.is_a?(Hash)
             deep_freeze(i)
           else
             i.freeze
@@ -60,11 +60,11 @@ module Sinja
 
     def initialize
       @query_params = {
-        :include=>[], # passthru to JAS
-        :fields=>{}, # passthru to JAS
-        :filter=>{},
-        :page=>{},
-        :sort=>[]
+        :include=>Array, # passthru to JAS
+        :fields=>Hash, # passthru to JAS
+        :filter=>Hash,
+        :page=>Hash,
+        :sort=>Array
       }
 
       @error_logger = ->(h) { logger.error('sinja') { h } }
@@ -93,14 +93,14 @@ module Sinja
       @validation_exceptions = Set.new
       @validation_formatter = ->{ Array.new }
 
-      @opts = deep_copy(DEFAULT_OPTS)
+      @opts = DEFAULT_OPTS.dup
       @page_using = Hash.new
       @serializer_opts = deep_copy(DEFAULT_SERIALIZER_OPTS)
     end
 
     def error_logger=(f)
       fail "Invalid error formatter #{f}" \
-        unless f.respond_to?(:call)
+        unless f.respond_to?(:call) || f.nil?
 
       fail "Can't modify frozen proc" \
         if @error_logger.frozen?
@@ -109,15 +109,15 @@ module Sinja
     end
 
     def conflict_exceptions=(e=[])
-      @conflict_exceptions.replace([*e])
+      @conflict_exceptions.replace(Array(e))
     end
 
     def not_found_exceptions=(e=[])
-      @not_found_exceptions.replace([*e])
+      @not_found_exceptions.replace(Array(e))
     end
 
     def validation_exceptions=(e=[])
-      @validation_exceptions.replace([*e])
+      @validation_exceptions.replace(Array(e))
     end
 
     def validation_formatter=(f)
@@ -154,7 +154,7 @@ module Sinja
       @default_roles[:has_one].merge!(other)
     end
 
-    DEFAULT_OPTS.keys.each do |k|
+    DEFAULT_OPTS.each_key do |k|
       define_method(k) { @opts[k] }
       define_method("#{k}=") { |v| @opts[k] = v }
     end
@@ -188,9 +188,11 @@ module Sinja
   end
 
   class Roles < Set
-    def ===(other)
-      self.intersect?(Set === other ? other : Set[*other])
+    def intersect?(other)
+      super(other.instance_of?(self.class) ? other : self.class[*other])
     end
+
+    alias === intersect?
   end
 
   class RolesConfig
@@ -211,7 +213,7 @@ module Sinja
       h.each do |action, roles|
         abort "Unknown or invalid action helper `#{action}' in configuration" \
           unless @data.key?(action)
-        @data[action].replace([*roles])
+        @data[action].replace(Array(roles))
       end
       @data
     end

data/lib/sinja/errors.rb

@@ -74,10 +74,10 @@ module Sinja
     attr_reader :tuples
 
     def initialize(tuples=[])
-      @tuples = [*tuples]
+      @tuples = Array(tuples)
 
       fail 'Tuples not properly formatted' \
-        unless @tuples.any? && @tuples.all? { |t| Array === t && t.length == 2 }
+        unless @tuples.any? && @tuples.all? { |t| t.instance_of?(Array) && t.length.between?(2, 3) }
 
       super(HTTP_STATUS)
     end

data/lib/sinja/helpers/serializers.rb

@@ -11,7 +11,7 @@ module Sinja
       VALID_PAGINATION_KEYS = Set.new(%i[self first prev next last]).freeze
 
       def dedasherize(s=nil)
-        s.to_s.underscore.send(Symbol === s ? :to_sym : :itself)
+        s.to_s.underscore.send(s.instance_of?(Symbol) ? :to_sym : :itself)
       end
 
       def dedasherize_names(*args)
@@ -22,7 +22,7 @@ module Sinja
         return enum_for(__callee__, hash) unless block_given?
 
         hash.each do |k, v|
-          yield dedasherize(k), Hash === v ? dedasherize_names(v) : v
+          yield dedasherize(k), v.is_a?(Hash) ? dedasherize_names(v) : v
         end
       end
 
@@ -48,12 +48,12 @@ module Sinja
           options.delete(:exclude) || []
 
         if included.empty?
-          included = Array === default ? default : default.split(',')
+          included = default.is_a?(Array) ? default : default.split(',')
 
           return included if included.empty?
         end
 
-        excluded = Array === excluded ? excluded : excluded.split(',')
+        excluded = excluded.is_a?(Array) ? excluded : excluded.split(',')
         unless excluded.empty?
           excluded = Set.new(excluded)
           included.delete_if do |termstr|
@@ -79,28 +79,29 @@ module Sinja
               # Move cursor through each term, avoiding the default proc,
               # halting if no roles found, i.e. client asked to include
               # something that Sinja doesn't know about
-              throw :keep?, true \
-                unless config = settings._sinja.resource_config.fetch(term.pluralize.to_sym, nil)
+              throw :keep?, true unless config =
+                settings._sinja.resource_config.fetch(term.pluralize.to_sym, nil)
             end
 
-            roles = (
-              config.dig(:has_many, last_term.pluralize.to_sym, :fetch) ||
-              config.dig(:has_one, last_term.singularize.to_sym, :pluck)
-            )[:roles]
+            throw :keep?, true unless roles =
+              config.dig(:has_many, last_term.pluralize.to_sym, :fetch, :roles) ||
+              config.dig(:has_one, last_term.singularize.to_sym, :pluck, :roles)
 
-            throw :keep?, roles && (roles.empty? || roles === memoized_role)
+            throw :keep?, roles && (roles.empty? || roles.intersect?(memoized_role))
           end
         end
       end
 
       def serialize_model(model=nil, options={})
         options[:is_collection] = false
-        options[:skip_collection_check] = defined?(::Sequel) && ::Sequel::Model === model
+        options[:skip_collection_check] = defined?(::Sequel) && model.is_a?(::Sequel::Model)
         options[:include] = include_exclude!(options)
         options[:fields] ||= params[:fields] unless params[:fields].empty?
         options = settings._sinja.serializer_opts.merge(options)
 
         ::JSONAPI::Serializer.serialize(model, options)
+      rescue ::JSONAPI::Serializer::InvalidIncludeError=>e
+        raise BadRequestError, e
       end
 
       def serialize_model?(model=nil, options={})
@@ -122,7 +123,7 @@ module Sinja
         if pagination
           # Whitelist pagination keys and dasherize query parameter names
           pagination = VALID_PAGINATION_KEYS
-            .select { |outer_key| pagination.key?(outer_key) }
+            .select(&pagination.method(:key?))
             .map! do |outer_key|
               [outer_key, pagination[outer_key].map do |inner_key, value|
                 [inner_key.to_s.dasherize.to_sym, value]
@@ -151,11 +152,13 @@ module Sinja
           end.to_h)
         end
 
-        ::JSONAPI::Serializer.serialize([*models], options)
+        ::JSONAPI::Serializer.serialize(Array(models), options)
+      rescue ::JSONAPI::Serializer::InvalidIncludeError=>e
+        raise BadRequestError, e
       end
 
       def serialize_models?(models=[], options={}, pagination=nil)
-        if [*models].any?
+        if Array(models).any?
           body serialize_models(models, options, pagination)
         elsif options.key?(:meta)
           body serialize_models([], :meta=>options[:meta])
@@ -166,7 +169,7 @@ module Sinja
 
       def serialize_linkage(model, rel, options={})
         options[:is_collection] = false
-        options[:skip_collection_check] = defined?(::Sequel) && ::Sequel::Model === model
+        options[:skip_collection_check] = defined?(::Sequel::Model) && model.is_a?(::Sequel::Model)
         options[:include] = rel.to_s
         options = settings._sinja.serializer_opts.merge(options)
 
@@ -202,17 +205,18 @@ module Sinja
         e.respond_to?(:title) ? e.title : e.class.name.demodulize.titleize
       end
 
-      def serialize_errors(&block)
+      def serialize_errors
         raise env['sinatra.error'] if env['sinatra.error'] && sideloaded?
 
+        abody = Array(body)
         error_hashes =
-          if [*body].any?
-            if [*body].all? { |error| Hash === error }
+          if abody.any?
+            if abody.all? { |error| error.is_a?(Hash) }
               # `halt' with a hash or array of hashes
-              [*body].flat_map { |error| error_hash(error) }
+              abody.flat_map(&method(:error_hash))
             elsif not_found?
               # `not_found' or `halt 404'
-              message = [*body].first.to_s
+              message = abody.first.to_s
               error_hash \
                 :title=>'Not Found Error',
                 :detail=>(message unless message == '<h1>Not Found</h1>')
@@ -220,7 +224,7 @@ module Sinja
               # `halt'
               error_hash \
                 :title=>'Unknown Error',
-                :detail=>[*body].first.to_s
+                :detail=>abody.first.to_s
             end
           end
 
@@ -231,12 +235,12 @@ module Sinja
         error_hashes ||=
           case e = env['sinatra.error']
           when UnprocessibleEntityError
-            e.tuples.flat_map do |attribute, full_message|
+            e.tuples.flat_map do |key, full_message, type=:attributes|
               error_hash \
                 :title=>exception_title(e),
                 :detail=>full_message.to_s,
                 :source=>{
-                  :pointer=>(attribute ? "/data/attributes/#{attribute.to_s.dasherize}" : '/data')
+                  :pointer=>(key ? "/data/#{type}/#{key.to_s.dasherize}" : '/data')
                 }
             end
           when Exception
@@ -248,7 +252,9 @@ module Sinja
               :title=>'Unknown Error'
           end
 
-        error_hashes.each { |h| instance_exec(h, &block) } if block
+        if block = settings._sinja.error_logger
+          error_hashes.each { |h| instance_exec(h, &block) }
+        end
 
         content_type :api_json
         JSON.send settings._sinja.json_error_generator,

data/lib/sinja/resource.rb

@@ -27,10 +27,10 @@ module Sinja
 
       context.define_singleton_method(action) do |**opts, &block|
         abort "Unexpected option(s) for `#{action}' action helper" \
-          unless (opts.keys - [*allow_opts]).empty?
+          unless (opts.keys - Array(allow_opts)).empty?
 
         resource_config[action].each do |k, v|
-          v.replace([*opts[k]]) if opts.key?(k)
+          v.replace(Array(opts[k])) if opts.key?(k)
         end
 
         return unless block ||=
@@ -57,9 +57,9 @@ module Sinja
           case result = instance_exec(*args, &block)
           when Array
             opts = {}
-            if Hash === result.last
+            if result.last.instance_of?(Hash)
               opts = result.pop
-            elsif required_arity < 0 && !(Array === result.first)
+            elsif required_arity < 0 && !result.first.is_a?(Array)
               result = [result]
             end
 
@@ -97,7 +97,7 @@ module Sinja
               parent = sideloaded? && env['sinja.passthru'].to_sym
 
               roles, sideload_on = config.fetch(action, {}).values_at(:roles, :sideload_on)
-              roles.nil? || roles.empty? || roles === memoized_role ||
+              roles.nil? || roles.empty? || roles.intersect?(memoized_role) ||
                 parent && sideload_on.include?(parent) && super(parent, *args)
             end
 

data/lib/sinja/resource_routes.rb

@@ -15,8 +15,8 @@ module Sinja
 
       app.get '', :qcaptures=>{ :filter=>:id }, :qparams=>%i[include fields], :actions=>:show do
         ids = @qcaptures.first # TODO: Get this as a block parameter?
-        ids = ids.split(',') if String === ids
-        ids = [*ids].tap(&:uniq!)
+        ids = ids.split(',') if ids.instance_of?(String)
+        ids = Array(ids).tap(&:uniq!)
 
         resources, opts =
           if respond_to?(:show_many)
@@ -49,7 +49,7 @@ module Sinja
         serialize_models(collection, opts, pagination)
       end
 
-      app.post '', :qparams=>:include, :actions=>:create do
+      app.post '', :qparams=>%i[include fields], :actions=>:create do
         sanity_check!
 
         opts = {}
@@ -92,7 +92,7 @@ module Sinja
         serialize_model(tmp, opts)
       end
 
-      app.patch '/:id', :qparams=>:include, :actions=>:update do |id|
+      app.patch '/:id', :qparams=>%i[include fields], :actions=>:update do |id|
         sanity_check!(id)
         tmp, opts = transaction do
           update(attributes).tap do

data/lib/sinja/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sinja
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/sinja.gemspec

@@ -18,15 +18,16 @@ Gem::Specification.new do |spec|
     and it configures Sinatra with the proper settings, MIME-types, filters,
     conditions, and error-handling.
 
-    There are many parsing (deserializing) and rendering (serializing) and
-    so-called "JSON API" libraries available for Ruby, but relatively few that
-    attempt to correctly implement the entire {json:api} specification,
-    including routing, request header and query parameter checking, and
-    relationship side-loading. Sinja lets you focus on the business logic of
-    your applications without worrying about the specification, and without
-    pulling in a heavy framework like Rails. It's lightweight and ORM-agnostic!
+    There are many parsing (deserializing), rendering (serializing), and other
+    "JSON API" libraries available for Ruby, but relatively few that attempt to
+    correctly implement the entire {json:api} server specification, including
+    routing, request header and query parameter checking, and relationship
+    side-loading. Sinja lets you focus on the business logic of your
+    applications without worrying about the specification, and without pulling
+    in a heavy framework like Rails. It's lightweight, ORM-agnostic, and
+    Ember.js-friendly!
   EOF
-  spec.homepage      = 'https://github.com/mwpastore/sinja'
+  spec.homepage      = 'http://sinja-rb.org'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinja
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Mike Pastore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-18 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -216,13 +216,14 @@ description: |
   and it configures Sinatra with the proper settings, MIME-types, filters,
   conditions, and error-handling.
 
-  There are many parsing (deserializing) and rendering (serializing) and
-  so-called "JSON API" libraries available for Ruby, but relatively few that
-  attempt to correctly implement the entire {json:api} specification,
-  including routing, request header and query parameter checking, and
-  relationship side-loading. Sinja lets you focus on the business logic of
-  your applications without worrying about the specification, and without
-  pulling in a heavy framework like Rails. It's lightweight and ORM-agnostic!
+  There are many parsing (deserializing), rendering (serializing), and other
+  "JSON API" libraries available for Ruby, but relatively few that attempt to
+  correctly implement the entire {json:api} server specification, including
+  routing, request header and query parameter checking, and relationship
+  side-loading. Sinja lets you focus on the business logic of your
+  applications without worrying about the specification, and without pulling
+  in a heavy framework like Rails. It's lightweight, ORM-agnostic, and
+  Ember.js-friendly!
 email:
 - mike@oobak.org
 executables: []
@@ -264,7 +265,7 @@ files:
 - lib/sinja/resource_routes.rb
 - lib/sinja/version.rb
 - sinja.gemspec
-homepage: https://github.com/mwpastore/sinja
+homepage: http://sinja-rb.org
 licenses:
 - MIT
 metadata: {}