trestle-search 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b0d81acc19c8af1130e82598e8a8c6692ea1d303874f9ddc4b44a91b816447b
-  data.tar.gz: c806a1734cd63cebc00e78c19f2191da54ef56675eb11ca7e50fac1b55039d19
+  metadata.gz: 7bc1fa4641982dcb21cc9ae627fb195a7478d309772a8783a058eb9520fc7753
+  data.tar.gz: 2dddb7bf7cd81cfa160a00a117197e9069d079c1e9071190866cbaebf2802726
 SHA512:
-  metadata.gz: 36f4856d6b27759116fd98f589fff5101e283c9f2d66d7525791424df9678cd2496cccab3fdc5eb2ac2a4936eda31b63d601094201e623a965f9e208314e4824
-  data.tar.gz: 91022be5e6490aad23d6c9adc8cc751a5e3d5bf599550160e18c1b9e8c7832685539928a0924d6c3506e26b818b5656dbe0fb90620d0a5bfc6e352f00e82e8bd
+  metadata.gz: e868a81ac6c4e7cfb1147746053234e995c638ee67c0b8f9b15494a2bc3aa12255c975abaef830c8d446c3c40ae3360a6f30905a48ae1a0be1bf672c088f0e40
+  data.tar.gz: 042b653baf975277db24c9d1f39aaf01af1878e3d189bfea640dccd1ae975a8daa468afa4a8f275f7473a64215d942740165fdfd77485cd84e051b7f95fb51a4

data/app/assets/stylesheets/trestle/search.scss

@@ -1,55 +1,41 @@
 @import "trestle/support";
 
 .searchbox {
-  float: left;
-  max-width: 25%;
-  padding: 8px 0;
+  width: 100%;
+  max-width: 30em;
+  margin-right: auto;
+
+  .input-group {
+    background: white;
+    border: 1px solid #ccc;
+    border-radius: 50px;
+    box-shadow: inset 0 1px 1px rgba(black, 0.075);
+  }
 
   .input-group-addon {
-    background: none;
-    border: none;
-    padding-left: 0;
+    background: transparent;
+    border: 0;
   }
 
   .form-control {
     padding-left: 0;
 
-    background: none;
+    background: transparent;
     box-shadow: none;
 
-    border: none;
-    border-radius: 0;
-
-    border-bottom: 1px solid #ddd;
-
-    transition: border-color 500ms;
-
-    &:focus {
-      border-color: #555;
-    }
+    border: 0;
   }
 
-  @media (max-width: $screen-xs-max) {
+  .clear-search {
     position: absolute;
-    top: 10px;
-    left: 10px;
-    width: $sidebar-width - 20px;
-    max-width: none;
-
-    padding: 0 12px;
-    background: white;
-    box-shadow: inset 0 1px 1px rgba(black, 0.075);
-    border-radius: 50px;
-
-    .form-control {
-      border-bottom: none;
-      font-size: 16px;
+    right: 10px;
+    z-index: 5;
+    color: #555;
+    font-size: 16px;
+    padding: 4px;
+
+    &:hover, &:focus {
+      color: #333;
     }
   }
 }
-
-@media (max-width: $screen-xs-max) {
-  .app-sidebar {
-    padding-top: 40px;
-  }
-}

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

@@ -1,10 +1,9 @@
-<% 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>
-    <% end %>
-  </div>
-<% end -%>
+<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>
+      <%= 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/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/engine.rb

@@ -4,7 +4,7 @@ module Trestle
       config.assets.precompile << "trestle/search.css"
 
       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

data/lib/trestle/search/resource.rb

@@ -1,22 +1,30 @@
 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?
+            adapter.search(params[:q].presence, params)
+          else
+            super
+          end
+        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.3.0"
   end
 end

data/trestle-search.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trestle", "~> 0.8", ">= 0.8.7"
+  spec.add_dependency "trestle", "~> 0.8", ">= 0.8.10"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle-search
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trestle
@@ -19,7 +19,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.8.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.8.10
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Search plugin for the Trestle admin framework