sinja 1.1.0.pre3 → 1.1.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2b7704d06378c377a7668407ccfe7dd391bf22c
-  data.tar.gz: 2a26bd92d8b7357d8561204654030e89398223d3
+  metadata.gz: a86013c139ad0c6cd3555443076a4c813c8cedc6
+  data.tar.gz: 7c3dc7d285fb817bb9e4c6003bc24c0cb8d2b1f2
 SHA512:
-  metadata.gz: c7541478e11cd932871936c7bb470169fafcc4f24133d77c2a8559c5ba5fae07e0f0a5cfd03be94b0efa6222b19cf97f452a14a87300760738fb028b13b58f96
-  data.tar.gz: abc9e3d5c75bc8324537f5d5cecad33c61c84eb82f98e2f24ba048fb74de128b5de377f7c272d3078da0dabe9c06578e0827097b358942337636fdbb5dd3d1f9
+  metadata.gz: 86a0909d1e859b4f2177de1d71c91b60fa5bc0160c8b1568f94acc100ce84c01157439633e89124eed2e09318a3b4ffb0aa6596fc7bae3a09ee88a4e9132ca43
+  data.tar.gz: 21f0f20bda31d9a6954437f66848eb47f7c13dd8e8250992bb259c9791f7cb3fa7b39f6ba8291101f7128bf8b7add9b8e87b32c768d95d3924a839fee90627c6

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/sinja.svg)](https://badge.fury.io/rb/sinja)
 [![Build Status](https://travis-ci.org/mwpastore/sinja.svg?branch=master)](https://travis-ci.org/mwpastore/sinja)
+[![Chat](https://badges.gitter.im/sinja-rb/Lobby.svg)](https://gitter.im/sinja-rb/Lobby)
 
 Sinja is a [Sinatra][1] [extension][10] for quickly building [RESTful][11],
 [{json:api}][2]-[compliant][7] web services, leveraging the excellent
@@ -313,7 +314,7 @@ application.
 
 **dedasherize**
 : Takes a string or symbol and returns the string or symbol with any and all
-  dashes transliterated to underscores.
+  dashes transliterated to underscores, and camelCase converted to snake_case.
 
 **dedasherize_names**
 : Takes a hash and returns the hash with its keys dedasherized (deeply).

data/demo-app/app.rb

@@ -17,16 +17,14 @@ configure_jsonapi do |c|
   Sinja::Helpers::Sequel.config(c)
 end
 
-helpers Sinja::Helpers::Sequel do
+helpers do
+  prepend Sinja::Helpers::Sequel
+
   def current_user
     # TESTING/DEMO PURPOSES ONLY -- DO NOT DO THIS IN PRODUCTION
     Author.first_by_email(env['HTTP_X_EMAIL']) if env.key?('HTTP_X_EMAIL')
   end
 
-  def database
-    DB
-  end
-
   def role
     [].tap do |a|
       a << :logged_in if current_user

data/lib/sinja/errors.rb

@@ -42,7 +42,7 @@ module Sinja
     def initialize(*args) super(405, *args) end
   end
 
-  class NotAcceptibleError < HttpError
+  class NotAcceptableError < HttpError
     def initialize(*args) super(406, *args) end
   end
 

data/lib/sinja/helpers/sequel.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
+require 'forwardable'
 require 'sequel/model/inflections'
 
 module Sinja
   module Helpers
     module Sequel
       include ::Sequel::Inflections
+      extend Forwardable
 
       def self.config(c)
         c.conflict_exceptions << ::Sequel::ConstraintViolation
@@ -19,17 +21,8 @@ module Sinja
         } if ::Sequel::Database::EXTENSIONS.key?(:pagination)
       end
 
-      def validate!
-        raise ::Sequel::ValidationFailed, resource unless resource.valid?
-      end
-
-      def database
-        ::Sequel::DATABASES.first
-      end
-
-      def filter(collection, fields)
-        collection.where(fields)
-      end
+      def_delegator ::Sequel::Model, :db, :database
+      def_delegator :database, :transaction
 
       def sort(collection, fields)
         collection.order(*fields.map { |k, v| ::Sequel.send(v, k) })
@@ -60,12 +53,11 @@ module Sinja
         return collection, pagination
       end if ::Sequel::Database::EXTENSIONS.key?(:pagination)
 
-      def finalize(collection)
-        collection.all
-      end
+      define_method :filter, proc(&:where)
+      define_method :finalize, proc(&:all)
 
-      def transaction(&block)
-        database.transaction(&block)
+      def validate!
+        raise ::Sequel::ValidationFailed, resource unless resource.valid?
       end
 
       def next_pk(resource, **opts)

data/lib/sinja/helpers/serializers.rb

@@ -7,8 +7,10 @@ require 'set'
 module Sinja
   module Helpers
     module Serializers
+      VALID_PAGINATION_KEYS = Set.new(%i[self first prev next last]).freeze
+
       def dedasherize(s=nil)
-        s.to_s.tr('-', '_').send(Symbol === s ? :to_sym : :itself)
+        s.to_s.underscore.send(Symbol === s ? :to_sym : :itself)
       end
 
       def dedasherize_names(*args)
@@ -110,38 +112,50 @@ module Sinja
         end
       end
 
-      def serialize_models(models=[], options={})
+      def serialize_models(models=[], options={}, pagination=nil)
         options[:is_collection] = true
         options[:include] = include_exclude!(options)
         options[:fields] ||= params[:fields] unless params[:fields].empty?
         options = settings._sinja.serializer_opts.merge(options)
 
-        if options.key?(:links) && pagination = options[:links].delete(:pagination)
+        if pagination
+          # Whitelist pagination keys and dasherize query parameter names
+          pagination = VALID_PAGINATION_KEYS
+            .select { |outer_key| pagination.key?(outer_key) }
+            .map! do |outer_key|
+              [outer_key, pagination[outer_key].map do |inner_key, value|
+                [inner_key.to_s.dasherize.to_sym, value]
+              end.to_h]
+            end.to_h
+
+          options[:meta] ||= {}
+          options[:meta][:pagination] = pagination
+
+          options[:links] ||= {}
           options[:links][:self] = request.url unless pagination.key?(:self)
 
-          query = Rack::Utils.build_nested_query \
+          base_query = Rack::Utils.build_nested_query \
             env['rack.request.query_hash'].dup.tap { |h| h.delete('page') }
+
           self_link, join_char =
-            if query.empty?
+            if base_query.empty?
               [request.path, ??]
             else
-              ["#{request.path}?#{query}", ?&]
+              ["#{request.path}?#{base_query}", ?&]
             end
 
-          %i[self first prev next last].each do |key|
-            next unless pagination.key?(key)
-            query = Rack::Utils.build_nested_query \
-              :page=>pagination[key]
-            options[:links][key] = "#{self_link}#{join_char}#{query}"
-          end
+          options[:links].merge!(pagination.map do |key, value|
+            [key, [self_link,
+              Rack::Utils.build_nested_query(:page=>value)].join(join_char)]
+          end.to_h)
         end
 
         ::JSONAPI::Serializer.serialize([*models], options)
       end
 
-      def serialize_models?(models=[], options={})
+      def serialize_models?(models=[], options={}, pagination=nil)
         if [*models].any?
-          body serialize_models(models, options)
+          body serialize_models(models, options, pagination)
         elsif options.key?(:meta)
           body serialize_models([], :meta=>options[:meta])
         else
@@ -184,11 +198,7 @@ module Sinja
       end
 
       def exception_title(e)
-        if e.respond_to?(:title)
-          e.title
-        else
-          e.class.name.split('::').last.split(/(?=[[:upper:]])/).join(' ')
-        end
+        e.respond_to?(:title) ? e.title : e.class.name.demodulize.titleize
       end
 
       def serialize_errors(&block)

data/lib/sinja/relationship_routes/has_many.rb

@@ -25,9 +25,8 @@ module Sinja
         app.get '', :qparams=>%i[include fields filter sort page], :actions=>:fetch do
           filter_sort_page?(:fetch)
           collection, opts = fetch
-          collection, links = filter_sort_page(collection)
-          (opts[:links] ||= {}).merge!(links)
-          serialize_models(collection, opts)
+          collection, pagination = filter_sort_page(collection)
+          serialize_models(collection, opts, pagination)
         end
 
         app.patch '', :nullif=>proc(&:empty?), :actions=>:clear do

data/lib/sinja/resource.rb

@@ -105,8 +105,7 @@ module Sinja
             end
           end
 
-          register RelationshipRoutes.const_get \
-            rel_type.to_s.split('_').map(&:capitalize).join.to_sym
+          register RelationshipRoutes.const_get(rel_type.to_s.camelize)
 
           instance_eval(&block) if block
         end

data/lib/sinja/resource_routes.rb

@@ -41,9 +41,8 @@ module Sinja
       app.get '', :qparams=>%i[include fields filter sort page], :actions=>:index do
         filter_sort_page?(:index)
         collection, opts = index
-        collection, links = filter_sort_page(collection)
-        (opts[:links] ||= {}).merge!(links)
-        serialize_models(collection, opts)
+        collection, pagination = filter_sort_page(collection)
+        serialize_models(collection, opts, pagination)
       end
 
       app.post '', :qparams=>:include, :actions=>:create do

data/lib/sinja/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sinja
-  VERSION = '1.1.0.pre3'
+  VERSION = '1.1.0.pre4'
 end

data/lib/sinja.rb

@@ -18,7 +18,7 @@ module Sinja
     ForbiddenError,
     NotFoundError,
     MethodNotAllowedError,
-    NotAcceptibleError,
+    NotAcceptableError,
     ConflictError,
     UnsupportedTypeError
   ].map! { |c| [c.new.http_status, c] }.to_h.tap do |h|
@@ -275,7 +275,7 @@ module Sinja
 
         collection = finalize(collection) if respond_to?(:finalize)
 
-        return collection, :pagination=>pagination
+        return collection, pagination
       end
 
       def halt(code, body=nil)
@@ -319,7 +319,7 @@ module Sinja
 
     app.before do
       unless sideloaded?
-        raise NotAcceptibleError unless request.preferred_type.entry == MIME_TYPE
+        raise NotAcceptableError unless request.preferred_type.entry == MIME_TYPE
         raise UnsupportedTypeError if content? && (
           request.media_type != MIME_TYPE || request.media_type_params.keys.any? { |k| k != 'charset' }
         )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinja
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre3
+  version: 1.1.0.pre4
 platform: ruby
 authors:
 - Mike Pastore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport