sinja 1.2.0.pre2 → 1.2.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7194e1502968ad1c77f29a86eba2142a02e9fab0
-  data.tar.gz: d60c872b2a8b8d5555f18eb2a3064fd748ab4ec8
+  metadata.gz: 82d0d656750a406ce8ac8f8e3fc227dcd9123970
+  data.tar.gz: 87b665b88f0abc9097b935ed59a648d5fdbca4e7
 SHA512:
-  metadata.gz: a42b7e9f8c15e748145b731f9329c7bcce307fb4224ba1f33c2172faacb41fd75dcebe02374e9aa6101fef422f8d12bf09f1c32fdfb4b2a45239e97bd28643c1
-  data.tar.gz: ec35d6bd75b8b47b03ad9a6803407f03ca5c89593389962820de22c1a63de6c7ce7309b592264e8ac961ad552547658ff8723eeac22f8a0f1b8b628cd3c8a9da
+  metadata.gz: 14557eda5449b7249797c693497f7bf686c0dd4b040e78fdd77e868df6b3b21c794ca7709f4cd37a0cc40ace6edc2e26f424156a35b4227be9b9190873339b1d
+  data.tar.gz: d9a3e61434e0733425045e110a494bd25f4c57176ffb5ba6e374c8b45a883f1ea42704d77f3426ff73e5ae035ebcb2ed4e6830be6185e24151c47628e52dde83

data/Gemfile

@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
 
 gemspec
-gem 'sinja-sequel', :require=>false, :path=>'extensions/sequel'
-gem 'munson', '~> 0.3', :require=>false,
-  :git=>'https://github.com/mwpastore/munson', :branch=>'develop'
+
+gem 'munson', :require=>false,
+  :git=>'https://github.com/mwpastore/munson.git', :branch=>'develop'
+gem 'sinja-sequel', :require=>false,
+  :git=>'https://github.com/mwpastore/sinja-sequel.git', :branch=>'master'

data/README.md

@@ -362,8 +362,7 @@ welcome.
 
 Sinja extensions provide additional helpers, DSL, and configuration, packaging
 ORM-specific boilerplate as separate gems. At the moment, the only available
-extension is for [Sequel](/extensions/sequel), but community contributions are
-welcome!
+extension is for [Sequel][30], but community contributions are welcome!
 
 ### Comparison with JSONAPI::Resources
 
@@ -1032,8 +1031,7 @@ Could be used to build the following top-level links in the response document:
 You must also set the `page_using` configurable to a hash of symbols
 representing the paging fields used in your application (for example, `:number`
 and `:size` for the above example) along with their default values (or `nil`).
-Please see the [Sequel extension](/extensions/sequel) in this repository for a
-detailed, working example.
+Please see the [Sequel extension][30] for a detailed, working example.
 
 The easiest way to page a collection by default is to tweak the post-processed
 query parameter(s) in a `before_<action>` hook:
@@ -1574,3 +1572,4 @@ License](http://opensource.org/licenses/MIT).
 [27]: https://github.com/coryodaniel/munson
 [28]: https://github.com/chingor13/json_api_client
 [29]: https://github.com/brynary/rack-test
+[30]: https://github.com/mwpastore/sinja-sequel

data/demo-app/Dockerfile

@@ -13,7 +13,7 @@ RUN apk --no-cache add --virtual build-dependencies \
         ruby-dev \
         sqlite-dev \
     && cd /app \
-    && DOCKER_BUILD=true bundle install --jobs=4 \
+    && bundle install --jobs=4 \
     && apk del build-dependencies
 
 COPY . /app

data/demo-app/Gemfile

@@ -1,14 +1,10 @@
 source 'https://rubygems.org'
 
 gem 'json', '~> 2.0'
-gem 'sequel', '~> 4.41'
 gem 'sinatra', '>= 2.0.0.beta2', '< 3'
 gem 'sinatra-contrib', '>= 2.0.0.beta2', '< 3'
-unless ENV.key?('DOCKER_BUILD')
-  gem 'sinja', path: '..'
-  gem 'sinja-sequel', path: '../extensions/sequel'
-else
-  gem 'sinja'
-  gem 'sinja-sequel'
-end
+gem 'sinja',
+  git: 'https://github.com/mwpastore/sinja.git', branch: 'master'
+gem 'sinja-sequel',
+  git: 'https://github.com/mwpastore/sinja-sequel.git', branch: 'master'
 gem 'sqlite3', '~> 1.3'

data/demo-app/README.md

@@ -2,9 +2,10 @@
 
 This is the demo app for Sinja, provided both as an example of and for testing
 Sinja. It uses [Sequel ORM](http://sequel.jeremyevans.net) with an in-memory
-SQLite database and demonstrates the [Sequel extension](/extensions/sequel) for
-Sinja. It works under both MRI/YARV 2.3+ and JRuby 9.1+. It is a very
-simplistic blog-like application with [database
+SQLite database and demonstrates the [Sequel
+extension](https://github.com/mwpastore/sinja-sequel) for Sinja. It works under
+both MRI/YARV 2.3+ and JRuby 9.1+. It is a very simplistic blog-like
+application with [database
 tables](http://sequel.jeremyevans.net/rdoc/files/doc/schema_modification_rdoc.html),
 [models](http://sequel.jeremyevans.net/rdoc/files/README_rdoc.html#label-Sequel+Models),
 [serializers](https://github.com/fotinakis/jsonapi-serializers), and

data/demo-app/app.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 require 'sinatra'
 require 'sinatra/jsonapi'
+
+# Load the Sequel helpers without registering the extension.
 require 'sinja/sequel/helpers'
 
 require_relative 'classes/author'

data/lib/sinja/version.rb

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

data/sinja.gemspec

@@ -31,9 +31,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'jdbc-sqlite3', '~> 3.8' if defined?(JRUBY_VERSION)
   spec.add_development_dependency 'minitest', '~> 5.9'
   spec.add_development_dependency 'minitest-hooks', '~> 1.4'
-  #spec.add_development_dependency 'munson', '~> 0.4'
+  #spec.add_development_dependency 'munson', '~> 0.4' # in Gemfile
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'sequel', '~> 4.41'
-  spec.add_development_dependency 'sinja-sequel', '~> 0.1'
+  #spec.add_development_dependency 'sinja-sequel', '~> 0.1' # in Gemfile
   spec.add_development_dependency 'sqlite3', '~> 1.3' if !defined?(JRUBY_VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinja
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre2
+  version: 1.2.0.pre3
 platform: ruby
 authors:
 - Mike Pastore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -194,20 +194,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.41'
-- !ruby/object:Gem::Dependency
-  name: sinja-sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -250,20 +236,6 @@ files:
 - demo-app/classes/post.rb
 - demo-app/classes/tag.rb
 - demo-app/database.rb
-- extensions/sequel/Gemfile
-- extensions/sequel/LICENSE.txt
-- extensions/sequel/README.md
-- extensions/sequel/Rakefile
-- extensions/sequel/bin/console
-- extensions/sequel/bin/setup
-- extensions/sequel/lib/sinatra/jsonapi/sequel.rb
-- extensions/sequel/lib/sinja-sequel.rb
-- extensions/sequel/lib/sinja/sequel.rb
-- extensions/sequel/lib/sinja/sequel/core.rb
-- extensions/sequel/lib/sinja/sequel/helpers.rb
-- extensions/sequel/lib/sinja/sequel/version.rb
-- extensions/sequel/sinja-sequel.gemspec
-- extensions/sequel/test/test_helper.rb
 - lib/sinatra/jsonapi.rb
 - lib/sinja.rb
 - lib/sinja/config.rb

data/extensions/sequel/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-gem 'sinja', :require=>false, :path=>'../..'

data/extensions/sequel/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Mike Pastore
-
-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/extensions/sequel/README.md

@@ -1,274 +0,0 @@
-# Sinja::Sequel
-
-<!--
-  Title: Sinja::Sequel
-  Description: Sequel-specific Helpers and DSL for Sinja
-  Author: Mike Pastore
-  Keywords: Ruby, Sinatra, Sinatra::JSONAPI, Sinja, Sequel
-  -->
-
-[![Gem Version](https://badge.fury.io/rb/sinja-sequel.svg)](https://badge.fury.io/rb/sinja-sequel)
-
-Sinja::Sequel configures your [Sinja][1] application to work with [Sequel][2]
-out of the box, and provides additional helpers to greatly simplify the process
-of writing the more complex action helpers (specifically `replace`, `merge`,
-and `subtract`). An optional extension enhances Sinja's DSL to generate basic
-action helpers that can be overridden, customized, or removed.
-
-The core configuration and helpers are in pretty good shape (Sinja uses them in
-its [demo app][3] and test suite), but the extension could use some fleshing
-out. Testers and community contributions welcome!
-
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-
-
-- [Installation](#installation)
-- [Usage](#usage)
-  - [Core](#core)
-  - [Helpers](#helpers)
-    - [`next_pk`](#next_pk)
-    - [`add_missing`](#add_missing)
-    - [`remove_present`](#remove_present)
-    - [`add_remove`](#add_remove)
-  - [Extension](#extension)
-- [Development](#development)
-- [Contributing](#contributing)
-- [License](#license)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'sinja-sequel'
-```
-
-And then execute:
-
-```sh
-$ bundle
-```
-
-Or install it yourself as:
-
-```sh
-$ gem install sinja-sequel
-```
-
-## Usage
-
-Always return Sequel datasets (instead of arrays of objects) from your `index`
-(e.g. `Foo.dataset`) and `fetch` (e.g.  `resource.bars_dataset`) action
-helpers. The `finalize` helper, described below, will ensure they are
-"rasterized" before being passed to [JSONAPI::Serializers][5].
-
-You'll want to enable Sequel's `:tactical_eager_loading` plugin for the best
-performance with JSONAPI::Serializers. I've [seen][6] it reduce complex
-serializations by a factor of 100 (i.e. quite literally one query instead of
-100).
-
-If you want to use client-generated IDs, enable the `:update_primary_key`
-plugin on the model and call `unrestrict_primary_key` in the model definition
-to allow mass assignment (e.g. with `Sequel::Model#set_fields`).
-
-If your model has foreign keys and you want to enforce a non-nullable
-constraint at the application level, consider enabling the
-`:validation_helpers` plugin on the model and using `validates_not_null` in
-conjuction with the `validate!` helper described below:
-
-```ruby
-class Bar < Sequel::Model
-  plugin :validation_helpers
-
-  def validate
-    super
-    validates_not_null :foo
-  end
-end
-```
-
-See "Avoding Null Foreign Keys" in the [Sinja][1] documentation for more
-information.
-
-Finally, enable the `:pagination` extension on your connection (before
-prepending Core) to enable pagination!
-
-### Core
-
-Prepend [Sinja::Sequel::Core](/extensions/sequel/lib/sinja/sequel/core.rb)
-after registering Sinja:
-
-```ruby
-require 'sinja'
-require 'sinja/sequel/core'
-
-class MyApp < Sinatra::Base
-  register Sinja
-
-  helpers do
-    prepend Sinja::Sequel::Core
-  end
-end
-```
-
-Note that you must use `prepend` (instead of including Sinja::Sequel::Core like
-a normal module of Sinatra helpers) in order to ensure that the included
-methods take precedence over Sinja's method stubs (e.g. `transaction`).
-[This][4] will hopefully be fixed in a future version of Sinatra.
-
-Prepending Core does the following to your application:
-
-* Configures `conflict_`, `not_found_`, and `validation_exceptions`, and
-  `validation_formatter`.
-* Defines a `database` helper that delegates to `Sequel::Model.db`.
-* Defines a `transaction` helper that delegates to `database.transaction`.
-* Defines a `validate!` helper that raises an error if `resource` is invalid
-  after a `create` or `update` action helper invocation.
-* Defines a simple equality-based `filter` helper that passes the filter params
-  to `Sequel::Dataset#where`.
-* Defines a `sort` helper that applies `Sequel.asc` and `Sequel.desc` to the
-  sort terms and passes them to `Sequel::Dataset#order`.
-* Defines a `finalize` helper that simply calls `Sequel::Dataset#all`.
-
-If the `:pagination` Sequel extension is loaded, it also does the following:
-
-* Configures `page_using` for page number- and size-based pagination, with an
-  additional record count parameter to avoid repetitive `SELECT COUNT` queries
-  while paging.
-* Defines a `page` helper that calls `Sequel::Dataset#paginate` and computes a
-  hash of page params that Sinja will use to construct the root pagination
-  links and add to the root metadata of the response.
-
-You may override any of the installed helpers by defining your own. Please see
-the [Sinja][1] documentation for more information about Sinja hooks and
-configurables, and the [Sequel][2] documentation for more information about
-Sequel plugins and features.
-
-### Helpers
-
-Include
-[Sinja::Sequel::Helpers](/extensions/sequel/lib/sinja/sequel/helpers.rb) after
-registering Sinja:
-
-```ruby
-require 'sinja'
-require 'sinja/sequel/helpers'
-
-class MyApp < Sinatra::Base
-  register Sinja
-
-  helpers Sinja::Sequel::Helpers
-end
-```
-
-This is the most common use-case. **Note that including Helpers will
-automatically prepend Core!**
-
-#### `next_pk`
-
-A convenience method to always return the primary key of the resource and the
-resource from your `create` action helpers. Simply use it instead of `next`!
-
-```ruby
-create do |attr|
-  next_pk Foo.create(attr)
-end
-```
-
-#### `add_missing`
-
-Take the key of a Sequel \*_to_many association and an array of resource
-identifier objects and add the "missing" records to the collection. Makes
-writing your `merge` action helpers a breeze!
-
-```ruby
-has_many :bars do
-  merge do |rios|
-    add_missing(:bars, rios)
-  end
-end
-```
-
-It will try to cast the ID of each resource identifier object by sending it the
-`:to_i` method; pass in a third argument to specify a different method (e.g. if
-the primary key of the `bars` table is a `varchar`, pass in `:to_s` instead).
-
-This helper also takes an optional block that can be used to filter
-subresources during processing. Simply return a truthy or falsey value from the
-block (or raise an error to abort the entire transaction):
-
-```ruby
-has_many :bars do
-  merge do |rios|
-    add_missing(:bars, rios) do |bar|
-      role?(:admin) || bar.owner == resource.owner
-    end
-  end
-end
-```
-
-#### `remove_present`
-
-Like `add_missing`, but removes the "present" records from the collection.
-Makes writing your `subtract` action helpers a breeze!
-
-#### `add_remove`
-
-Like `add_missing` and `remove_present`, but performs an efficient delta
-operation on the collection. Makes writing your `replace` action helpers a
-breeze!
-
-### Extension
-
-Register [Sinja::Sequel](/extensions/sequel/lib/sinja/sequel.rb) after
-registering Sinja:
-
-```ruby
-require 'sinja'
-require 'sinja/sequel'
-
-class MyApp < Sinatra::Base
-  register Sinja
-  register Sinja::Sequel
-end
-```
-
-**Note that registering the extension will automatically include Helpers!**
-
-After registering the extension, the `resource`, `has_many`, and `has_one` DSL
-keywords will generate basic action helpers. The default `create` action helper
-does not support client-generated IDs. These action helpers can be subsequently
-overridden, customized by setting action helper options (i.e. `:roles`) and/or
-defining `before_<action>` hooks, or removed entirely with `remove_<action>`.
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run
-`rake spec` to run the tests. You can also run `bin/console` for an interactive
-prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To
-release a new version, update the version number in `version.rb`, and then run
-`bundle exec rake release`, which will create a git tag for the version, push
-git commits and tags, and push the `.gem` file to
-[rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at
-https://github.com/mwpastore/sinja.
-
-## License
-
-The gem is available as open source under the terms of the [MIT
-License](http://opensource.org/licenses/MIT).
-
-[1]: https://github.com/mwpastore/sinja
-[2]: http://sequel.jeremyevans.net
-[3]: https://github.com/mwpastore/sinja/tree/master/demo-app
-[4]: https://github.com/sinatra/sinatra/issues/1213
-[5]: https://github.com/fotinakis/jsonapi-serializers
-[6]: https://github.com/fotinakis/jsonapi-serializers/pull/31#issuecomment-148193366

data/extensions/sequel/Rakefile

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-
-Rake::TestTask.new do |t|
-  t.test_files = FileList[File.expand_path('test/**/*_test.rb', __dir__)]
-  t.warning = false
-end
-
-task default: :test

data/extensions/sequel/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'sinja-sequel'
-
-# 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

data/extensions/sequel/bin/setup

@@ -1,8 +0,0 @@
-#!/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/extensions/sequel/lib/sinatra/jsonapi/sequel.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-require 'sinja/sequel'
-require 'sinatra/jsonapi'
-
-module Sinatra
-  register JSONAPI::Sequel
-end

data/extensions/sequel/lib/sinja-sequel.rb

@@ -1,2 +0,0 @@
-# frozen_string_literal: true
-require 'sinja/sequel'

data/extensions/sequel/lib/sinja/sequel.rb

@@ -1,110 +0,0 @@
-# frozen_string_literal: true
-require 'sinja/sequel/helpers'
-require 'sinja/sequel/version'
-
-module Sinja
-  module Sequel
-    def self.registered(app)
-      app.helpers Helpers
-    end
-
-    def resource(res, try_convert=:to_i, &block)
-      klass = res.to_s.classify.constantize
-
-      super(res) do
-        register Resource
-
-        helpers do
-          def find(id)
-            klass[id.send(try_convert)]
-          end
-        end
-
-        show
-
-        show_many do |ids|
-          klass.where(klass.primary_key=>ids.map(&try_convert)).all
-        end
-
-        index do
-          klass.dataset
-        end
-
-        create do |attr|
-          tmp = klass.new
-          if respond_to?(:settable_fields)
-            tmp.set_fields(attr, settable_fields)
-          else
-            tmp.set(attr)
-          end
-          tmp.save(:validate=>false)
-          next_pk tmp
-        end
-
-        update do |attr|
-          if respond_to?(:settable_fields)
-            resource.update_fields(attr, settable_fields, :validate=>false, :missing=>:skip)
-          else
-            resource.set(attr)
-            resource.save_changes(:validate=>false)
-          end
-        end
-
-        destroy do
-          resource.destroy
-        end
-
-        instance_eval(&block) if block
-      end
-    end
-
-    module Resource
-      def has_one(rel, &block)
-        super(rel) do
-          pluck do
-            resource.send(rel)
-          end
-
-          prune(:sideload_on=>:update) do
-            resource.send("#{rel}=", nil)
-            resource.save_changes
-          end
-
-          graft(:sideload_on=>%i[create update]) do |rio|
-            klass = resource.class.association_reflection(rel).associated_class
-            resource.send("#{rel}=", klass.with_pk!(rio[:id]))
-            resource.save_changes(:validate=>!sideloaded?)
-          end
-
-          instance_eval(&block) if block
-        end
-      end
-
-      def has_many(rel, &block)
-        super(rel) do
-          fetch do
-            resource.send("#{rel}_dataset")
-          end
-
-          clear(:sideload_on=>:update) do
-            resource.send("remove_all_#{rel}")
-          end
-
-          replace(:sideload_on=>:update) do |rios|
-            add_remove(rel, rios)
-          end
-
-          merge(:sideload_on=>:create) do |rios|
-            add_missing(rel, rios)
-          end
-
-          subtract do |rios|
-            remove_present(rel, rios)
-          end
-
-          instance_eval(&block) if block
-        end
-      end
-    end
-  end
-end

data/extensions/sequel/lib/sinja/sequel/core.rb

@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-require 'forwardable'
-require 'sequel'
-
-module Sinja
-  module Sequel
-    module Core
-      extend Forwardable
-
-      def self.prepended(base)
-        base.sinja do |c|
-          c.conflict_exceptions << ::Sequel::ConstraintViolation
-          c.not_found_exceptions << ::Sequel::NoMatchingRow
-          c.validation_exceptions << ::Sequel::ValidationFailed
-          c.validation_formatter = ->(e) { e.errors.keys.zip(e.errors.full_messages) }
-        end
-
-        base.include Pagination if ::Sequel::Database::EXTENSIONS.key?(:pagination)
-      end
-
-      def_delegator ::Sequel::Model, :db, :database
-
-      def_delegator :database, :transaction
-
-      define_method :filter, proc(&:where)
-
-      def sort(collection, fields)
-        collection.order(*fields.map { |k, v| ::Sequel.send(v, k) })
-      end
-
-      define_method :finalize, proc(&:all)
-
-      def validate!
-        raise ::Sequel::ValidationFailed, resource unless resource.valid?
-      end
-    end
-
-    module Pagination
-      def self.included(base)
-        base.sinja { |c| c.page_using = {
-          :number=>1,
-          :size=>10,
-          :record_count=>nil
-        }}
-      end
-
-      def page(collection, opts)
-        collection = collection.dataset unless collection.respond_to?(:paginate)
-
-        opts = settings._sinja.page_using.merge(opts)
-        collection = collection.paginate opts[:number].to_i, opts[:size].to_i,
-          (opts[:record_count].to_i if opts[:record_count])
-
-        # Attributes common to all pagination links
-        base = {
-          :size=>collection.page_size,
-          :record_count=>collection.pagination_record_count
-        }
-
-        pagination = {
-          :first=>base.merge(:number=>1),
-          :self=>base.merge(:number=>collection.current_page),
-          :last=>base.merge(:number=>collection.page_count)
-        }
-        pagination[:next] = base.merge(:number=>collection.next_page) if collection.next_page
-        pagination[:prev] = base.merge(:number=>collection.prev_page) if collection.prev_page
-
-        return collection, pagination
-      end
-    end
-  end
-end

data/extensions/sequel/lib/sinja/sequel/helpers.rb

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-require 'sinja/sequel/core'
-
-module Sinja
-  module Sequel
-    module Helpers
-      def self.included(base)
-        base.prepend Core
-      end
-
-      def next_pk(resource, opts={})
-        [resource.pk, resource, opts]
-      end
-
-      def add_remove(association, rios, try_convert=:to_i)
-        meth_suffix = association.to_s.singularize
-        add_meth = "add_#{meth_suffix}".to_sym
-        remove_meth = "remove_#{meth_suffix}".to_sym
-
-        dataset = resource.send("#{association}_dataset")
-        klass = dataset.association_reflection.associated_class
-
-        # does not / will not work with composite primary keys
-        new_ids = rios.map { |rio| rio[:id].send(try_convert) }
-        transaction do
-          resource.lock!
-          old_ids = dataset.select_map(klass.primary_key)
-          in_common = old_ids & new_ids
-
-          (new_ids - in_common).each do |id|
-            subresource = klass.with_pk!(id)
-            resource.send(add_meth, subresource) \
-              unless block_given? && !yield(subresource)
-          end
-
-          (old_ids - in_common).each do |id|
-            subresource = klass.with_pk!(id)
-            resource.send(remove_meth, subresource) \
-              unless block_given? && !yield(subresource)
-          end
-
-          resource.reload
-        end
-      end
-
-      def add_missing(*args, &block)
-        add_or_remove(:add, :-, *args, &block)
-      end
-
-      def remove_present(*args, &block)
-        add_or_remove(:remove, :&, *args, &block)
-      end
-
-      private
-
-      def add_or_remove(meth_prefix, operator, association, rios, try_convert=:to_i)
-        meth = "#{meth_prefix}_#{association.to_s.singularize}".to_sym
-        transaction do
-          resource.lock!
-          venn(operator, association, rios, try_convert) do |subresource|
-            resource.send(meth, subresource) \
-              unless block_given? && !yield(subresource)
-          end
-          resource.reload
-        end
-      end
-
-      def venn(operator, association, rios, try_convert)
-        dataset = resource.send("#{association}_dataset")
-        klass = dataset.association_reflection.associated_class
-        # does not / will not work with composite primary keys
-        rios.map { |rio| rio[:id].send(try_convert) }
-          .send(operator, dataset.select_map(klass.primary_key))
-          .each { |id| yield klass.with_pk!(id) }
-      end
-    end
-  end
-end

data/extensions/sequel/lib/sinja/sequel/version.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-module Sinja
-  module Sequel
-    VERSION = '0.1.0'
-  end
-end

data/extensions/sequel/sinja-sequel.gemspec

@@ -1,29 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sinja/sequel/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'sinja-sequel'
-  spec.version       = Sinja::Sequel::VERSION
-  spec.authors       = ['Mike Pastore']
-  spec.email         = ['mike@oobak.org']
-
-  spec.summary       = 'Sequel-specific Helpers and DSL for Sinja'
-  spec.homepage      = 'https://github.com/mwpastore/sinja/tree/master/extensions/sequel'
-  spec.license       = 'MIT'
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.require_paths = %w[lib]
-
-  spec.required_ruby_version = '>= 2.3.0'
-
-  spec.add_dependency 'sequel', '~> 4.0'
-  spec.add_dependency 'sinja', '>= 1.2.0.pre2', '< 2'
-
-  spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'minitest', '~> 5.9'
-  spec.add_development_dependency 'rake', '~> 12.0'
-end

data/extensions/sequel/test/test_helper.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-require 'bundler/setup'
-require 'minitest/autorun'