sinja-sequel 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f7b795742fcfdbe13930f92bd6946f3de0d89ed
-  data.tar.gz: c12983f2a42794564b744ecfef193c84f6ef064e
+  metadata.gz: df1760457e554a3c32e7986732018fbf8aba0ebc
+  data.tar.gz: 527006ae41bc69e3c17382eeb262f1154e54b1f8
 SHA512:
-  metadata.gz: d619607435ab470cef5837a7603d0b60845ef346133962d1332f9a29d1eb48961a959449c865f94b7fb179909d10a2a0935c0401490801ee7ffdf6d2cb7b4f24
-  data.tar.gz: 129a26fe0d65b9a69c886c010202229bb6a11603aee4348e119c2ef71372dbdf7c69bae15ee10fc3c2066f9049e75750374a384ef4bf7ab563eb0841de36213d
+  metadata.gz: 0576ac7375b2b40101dabf6c098e119f8356f4f84495f07f1cc6aec73356ce5c09912991f82c6247612ca352ca670abdcad7fce354032104372e546ba09755d3
+  data.tar.gz: f3e3fcfa3ee266d870e520991dcabf9a3402823e90d5db0d85093282278c0e7ab4d993895ad7ac603fd4b88af396588f185dfb6a9fbad85c54b67f00c52d4b58

data/.gitignore

@@ -0,0 +1,10 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/test*.rb

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
 gemspec
-gem 'sinja', :require=>false, :path=>'../..'
+
+gem 'sinja', :require=>false,
+  :git=>'https://github.com/mwpastore/sinja.git', :branch=>'master'

data/README.md

@@ -8,6 +8,7 @@
   -->
 
 [![Gem Version](https://badge.fury.io/rb/sinja-sequel.svg)](https://badge.fury.io/rb/sinja-sequel)
+[![Dependency Status](https://gemnasium.com/badges/github.com/mwpastore/sinja-sequel.svg)](https://gemnasium.com/github.com/mwpastore/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
@@ -90,7 +91,7 @@ class Bar < Sequel::Model
 end
 ```
 
-See "Avoding Null Foreign Keys" in the [Sinja][1] documentation for more
+See "Avoiding Null Foreign Keys" in the [Sinja][1] documentation for more
 information.
 
 Finally, enable the `:pagination` extension on your connection (before
@@ -98,7 +99,7 @@ prepending Core) to enable pagination!
 
 ### Core
 
-Prepend [Sinja::Sequel::Core](/extensions/sequel/lib/sinja/sequel/core.rb)
+Prepend [Sinja::Sequel::Core](/lib/sinja/sequel/core.rb)
 after registering Sinja:
 
 ```ruby
@@ -150,7 +151,7 @@ Sequel plugins and features.
 ### Helpers
 
 Include
-[Sinja::Sequel::Helpers](/extensions/sequel/lib/sinja/sequel/helpers.rb) after
+[Sinja::Sequel::Helpers](/lib/sinja/sequel/helpers.rb) after
 registering Sinja:
 
 ```ruby
@@ -223,7 +224,7 @@ breeze!
 
 ### Extension
 
-Register [Sinja::Sequel](/extensions/sequel/lib/sinja/sequel.rb) after
+Register [Sinja::Sequel](/lib/sinja/sequel.rb) after
 registering Sinja:
 
 ```ruby
@@ -239,10 +240,20 @@ 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>`.
+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).
+
+* The generated `create` action helper does not support client-generated IDs.
+
+* Optionally define a `settable_fields` helper in each resource that returns an
+  array of symbols to pass to `Sequel::Model#set_fields`.
+
+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
 
@@ -259,7 +270,7 @@ git commits and tags, and push the `.gem` file to
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at
-https://github.com/mwpastore/sinja.
+https://github.com/mwpastore/sinja-sequel.
 
 ## License
 

data/lib/sinja/sequel.rb

@@ -80,7 +80,7 @@ module Sinja
         end
       end
 
-      def has_many(rel, &block)
+      def has_many(rel, try_convert=:to_i, &block)
         super(rel) do
           fetch do
             resource.send("#{rel}_dataset")
@@ -91,15 +91,15 @@ module Sinja
           end
 
           replace(:sideload_on=>:update) do |rios|
-            add_remove(rel, rios)
+            add_remove(rel, rios, try_convert)
           end
 
           merge(:sideload_on=>:create) do |rios|
-            add_missing(rel, rios)
+            add_missing(rel, rios, try_convert)
           end
 
           subtract do |rios|
-            remove_present(rel, rios)
+            remove_present(rel, rios, try_convert)
           end
 
           instance_eval(&block) if block

data/lib/sinja/sequel/core.rb

@@ -15,7 +15,11 @@ module Sinja
           c.validation_formatter = ->(e) { e.errors.keys.zip(e.errors.full_messages) }
         end
 
-        base.include Pagination if ::Sequel::Database::EXTENSIONS.key?(:pagination)
+        base.prepend Pagination if ::Sequel::Database::EXTENSIONS.key?(:pagination)
+      end
+
+      def self.included(_)
+        abort "You must `prepend' Sinja::Sequel::Core, not `include' it!"
       end
 
       def_delegator ::Sequel::Model, :db, :database
@@ -36,7 +40,7 @@ module Sinja
     end
 
     module Pagination
-      def self.included(base)
+      def self.prepended(base)
         base.sinja { |c| c.page_using = {
           :number=>1,
           :size=>10,
@@ -44,6 +48,10 @@ module Sinja
         }}
       end
 
+      def self.included(_)
+        abort "You must `prepend' Sinja::Sequel::Pagination, not `include' it!"
+      end
+
       def page(collection, opts)
         collection = collection.dataset unless collection.respond_to?(:paginate)
 

data/lib/sinja/sequel/helpers.rb

@@ -25,15 +25,15 @@ module Sinja
         transaction do
           resource.lock!
           old_ids = dataset.select_map(klass.primary_key)
-          in_common = old_ids & new_ids
+          ids_in_common = old_ids & new_ids
 
-          (new_ids - in_common).each do |id|
+          (new_ids - 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|
+          (old_ids - ids_in_common).each do |id|
             subresource = klass.with_pk!(id)
             resource.send(remove_meth, subresource) \
               unless block_given? && !yield(subresource)

data/lib/sinja/sequel/version.rb

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

data/sinja-sequel.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   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.homepage      = 'https://github.com/mwpastore/sinja-sequel'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinja-sequel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 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: sequel
@@ -93,6 +93,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -106,7 +107,7 @@ files:
 - lib/sinja/sequel/helpers.rb
 - lib/sinja/sequel/version.rb
 - sinja-sequel.gemspec
-homepage: https://github.com/mwpastore/sinja/tree/master/extensions/sequel
+homepage: https://github.com/mwpastore/sinja-sequel
 licenses:
 - MIT
 metadata: {}