grepg 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4461f02d7f064ba3c1b94e4c9d9e52585bfcc2a
-  data.tar.gz: facace3baba5687fecd162bede531d71bb87fbba
+  metadata.gz: 5970896fb073a016c531753aee5a4ea8e23537c1
+  data.tar.gz: f2ab740989e19f697af5fe94bcb3b79fcb396925
 SHA512:
-  metadata.gz: 3a5f2b0cac9fce61381180a5c17a9674819a3580377a601e2190eb9dc978c656827a6629bce6ce634a2e6e7dcb1623a2ff8f7f05688ce29bc988f14c55a5a940
-  data.tar.gz: 05a78e200bede2dfafce4a7680c73c099e245172592c253d073bc593247a8dba21dd00bf766e29c438c4f5c3c6dafb4a2e3df1bd7cf5a6147f5c894809a3bc24
+  metadata.gz: 7632215dcd09df77023e986964e939d4d6637ab72cc929b54d30651a7fb35fb1ec51adbb30e490da8ce065fb91bd69ba4b3f6bc826df2d754b33bd7638c372fb
+  data.tar.gz: da479cce6948f4f90bc274785b0055d12e533e9847431c93f59b262779d03609d903c42e24a65b4b3aca4ba9443b277dcf06a8cca2073c592ba723d520ae9fec

data/lib/grepg/parser.rb

@@ -23,6 +23,11 @@ module GrepPage
           :type => :string,
           :required => false,
           :short => "-s"
+        opt :search_operator,
+          "One of: OR, AND",
+          :type => :string,
+          :default => default_config['search_operator'],
+          :short => "-o"
         opt :colorize,
           "colorize output",
           :type => :boolean,
@@ -57,7 +62,8 @@ Defaults:
       @user = @opts[:user]
       @topic = @opts[:topic]
       @search_term = @opts[:search]
-      @colorize = @opts[:colorize]
+      @search_operator = (@opts[:search_operator] || "and").upcase.to_sym
+      @colorize = @opts[:colorize] || true
     end
 
     def self.get_default_config
@@ -84,48 +90,56 @@ Defaults:
       GrepPage::API.cheats(user, sheet_id)
     end
 
-    def filter_cheats(cheats, search_term)
+    def filter_cheats(cheats, search_term, search_operator)
       cheats.select do |cheat|
-        (cheat[:description].downcase[search_term.downcase] ||
-         cheat[:command].downcase[search_term.downcase]) != nil
+        search_term.split(' ').map do |token|
+          text_to_search = [ cheat[:description],
+                             cheat[:command]
+          ].join(' ').downcase
+          text_to_search.include? token.downcase
+        end.reduce {|a,b| search_operator == :AND ? a && b : a || b}
       end
     end
 
-    def process_args(user, topic, search_term, colorize)
-      headers = ["User: #{user}"]
-      headers << "Topic: #{topic}" if topic
-      headers << "Search-Term: #{search_term}" if search_term
+    def process_args
+      headers = ["User: #{@user}"]
+      headers << "Topic: #{@topic}" if @topic
+      if(@search_term)
+        label = "Search-Term: #{@search_term}"
+        label += "(#{@search_operator})" if @search_term.split(' ').count > 1
+        headers << label
+      end
       puts headers.join(", ")
 
       begin
-        topics = get_all_topics(user)
+        topics = get_all_topics(@user)
       rescue RestClient::ResourceNotFound
         raise GrepPage::NotFoundError, "Unable to find user"
       end
 
-      unless topic
+      unless @topic
         # No topic specified so show all topics
         puts "Available Topics => "
         puts topics.map{|t| t[:name]}
         return
       end
 
-      topic = filter_topics(topics, topic)
+      topic = filter_topics(topics, @topic)
       if topic.nil? || topic.empty?
         puts "Can't find that topic. Choose one of the following"
         puts topics.map{|t| t[:name]}
         raise GrepPage::NotFoundError, "Unable to find topic"
       end
 
-      cheats = get_cheats(user, topic[:id])
-      cheats = filter_cheats(cheats, search_term) if search_term
+      cheats = get_cheats(@user, topic[:id])
+      cheats = filter_cheats(cheats, @search_term, @search_operator) if @search_term
 
-      GrepPage::Formatter.cheat_rows(cheats, search_term, colorize)
+      GrepPage::Formatter.cheat_rows(cheats, @search_term, @colorize)
     end
 
     def run!
       begin
-        process_args(@user, @topic, @search_term, @colorize)
+        process_args
       rescue GrepPage::NotFoundError => ex
         abort "Error: #{ex.message}"
       end

data/lib/grepg/version.rb

@@ -1,3 +1,3 @@
 module GrepPage
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/grepg/parser_spec.rb

@@ -2,19 +2,31 @@ require 'json'
 require 'yaml'
 require_relative '../../lib/grepg.rb'
 
+# Integration level tests
 describe GrepPage::Parser do
   describe '.initialize' do
     context "expected behavior" do
       it "returns a set of cheats when username and topic are given" do
         parser = GrepPage::Parser.new('-u kdavis -t css'.split(' '))
         output = capture_stdout { parser.run! }
-        expect(output).to match(/colors/)
+        expect(output).to match(/palette/)
       end
 
       it "returns a set of cheats when username, topic and search term are given" do
         parser = GrepPage::Parser.new('-u kdavis -t css -s colors'.split(' '))
         output = capture_stdout { parser.run! }
-        expect(output).to match(/colors/)
+        expect(output).to match(/palette/)
+      end
+
+      it "returns a set of cheats search term has multiple words" do
+        args = '-u kdavis -t css -o AND -s'.split(' ')
+        parser = GrepPage::Parser.new(args << "colors asbd")
+        output = capture_stdout { parser.run! }
+        expect(output).not_to match(/palette/)
+        args = '-u kdavis -t css -o OR -s'.split(' ')
+        expect(capture_stdout {
+          GrepPage::Parser.new(args << "colors asbd").run!
+        }).to match(/palette/)
       end
 
       # Test if we are seeing colors in the output
@@ -81,6 +93,28 @@ describe GrepPage::Parser do
       expect(GrepPage::Parser.get_default_config).to eq(default_contents)
     end
   end
+
+  describe '#filter_cheats' do
+    let ( :parser ) { GrepPage::Parser.new('-u kdavis'.split(' ')) }
+    let ( :cheats ) {[{
+      description: "bootstrap styles $@ 123",
+      command: "command for bootstrap styles"
+    }]}
+
+    it('filters cheats based on search term') do
+      expect(parser.filter_cheats(cheats, 'boot style', :AND).count).to be > 0
+      expect(parser.filter_cheats(cheats, 'boot', :AND).count).to be > 0
+      # test special characters
+      expect(parser.filter_cheats(cheats, '$@', :AND).count).to be > 0
+    end
+
+    it('processes AND and OR for queries') do
+      # process OR
+      expect(parser.filter_cheats(cheats, 'boot garbage', :OR).count).to be > 0
+      # process AND
+      expect(parser.filter_cheats(cheats, 'boot garbage', :AND).count).to be 0
+    end
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grepg
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Yash Ranadive