searchable-by 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '008edf75bb0e4b27410f7e889cbfd26eda27d0391dd7e70be3e984a962ddd756'
-  data.tar.gz: 9b2fbbc4cc13b2cfe6e23998616ec48e49617bfb67db3143f800c5d35134b2df
+  metadata.gz: 8c1c5cfdea465a6a9ff73159a062558c5475889d27e0119e81212bb8bb37bbc1
+  data.tar.gz: c77c158c890b37b67d1243c93b4d5c982731b55fb48d284ecc404de58142da26
 SHA512:
-  metadata.gz: 0fa58611207ecef62a12c698be927aa34659e0b19f5c5a4ce6c8c2c87b77df49349fb72a4356683f406a80110727442e854448f4b1dc20bc04527e1981af03a2
-  data.tar.gz: b9dbbde8350310301567ed1ba6cf8a45d80813e7f99415a6e0a6dc6d1a69b4dbd0f340a39851b8db4e291b503f21c2f4f9e8d74311cdaa5fe705a3a06a9201e1
+  metadata.gz: 1ba79022ae7056fc1cd6f6ef7af109ed6e0a7228601241ac2bc8f501818b6f487a6fd929f77bc3ce0dba9956b879def3dc705159c3696246d4653e3197f3d71f
+  data.tar.gz: c023dff5eb1bb4685dcfe7d10b7164242a090a930189ccc1b336c6de3437ab05d1de0dc90d13f52412e8e15b16a0a1386d5dacb289b208e00eefca5eab0cc2f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    searchable-by (0.5.0)
+    searchable-by (0.5.1)
       activerecord
       activesupport
 

data/lib/searchable_by.rb

@@ -3,24 +3,42 @@ require 'shellwords'
 
 module ActiveRecord
   module SearchableBy
-    class Config < Hash
+    class Column
+      attr_reader :attr, :type
+      attr_accessor :node
+
+      def initialize(attr, type: :string)
+        @attr = attr
+        @type = type.to_sym
+      end
+    end
+
+    class Config
+      attr_reader :columns, :scoping
+      attr_accessor :max_terms
+
       def initialize
-        update columns: [], max_terms: 5
+        @columns = []
+        @max_terms = 5
         scope { all }
       end
 
+      def initialize_copy(other)
+        @columns = other.columns.dup
+        super
+      end
+
       def column(*attrs, &block)
         opts = attrs.extract_options!
-        cols = self[:columns]
         attrs.each do |attr|
-          cols.push(opts.merge(column: attr))
+          columns.push Column.new(attr, opts)
         end
-        cols.push(opts.merge(column: block)) if block
-        cols
+        columns.push Column.new(block, opts) if block
+        columns
       end
 
       def scope(&block)
-        self[:scope] = block
+        @scoping = block
       end
     end
 
@@ -32,27 +50,30 @@ module ActiveRecord
       values
     end
 
-    def self.build_clauses(relations, values)
+    def self.build_clauses(columns, values)
       clauses = values.map do |value|
         negate = value[0] == '-'
         value.slice!(0) if negate || value[0] == '+'
 
-        c0, *cn = relations.map do |opts|
-          build_condition(opts, value)
-        end.compact
-        next unless c0
+        grouping = columns.map do |column|
+          build_condition(column, value)
+        end
+        grouping.compact!
+        next if grouping.empty?
 
-        [cn.inject(c0) {|x, part| x.or(part) }, negate]
+        clause = grouping.inject(&:or)
+        clause = clause.not if negate
+        clause
       end
       clauses.compact!
       clauses
     end
 
-    def self.build_condition(opts, value)
-      case opts[:type]
+    def self.build_condition(column, value)
+      case column.type
       when :int, :integer
         begin
-          opts[:rel].eq(Integer(value))
+          column.node.eq(Integer(value))
         rescue ArgumentError
           nil
         end
@@ -60,7 +81,7 @@ module ActiveRecord
         value = value.dup
         value.gsub!('%', '\%')
         value.gsub!('_', '\_')
-        opts[:rel].matches("%#{value}%")
+        column.node.matches("%#{value}%")
       end
     end
 
@@ -72,35 +93,35 @@ module ActiveRecord
       end
 
       def inherited(base) # :nodoc:
-        base._searchable_by_config = _searchable_by_config.deep_dup
+        base._searchable_by_config = _searchable_by_config.dup
         super
       end
 
       def searchable_by(max_terms: 5, &block)
         _searchable_by_config.instance_eval(&block)
-        _searchable_by_config[:max_terms] = max_terms if max_terms
+        _searchable_by_config.max_terms = max_terms if max_terms
       end
 
       # @param [String] query the search query
       # @return [ActiveRecord::Relation] the scoped relation
       def search_by(query)
-        columns = _searchable_by_config[:columns]
+        columns = _searchable_by_config.columns
         return all if columns.empty?
 
-        values = SearchableBy.norm_values(query).first(_searchable_by_config[:max_terms])
+        values = SearchableBy.norm_values(query).first(_searchable_by_config.max_terms)
         return all if values.empty?
 
-        relations = columns.map do |opts|
-          rel = opts[:column].is_a?(Proc) ? opts[:column].call : arel_table[opts[:column]]
-          opts.merge(rel: rel)
+        columns.each do |col|
+          col.node ||= col.attr.is_a?(Proc) ? col.attr.call : arel_table[col.attr]
         end
-        clauses = SearchableBy.build_clauses(relations, values)
+        clauses = SearchableBy.build_clauses(columns, values)
         return all if clauses.empty?
 
-        scope = instance_exec(&_searchable_by_config[:scope])
-        clauses.inject(scope) do |x, (clause, negate)|
-          negate ? x.where.not(clause) : x.where(clause)
+        scope = instance_exec(&_searchable_by_config.scoping)
+        clauses.each do |clause|
+          scope = scope.where(clause)
         end
+        scope
       end
     end
   end

data/searchable-by.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'searchable-by'
-  s.version     = '0.5.0'
+  s.version     = '0.5.1'
   s.authors     = ['Dimitrij Denissenko']
   s.email       = ['dimitrij@blacksquaremedia.com']
   s.summary     = 'Generate search scopes'

data/spec/searchable_by_spec.rb

@@ -1,11 +1,17 @@
 require 'spec_helper'
 
 describe ActiveRecord::SearchableBy do
+
   it 'should ignore bad inputs' do
     expect(Post.search_by(nil).count).to eq(4)
     expect(Post.search_by('').count).to eq(4)
   end
 
+  it 'should configure correctly' do
+    expect(AbstractModel._searchable_by_config.columns.size).to eq(1)
+    expect(Post._searchable_by_config.columns.size).to eq(4)
+  end
+
   it 'should generate SQL' do
     sql = Post.search_by('123').to_sql
     expect(sql).to include(%("posts"."id" = 123))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: searchable-by
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Dimitrij Denissenko