sinja 0.1.0.beta3 → 0.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e15669879c360c6e547ed1c4a054ab5e2003cdcf
-  data.tar.gz: 5a8bde26b795e72994009a09028c8d9a94421e6a
+  metadata.gz: 3a2a92548635cd6db938186715c337d3d19bec29
+  data.tar.gz: c31184c7f6c8c33698096846a986dce1e4ec53cc
 SHA512:
-  metadata.gz: 449e36f9a4eedf5152bc3d2b5dfcc291ee015c2fa322534dc0764b00200fd998d5c4324203f4dd42586d6268ad76502042bccaf54a585403c9f599cdb629e528
-  data.tar.gz: e8a7652d029cc81beff40fd9c5e9fc2a3b55a959cbf9aa8d643c883d4990d4408a0f3e6b550591a7e4ea361e5d0140bd69167aa691466643d6a35e901fd5c549
+  metadata.gz: 5e0ec4ee3a7b6bf7fa0ffb66fc0cde0cb736be5a16ba3ef1dcba40bd0d6b1bd8b378aa640c3dc21df7d439f5b0d78a9e0ea8ba05c6b0ecd4621ff9b0ac2f1c82
+  data.tar.gz: 1db8dcd6991dc3f89540a8e5e3a3230d42a210d1951a7fadbdb13b561a38727231575f36ad4b7351f78b4b78644bbdff66f74ba58d6ce2f8c163ed7fc3798c8a

data/README.md

@@ -55,6 +55,7 @@ has not yet been thoroughly tested or vetted in a production environment.**
     - [`role` helper](#role-helper)
   - [Conflicts](#conflicts)
   - [Transactions](#transactions)
+  - [Coalesced Find Requests](#coalesced-find-requests)
   - [Module Namespaces](#module-namespaces)
   - [Code Organization](#code-organization)
 - [Development](#development)
@@ -280,8 +281,6 @@ end
 
 **dedasherize_names**
 : Takes a hash and returns the hash with its keys dedasherized (deeply).
-  Useful for fixing up the hashes of attributes passed to the `create` and
-  `update` action helpers before they are passed on to ORM methods.
 
 ### Performance
 
@@ -356,7 +355,7 @@ these settings.
   by manually `use`-ing the Rack::Protection middleware)
 * Disables static file routes (can be reenabled with `enable :static`)
 * Sets `:show_exceptions` to `:after_handler`
-* Adds an `:api_json` MIME-type (`Sinatra::JSONAPI::MIME_TYPE`)
+* Adds an `:api_json` MIME-type (`Sinja::MIME_TYPE`)
 * Enforces strict checking of the `Accept` and `Content-Type` request headers
 * Sets the `Content-Type` response header to `:api_json` (can be overriden with
   the `content_type` helper)
@@ -408,7 +407,9 @@ to JSONAPI::Serializers. You may also use the special `:exclude` option to
 prevent specific relationships from being included in the response. This
 accepts the same formats as JSONAPI::Serializers does for `:include`. If you
 exclude a relationship, any sub-relationships will also be excluded. The
-`:sort`, `:page`, and `:filter` query parameters must be handled manually.
+`:sort`, `:page`, and `:filter` query parameters must be handled manually (with
+the exception of the `:id` filter, discussed under "Coalesced Find Requests"
+below).
 
 All arguments to action helpers are "tainted" and should be treated as
 potentially dangerous: IDs, attribute hashes, and [resource identifier
@@ -436,22 +437,22 @@ serialize on the response.
 
 ##### `create {|attr, id| ..}` => id, Object?
 
-With client-generated IDs: Take a hash of attributes and a client-generated ID,
-create a new resource, and return the ID and optionally the created resource.
-(Note that only one or the other `create` action helpers is allowed in any
-given resource block.)
+With client-generated IDs: Take a hash of (dedasherized) attributes and a
+client-generated ID, create a new resource, and return the ID and optionally
+the created resource. (Note that only one or the other `create` action helpers
+is allowed in any given resource block.)
 
 ##### `create {|attr| ..}` => id, Object
 
-Without client-generated IDs: Take a hash of attributes, create a new resource,
-and return the server-generated ID and the created resource. (Note that only
-one or the other `create` action helpers is allowed in any given resource
-block.)
+Without client-generated IDs: Take a hash of (dedasherized) attributes, create
+a new resource, and return the server-generated ID and the created resource.
+(Note that only one or the other `create` action helpers is allowed in any
+given resource block.)
 
 ##### `update {|attr| ..}` => Object?
 
-Take a hash of attributes, update `resource`, and optionally return the updated
-resource.
+Take a hash of (dedasherized) attributes, update `resource`, and optionally
+return the updated resource.
 
 ##### `destroy {..}`
 
@@ -462,8 +463,7 @@ Delete or destroy `resource`.
 ##### `pluck {..}` => Object
 
 Return the related object vis-à-vis `resource` to serialize on the
-response. Defined by default as `resource.send(<to-one>)`; can be either
-overridden or disabled entirely with `pluck(&nil)`.
+response.
 
 ##### `prune {..}` => TrueClass?
 
@@ -493,8 +493,7 @@ Take a [resource identifier object][22] and update the relationship on
 ##### `fetch {..}` => Array
 
 Return an array of related objects vis-&agrave;-vis `resource` to serialize on
-the response. Defined by default as `resource.send(<to-many>)`; can be either
-overridden or disabled entirely with `fetch(&nil)`.
+the response.
 
 ##### `clear {..}` => TrueClass?
 
@@ -614,6 +613,23 @@ helpers do
 end
 ```
 
+If you need more fine-grained control, for example if your action helper logic
+varies by the user's role, you can use a simple switch statement along with the
+`RoleList` utility class:
+
+```ruby
+index(roles: []) do
+  case role
+  when RoleList[:user]
+    # logic specific to user role
+  when RoleList[:admin, :super]
+    # logic specific to administrative roles
+  else
+    halt 403, 'Access denied!'
+  end
+end
+```
+
 ### Conflicts
 
 If your database driver raises exceptions on constraint violations, you should
@@ -649,6 +665,15 @@ helpers do
 end
 ```
 
+### Coalesced Find Requests
+
+If your JSON:API client coalesces find requests, the `show` action helper will
+be invoked once for each ID in the `:id` filter, and the resulting collection
+will be serialized on the response. Both query parameter syntaxes for arrays
+are supported: `?filter[id]=1,2` and `?filter[id][]=1&filter[id][]=2`. If any
+ID is not found (i.e. `show` returns `nil`), the route will halt with HTTP
+status code 404.
+
 ### Module Namespaces
 
 Everything is dual-namespaced under both Sinatra::JSONAPI and Sinja, and Sinja

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'sinatra/jsonapi/resource'
+require 'sinja'
 
 # 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.

data/lib/role_list.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+require 'set'
+
+class RoleList < Set
+  def ===(other)
+    self.intersect?(self.class === other ? other : self.class[*other])
+  end
+end

data/lib/sinatra/jsonapi.rb

@@ -1,134 +1,6 @@
 # frozen_string_literal: true
-require 'set'
-require 'sinatra/base'
-require 'sinatra/namespace'
-
 require 'sinja'
-require 'sinja/version'
-
-require 'sinatra/jsonapi/config'
-require 'sinatra/jsonapi/helpers/serializers'
-require 'sinatra/jsonapi/resource'
-
-module Sinatra::JSONAPI
-  def resource(resource_name, konst=nil, &block)
-    abort "Must supply proc constant or block for `resource'" \
-      unless block = konst and konst.is_a?(Proc) or block
-
-    sinja_config.resource_roles[resource_name.to_sym] # trigger default proc
-
-    namespace "/#{resource_name.to_s.tr('_', '-')}" do
-      define_singleton_method(:can) do |action, roles|
-        sinja_config.resource_roles[resource_name.to_sym].merge!(action=>roles)
-      end
-
-      helpers do
-        define_method(:can?) do |*args|
-          super(resource_name.to_sym, *args)
-        end
-      end
-
-      register Resource
-
-      instance_eval(&block)
-    end
-  end
-
-  def sinja
-    if block_given?
-      yield sinja_config
-    else
-      sinja_config
-    end
-  end
-
-  alias_method :configure_jsonapi, :sinja
-  def freeze_jsonapi
-    sinja_config.freeze
-  end
-
-  def self.registered(app)
-    app.register Sinatra::Namespace
-
-    app.disable :protection, :static
-    app.set :sinja_config, Sinatra::JSONAPI::Config.new
-    app.configure(:development) do |c|
-      c.set :show_exceptions, :after_handler
-    end
-
-    app.set :actions do |*actions|
-      condition do
-        actions.each do |action|
-          halt 403, 'You are not authorized to perform this action' unless can?(action)
-          halt 405, 'Action or method not implemented or supported' unless respond_to?(action)
-        end
-        true
-      end
-    end
-
-    app.set :nullif do |nullish|
-      condition { nullish.(data) }
-    end
-
-    app.mime_type :api_json, MIME_TYPE
-
-    app.helpers Helpers::Serializers do
-      def can?(resource_name, action)
-        roles = settings.sinja_config.resource_roles[resource_name][action]
-        roles.nil? || roles.empty? || Set[*role].intersect?(roles)
-      end
-
-      def content?
-        request.body.respond_to?(:size) && request.body.size > 0
-      end
-
-      def data
-        @data ||= deserialized_request_body[:data]
-      end
-
-      def normalize_params!
-        # TODO: halt 400 if other params, or params not implemented?
-        {
-          :fields=>{}, # passthru
-          :include=>[], # passthru
-          :filter=>{},
-          :page=>{},
-          :sort=>''
-        }.each { |k, v| params[k] ||= v }
-      end
-
-      def role
-        nil
-      end
-
-      def transaction
-        yield
-      end
-    end
-
-    app.before do
-      halt 406 unless request.preferred_type.entry == MIME_TYPE
-
-      if content?
-        halt 415 unless request.media_type == MIME_TYPE
-        halt 415 if request.media_type_params.keys.any? { |k| k != 'charset' }
-      end
-
-      content_type :api_json
-
-      normalize_params!
-    end
-
-    app.after do
-      body serialized_response_body if response.ok?
-    end
-
-    app.error 400...600, nil do
-      serialized_error
-    end
-  end
-end
 
 module Sinatra
-  register JSONAPI
+  register JSONAPI = Sinja
 end

data/lib/sinja.rb

@@ -1,13 +1,140 @@
 # frozen_string_literal: true
-module Sinatra
-  module JSONAPI
-    MIME_TYPE = 'application/vnd.api+json'
+require 'sinatra/base'
+require 'sinatra/namespace'
 
-    SinjaError = Class.new(StandardError)
-    ActionHelperError = Class.new(SinjaError)
+require 'role_list'
+require 'sinja/config'
+require 'sinja/helpers/serializers'
+require 'sinja/resource'
+
+module Sinja
+  MIME_TYPE = 'application/vnd.api+json'
+
+  SinjaError = Class.new(StandardError)
+  ActionHelperError = Class.new(SinjaError)
+
+  def resource(resource_name, konst=nil, &block)
+    abort "Must supply proc constant or block for `resource'" \
+      unless block = (konst and konst.is_a?(Proc) or block)
+
+    _sinja.resource_roles[resource_name.to_sym] # trigger default proc
+
+    namespace "/#{resource_name.to_s.tr('_', '-')}" do
+      define_singleton_method(:can) do |action, roles|
+        _sinja.resource_roles[resource_name.to_sym].merge!(action=>roles)
+      end
+
+      helpers do
+        define_method(:can?) do |*args|
+          super(resource_name.to_sym, *args)
+        end
+      end
+
+      register Resource
+
+      instance_eval(&block)
+    end
   end
-end
 
-Sinja = Sinatra::JSONAPI
+  def sinja
+    if block_given?
+      yield _sinja
+    else
+      _sinja
+    end
+  end
+
+  alias_method :configure_jsonapi, :sinja
+  def freeze_jsonapi
+    _sinja.freeze
+  end
+
+  def self.registered(app)
+    app.register Sinatra::Namespace
+
+    app.disable :protection, :static
+    app.set :_sinja, Sinja::Config.new
+    app.configure(:development) do |c|
+      c.set :show_exceptions, :after_handler
+    end
+
+    app.set :actions do |*actions|
+      condition do
+        actions.each do |action|
+          halt 403, 'You are not authorized to perform this action' unless can?(action)
+          halt 405, 'Action or method not implemented or supported' unless respond_to?(action)
+        end
+        true
+      end
+    end
+
+    app.set :pfilters do |*pfilters|
+      condition do
+        pfilters.all? do |pfilter|
+          params.key?('filter') && params['filter'].key?(pfilter.to_s)
+        end
+      end
+    end
 
-require 'sinatra/jsonapi'
+    app.set :nullif do |nullish|
+      condition { nullish.(data) }
+    end
+
+    app.mime_type :api_json, MIME_TYPE
+
+    app.helpers Helpers::Serializers do
+      def can?(resource_name, action)
+        roles = settings._sinja.resource_roles[resource_name][action]
+        roles.nil? || roles.empty? || roles === role
+      end
+
+      def content?
+        request.body.respond_to?(:size) && request.body.size > 0
+      end
+
+      def data
+        @data ||= deserialized_request_body[:data]
+      end
+
+      def normalize_params!
+        # TODO: halt 400 if other params, or params not implemented?
+        {
+          :fields=>{}, # passthru
+          :include=>[], # passthru
+          :filter=>{},
+          :page=>{},
+          :sort=>''
+        }.each { |k, v| params[k] ||= v }
+      end
+
+      def role
+        nil
+      end
+
+      def transaction
+        yield
+      end
+    end
+
+    app.before do
+      halt 406 unless request.preferred_type.entry == MIME_TYPE
+
+      if content?
+        halt 415 unless request.media_type == MIME_TYPE
+        halt 415 if request.media_type_params.keys.any? { |k| k != 'charset' }
+      end
+
+      content_type :api_json
+
+      normalize_params!
+    end
+
+    app.after do
+      body serialized_response_body if response.ok?
+    end
+
+    app.error 400...600, nil do
+      serialized_error
+    end
+  end
+end

data/lib/{sinatra/jsonapi → sinja}/config.rb

@@ -2,11 +2,12 @@
 require 'forwardable'
 require 'set'
 
-require 'sinatra/jsonapi/relationship_routes/has_many'
-require 'sinatra/jsonapi/relationship_routes/has_one'
-require 'sinatra/jsonapi/resource_routes'
+require 'role_list'
+require 'sinja/relationship_routes/has_many'
+require 'sinja/relationship_routes/has_one'
+require 'sinja/resource_routes'
 
-module Sinatra::JSONAPI
+module Sinja
   module ConfigUtils
     def deep_copy(c)
       Marshal.load(Marshal.dump(c))
@@ -98,7 +99,7 @@ module Sinatra::JSONAPI
         ResourceRoutes::ACTIONS,
         RelationshipRoutes::HasMany::ACTIONS,
         RelationshipRoutes::HasOne::ACTIONS
-      ].reduce([], :concat).map { |action| [action, Set.new] }.to_h
+      ].reduce([], :concat).map { |action| [action, RoleList.new] }.to_h
     end
 
     def_delegator :@data, :[]
@@ -107,7 +108,7 @@ module Sinatra::JSONAPI
       h.each do |action, roles|
         abort "Unknown or invalid action helper `#{action}' in configuration" \
           unless @data.key?(action)
-        @data[action].replace(Set[*roles])
+        @data[action].replace(RoleList[*roles])
       end
       @data
     end

data/lib/{sinatra/jsonapi → sinja}/helpers/relationships.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'json'
 
-module Sinatra::JSONAPI
+module Sinja
   module Helpers
     module Relationships
       def dispatch_relationship_request(id, path, **opts)

data/lib/{sinatra/jsonapi → sinja}/helpers/sequel.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'sequel/model/inflections'
 
-module Sinatra::JSONAPI
+module Sinja
   module Helpers
     module Sequel
       include ::Sequel::Inflections
@@ -26,12 +26,12 @@ module Sinatra::JSONAPI
         [resource.pk, resource, opts]
       end
 
-      # <= association, rios, extra_keys
+      # <= association, rios, block
       def add_missing(*args)
         add_remove(:add, :-, *args)
       end
 
-      # <= association, rios, extra_keys
+      # <= association, rios, block
       def remove_present(*args)
         add_remove(:remove, :&, *args)
       end
@@ -42,10 +42,8 @@ module Sinatra::JSONAPI
         meth = "#{meth_prefix}_#{singularize(association)}".to_sym
         transaction do
           resource.lock!
-          venn(operator, association, rios) do |subresource, rio|
-            args = [subresource]
-            args.push(yield(rio)) if block_given?
-            resource.send(meth, *args)
+          venn(operator, association, rios) do |subresource|
+            resource.send(meth, subresource)
           end
           resource.reload
         end
@@ -53,11 +51,10 @@ module Sinatra::JSONAPI
 
       def venn(operator, association, rios)
         dataset = resource.send("#{association}_dataset")
-        klass = resource.class.association_reflection(association)
-        rios = rios.map { |rio| [rio[:id], rio] }.to_h
-        rios.keys.send(operator, dataset.select_map(klass.primary_key)).each do |id|
-          yield klass.with_pk!(id), rios[id]
-        end
+        # does not / will not work with composite primary keys
+        rios.map { |rio| rio[:id].to_i }
+          .send(operator, dataset.select_map(:id))
+          .each { |id| yield dataset.with_pk!(id) }
       end
     end
   end

data/lib/{sinatra/jsonapi → sinja}/helpers/serializers.rb

@@ -3,7 +3,7 @@ require 'json'
 require 'jsonapi-serializers'
 require 'set'
 
-module Sinatra::JSONAPI
+module Sinja
   module Helpers
     module Serializers
       def dedasherize(s=nil)
@@ -32,7 +32,7 @@ module Sinatra::JSONAPI
       end
 
       def serialized_response_body
-        JSON.send settings.sinja_config.json_generator, response.body
+        JSON.send settings._sinja.json_generator, response.body
       rescue JSON::GeneratorError
         halt 400, 'Unserializable entities in the response body'
       end
@@ -64,7 +64,7 @@ module Sinatra::JSONAPI
         exclude!(options) if options[:include] && options[:exclude]
 
         ::JSONAPI::Serializer.serialize model,
-          settings.sinja_config.serializer_opts.merge(options)
+          settings._sinja.serializer_opts.merge(options)
       end
 
       def serialize_model?(model=nil, options={})
@@ -87,7 +87,7 @@ module Sinatra::JSONAPI
         exclude!(options) if options[:include] && options[:exclude]
 
         ::JSONAPI::Serializer.serialize [*models],
-          settings.sinja_config.serializer_opts.merge(options)
+          settings._sinja.serializer_opts.merge(options)
       end
 
       def serialize_models?(models=[], options={})
@@ -101,7 +101,7 @@ module Sinatra::JSONAPI
       end
 
       def serialize_linkage(options={})
-        options = settings.sinja_config.serializer_opts.merge(options)
+        options = settings._sinja.serializer_opts.merge(options)
         linkage.tap do |c|
           c[:meta] = options[:meta] if options.key?(:meta)
           c[:jsonapi] = options[:jsonapi] if options.key?(:jsonapi)
@@ -142,8 +142,8 @@ module Sinatra::JSONAPI
 
       def serialized_error
         hash = error_hash(normalized_error)
-        logger.error(settings.sinja_config.logger_progname) { hash }
-        JSON.send settings.sinja_config.json_error_generator,
+        logger.error(settings._sinja.logger_progname) { hash }
+        JSON.send settings._sinja.json_error_generator,
           ::JSONAPI::Serializer.serialize_errors([hash])
       end
     end

data/lib/{sinatra/jsonapi → sinja}/relationship_routes/has_many.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-module Sinatra::JSONAPI
+module Sinja
   module RelationshipRoutes
     module HasMany
       ACTIONS = %i[fetch clear merge subtract].freeze

data/lib/{sinatra/jsonapi → sinja}/relationship_routes/has_one.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-module Sinatra::JSONAPI
+module Sinja
   module RelationshipRoutes
     module HasOne
       ACTIONS = %i[pluck prune graft].freeze

data/lib/sinja/relationship_routes/sequel.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+require 'sinja/helpers/sequel'
+
+module Sinja
+  module Resource
+    alias_method :core_has_one, :has_one
+
+    def has_one(rel, &block)
+      core_has_one(rel) do
+        pluck do
+          resource.send(rel)
+        end
+
+        prune do
+          resource.send("#{rel}=", nil)
+          resource.save_changes
+        end
+
+        graft do |rio|
+          klass = resource.class.association_reflection(rel).associated_class
+          resource.send("#{rel}=", klass.with_pk!(rio[:id]))
+          resource.save_changes
+        end
+
+        instance_eval(&block) if block
+      end
+    end
+
+    alias_method :core_has_many, :has_many
+
+    def has_many(rel, &block)
+      core_has_many(rel) do
+        fetch do
+          resource.send(rel)
+        end
+
+        clear do
+          resource.send("remove_all_#{rel}")
+        end
+
+        merge do |rios|
+          add_missing(rel, rios)
+        end
+
+        subtract do |rios|
+          remove_present(rel, rios)
+        end
+
+        instance_eval(&block) if block
+      end
+    end
+  end
+end

data/lib/{sinatra/jsonapi → sinja}/resource.rb

@@ -2,12 +2,12 @@
 require 'sinatra/base'
 require 'sinatra/namespace'
 
-require 'sinatra/jsonapi/helpers/relationships'
-require 'sinatra/jsonapi/relationship_routes/has_many'
-require 'sinatra/jsonapi/relationship_routes/has_one'
-require 'sinatra/jsonapi/resource_routes'
+require 'sinja/helpers/relationships'
+require 'sinja/relationship_routes/has_many'
+require 'sinja/relationship_routes/has_one'
+require 'sinja/resource_routes'
 
-module Sinatra::JSONAPI
+module Sinja
   module Resource
     def def_action_helper(action, context=nil)
       abort "JSONAPI resource actions can't be HTTP verbs!" \
@@ -16,24 +16,18 @@ module Sinatra::JSONAPI
       context.define_singleton_method(action) do |**opts, &block|
         can(action, opts[:roles]) if opts.key?(:roles)
 
-        if block.nil?
-          if respond_to?(action)
-            # TODO: Is this safe?
-            remove_method(action)
-            return
-          else
-            # TODO: Throw an error?
-          end
-        end
+        return if block.nil?
 
         define_method(action) do |*args|
+          send("before_#{action}") if respond_to?("before_#{action}")
+
           result =
             begin
               instance_exec(*args.take(block.arity.abs), &block)
             rescue Exception=>e
-              halt 409, e.message if settings.sinja_config.conflict?(action, e.class)
-              #halt 422, resource.errors if settings.sinja_config.invalid?(action, e.class) # TODO
-              #not_found if settings.sinja_config.not_found?(action, e.class) # TODO
+              halt 409, e.message if settings._sinja.conflict?(action, e.class)
+              #halt 422, resource.errors if settings._sinja.invalid?(action, e.class) # TODO
+              #not_found if settings._sinja.not_found?(action, e.class) # TODO
               raise
             end
 
@@ -63,6 +57,10 @@ module Sinatra::JSONAPI
             [result, nil].take(required_arity.abs).push({})
           end
         end
+
+        define_singleton_method("remove_#{action}") do
+          remove_method(action)
+        end
       end
     end
 
@@ -74,6 +72,10 @@ module Sinatra::JSONAPI
       app.helpers Helpers::Relationships do
         attr_accessor :resource
 
+        def attributes
+          dedasherize_names(data.fetch(:attributes, {}))
+        end
+
         def sanity_check!(id=nil)
           halt 409, 'Resource type in payload does not match endpoint' \
             if data[:type] != request.path.split('/').last # TODO
@@ -123,12 +125,6 @@ module Sinatra::JSONAPI
           register RelationshipRoutes.const_get \
             rel_type.to_s.split('_').map(&:capitalize).join.to_sym
 
-          if rel_type == :has_one
-            pluck { resource.send(rel) }
-          elsif rel_type == :has_many
-            fetch { resource.send(rel) }
-          end
-
           instance_eval(&block) if block
         end
       end

data/lib/{sinatra/jsonapi → sinja}/resource_routes.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-module Sinatra::JSONAPI
+module Sinja
   module ResourceRoutes
     ACTIONS = %i[index show create update destroy].freeze
     CONFLICT_ACTIONS = %i[create update].freeze
@@ -7,6 +7,21 @@ module Sinatra::JSONAPI
     def self.registered(app)
       app.def_action_helpers(ACTIONS, app)
 
+      app.get '', :pfilters=>:id, :actions=>:show do
+        ids = params['filter'].delete('id')
+        ids = ids.split(',') if ids.respond_to?(:split)
+
+        opts = {}
+        resources = [*ids].tap(&:uniq!).map! do |id|
+          self.resource, opts = show(id)
+          not_found "Resource '#{id}' not found" unless resource
+          resource
+        end
+
+        # TODO: Serialize collection with opts from last model found?
+        serialize_models(resources, opts)
+      end
+
       app.get '', :actions=>:index do
         serialize_models(*index)
       end
@@ -23,7 +38,7 @@ module Sinatra::JSONAPI
           if data[:id] && method(:create).arity != 2
 
         _, self.resource, opts = transaction do
-          create(data.fetch(:attributes, {}), data[:id]).tap do |id, *|
+          create(attributes, data[:id]).tap do |id, *|
             dispatch_relationship_requests!(id, :method=>:patch)
           end
         end
@@ -46,7 +61,7 @@ module Sinatra::JSONAPI
         self.resource, = show(id)
         not_found "Resource '#{id}' not found" unless resource
         serialize_model?(transaction do
-          update(data.fetch(attributes, {})).tap do
+          update(attributes).tap do
             dispatch_relationship_requests!(id, :method=>:patch)
           end
         end)

data/lib/sinja/version.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: false
-module Sinatra
-  module JSONAPI
-    VERSION = '0.1.0.beta3'.freeze
-  end
+module Sinja
+  VERSION = '0.2.0.beta1'.freeze
 end

data/sinja.gemspec

@@ -5,7 +5,7 @@ require 'sinja/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'sinja'
-  spec.version       = Sinatra::JSONAPI::VERSION
+  spec.version       = Sinja::VERSION
   spec.authors       = ['Mike Pastore']
   spec.email         = ['mike@oobak.org']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinja
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta3
+  version: 0.2.0.beta1
 platform: ruby
 authors:
 - Mike Pastore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -124,16 +124,18 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/role_list.rb
 - lib/sinatra/jsonapi.rb
-- lib/sinatra/jsonapi/config.rb
-- lib/sinatra/jsonapi/helpers/relationships.rb
-- lib/sinatra/jsonapi/helpers/sequel.rb
-- lib/sinatra/jsonapi/helpers/serializers.rb
-- lib/sinatra/jsonapi/relationship_routes/has_many.rb
-- lib/sinatra/jsonapi/relationship_routes/has_one.rb
-- lib/sinatra/jsonapi/resource.rb
-- lib/sinatra/jsonapi/resource_routes.rb
 - lib/sinja.rb
+- lib/sinja/config.rb
+- lib/sinja/helpers/relationships.rb
+- lib/sinja/helpers/sequel.rb
+- lib/sinja/helpers/serializers.rb
+- lib/sinja/relationship_routes/has_many.rb
+- lib/sinja/relationship_routes/has_one.rb
+- lib/sinja/relationship_routes/sequel.rb
+- lib/sinja/resource.rb
+- lib/sinja/resource_routes.rb
 - lib/sinja/version.rb
 - sinja.gemspec
 homepage: https://github.com/mwpastore/sinja