searcher 0.0.6 → 6.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 4eb69651c6c8a4237406d4bd25f47fcfa10d59679ed5b0e07a71ffbc742f20cf
+  data.tar.gz: 8733222ec9ade3fb808cb0e9a7dae0059fba5a0ba7da22437188fb7042a6cb7c
+SHA512:
+  metadata.gz: 6cd72fc4ff1e9423740822169365aaeaae03003dd11b182295f84676dc3ada69f22c0913b2373decd029c20c746347954ae19fc3e9c91d562c4157c037212a68
+  data.tar.gz: 8e3743a5c5f3d759b6d132fcaf847c0f643de2ded548a06974ffb1a0bf6a08a845f872f0bf6d2288fca0ade0ff4234fe5288137c2ba540862a75533d2bc1d2dc

data/Gemfile

@@ -1,7 +1,7 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 group(:test) do
-  gem 'sqlite3-ruby'
+  gem 'sqlite3'
   gem 'rspec'
 end
 

data/Gemfile.lock

@@ -1,46 +1,61 @@
 PATH
   remote: .
   specs:
-    searcher (0.0.3)
-      activerecord (~> 3.0.0)
+    searcher (0.0.7)
+      activerecord (~> 6.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.0)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    i18n (0.4.1)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-    sqlite3-ruby (1.3.1)
-    tzinfo (0.3.23)
+    activemodel (6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activerecord (6.0.2.2)
+      activemodel (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+    activesupport (6.0.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.3)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    minitest (5.14.0)
+    pry (0.13.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    sqlite3 (1.4.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.0)
   bundler (>= 1.0.0)
+  pry
   rspec
   searcher!
-  sqlite3-ruby
+  sqlite3
+
+BUNDLED WITH
+   2.1.4

data/lib/searcher.rb

@@ -2,25 +2,14 @@ require 'active_record'
 require 'searcher/class_methods'
 
 module Searcher
-  mattr_accessor :classes
+  def self.classes=(klass_list)
+    @@classes = klass_list
+  end
+
   def self.classes
-    @classes ||= []
+    @@classes ||= []
   end
 end
 
 ActiveRecord::Base.extend(Searcher::ClassMethods)
 
-ActiveSupport.on_load(:after_initialize) do
-  Dir[Rails.root + "app/models/**/*.rb"].each { |f| require f } if Rails.env.development?
-  Searcher.classes.each do |klass|
-    table = klass.arel_table
-    klass.searcher[:labels].each do |name, config|
-      association = klass.reflect_on_association(config[:from])
-      association_table = association.klass.arel_table
-      if [:has_and_belongs_to_many, :belongs_to].include?(association.macro)
-        scope = lambda { |q, field| klass.joins(config[:from]).where(association_table[field].eq(q)) }
-        klass.scope "by_#{name}", scope
-      end
-    end
-  end
-end

data/lib/searcher/class_methods.rb

@@ -4,22 +4,36 @@ module Searcher
   module ClassMethods
     def searcher(&block)
       Searcher.classes << self unless Searcher.classes.include?(self)
-      @config ||= Searcher::Config.new.instance_exec(&block)
+      @config = Searcher::Config.new.instance_exec(&block)
+      @config[:labels].each do |name, config|
+        association = reflect_on_association(config[:from])
+        association_table = association.klass.arel_table
+
+        next unless %i[has_and_belongs_to_many belongs_to].include?(association.macro)
+
+        scope = lambda do |q, field|
+          joins(config[:from])
+            .where(association_table[field].eq(q))
+        end
+        self.scope "by_#{name}", scope
+      end
     end
-    
+
     def search(query)
       klass = self
 
-      result = query.split(" ").inject(klass) do |k, piece|
-        if piece.include?(":")
-          name, q = piece.split(":")
-          label = @config[:labels][name.to_sym]
-          next unless label
-          send("by_#{name}", q, label[:field])
-        end
+      result = query.split(' ').inject(klass) do |kls, piece|
+        next kls unless piece.include?(':')
+
+        name, q = piece.split(':')
+        label = @config[:labels][name.to_sym]
+
+        next kls unless label
+
+        kls.send("by_#{name}", q, label[:field])
       end
-      
-      result || klass.all
+
+      result.all
     end
   end
-end
+end

data/lib/searcher/version.rb

@@ -1,3 +1,3 @@
 module Searcher
-  VERSION = "0.0.6"
+  VERSION = "6.0.0"
 end

data/license.txt

@@ -0,0 +1,7 @@
+Copyright (C) 2011 Ryan Bigg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/searcher.gemspec

@@ -5,18 +5,18 @@ Gem::Specification.new do |s|
   s.name        = "searcher"
   s.version     = Searcher::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = []
-  s.email       = []
+  s.authors     = ["Ryan Bigg"]
+  s.email       = ["radarlistener@gmail.com"]
   s.homepage    = "http://rubygems.org/gems/searcher"
   s.summary     = "Label-based straight-SQL searcher"
   s.description = "Label-based straight-SQL searcher"
 
   s.required_rubygems_version = ">= 1.3.6"
-  s.rubyforge_project         = "searcher"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
-  
-  s.add_dependency "activerecord", "~> 3.0"
+  s.add_development_dependency "pry"
+
+  s.add_dependency "activerecord", "~> 6.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/spec/fixtures/models.rb

@@ -1,3 +1,11 @@
+class Tag < ActiveRecord::Base
+  has_and_belongs_to_many :tickets
+end
+
+class State < ActiveRecord::Base
+  has_many :tickets
+end
+
 class Ticket < ActiveRecord::Base
   has_and_belongs_to_many :tags
   belongs_to :state
@@ -8,14 +16,6 @@ class Ticket < ActiveRecord::Base
   end
 end
 
-class Tag < ActiveRecord::Base
-  has_and_belongs_to_many :tickets
-end
-
-class State < ActiveRecord::Base
-  has_many :tickets
-end
-
 #############
 ### SEEDS ###
 #############

data/spec/fixtures/schema.rb

@@ -4,7 +4,7 @@ ActiveRecord::Schema.define do
   create_table :tickets, :force => true do |t|
     t.string :description
     t.integer :state_id
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table :tags_tickets, :force => true, :id => false do |t|
@@ -19,4 +19,4 @@ ActiveRecord::Schema.define do
     t.string :name
   end
 
-end
+end

data/spec/searcher_spec.rb

@@ -3,25 +3,39 @@ require 'spec_helper'
 describe Searcher do
   let(:search_results) { subject }
   let(:first_result) { subject.first }
-  
-  context "habtm label search" do  
+
+  context "habtm label search" do
     subject { Ticket.search("tag:bug") }
     it "finds a ticket" do
-      first_result.description.should eql("Hello world! You are awesome.")
+      expect(first_result.description).to eq("Hello world! You are awesome.")
     end
   end
-  
+
   context "belongs_to label search" do
     subject { Ticket.search("state:Open") }
     it "finds a ticket" do
-      first_result.description.should eql("Hello world! You are awesome.")
+      expect(first_result.description).to eq("Hello world! You are awesome.")
+    end
+  end
+
+  context "combined search" do
+    subject { Ticket.search("tag:bug state:Open") }
+    it "finds a ticket" do
+      expect(first_result.description).to eq("Hello world! You are awesome.")
     end
   end
-  
+
+  context "no tickets with tag feature" do
+    subject { Ticket.search("tag:feature state:Open") }
+    it "finds a ticket" do
+      expect(first_result).to be_nil
+    end
+  end
+
   context "undefined label search" do
     subject { Ticket.search("undefined:true") }
     it "returns all the records" do
-      search_results.should eql(Ticket.all)
+      expect(search_results).to eq(Ticket.all)
     end
   end
 end

metadata

@@ -1,65 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: searcher
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+version: !ruby/object:Gem::Version
+  version: 6.0.0
 platform: ruby
-authors: []
-
+authors:
+- Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-30 00:00:00 +11:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2020-04-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 description: Label-based straight-SQL searcher
-email: []
-
+email:
+- radarlistener@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -68,6 +68,7 @@ files:
 - lib/searcher/class_methods.rb
 - lib/searcher/config.rb
 - lib/searcher/version.rb
+- license.txt
 - searcher.gemspec
 - searcher.sqlite3
 - spec/fixtures/models.rb
@@ -75,41 +76,26 @@ files:
 - spec/searcher_spec.rb
 - spec/spec_helper.rb
 - tmp/.gitkeep
-has_rdoc: true
 homepage: http://rubygems.org/gems/searcher
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
-rubyforge_project: searcher
-rubygems_version: 1.3.7
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Label-based straight-SQL searcher
 test_files: []
-