sinja-sequel 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb30aa642fe1f0894e0269a008db57334f870081
-  data.tar.gz: d1a3ede80eda81247c2040bf481317500f109961
+  metadata.gz: 32bb578a115bf6a9131d63b7cad0c4a88c4a39a8
+  data.tar.gz: f24e404c4e24ded1f117b044c6c2240fb7b5d27e
 SHA512:
-  metadata.gz: fd5663290dbeb54f64ff993eca18f42ba0f062c2662c9438f50f0f8853adfbf4055c20dc8c208a1e4b1d44228436deaac50e60155330b1ae210861bea37aa085
-  data.tar.gz: 9e3e3a475b167c0b8421b2945d8ff0abdb3ead59baed29c942bb0a78b9609cee3a6a143199931cc7c1eec39cca1d6a55f54a62189dcc2e13bdcb65dc4efc8003
+  metadata.gz: af4a7ad263d1a02a67f2c91f7775c5237e40b1d996043180226251968d1d7e57cfb64a01dc83befa535df9193c709fdc7a81a8322571fa39d6920944403ed730
+  data.tar.gz: 0bad99425681c3625a336c0c605246c008fe8c060894d24d291f863dbf00529c24ed36b5b41d11f55426029dc9626f6a505bc487945b8a8759cc0fbf8ffe145c

data/README.md

@@ -261,7 +261,8 @@ class MyApp < Sinatra::Base
 end
 ```
 
-**Note that registering the extension will automatically include Helpers!**
+**Note that registering the extension will automatically include Helpers and
+prepend Core!**
 
 After registering the extension, the `resource`, `has_many`, and `has_one` DSL
 keywords will generate basic action helpers.

data/lib/sinja/sequel.rb

@@ -9,20 +9,20 @@ module Sinja
     end
 
     def resource(res, try_convert=:to_i, **opts, &block)
+      klass = opts.fetch(:class) { res.to_s.classify.constantize }
+
       super(res, **opts) do
         register Resource
 
         helpers do
-          def dataset
+          define_method(:default_dataset) do
             klass.dataset
           end
 
-          def klass
-            class_for_type(data[:type])
-          end
+          alias_method :dataset, :default_dataset
 
           define_method(:find) do |id|
-            dataset.with_pk(id.send(try_convert))
+            dataset.with_pk(proc(&try_convert).(id))
           end
         end
 
@@ -37,10 +37,7 @@ module Sinja
         end
 
         create do |attr|
-          tmp = klass.new
-          tmp.set(attr)
-          tmp.save(:validate=>false)
-          next_pk tmp
+          next_pk klass.new(attr)
         end
 
         update do |attr|
@@ -65,12 +62,12 @@ module Sinja
 
           prune(:sideload_on=>:update) do
             resource.send("#{rel}=", nil)
-            resource.save_changes
+            resource.save_changes(:validate=>!sideloaded?)
           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].send(try_convert)))
+            resource.send("#{rel}=", klass.with_pk!(proc(&try_convert).(rio[:id])))
             resource.save_changes(:validate=>!sideloaded?)
           end
 

data/lib/sinja/sequel/core.rb

@@ -11,11 +11,22 @@ module Sinja
       extend Forwardable
 
       def self.prepended(base)
-        base.sinja do |c|
+        base.sinja.configure do |c|
           c.conflict_exceptions << ::Sequel::ConstraintViolation
           c.not_found_exceptions << ::Sequel::NoMatchingRow
           c.validation_exceptions << ::Sequel::ValidationFailed
           c.validation_formatter = proc do |e|
+            e.errors.keys.each do |column|
+              if assocs = e.model.class.autoreloading_associations[column]
+                # copy errors attached to a FK column to the relevant association
+                assocs.each do |assoc|
+                  e.errors[assoc] = e.errors[column]
+                end
+
+                e.errors.delete(column)
+              end
+            end
+
             typeof = e.model.class.associations
               .map { |k| [k, :relationships] }.to_h
               .tap { |h| h.default = :attributes }
@@ -42,17 +53,32 @@ module Sinja
 
       def_delegator :database, :transaction
 
-      define_method :filter, proc(&:where)
+      define_method :filter, &:where
 
       def sort(collection, fields)
         collection.order(*fields.map { |k, v| ::Sequel.send(v, k) })
       end
 
-      define_method :finalize, proc(&:all)
+      define_method :finalize, &:all
 
       def validate!
         raise ::Sequel::ValidationFailed, resource unless resource.valid?
       end
+
+      def after_create
+        resource.save(:validate=>false)
+        resource.pk
+      end
+
+      def serialize_linkage(*, **options)
+        options[:skip_collection_check] = true
+        super
+      end
+
+      def serialize_model(*, **options)
+        options[:skip_collection_check] = true
+        super
+      end
     end
   end
 end

data/lib/sinja/sequel/helpers.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'active_support/inflector'
-
 require 'sinja/sequel/core'
 
 module Sinja
@@ -10,11 +8,6 @@ module Sinja
         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
@@ -33,7 +26,7 @@ module Sinja
         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) }
+        new_ids = rios.map { |rio| proc(&try_convert).(rio[:id]) }
         transaction do
           resource.lock!
           old_ids = dataset.select_map(klass.primary_key)
@@ -81,7 +74,7 @@ module Sinja
         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) }
+        rios.map { |rio| proc(&try_convert).(rio[:id]) }
           .send(operator, dataset.select_map(klass.primary_key))
           .each { |id| yield klass.with_pk!(id) }
       end

data/lib/sinja/sequel/pagination.rb

@@ -3,7 +3,7 @@ module Sinja
   module Sequel
     module Pagination
       def self.prepended(base)
-        base.sinja { |c| c.page_using = {
+        base.sinja.configure { |c| c.page_using = {
           :number=>1,
           :size=>10,
           :record_count=>nil
@@ -15,10 +15,13 @@ module Sinja
       end
 
       def page(collection, opts)
-        collection = collection.dataset unless collection.respond_to?(:paginate)
+        return collection, {} unless collection.respond_to?(:paginate) ||
+          collection.respond_to?(:dataset) && (collection = collection.dataset).respond_to?(:paginate)
 
         opts = settings._sinja.page_using.merge(opts)
-        collection = collection.paginate opts[:number].to_i, opts[:size].to_i,
+        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

data/lib/sinja/sequel/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Sinja
   module Sequel
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 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.44'
+  spec.add_dependency 'sequel', '>= 4.49', '< 6'
   spec.add_dependency 'sinja', '~> 1.2'
 
   spec.add_development_dependency 'bundler', '~> 1.11'

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: sinja-sequel
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Mike Pastore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.49'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.44'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.49'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.44'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: sinja
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Sequel-specific Helpers and DSL for Sinja