philtre 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c75bbf7d7dfed6ed3cd5afb6f4477f48b613e8e2
-  data.tar.gz: 8d4dd4dc4075865c44baa7872a03ff6dbf21fed1
+SHA256:
+  metadata.gz: 8bdfc9784c01323889c0147bb0addfcaa54eb8a5fba82241d2217261763b7bc0
+  data.tar.gz: 4caf87fc11f80fd2c9affbc30068909811d381a64f144a48b46f4aeedec54ceb
 SHA512:
-  metadata.gz: dcb1f7273340067c4d12faa431406a8b1f9f8658730d1516cdb1bf9568b95033f71e6631c497c6dcef1854193cecba2d18754a06406e5546cc0cff41cedd975d
-  data.tar.gz: 057199f52f8ec5b894020acb67e618ccfe952e450b374e8e29d68163e587ba8aa756376d8f5ba11e0bc3961634968a2fa273db3ac142d7df9b9dc4600f7179b1
+  metadata.gz: bcdfc3a3c39d329cc3cc992e0a2b96f040349b387d5e704348114eee33f70ec87bab510afa90cd8a2190074f72b5b54f3f9d2096fb7b5f876d7bd46b1f6d872f
+  data.tar.gz: de2a824f0846f20216ccd1f3cd7847fcaa12ad1be786b4771be1ce45ceaaf33a52d19ea88a209577420751589883f35211cf004948e61f2522b1718f49c0fe36

data/.travis.yml

@@ -1,10 +1,14 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - jruby-9.0.5.0
-  - jruby-9.1.0.0
-  - rbx-2
+  - 2.4
+  - 2.5
+  - 2.6
+
+  # srsly, not fighting with this
+  # - jruby-9.0
+  # - jruby-9.1
+  # - jruby-9.2
+  # does not install on travis as of 26-Oct-2016
+  # - rbx
+  # - rbx-2
 script: bundle exec rspec spec

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in philtre.gemspec
 gemspec
+
+group :development do
+  gem 'pry-debundle'
+end

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.2
+* fix grinder and various specs to be compatible with Sequel-5.x (tested with Sequel-5.24.0)
+* drop travis support for jruby and <ruby-2.4.0 - it might still work ok but it won't be ci tested
+
 == 0.1.1
 * drop support for ruby-2.0.0
 * add customisable parameter filtering

data/lib/philtre/grinder.rb

@@ -124,8 +124,15 @@ protected
       obj.clone Hash[ v(obj.opts).map{|k,val| [k, val.is_a?(Philtre::EmptyExpression) ? false : val]} ]
 
     # for Sequel::Models
-    when ->(obj){obj.respond_to? :dataset}
-      v obj.dataset
+    when -> obj { obj.is_a?(Class) && obj.ancestors.include?(Sequel::Model) }
+      # From sequel-5.x.x, I suspect,
+      # SomeModel.dataset.opts includes :row_proc => SomeModel and :model => SomeModel
+      # which sends v into an endless loop.
+      opts = obj.dataset.opts.reject{|_,v| v == obj}
+      transformed = v(opts).map do |k,val|
+        [k, val.is_a?(Philtre::EmptyExpression) ? false : val]
+      end
+      obj.dataset.clone Hash[transformed]
 
     # for other things that are convertible to dataset
     when ->(obj){obj.respond_to? :to_dataset}

data/lib/philtre/version.rb

@@ -1,3 +1,3 @@
 module Philtre #:nodoc:
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/philtre.gemspec

@@ -21,8 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sequel'
   spec.add_dependency 'fastandand'
 
-  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'faker'
+  spec.add_development_dependency 'strscan'
 end

data/spec/dataset_spec.rb

@@ -9,7 +9,7 @@ Sequel.extension :core_extensions
 
 describe Sequel::Dataset do
   subject do
-    Sequel.mock[:t].filter( :name.lieu, :title.lieu ).order( :birth_year.lieu )
+    Sequel.mock[:t].filter( Sequel.&(:name.lieu, :title.lieu) ).order( :birth_year.lieu )
   end
 
   describe '#grind' do

data/spec/filter_spec.rb

@@ -8,10 +8,17 @@ describe Philtre::Filter do
   # must be in before otherwise it's unpleasant to hook the
   # class in to the dataset.
   before :all do
-    @dataset = Sequel.mock[:planks]
+    @dataset = Sequel.mock[:planks].dup
     class Plank < Sequel::Model; end
     # just stop whining and generate the bleedin' sql, k?
-    def @dataset.supports_regexp?; true end
+    # def @dataset.supports_regexp?; true end
+  end
+
+  # replacement for remove Sequel::Dataset.sql_literal
+  # that is, create a string from an expression and dataset
+  def sql_of( expr, dataset)
+    dataset.send :literal_expression_append, rv=String.new, expr
+    rv
   end
 
   attr_reader :dataset
@@ -85,7 +92,7 @@ describe Philtre::Filter do
 
     it 'defaults to asc' do
       filter = described_class.new one: 1, two: 2, order: 'things'
-      sqlfrag = filter.order_expr(:things).sql_literal(dataset)
+      sqlfrag = sql_of filter.order_expr(:things), dataset
       sqlfrag.should == 'things ASC'
     end
   end
@@ -148,7 +155,7 @@ describe Philtre::Filter do
         expr.args.first.should == Sequel.expr(field)
         expr.args.last.should == value
 
-        expr.sql_literal(@dataset).should be_a(String)
+        sql_of(expr, @dataset).should be_a(String)
       end
     end
 
@@ -255,11 +262,11 @@ describe Philtre::Filter do
     end
 
     it 'substitutes a field name' do
-      expr = Sequel.expr( filter.to_expr( :owner_like, 'hallelujah', :heavens__salutation ) )
+      expr = Sequel.expr( filter.to_expr( :owner_like, 'hallelujah', Sequel.qualify(:heavens, :salutation) ) )
       expr.op.should == :'~*'
       expr.args.first.should be_kind_of(Sequel::SQL::QualifiedIdentifier)
-      expr.args.first.column.should == 'salutation'
-      expr.args.first.table.should == 'heavens'
+      expr.args.first.column.should == :salutation
+      expr.args.first.table.should == :heavens
       expr.args.last.should == 'hallelujah'
     end
 
@@ -273,7 +280,7 @@ describe Philtre::Filter do
 
       expr = filter.to_expr( :year_range, [1984, 1970, 2012] )
       expr.should be_a(Sequel::SQL::Expression)
-      expr.sql_literal(dataset).should == '((year >= 1970) AND (year <= 2012))'
+      sql_of(expr, dataset).should == '((year >= 1970) AND (year <= 2012))'
     end
   end
 
@@ -294,13 +301,13 @@ describe Philtre::Filter do
     end
 
     it 'alternate name' do
-      expr = filter.expr_for(:name, :things__name)
+      expr = filter.expr_for(:name, Sequel.qualify(:things, :name) )
       expr.should_not be_nil
       expr.should be_a(Sequel::SQL::BooleanExpression)
 
       expr.args.first.tap do |field_expr|
-        field_expr.column.should == 'name'
-        field_expr.table.should == 'things'
+        field_expr.column.should == :name
+        field_expr.table.should == :things
       end
     end
   end
@@ -314,11 +321,11 @@ describe Philtre::Filter do
     end
 
     it 'ascending' do
-      filter.order_for(:year).sql_literal(dataset).should == 'year ASC'
+      sql_of(filter.order_for(:year), dataset).should == 'year ASC'
     end
 
     it 'name clash' do
-      filter.order_for(:title).sql_literal(dataset).should == 'title ASC'
+      sql_of(filter.order_for(:title), dataset).should == 'title ASC'
     end
   end
 

data/spec/grinder_spec.rb

@@ -7,7 +7,7 @@ Sequel.extension :core_extensions
 
 describe Philtre::Grinder do
   def ds
-    @ds ||= Sequel.mock[:t].filter( :name.lieu, :title.lieu ).order( :birth_year.lieu )
+    @ds ||= Sequel.mock[:t].filter( Sequel.&(:name.lieu, :title.lieu) ).order( :birth_year.lieu )
   end
 
   def other_ds
@@ -138,7 +138,7 @@ describe Philtre::Grinder do
       @ds ||=
       begin
         subselect = Sequel.mock[:sub].select(:id)
-        Sequel.mock[:t].filter( :name.lieu, :title.lieu, person_id: subselect ).order( :birth_year.lieu )
+        Sequel.mock[:t].filter( Sequel.&(:name.lieu, :title.lieu, person_id: subselect) ).order( :birth_year.lieu )
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: philtre
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - John Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-27 00:00:00.000000000 Z
+date: 2019-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: strscan
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Encode various filtering operations in http parameter hashes
 email:
 - panic@semiosix.com
@@ -147,8 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: http parameter-hash friendly filtering for Sequel