sinja 1.1.0.pre4 → 1.2.0.pre2

data/lib/sinja/config.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'forwardable'
 require 'set'
+
 require 'sinatra/base'
 
 require 'sinja/resource'
@@ -63,15 +64,15 @@ module Sinja
         :fields=>{}, # passthru to JAS
         :filter=>{},
         :page=>{},
-        :sort=>{}
+        :sort=>[]
       }
 
       @error_logger = ->(h) { logger.error('sinja') { h } }
 
       @default_roles = {
         :resource=>RolesConfig.new(%i[show show_many index create update destroy]),
-        :has_many=>RolesConfig.new(%i[fetch merge subtract clear]),
-        :has_one=>RolesConfig.new(%i[pluck graft prune])
+        :has_many=>RolesConfig.new(%i[fetch clear replace merge subtract]),
+        :has_one=>RolesConfig.new(%i[pluck prune graft])
       }
 
       action_proc = proc { |type, hash, action| hash[action] = {

data/lib/sinja/helpers/serializers.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+require 'set'
+
 require 'active_support/inflector'
 require 'json'
 require 'jsonapi-serializers'
-require 'set'
 
 module Sinja
   module Helpers

data/lib/sinja/relationship_routes/has_many.rb

@@ -5,6 +5,7 @@ module Sinja
       def self.registered(app)
         app.def_action_helper(app, :fetch, %i[roles filter_by sort_by])
         app.def_action_helper(app, :clear, %i[roles sideload_on])
+        app.def_action_helper(app, :replace, %i[roles sideload_on])
         app.def_action_helper(app, :merge, %i[roles sideload_on])
         app.def_action_helper(app, :subtract, :roles)
 
@@ -12,7 +13,7 @@ module Sinja
           unless relationship_link?
             allow :get=>:fetch
           else
-            allow :get=>:show, :patch=>[:clear, :merge], :post=>:merge, :delete=>:subtract
+            allow :get=>:show, :patch=>[:clear, :replace], :post=>:merge, :delete=>:subtract
           end
         end
 
@@ -23,9 +24,9 @@ module Sinja
         end
 
         app.get '', :qparams=>%i[include fields filter sort page], :actions=>:fetch do
-          filter_sort_page?(:fetch)
+          fsp_opts = filter_sort_page?(:fetch)
           collection, opts = fetch
-          collection, pagination = filter_sort_page(collection)
+          collection, pagination = filter_sort_page(collection, fsp_opts)
           serialize_models(collection, opts, pagination)
         end
 
@@ -33,17 +34,15 @@ module Sinja
           serialize_linkages?(*clear)
         end
 
-        app.patch '', :actions=>%i[clear merge] do
-          clear_updated, clear_opts = clear
-          merge_updated, merge_opts = merge(data)
-          serialize_linkages?(clear_updated||merge_updated, clear_opts.merge(merge_opts)) # TODO: DWIM?
+        app.patch '', :actions=>:replace do
+          serialize_linkages?(*replace(data))
         end
 
-        app.post '', :actions=>%i[merge] do
+        app.post '', :actions=>:merge do
           serialize_linkages?(*merge(data))
         end
 
-        app.delete '', :actions=>%i[subtract] do
+        app.delete '', :actions=>:subtract do
           serialize_linkages?(*subtract(data))
         end
       end

data/lib/sinja/relationship_routes/has_one.rb

@@ -4,7 +4,7 @@ module Sinja
     module HasOne
       def self.registered(app)
         app.def_action_helper(app, :pluck, :roles)
-        app.def_action_helper(app, :prune, :roles)
+        app.def_action_helper(app, :prune, %i[roles sideload_on])
         app.def_action_helper(app, :graft, %i[roles sideload_on])
 
         app.head '' do

data/lib/sinja/resource.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
-require 'active_support/inflector'
 require 'set'
+
+require 'active_support/inflector'
 require 'sinatra/base'
 require 'sinatra/namespace'
 

data/lib/sinja/resource_routes.rb

@@ -39,9 +39,9 @@ module Sinja
       end
 
       app.get '', :qparams=>%i[include fields filter sort page], :actions=>:index do
-        filter_sort_page?(:index)
+        fsp_opts = filter_sort_page?(:index)
         collection, opts = index
-        collection, pagination = filter_sort_page(collection)
+        collection, pagination = filter_sort_page(collection, fsp_opts)
         serialize_models(collection, opts, pagination)
       end
 

data/lib/sinja/version.rb

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

data/sinja.gemspec

@@ -28,14 +28,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sinatra-contrib', ">= #{ENV.fetch('sinatra', '1.4.7')}", '< 3'
 
   spec.add_development_dependency 'bundler', '~> 1.11'
+  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 'rake', '~> 11.3'
-  spec.add_development_dependency 'sequel', '~> 4.38'
-  if defined?(JRUBY_VERSION)
-    spec.add_development_dependency 'jdbc-sqlite3', '~> 3.8'
-  else
-    spec.add_development_dependency 'sqlite3', '~> 1.3'
-  end
+  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 '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.1.0.pre4
+  version: 1.2.0.pre2
 platform: ruby
 authors:
 - Mike Pastore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -172,28 +172,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.38'
+        version: '4.41'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.38'
+        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
@@ -216,7 +230,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -224,24 +237,39 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- demo-app/.dockerignore
+- demo-app/Dockerfile
 - demo-app/Gemfile
 - demo-app/README.md
+- demo-app/Rakefile
 - demo-app/app.rb
-- demo-app/base.rb
 - demo-app/boot.rb
 - demo-app/classes/author.rb
+- demo-app/classes/base.rb
 - demo-app/classes/comment.rb
 - 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
 - lib/sinja/errors.rb
-- lib/sinja/extensions/sequel.rb
 - lib/sinja/helpers/nested.rb
 - lib/sinja/helpers/relationships.rb
-- lib/sinja/helpers/sequel.rb
 - lib/sinja/helpers/serializers.rb
 - lib/sinja/method_override.rb
 - lib/sinja/relationship_routes/has_many.rb
@@ -270,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: RESTful, {json:api}-compliant web services in Sinatra

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/lib/sinja/extensions/sequel.rb

@@ -1,53 +0,0 @@
-# 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(validate: !sideloaded?)
-        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/sinja/helpers/sequel.rb

@@ -1,101 +0,0 @@
-# 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
-        c.not_found_exceptions << ::Sequel::NoMatchingRow
-        c.validation_exceptions << ::Sequel::ValidationFailed
-        c.validation_formatter = ->(e) { e.errors.keys.zip(e.errors.full_messages) }
-
-        c.page_using = {
-          :number=>1,
-          :size=>10,
-          :record_count=>nil
-        } if ::Sequel::Database::EXTENSIONS.key?(:pagination)
-      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) })
-      end
-
-      def page(collection, opts)
-        opts = settings._sinja.page_using.merge(opts)
-        collection = collection.dataset \
-          unless collection.respond_to?(:paginate)
-        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 if ::Sequel::Database::EXTENSIONS.key?(:pagination)
-
-      define_method :filter, proc(&:where)
-      define_method :finalize, proc(&:all)
-
-      def validate!
-        raise ::Sequel::ValidationFailed, resource unless resource.valid?
-      end
-
-      def next_pk(resource, **opts)
-        [resource.pk, resource, opts]
-      end
-
-      # <= association, rios, block
-      def add_missing(*args, &block)
-        add_remove(:add, :-, *args, &block)
-      end
-
-      # <= association, rios, block
-      def remove_present(*args, &block)
-        add_remove(:remove, :&, *args, &block)
-      end
-
-      private
-
-      def add_remove(meth_prefix, operator, association, rios)
-        meth = "#{meth_prefix}_#{singularize(association)}".to_sym
-        transaction do
-          resource.lock!
-          venn(operator, association, rios) do |subresource|
-            resource.send(meth, subresource) \
-              unless block_given? && !yield(subresource)
-          end
-          resource.reload
-        end
-      end
-
-      def venn(operator, association, rios)
-        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].to_i }
-          .send(operator, dataset.select_map(:id))
-          .each { |id| yield klass.with_pk!(id) }
-      end
-    end
-  end
-end