sinja-sequel 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f6130a46d4d434db90681a9182e327c13550d42
-  data.tar.gz: 0a23d5b4651bde8259570ab7672f65b57b885cf2
+  metadata.gz: cb30aa642fe1f0894e0269a008db57334f870081
+  data.tar.gz: d1a3ede80eda81247c2040bf481317500f109961
 SHA512:
-  metadata.gz: f4c434c45f126785e659ecb82acbd1c6a47a83abb5bbc0ae9feaf169dbc58a28831c071106872cfabefeb366f5527fb6123831705d76ced489ab772dda2c903f
-  data.tar.gz: 04e1802c3e8370ebe8793bf3db3fcaf756e326a8dad52542f0b4481e5fa6f405203fd24b3b8f04826aad07dba575cecb698c743ed4050f0a2abe7b7ddfbb5b84
+  metadata.gz: fd5663290dbeb54f64ff993eca18f42ba0f062c2662c9438f50f0f8853adfbf4055c20dc8c208a1e4b1d44228436deaac50e60155330b1ae210861bea37aa085
+  data.tar.gz: 9e3e3a475b167c0b8421b2945d8ff0abdb3ead59baed29c942bb0a78b9609cee3a6a143199931cc7c1eec39cca1d6a55f54a62189dcc2e13bdcb65dc4efc8003

data/README.md

@@ -238,6 +238,10 @@ Like `add_missing` and `remove_present`, but performs an efficient delta
 operation on the collection. Makes writing your `replace` action helpers a
 breeze!
 
+An optional block passed to this method will be used to filter both adds and
+removes. To use different filters for the two operations, pass a hash of
+callables (with keys `:add` and/or `:remove`).
+
 ### Extension
 
 Register [Sinja::Sequel](/lib/sinja/sequel.rb) after
@@ -262,12 +266,9 @@ end
 After registering the extension, the `resource`, `has_many`, and `has_one` DSL
 keywords will generate basic action helpers.
 
-* `resource` and `has_many` take an optional second argument that specifies the
-  method to use to cast the ID of the resource or each resource identifier
-  object (`:to_i` by default).
-
-* Optionally define a `settable_fields` helper in each resource that returns an
-  array of symbols to pass to `Sequel::Model#set_fields`.
+* `resource` and `has_many`, and `has_one` take an optional second argument
+  that specifies the method to use to cast the ID of the resource or resource
+  identifier object(s) (`:to_i` by default).
 
 * The generated action helpers will be unrestricted by default.
 
@@ -319,6 +320,10 @@ DB = Sequel.connect ENV['DB_URL']
 OTHER_DB = Sequel.connect ENV['OTHER_DB_URL']
 OTHER_DB.extension :pagination
 
+# Sequel::Model.db now points to DB, which does not support pagination, so
+# pagination will not be automatically enabled. We'll point Sinja::Sequel at
+# OTHER_DB instead, and manually enable pagination...
+
 class MyApp < Sinatra::Base
   register Sinja
   register Sinja::Sequel

data/lib/sinja/sequel/core.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require 'forwardable'
-require 'set'
 
 require 'sequel'
 
@@ -17,13 +16,22 @@ module Sinja
           c.not_found_exceptions << ::Sequel::NoMatchingRow
           c.validation_exceptions << ::Sequel::ValidationFailed
           c.validation_formatter = proc do |e|
-            lookup = e.model.class.associations.to_set
-            e.errors.keys.zip(e.errors.full_messages)
-              .map { |a| a << :relationships if lookup.include?(a.first) }
+            typeof = e.model.class.associations
+              .map { |k| [k, :relationships] }.to_h
+              .tap { |h| h.default = :attributes }
+
+            e.errors.flat_map do |ee|
+              next [[nil, ee]] if ee.is_a?(::Sequel::LiteralString)
+
+              key, messages = *ee
+              Array(messages).map do |message|
+                [key, "#{key} #{message}", typeof[key]]
+              end
+            end
           end
         end
 
-        base.prepend Pagination if ::Sequel::Model.db.dataset.respond_to?(:paginate)
+        base.prepend(Pagination) if ::Sequel::Model.db.dataset.respond_to?(:paginate)
       end
 
       def self.included(_)

data/lib/sinja/sequel/helpers.rb

@@ -1,22 +1,34 @@
 # frozen_string_literal: true
+require 'active_support/inflector'
+
 require 'sinja/sequel/core'
 
 module Sinja
   module Sequel
     module Helpers
       def self.included(base)
-        base.prepend Core
+        base.prepend(Core)
+      end
+
+      def class_for_type(type)
+        @klass ||= {}
+        @klass[type] ||= type.underscore.classify.constantize
       end
 
       def next_pk(resource, opts={})
         [resource.pk, resource, opts]
       end
 
-      def add_remove(association, rios, try_convert=:to_i)
+      def add_remove(association, rios, try_convert=:to_i, **filters, &block)
         meth_suffix = association.to_s.singularize
         add_meth = "add_#{meth_suffix}".to_sym
         remove_meth = "remove_#{meth_suffix}".to_sym
 
+        if block
+          filters[:add] ||= block
+          filters[:remove] ||= block
+        end
+
         dataset = resource.send("#{association}_dataset")
         klass = dataset.association_reflection.associated_class
 
@@ -29,14 +41,14 @@ module Sinja
 
           (new_ids - ids_in_common).each do |id|
             subresource = klass.with_pk!(id)
-            resource.send(add_meth, subresource) \
-              unless block_given? && !yield(subresource)
+            next if filters[:add] && !filters[:add].(subresource)
+            resource.send(add_meth, subresource)
           end
 
           (old_ids - ids_in_common).each do |id|
             subresource = klass.with_pk!(id)
-            resource.send(remove_meth, subresource) \
-              unless block_given? && !yield(subresource)
+            next if filters[:remove] && !filters[:remove].(subresource)
+            resource.send(remove_meth, subresource)
           end
 
           resource.reload
@@ -58,8 +70,8 @@ module Sinja
         transaction do
           resource.lock!
           venn(operator, association, rios, try_convert) do |subresource|
-            resource.send(meth, subresource) \
-              unless block_given? && !yield(subresource)
+            next if block_given? && !yield(subresource)
+            resource.send(meth, subresource)
           end
           resource.reload
         end

data/lib/sinja/sequel/version.rb

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

data/lib/sinja/sequel.rb

@@ -8,26 +8,28 @@ module Sinja
       app.helpers Helpers
     end
 
-    def resource(res, try_convert=:to_i, &block)
-      klass = res.to_s.classify.constantize
-
-      super(res) do
+    def resource(res, try_convert=:to_i, **opts, &block)
+      super(res, **opts) do
         register Resource
 
         helpers do
-          define_method(:dataset) do
+          def dataset
             klass.dataset
           end
 
+          def klass
+            class_for_type(data[:type])
+          end
+
           define_method(:find) do |id|
-            dataset[id.send(try_convert)]
+            dataset.with_pk(id.send(try_convert))
           end
         end
 
         show
 
         show_many do |ids|
-          dataset.where(klass.primary_key=>ids.map!(&try_convert)).all
+          dataset.where_all(klass.primary_key=>ids.map!(&try_convert))
         end
 
         index do
@@ -36,22 +38,14 @@ module Sinja
 
         create do |attr|
           tmp = klass.new
-          if respond_to?(:settable_fields)
-            tmp.set_fields(attr, settable_fields)
-          else
-            tmp.set(attr)
-          end
+          tmp.set(attr)
           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
+          resource.set(attr)
+          resource.save_changes(:validate=>false)
         end
 
         destroy do
@@ -63,7 +57,7 @@ module Sinja
     end
 
     module Resource
-      def has_one(rel, &block)
+      def has_one(rel, try_convert=:to_i, &block)
         super(rel) do
           pluck do
             resource.send(rel)
@@ -76,7 +70,7 @@ module Sinja
 
           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.send("#{rel}=", klass.with_pk!(rio[:id].send(try_convert)))
             resource.save_changes(:validate=>!sideloaded?)
           end
 

data/sinja-sequel.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_dependency 'sequel', '~> 4.0'
+  spec.add_dependency 'sequel', '~> 4.44'
   spec.add_dependency 'sinja', '~> 1.2'
 
   spec.add_development_dependency 'bundler', '~> 1.11'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinja-sequel
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Mike Pastore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.44'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.44'
 - !ruby/object:Gem::Dependency
   name: sinja
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Sequel-specific Helpers and DSL for Sinja