trestle-search 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bc1fa4641982dcb21cc9ae627fb195a7478d309772a8783a058eb9520fc7753
-  data.tar.gz: 2dddb7bf7cd81cfa160a00a117197e9069d079c1e9071190866cbaebf2802726
+  metadata.gz: 9d2248468b6836412e7e254a97b044de88877f15071c77fcdb3d982fd6f3effb
+  data.tar.gz: d67cdb6dd4dbcaac0d1a5f58c6660d08e0047a5b88a927db4da0454055586397
 SHA512:
-  metadata.gz: e868a81ac6c4e7cfb1147746053234e995c638ee67c0b8f9b15494a2bc3aa12255c975abaef830c8d446c3c40ae3360a6f30905a48ae1a0be1bf672c088f0e40
-  data.tar.gz: 042b653baf975277db24c9d1f39aaf01af1878e3d189bfea640dccd1ae975a8daa468afa4a8f275f7473a64215d942740165fdfd77485cd84e051b7f95fb51a4
+  metadata.gz: c573ba644e674b9bcb23fbc9189aa38ff52a87cefe8561aa3aa735c4db93b95de2d950ee75ed5e3ffe32722cfed1010c6a0544f54cc73ca65173ecbe08e21a54
+  data.tar.gz: f489967f05d2ce2af032532731cc810683219852fb2c56317d4bca1092ab24d70b8443e546b53c54b0a504a23e00020f1692b967c2f9af73fdc4802757d14fc3

data/.browserlistrc

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

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/node_modules/

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,7 +1,9 @@
 <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>
+      <div class="input-group-prepend">
+        <span class="input-group-text"><icon class="fa fa-search"></icon></span>
+      </div>
       <%= 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>

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/{app/assets/stylesheets/trestle/search.scss → frontend/index.scss}

@@ -1,5 +1,3 @@
-@import "trestle/support";
-
 .searchbox {
   width: 100%;
   max-width: 30em;
@@ -8,11 +6,10 @@
   .input-group {
     background: white;
     border: 1px solid #ccc;
-    border-radius: 50px;
-    box-shadow: inset 0 1px 1px rgba(black, 0.075);
+    border-radius: 50rem;
   }
 
-  .input-group-addon {
+  .input-group-text {
     background: transparent;
     border: 0;
   }
@@ -24,15 +21,19 @@
     box-shadow: none;
 
     border: 0;
+
+    &::-webkit-search-cancel-button {
+      display: none;
+    }
   }
 
   .clear-search {
     position: absolute;
-    right: 10px;
+    right: 0.75rem;
     z-index: 5;
     color: #555;
-    font-size: 16px;
-    padding: 4px;
+    font-size: 1.2rem;
+    padding: 0.35rem;
 
     &:hover, &:focus {
       color: #333;

data/lib/trestle/search/resource.rb

@@ -12,13 +12,17 @@ module Trestle
       end
 
       module Collection
-        def collection(params)
+        def collection(params={})
           if searchable?
-            adapter.search(params[:q].presence, params)
+            search(params[:q].presence, params)
           else
             super
           end
         end
+
+        def search(query, params={})
+          adapter.search(query, params)
+        end
       end
 
       module ClassMethods

data/lib/trestle/search/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module Search
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   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

@@ -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.10"
+  spec.add_dependency "trestle", "~> 0.9.0"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

data/webpack.config.js

@@ -0,0 +1,48 @@
+const path = require('path');
+
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
+const FixStyleOnlyEntriesPlugin = require('webpack-fix-style-only-entries');
+
+module.exports = {
+  entry: {
+    search: path.resolve(__dirname, 'frontend/index.scss')
+  },
+  output: {
+    path: path.resolve(__dirname, 'app/assets/bundle/trestle')
+  },
+  optimization: {
+    splitChunks: {
+      cacheGroups: {
+        styles: {
+          name: 'bundle',
+          test: /\.css$/,
+          chunks: 'all',
+          enforce: true
+        }
+      }
+    },
+    minimizer: [
+      new OptimizeCSSAssetsPlugin({})
+    ]
+  },
+  module: {
+    rules: [
+      {
+        test: /\.s?[ac]ss$/,
+        use: [
+          { loader: MiniCssExtractPlugin.loader },
+          { loader: 'css-loader' },
+          { loader: 'postcss-loader', options: { plugins: [ require('autoprefixer') ] } },
+          { loader: 'sass-loader' }
+        ]
+      }
+    ]
+  },
+  plugins: [
+    new FixStyleOnlyEntriesPlugin(),
+    new MiniCssExtractPlugin({
+      filename: '[name].css'
+    })
+  ]
+}