rails_cve 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c029756d626fb174a6de2f71dfdaff1f81d25bd
-  data.tar.gz: 4f5f4919e99684fdeb384d65db5717c74f686319
+  metadata.gz: 2a1bf677ded00c3e9e88026fc83feb366249765e
+  data.tar.gz: b345a9512442777e11ac6a9acec5d113c08b5d21
 SHA512:
-  metadata.gz: 5d4f17f1c5c038c3f2a04cb161febdb7b15fff2f9429d334a0d04e93c6f297c1f9ee9bb10bd5f653a8f3b1287e4c30bb9edc60f8cfda4454df46cba2ad08670a
-  data.tar.gz: 43a59a3228c7c6bd8c57f121900b6d2f8c06f4c338da2402971bbafa6ff922872024d508761334997276f2c9766ede125dd934d869630b434cc4fd436517b2b1
+  metadata.gz: 7fdbfeaedd6579193406dbe0df27f01cc5c932de77ecbdfb01d3f25b2ef6a9fa6f307ca5374b00c0efcd855f10159d6376d91665dd9bc3cb6965a34a23df3341
+  data.tar.gz: 2f0672ff5993e98276fb4466cc49bca8bb95fac5b1449ca13c52c44fce9b4101bf3224514506ee2f135ab8c68aacc64217e7be06a78ee5677facb0eacde17933

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.0.4 (2014-04-28)
+
+* enhancements
+  * refactoring of search scopes (perform a build disjoint query if multiple
+    search fragments given)
+  * import task is less noisy when printing progress (format only)
+
 ### 0.0.3 (2014-04-28)
 
 * enhancements

data/README.md

@@ -80,14 +80,24 @@ RailsCVE::Entry.search_ranked('ruby rails').search_ranked('windows')
 RailsCVE::Entry.search_ranked('ruby rails & windows')
 ```
 
+Both `search_ranked` and `search_plain` accept an array of search fragments,
+which will result in a disjoint query:
+
+```ruby
+RailsCVE::Entry.search_plain('ruby', 'rails').to_sql
+#=> SELECT "rails_cve_entries".*
+#   FROM "rails_cve_entries"
+#   WHERE to_tsvector('simple', description) @@ (to_tsquery('simple', 'ruby | rails'))
+```
+
 ## Installation
 
 **This engine requires a PostgreSQL database!**
 
-Add `rails-cve` to your Gemfile and run `bundle install`:
+Add `rails_cve` to your Gemfile and run `bundle install`:
 
 ```ruby
-gem 'rails-cve'
+gem 'rails_cve'
 ```
 
 Then install and run the migrations via

data/app/models/concerns/rails_cve/entry/search.rb

@@ -1,21 +1,27 @@
 module RailsCVE::Entry::Search
   extend ActiveSupport::Concern
 
-  TS_QUERY = "to_tsvector('simple', description) @@ plainto_tsquery(%{q})"
-  TS_RANK  = "ts_rank(to_tsvector('simple', description), plainto_tsquery(%{q}))"
+  TS_QUERY = "to_tsvector('simple', description) @@ (%{q})"
+  TS_RANK  = "ts_rank(to_tsvector('simple', description), (%{q}))"
 
   included do
-    scope :search_ranked, ->(query){
-      q = sanitize(query)
-      rank = "#{TS_RANK} AS rank" % { q: q }
+    scope :search_ranked, ->(*query){
+      rank = "#{TS_RANK} AS rank" % { q: plainto_tsquery(query) }
 
       select("*, #{rank}")
         .search_plain(query)
         .order("rank DESC")
     }
 
-    scope :search_plain, ->(query){
-      where(TS_QUERY % { q: sanitize(query) })
+    scope :search_plain, ->(*query){
+      where(TS_QUERY % { q: plainto_tsquery(query) })
     }
   end
+
+  module ClassMethods
+    def plainto_tsquery(*fragments)
+      plain = sanitize fragments.flatten.map(&:strip).join(' | ')
+      "to_tsquery('simple', #{plain})"
+    end
+  end
 end

data/lib/rails_cve/version.rb

@@ -1,3 +1,3 @@
 module RailsCVE
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/tasks/rails_cve_tasks.rake

@@ -3,10 +3,17 @@ namespace :rails_cve do
   desc "Seed the database"
   task seed: :environment do
     puts '(Re-) Importing CVE list. This could take a while...'
+
+    last = nil
     n = RailsCVE::Entry.rebuild_entries! do |entry|
-      puts "\t#{entry.name} imported"
+      if last != entry.year
+        last = entry.year
+        puts "Imports for #{last}:"
+      end
+      print "\t#{entry.name.split('-').last}"
     end
-    puts "Done! Imported #{n} CVE entries."
+
+    puts '', "Done! Imported #{n} CVE entries."
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_cve
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dominik Menke