trestle-search 0.2.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b0d81acc19c8af1130e82598e8a8c6692ea1d303874f9ddc4b44a91b816447b
-  data.tar.gz: c806a1734cd63cebc00e78c19f2191da54ef56675eb11ca7e50fac1b55039d19
+  metadata.gz: c44c519d3870778dc31c5eec549290d197ea2bb09eb3db856c4208a64e3be20c
+  data.tar.gz: 712100fba45ffa35814854889da4f5e94be4e0f479a0863a73a2d3286f45bd04
 SHA512:
-  metadata.gz: 36f4856d6b27759116fd98f589fff5101e283c9f2d66d7525791424df9678cd2496cccab3fdc5eb2ac2a4936eda31b63d601094201e623a965f9e208314e4824
-  data.tar.gz: 91022be5e6490aad23d6c9adc8cc751a5e3d5bf599550160e18c1b9e8c7832685539928a0924d6c3506e26b818b5656dbe0fb90620d0a5bfc6e352f00e82e8bd
+  metadata.gz: 7791222516cebd2bea8d941279d7c71c6e120976cbebd229564925220e2e8fac794f240fcb25f8ba570b32acdf4fd5084bf202dd0abef7920525ea0d1f75b42e
+  data.tar.gz: 76cb2f9208c783b2fe3ace5ed8bf8f36a0bb9a6e31f5fd5a89c9c43cf797306e38f3785217571e9fcad2cca773d3b1e969485c0ac32dc7ffbd6e342b46d5f35e

data/.browserlistrc

@@ -0,0 +1 @@
+> 0.25%

data/.gitignore

@@ -7,3 +7,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/node_modules/
+/spec/dummy/db/*.sqlite3
+/spec/dummy/*.sqlite3-journal
+/spec/dummy/log/*.log
+/spec/dummy/tmp/*

data/.rspec

@@ -1,2 +1,3 @@
+--require spec_helper
 --format documentation
 --color

data/.travis.yml

@@ -1,5 +1,22 @@
-sudo: false
 language: ruby
+
+cache: bundler
+
+before_install:
+  - gem update --system
+  - gem install bundler
+
 rvm:
-  - 2.3.1
-before_install: gem install bundler -v 1.12.5
+  - 2.6.5
+
+gemfile:
+  - gemfiles/rails-5.0.gemfile
+  - gemfiles/rails-5.1.gemfile
+  - gemfiles/rails-5.2.gemfile
+  - gemfiles/rails-6.0.gemfile
+
+jobs:
+  include:
+    gemfile: gemfiles/rails-4.2.gemfile
+    before_install:
+      - gem install bundler -v '< 2'

data/Gemfile

@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in trestle-auth.gemspec
 gemspec
+
+group :test do
+  gem "capybara"
+end
+
+gem "sqlite3", "~> 1.4"
+
+gem "trestle", github: "TrestleAdmin/trestle"

data/app/assets/bundle/trestle/search.css

@@ -0,0 +1 @@
+.searchbox{width:100%;max-width:30em;margin-right:auto}.searchbox .input-group{background:#fff;border:1px solid #ccc;border-radius:50rem}.searchbox .form-control,.searchbox .input-group-text{background:transparent;border:0}.searchbox .form-control{padding-left:0;box-shadow:none}.searchbox .form-control::-webkit-search-cancel-button{display:none}.searchbox .clear-search{position:absolute;right:.75rem;z-index:5;color:#555;font-size:1.2rem;padding:.35rem}.searchbox .clear-search:focus,.searchbox .clear-search:hover{color:#333}

data/app/views/trestle/search/_search.html.erb

@@ -1,10 +1,11 @@
-<% if defined?(admin) && admin.respond_to?(:searchable?) && admin.searchable? -%>
-  <div class="searchbox">
-    <%= form_tag admin.path, method: :get do %>
-      <div class="input-group">
-        <span class="input-group-addon"><icon class="fa fa-search"></icon></span>
-        <%= text_field_tag :q, params[:q], class: "form-control", placeholder: t("admin.search.placeholder", default: "Search") %>
+<div class="searchbox">
+  <%= form_tag admin.path, method: :get do %>
+    <div class="input-group">
+      <div class="input-group-prepend">
+        <span class="input-group-text"><icon class="fa fa-search"></icon></span>
       </div>
-    <% end %>
-  </div>
-<% end -%>
+      <%= link_to icon("fa fa-times"), admin.path, class: "clear-search" if params[:q].present? %>
+      <%= search_field_tag :q, params[:q], class: "form-control", autocomplete: "off", placeholder: admin.t("search.placeholder", default: "Search") %>
+    </div>
+  <% end %>
+</div>

data/config/initializers/trestle.rb

@@ -1,11 +1,11 @@
 Trestle.configure do |config|
   config.persistent_params << :q
-  
+
   config.hook("stylesheets") do
     stylesheet_link_tag "trestle/search"
   end
 
-  config.hook("view.header") do
+  config.hook("resource.index.header", if: -> { admin.searchable? }) do
     render "trestle/search/search"
   end
 end

data/config/locales/es.yml

@@ -0,0 +1,5 @@
+es:
+  admin:
+    search:
+      placeholder: "Buscar"
+      results: "Resultados de la búsqueda"

data/config/locales/fr.yml

@@ -0,0 +1,5 @@
+fr:
+  admin:
+    search:
+      placeholder: "Recherche"
+      results: "Résultats de la recherche"

data/config/locales/ru.yml

@@ -0,0 +1,5 @@
+ru:
+  admin:
+    search:
+      placeholder: "Поиск"
+      results: "Результаты поиска"

data/frontend/index.scss

@@ -0,0 +1,42 @@
+.searchbox {
+  width: 100%;
+  max-width: 30em;
+  margin-right: auto;
+
+  .input-group {
+    background: white;
+    border: 1px solid #ccc;
+    border-radius: 50rem;
+  }
+
+  .input-group-text {
+    background: transparent;
+    border: 0;
+  }
+
+  .form-control {
+    padding-left: 0;
+
+    background: transparent;
+    box-shadow: none;
+
+    border: 0;
+
+    &::-webkit-search-cancel-button {
+      display: none;
+    }
+  }
+
+  .clear-search {
+    position: absolute;
+    right: 0.75rem;
+    z-index: 5;
+    color: #555;
+    font-size: 1.2rem;
+    padding: 0.35rem;
+
+    &:hover, &:focus {
+      color: #333;
+    }
+  }
+}

data/gemfiles/rails-4.2.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+end
+
+gem "rails", "~> 4.2.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-5.0.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+end
+
+gem "rails", "~> 5.0.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-5.1.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+end
+
+gem "rails", "~> 5.1.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-5.2.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+  gem "capybara"
+
+  gem "sqlite3", "~> 1.3.13"
+end
+
+gem "rails", "~> 5.2.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/gemfiles/rails-6.0.gemfile

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "coveralls", require: false
+
+  gem "capybara"
+  gem "sqlite3", "~> 1.4"
+end
+
+gem "rails", "~> 6.0.0"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"

data/lib/trestle/search.rb

@@ -1,4 +1,4 @@
-require "trestle/search/version"
+require_relative "search/version"
 
 require "trestle"
 
@@ -6,9 +6,9 @@ module Trestle
   module Search
     extend ActiveSupport::Autoload
 
-    autoload :Builder
-    autoload :Controller
-    autoload :Resource
+    require_relative "search/builder"
+    require_relative "search/controller"
+    require_relative "search/resource"
 
     autoload_under "adapters" do
       autoload :ChewyAdapter
@@ -17,4 +17,4 @@ module Trestle
   end
 end
 
-require "trestle/search/engine" if defined?(Rails)
+require_relative "search/engine" if defined?(Rails)

data/lib/trestle/search/adapters/chewy_adapter.rb

@@ -4,6 +4,10 @@ module Trestle
       def finalize_collection(query)
         query.records
       end
+
+      def count(collection)
+        collection.count
+      end
     end
   end
 end

data/lib/trestle/search/builder.rb

@@ -2,7 +2,7 @@ module Trestle
   module Search
     module Builder
       def search(&block)
-        admin.search = block
+        admin.define_adapter_method(:search, &block)
       end
     end
   end

data/lib/trestle/search/controller.rb

@@ -2,11 +2,11 @@ module Trestle
   module Search
     module Controller
       def index
-        super
-
         if admin.searchable? && params[:q].present?
           breadcrumb t("admin.search.results", default: "Search Results"), { q: params[:q] }
         end
+
+        super
       end
     end
   end

data/lib/trestle/search/engine.rb

@@ -3,10 +3,13 @@ module Trestle
     class Engine < ::Rails::Engine
       config.assets.precompile << "trestle/search.css"
 
+      config.to_prepare do
+        Trestle::ResourceController.send(:prepend, Trestle::Search::Controller)
+      end
+
       initializer :extensions do
-        Trestle::Resource.singleton_class.send(:prepend, Trestle::Search::Resource)
+        Trestle::Resource.send(:include, Trestle::Search::Resource)
         Trestle::Resource::Builder.send(:include, Trestle::Search::Builder)
-        Trestle::Resource::Controller.send(:prepend, Trestle::Search::Controller)
       end
     end
   end

data/lib/trestle/search/resource.rb

@@ -1,22 +1,35 @@
 module Trestle
   module Search
     module Resource
-      attr_writer :search
+      extend ActiveSupport::Concern
 
-      def initialize_collection(params)
-        if searchable?
-          search(params[:q], params)
-        else
-          super(params)
-        end
+      included do
+        # Include custom #collection method on Resource instance
+        prepend Collection
+
+        # Include custom #collection method on Resource class
+        singleton_class.send(:prepend, Collection)
       end
 
-      def search(query, params)
-        instance_exec(query.presence, params, &@search)
+      module Collection
+        def collection(params={})
+          if searchable?
+            query = params[:q].presence
+            search(query, params) || super
+          else
+            super
+          end
+        end
+
+        def search(query, params={})
+          adapter.search(query, params)
+        end
       end
 
-      def searchable?
-        @search
+      module ClassMethods
+        def searchable?
+          adapter.respond_to?(:search)
+        end
       end
     end
   end

data/lib/trestle/search/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module Search
-    VERSION = "0.2.1"
+    VERSION = "0.4.3"
   end
 end

data/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "trestle-search",
+  "version": "0.4.0",
+  "description": "Search plugin for the Trestle admin framework",
+  "main": "index.scss",
+  "repository": "https://github.com/TrestleAdmin/trestle-search.git",
+  "author": "Sam Pohlenz <sam@sampohlenz.com>",
+  "license": "LGPL-3.0",
+  "private": true,
+  "scripts": {
+    "dev": "webpack --mode development",
+    "build": "webpack --mode production",
+    "watch": "webpack --mode development --watch"
+  },
+  "devDependencies": {
+    "autoprefixer": "^9.6.1",
+    "css-loader": "^3.2.0",
+    "mini-css-extract-plugin": "^0.8.0",
+    "node-sass": "^4.12.0",
+    "optimize-css-assets-webpack-plugin": "^5.0.3",
+    "postcss-loader": "^3.0.0",
+    "sass-loader": "^8.0.0",
+    "webpack": "^4.40.2",
+    "webpack-cli": "^3.3.9",
+    "webpack-fix-style-only-entries": "^0.4.0"
+  },
+  "dependencies": {
+    "trestle": "https://github.com/TrestleAdmin/trestle.git"
+  }
+}

data/trestle-search.gemspec

@@ -1,7 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'trestle/search/version'
+require_relative 'lib/trestle/search/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "trestle-search"
@@ -11,16 +8,21 @@ Gem::Specification.new do |spec|
   spec.email         = ["sam@sampohlenz.com"]
 
   spec.summary       = "Search plugin for the Trestle admin framework"
-  spec.description   = "Search plugin for the Trestle admin framework."
   spec.homepage      = "https://www.trestle.io"
   spec.license       = "LGPL-3.0"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
+  end
+
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trestle", "~> 0.8", ">= 0.8.7"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/TrestleAdmin/trestle-search"
+
+  spec.add_dependency "trestle", "~> 0.9.0", ">= 0.9.3"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-rails", "~> 3.0"
 end