tokite 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2434e8652fb4059aa7b0c8fd0905faafb58ba960
-  data.tar.gz: df14105b4a062e5d365d6c1fe2a1159ce5f41282
+  metadata.gz: ed46c4561bc0d16d27c9ea6bbc79b31b840e4e97
+  data.tar.gz: e348d0f776400676808b4b5fe3bb5f4257872af0
 SHA512:
-  metadata.gz: 371cfa623f9c36f12da066eff967ced6c5e96dc17a1d95b51d6cc680bed985f3ea1e6300e22704bd2c2829a6ec40665b083080f0921791b2055fb2143486c763
-  data.tar.gz: 47ae9aaa6d0f50087435e6023a83b718cffa281eb1c8232ac8e0e32fd3e1ba545ee25bf172d4402ed8a18c2a9f7a6ace5684dcbe55b3d9dbf3cdc8a4a69c223f
+  metadata.gz: 6aa4f62ed0f3e02a80d51f7327fe5ae6368667a13a55661dcabfda6632e69b399dfe5469b3ae93a0dd8169f916a7b6ba5815c3b6f6ac8b9ce5df1ef8c33ea33d
+  data.tar.gz: '0951d5b98aec5e9ae357cee76d1f2f71891da7483f8db70ec035d5add538c3fb49a9f18e5c944b5027c89b8077efe4010abad6ef5e3cf44ae8dc29ddae73ad2a'

data/app/assets/stylesheets/tokite/application.scss

@@ -0,0 +1,27 @@
+@import "bulma/sass/utilities/initial-variables";
+
+// Bootstrap like colors
+$white:  #fff;
+$black:  #000;
+$red:    #d9534f;
+$orange: #f0ad4e;
+$yellow: #ffd500;
+$green:  #5cb85c;
+$blue:   #0275d8;
+$teal:   #5bc0de;
+$pink:   #ff5b77;
+$purple: #613d7c;
+
+$primary: $blue;
+$info: $teal;
+$success: $green;
+$warning: $orange;
+$danger: $red;
+$dark: $grey-darker;
+$text: $grey-dark;
+
+@import "bulma/bulma";
+
+.vspace-40 {
+  margin: 40px 0;
+}

data/app/models/tokite/search_query.rb

@@ -22,7 +22,7 @@ module Tokite
       rule(:quot_word) { quot >> quoted_char.repeat(1).as(:word) >> quot }
       rule(:plain_word) { (match('[^\s/"]') >> match('[^\s]').repeat).as(:word) }
       rule(:field) { match('\w').repeat(1).as(:field) }
-      rule(:word) { (field >> str(':')).maybe >> (regexp_word | quot_word | plain_word) }
+      rule(:word) { (field >> str(':') >> space?).maybe >> (regexp_word | quot_word | plain_word) }
   
       rule(:query) { word >> (space >> word).repeat }
       root :query
@@ -46,20 +46,17 @@ module Tokite
     def match?(doc)
       tree.all? do |word|
         field = word[:field]
+        if field
+          targets = doc[field.to_sym] ? [doc[field.to_sym].downcase] : []
+        else
+          targets = doc.values.map(&:downcase)
+        end
         if word[:regexp_word]
-          regexp = word[:regexp_word].to_s
-          if field
-            doc[field.to_sym]&.match(regexp)
-          else
-            doc.values.any?{|text| text.match(regexp) }
-          end
+          regexp = word[:regexp_word].to_s.downcase
+          targets.any?{|text| text.match(regexp) }
         else
-          value = word[:word].to_s
-          if field
-            doc[field.to_sym]&.index(value)
-          else
-            doc.values.any?{|text| text.index(value) }
-          end
+          value = word[:word].to_s.downcase
+          targets.any?{|text| text.index(value) }
         end
       end
     end

data/lib/tokite/version.rb

@@ -1,3 +1,3 @@
 module Tokite
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tokite
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - hogelog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-18 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,7 +176,7 @@ files:
 - Rakefile
 - app/assets/config/tokite_manifest.js
 - app/assets/javascripts/tokite/application.js
-- app/assets/stylesheets/tokite/application.css
+- app/assets/stylesheets/tokite/application.scss
 - app/controllers/tokite/application_controller.rb
 - app/controllers/tokite/hooks_controller.rb
 - app/controllers/tokite/rules_controller.rb

data/app/assets/stylesheets/tokite/application.css

@@ -1,18 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
- * vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require bulma/bulma
- */
-
-.vspace-40 {
-  margin: 40px 0;
-}