hipchat_searcher 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69cc10fd7c58d30a07200b217825b20c7b445a0b
-  data.tar.gz: 4dc3f4a9387f9111ee4fb06362a750ad8e1ef00e
+  metadata.gz: 1fd098a01a0e50974e9e94aad6531217212b4f02
+  data.tar.gz: ff849519de62525a531f4705e0f4dcfe4c0c7f39
 SHA512:
-  metadata.gz: 5118535bdbe1af759eb832d8bae11f94bc4f156110aab3086a0cf58440dcdef605fa3ab8629c1fbcbb0528962a125fb658e166d95863fd5467e97d40b3ec8982
-  data.tar.gz: f5dbf4a436b03cbcc865d22e01ee7dbd030da587b75a0ab499bca5ab38b78a17b42b727b4983434e9ed722f5d4955d8156c7d63bb5b7a9825677bb6dd8c74750
+  metadata.gz: 88be4494c9f37e92b7668dcee89e9b57b106d788bf6b2d50c3ea967c5fb6d21140dff7ad5f9413cf69290677766b404b5c5a0f849e932bf81927a627dd682827
+  data.tar.gz: 2633cdb60c1494e9545048b0cc73031c647f876afa64bce65644c3c20043857752b6448db960ad4f285ed9a3ff042bdc3121dc312d3a37aeb819125a1d37088f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.0.3
+### Feature
+* Enable to search option `-A`, `-B`, `-C`, such as `grep`
+
+### Bugfix
+* Remove `#p` because `spec/lib/hipchat_searcher/searcher_spec.rb` was included
+
 # 0.0.2
 ### Feature
 * Enable to search Regexp on ignorecase.

data/README.md

@@ -22,9 +22,11 @@ echo {access_token} > ~/.hps
 
 ## Usage
 
-`hipchat_searcher` search for a regular expression the words that you specify.
+`hipchat_searcher` search for a regular expression the words that you specify.  
+In the specifications of the [hipchat api](https://www.hipchat.com/docs/apiv2/), `hipchat_searcher` search of the upcoming 100 comments.
 
 * Search the words in all room
+   * But it searches ALL the room that user know, so there may be heavy.
 
 ```
 hps word

data/hipchat_searcher.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["mgi166"]
   spec.email         = ["skskoari@gmail.com"]
   spec.summary       = %q{Search hipchat log on terminal}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/mgi166/hipchat_searcher"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/hipchat_searcher/command.rb

@@ -24,7 +24,7 @@ module HipchatSearcher
 
       message = Message.new(@config.token, @options.message_options)
 
-      rooms.inject([]) do |result, room|
+      rooms.each do |room|
         hist = message.history(room)
         Searcher.search(@pattern, hist, @options.search_options)
       end

data/lib/hipchat_searcher/options.rb

@@ -11,7 +11,12 @@ module HipchatSearcher
     end
 
     def search_options
-      user? ? { user: user } : {}
+      {}.tap do |o|
+        o.merge!(user: user)                     if user?
+        o.merge!(after_context:  after_context)  if after_context?
+        o.merge!(before_context: before_context) if before_context?
+        o.merge!(context: context)               if context?
+      end
     end
 
     class << self
@@ -19,9 +24,12 @@ module HipchatSearcher
       # [shortname, longname, description]
       def with_value
         [
-         ['r=', 'room=', 'Search only the log of the room that you specified'],
-         ['u=', 'user=', 'Search only the log that specified user talk'],
-         ['d=', 'date=', 'Search the log since specified date'],
+         ['r=', 'room=',           'Search only the log of the room that you specified'],
+         ['u=', 'user=',           'Search only the log that specified user talk'],
+         ['d=', 'date=',           'Search the log since specified date'],
+         ['A=', 'after_context=',  'Search the log that trails context after each match'],
+         ['B=', 'before_context=', 'Search the log that trails context before each match'],
+         ['C=', 'context=',        'Search the log that trails context surround each match'],
         ]
       end
 

data/lib/hipchat_searcher/searcher.rb

@@ -2,40 +2,52 @@ require 'colorize'
 
 module HipchatSearcher
   class Searcher
-    def initialize(result, options={})
+    def initialize(pattern, result, options={})
       @result     = result
       @options    = options
+      @pattern    = Regexp.new(pattern, Regexp::IGNORECASE)
       @print_room = false
+      @print_item = {}
     end
 
     def self.search(pattern, result, options)
-      new(result, options).search(pattern)
+      new(pattern, result, options).search
     end
 
-    def contents(pattern, item)
-      date    = date(item)
-      message = message(pattern, item)
+    def extended_items(index)
+      items[range(index)].map do |itm|
+        itm.extend(ItemExtention).tap do |i|
+          i.pattern = @pattern
+        end
+      end
+    end
 
-      "%s\n%s\n\n" % [date, message]
+    def items
+      @items ||= @result.items
     end
 
-    def puts_search_result(pattern, item)
-      contents = contents(pattern, item)
+    def puts_search_result(item)
       if option_user?
-        if @options[:user] == user_name(item)
-          puts_contents(contents)
+        if @options[:user] == item.mention_name
+          puts_contents(item)
         end
       else
-        puts_contents(contents)
+        puts_contents(item)
       end
     end
 
-    def search(pattern)
-      pattern = Regexp.new(pattern, Regexp::IGNORECASE)
-
-      @result.items.each do |item|
-        if pattern =~ item.message
-          puts_search_result(pattern, item)
+    def search
+      items.each_with_index do |item, idx|
+        next unless @pattern =~ item.message
+
+        if option_search?
+          extended_items(idx).each do |itm|
+            puts_search_result(itm)
+          end
+        else
+          ext = item.extend(ItemExtention)
+          ext.pattern = @pattern
+          puts_search_result(ext)
         end
       end
 
@@ -44,17 +56,20 @@ module HipchatSearcher
 
     private
 
-    def date(item)
-      "  Date: #{item.date}"
+    def option_after?
+      !!@options[:after_context]
     end
 
-    def message(pattern, item)
-      msg = item.message.gsub(pattern) do |matched|
-        matched.colorize(:red)
-      end
+    def option_before?
+      !!@options[:before_context]
+    end
 
-      name = user_name(item)
-      "  @#{name}" + ': ' + msg
+    def option_context?
+      !!@options[:context]
+    end
+
+    def option_search?
+      option_after? || option_before? || option_context?
     end
 
     def option_user?
@@ -70,17 +85,65 @@ module HipchatSearcher
       puts room.underline
     end
 
-    def puts_contents(contents)
+    def puts_contents(item)
       print_room? ? nil : puts_room
-      puts contents
+      puts item.contents unless printed?(item.id)
+    end
+
+    def range(index)
+      param = []
+
+      case
+      when option_before?
+        _i = index - @options[:before_context].to_i
+        param = _i < 0 ? [0, index] : [_i, index]
+      when option_after?
+        _i = index + @options[:after_context].to_i
+        param = [index, _i]
+      when option_context?
+        _i = index - @options[:context].to_i
+        _j = index + @options[:context].to_i
+        param = _i < 0 ? [0, _j] : [_i, _j]
+      end
+
+      Range.new(*param)
     end
 
     def room
       @result.room
     end
 
-    def user_name(item)
-      item.from.mention_name rescue item.from
+    def printed?(id)
+      if @print_item.key?(id)
+        true
+      else
+        @print_item[id] = 1
+        false
+      end
+    end
+
+    module ItemExtention
+      attr_accessor :pattern
+
+      def contents
+        "%s\n%s\n\n" % [_date, _message]
+      end
+
+      def mention_name
+        self.from.mention_name rescue self.from
+      end
+
+      def _date
+        "  Date: %s" % self.date
+      end
+
+      def _message
+        msg = self.message.gsub(pattern) do |matched|
+          matched.colorize(:red)
+        end
+
+        "  @%s: %s" % [mention_name, msg]
+      end
     end
   end
 end

data/lib/hipchat_searcher/version.rb

@@ -1,3 +1,3 @@
 module HipchatSearcher
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/data/item-list-with-overlap.json

@@ -0,0 +1,67 @@
+{
+    "items": [
+        {
+            "date": "2014-05-30T01:38:16.741565+00:00",
+            "from": {
+                "id": 12345,
+                "links": {"self": "https://api.hipchat.com/v2/user/12345"},
+                "mention_name": "jotaro",
+                "name": "Jotaro Kujo"
+            },
+            "id": "aaaa-bbbb-cccc",
+            "mentions": [],
+            "message": "yareyare daze"
+        },
+        {
+            "date": "2014-05-30T01:39:02.186319+00:00",
+            "from": {
+                "id": 23456,
+                "links": {"self": "https://api.hipchat.com/v2/user/23456"},
+                "mention_name": "noriaki",
+                "name": "Noriaki Kakyoin"
+            },
+            "id": "dddd-eeee-ffff",
+            "mentions": [],
+            "message": "rerorero"
+        },
+        {
+            "date": "2014-06-09T11:29:10.209014+00:00",
+            "from": {
+                "id": 34567,
+                "links": {"self": "https://api.hipchat.com/v2/user/34567"},
+                "mention_name": "polnareff",
+                "name": "Jean Pierre Polnareff"
+            },
+            "id": "gggg-hhhh-iiii",
+            "mentions": [],
+            "message": "a... arinomama ima okotta koto wo hanasu ze"
+        },
+        {
+            "date": "2014-06-10T08:36:09.281643+00:00",
+            "from": {
+                "id": 45678,
+                "links": {"self": "https://api.hipchat.com/v2/user/45678"},
+                "mention_name": "abdul",
+                "name": "mohamed abdul"
+            },
+            "id": "jjjj-kkkk-llll",
+            "mentions": [],
+            "message": "chirp chirp chirp"
+        },
+        {
+            "date": "2014-06-11T19:20:47.726182+00:00",
+            "from": {
+                "id": 34567,
+                "links": {"self": "https://api.hipchat.com/v2/user/34567"},
+                "mention_name": "lggy",
+                "name": "lggy"
+            },
+            "id": "mmmm-nnnn-oooo",
+            "mentions": [],
+            "message": "inu zuki no kodomo ha migoroshiniha dekine-ze"
+        }
+    ],
+    "links": {"self": "https://api.hipchat.com/v2/room/jojo-part3/history"},
+    "maxResults": 100,
+    "startIndex": 0
+}

data/spec/hipchat_searcher_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe HipchatSearcher do
   it 'has a version number' do
-    expect(HipchatSearcher::VERSION).not_to be '0.0.1'
+    HipchatSearcher::VERSION.should == '0.0.3'
   end
 end

data/spec/lib/hipchat_searcher/searcher_spec.rb

@@ -1,20 +1,111 @@
 require 'spec_helper'
 
 describe HipchatSearcher::Searcher do
-  def searcher(result)
-    described_class.new(result)
+  def searcher(pattern, result, options={})
+    described_class.new(pattern, result, options)
+  end
+
+  describe '#items' do
+    subject { searcher(pattern, result).items }
+
+    let(:pattern) { 'hoge' }
+    let(:result) do
+      response = File.read(File.join('spec', 'data', 'item-list.json'))
+      HipchatSearcher::Result.new(response)
+    end
+
+    it { should be_instance_of Array }
+
+    it 'should return array with Hashie::Mash objects' do
+      subject.first.should be_instance_of ::Hashie::Mash
+      subject.last.should  be_instance_of ::Hashie::Mash
+    end
+  end
+
+  describe '#extended_items' do
+    describe 'you speciy :before_context option' do
+      context 'when specify the range is included in the array' do
+        subject { searcher(pattern, result, before_context: '3').extended_items(3) }
+
+        let(:pattern) { 'fuga' }
+        let(:result)  { double(:result, items: %w|1 2 3 4 5 6|) }
+
+        it 'should return the array of range to include index you specify' do
+          should == %w|1 2 3 4|
+        end
+      end
+
+      context 'when specify the range is exluded in the array' do
+        subject { searcher(pattern, result, before_context: '3').extended_items(1) }
+
+        let(:pattern) { 'fuga' }
+        let(:result)  { double(:result, items: %w|1 2 3 4 5 6|) }
+
+        it 'should return the array includes range until index from first' do
+          should == %w|1 2|
+        end
+      end
+    end
+
+    describe 'you specify :after_context option' do
+      context 'when specify the range is included in the array' do
+        subject { searcher(pattern, result, after_context: '3').extended_items(1) }
+
+        let(:pattern) { 'fuga' }
+        let(:result)  { double(:result, items: %w|1 2 3 4 5 6|) }
+
+        it 'should return the array of range to include index you specify' do
+          should == %w|2 3 4 5|
+        end
+      end
+
+      context 'when specify the range is exluded in the array' do
+        subject { searcher(pattern, result, after_context: '3').extended_items(4) }
+
+        let(:pattern) { 'fuga' }
+        let(:result)  { double(:result, items: %w|1 2 3 4 5 6|) }
+
+        it 'should return the array includes range until the end from index' do
+          should == %w|5 6|
+        end
+      end
+    end
+
+    describe 'you specify :context option' do
+      context 'when specify the range is included in the array' do
+        subject { searcher(pattern, result, context: '2').extended_items(3) }
+
+        let(:pattern) { 'fuga' }
+        let(:result)  { double(:result, items: %w|1 2 3 4 5 6|) }
+
+        it 'should return the array of range to surround index you specify' do
+          should == %w|2 3 4 5 6|
+        end
+      end
+
+      context 'when specify the range is exluded in the array' do
+        subject { searcher(pattern, result, context: '5').extended_items(3) }
+
+        let(:pattern) { 'fuga' }
+        let(:result)  { double(:result, items: %w|1 2 3 4 5 6|) }
+
+        it 'should return the array includes range to surround as much as possible' do
+          should == %w|1 2 3 4 5 6|
+        end
+      end
+    end
   end
 
   describe '#search' do
     context 'when matches pattern in messages' do
-      subject { searcher(result).search(pattern) }
+      subject { searcher(pattern, result).search }
 
       let(:pattern)  { 'yare' }
-      let(:response) { File.read(File.join('spec', 'data', 'item-list.json')) }
       let(:result) do
-        r = HipchatSearcher::Result.new(response)
-        r.room = "Joestars"
-        r
+        response = File.read(File.join('spec', 'data', 'item-list.json'))
+        HipchatSearcher::Result.new(response).tap do |r|
+          r.room = "Joestars"
+        end
       end
       let(:search_result) do
         "\e[4;39;49mJoestars\e[0m" + "\n" + \
@@ -31,14 +122,14 @@ describe HipchatSearcher::Searcher do
     end
 
     context 'when matches pattern in many messages' do
-      subject { searcher(result).search(pattern) }
+      subject { searcher(pattern, result).search }
 
       let(:pattern)  { 'ze' }
-      let(:response) { File.read(File.join('spec', 'data', 'item-list.json')) }
       let(:result) do
-        r = HipchatSearcher::Result.new(response)
-        r.room = "Joestars"
-        r
+        response = File.read(File.join('spec', 'data', 'item-list.json'))
+        HipchatSearcher::Result.new(response).tap do |r|
+          r.room = "Joestars"
+        end
       end
       let(:search_result) do
         "\e[4;39;49mJoestars\e[0m" + "\n" + \
@@ -57,15 +148,140 @@ describe HipchatSearcher::Searcher do
       end
     end
 
+    context 'when search_option --before_context' do
+      subject { searcher(pattern, result, before_context: '1').search }
+
+      let(:pattern) { 'inu' }
+      let(:result) do
+        response = File.read(File.join('spec', 'data', 'item-list-with-overlap.json'))
+        HipchatSearcher::Result.new(response).tap do |r|
+          r.room = "Joestars"
+        end
+      end
+      let(:search_result) do
+        "\e[4;39;49mJoestars\e[0m" + "\n" + \
+        "  Date: 2014-06-10T08:36:09.281643+00:00" + "\n" + \
+        "  @abdul: chirp chirp chirp" + "\n" + \
+        "\n" + \
+        "  Date: 2014-06-11T19:20:47.726182+00:00" + "\n" + \
+        "  @lggy: \e[0;31;49minu\e[0m zuki no kodomo ha migoroshiniha dekine-ze" + "\n" + \
+        "\n"
+      end
+
+      it 'should print the matched message and after context' do
+        expect do
+          subject
+        end.to output(search_result).to_stdout
+      end
+    end
+
+    context 'when search_option --after_context' do
+      subject { searcher(pattern, result, after_context: '1').search }
+
+      let(:pattern) { 'rero' }
+      let(:result) do
+        response = File.read(File.join('spec', 'data', 'item-list-with-overlap.json'))
+        HipchatSearcher::Result.new(response).tap do |r|
+          r.room = "Joestars"
+        end
+      end
+      let(:search_result) do
+        "\e[4;39;49mJoestars\e[0m" + "\n" + \
+        "  Date: 2014-05-30T01:39:02.186319+00:00" + "\n" + \
+        "  @noriaki: \e[0;31;49mrero\e[0m\e[0;31;49mrero\e[0m" + "\n" + \
+        "\n" + \
+        "  Date: 2014-06-09T11:29:10.209014+00:00" + "\n" + \
+        "  @polnareff: a... arinomama ima okotta koto wo hanasu ze" + "\n" + \
+        "\n"
+      end
+
+      it 'should print the matched message and after context' do
+        expect do
+          subject
+        end.to output(search_result).to_stdout
+      end
+    end
+
+    context 'when search_option --context' do
+      subject { searcher(pattern, result, context: '2').search }
+
+      let(:pattern) { 'chirp' }
+      let(:result) do
+        response = File.read(File.join('spec', 'data', 'item-list-with-overlap.json'))
+        HipchatSearcher::Result.new(response).tap do |r|
+          r.room = "Joestars"
+        end
+      end
+      let(:search_result) do
+        "\e[4;39;49mJoestars\e[0m" + "\n" + \
+        "  Date: 2014-05-30T01:39:02.186319+00:00" + "\n" + \
+        "  @noriaki: rerorero" + "\n" + \
+        "\n" + \
+        "  Date: 2014-06-09T11:29:10.209014+00:00" + "\n" + \
+        "  @polnareff: a... arinomama ima okotta koto wo hanasu ze" + "\n" + \
+        "\n" + \
+        "  Date: 2014-06-10T08:36:09.281643+00:00" + "\n" + \
+        "  @abdul: \e[0;31;49mchirp\e[0m \e[0;31;49mchirp\e[0m \e[0;31;49mchirp\e[0m" + "\n" + \
+        "\n" + \
+        "  Date: 2014-06-11T19:20:47.726182+00:00" + "\n" + \
+        "  @lggy: inu zuki no kodomo ha migoroshiniha dekine-ze" + "\n" + \
+        "\n"
+      end
+
+      it 'should print the matched message and surround context' do
+        expect do
+          subject
+        end.to output(search_result).to_stdout
+      end
+    end
+
+    context 'when match result overlaped and specify search options' do
+      subject { searcher(pattern, result, after_context: '2').search }
+
+      let(:pattern) { 'ze' }
+      let(:result) do
+        response = File.read(File.join('spec', 'data', 'item-list-with-overlap.json'))
+        HipchatSearcher::Result.new(response).tap do |r|
+          r.room = "Joestars"
+        end
+      end
+      let(:search_result) do
+        "\e[4;39;49mJoestars\e[0m" + "\n" + \
+        "  Date: 2014-05-30T01:38:16.741565+00:00" + "\n" + \
+        "  @jotaro: yareyare da\e[0;31;49mze\e[0m" + "\n" + \
+        "\n" + \
+        "  Date: 2014-05-30T01:39:02.186319+00:00" + "\n" + \
+        "  @noriaki: rerorero" + "\n" + \
+        "\n" + \
+        "  Date: 2014-06-09T11:29:10.209014+00:00" + "\n" + \
+        "  @polnareff: a... arinomama ima okotta koto wo hanasu \e[0;31;49mze\e[0m" + "\n" + \
+        "\n" + \
+        "  Date: 2014-06-10T08:36:09.281643+00:00" + "\n" + \
+        "  @abdul: chirp chirp chirp" + "\n" + \
+        "\n" + \
+        "  Date: 2014-06-11T19:20:47.726182+00:00" + "\n" + \
+        "  @lggy: inu zuki no kodomo ha migoroshiniha dekine-\e[0;31;49mze\e[0m" + "\n" + \
+        "\n"
+      end
+
+      it 'should print the matched message without overlap' do
+        expect do
+          subject
+        end.to output(search_result).to_stdout
+      end
+    end
+
     context "when don't match pattern in messages" do
-      subject { searcher(result).search(pattern) }
+      subject { searcher(pattern, result).search }
 
-      let(:pattern)  { 'abcd' }
-      let(:result)   { HipchatSearcher::Result.new(response) }
-      let(:response) { File.read(File.join('spec', 'data', 'item-list.json')) }
+      let(:pattern) { 'abcd' }
+      let(:result) do
+        response = File.read(File.join('spec', 'data', 'item-list.json'))
+        HipchatSearcher::Result.new(response)
+      end
 
       it { should be_nil }
-p
+
       it 'should no output to stdout' do
         expect do
           subject
@@ -74,11 +290,13 @@ p
     end
 
     context "when pattern can't convert regexp" do
-      subject { searcher(result).search(pattern) }
+      subject { searcher(pattern, result).search }
 
-      let(:pattern)  { nil }
-      let(:result)   { HipchatSearcher::Result.new(response) }
-      let(:response) { File.read(File.join('spec', 'data', 'item-list.json')) }
+      let(:pattern) { nil }
+      let(:result) do
+        response = File.read(File.join('spec', 'data', 'item-list.json'))
+        HipchatSearcher::Result.new(response)
+      end
 
       it 'should raise exception' do
         expect do
@@ -89,14 +307,24 @@ p
   end
 
   describe '#puts_search_result' do
+    def extended_items(path, pattern)
+      hash  = JSON.parse(File.read(path))
+      items = ::Hashie::Mash.new(hash).items
+      items.map do |itm|
+        itm.extend(HipchatSearcher::Searcher::ItemExtention).tap do |i|
+          i.pattern = Regexp.new(pattern)
+        end
+      end
+    end
+
     context 'when only person in room' do
-      subject { searcher(double(:result, room: 'Joestars')).puts_search_result(pattern, item) }
+      subject { searcher(pattern, result).puts_search_result(item) }
 
-      let(:pattern) { Regexp.new('yare') }
+      let(:pattern) { 'yare' }
+      let(:result)  { double(:result, room: 'Joestars') }
       let(:item) do
-        src  = File.read(File.join('spec', 'data', 'item-list.json'))
-        hash = JSON.parse(src)
-        ::Hashie::Mash.new(hash).items.first
+        path = File.join('spec', 'data', 'item-list.json')
+        extended_items(path, pattern).first
       end
 
       let(:search_result) do
@@ -114,13 +342,13 @@ p
     end
 
     context 'when person and bot in room' do
-      subject { searcher(double(:result, room: 'Joestars')).puts_search_result(pattern, item) }
+      subject { searcher(pattern, result).puts_search_result(item) }
 
-      let(:pattern) { Regexp.new('mgi166') }
+      let(:pattern) { 'mgi166' }
+      let(:result)  { double(:result, room: 'Joestars') }
       let(:item) do
-        src  = File.read(File.join('spec', 'data', 'item-list-with-bot.json'))
-        hash = JSON.parse(src)
-        ::Hashie::Mash.new(hash).items.first
+        path = File.join('spec', 'data', 'item-list-with-bot.json')
+        extended_items(path, pattern).first
       end
 
       let(:search_result) do
@@ -137,13 +365,13 @@ p
     end
 
     context "when user options specified but the user don't speak this message" do
-      subject { described_class.new(double(:result, room: 'Joestars'), user: 'jotaro').puts_search_result(pattern, item) }
+      subject { searcher(pattern, result, user: 'jotaro').puts_search_result(item) }
 
-      let(:pattern)  { 'ze' }
+      let(:pattern) { 'ze' }
+      let(:result)  { double(:result, room: 'Joestars') }
       let(:item) do
-        src  = File.read(File.join('spec', 'data', 'item-list.json'))
-        hash = JSON.parse(src)
-        ::Hashie::Mash.new(hash).items.last
+        path = File.join('spec', 'data', 'item-list.json')
+        extended_items(path, pattern).last
       end
 
       it 'should not print message' do
@@ -154,13 +382,13 @@ p
     end
 
     context "when user options specified and the user speak this message" do
-      subject { described_class.new(double(:result, room: 'Joestars'), user: 'jotaro').puts_search_result(pattern, item) }
+      subject { searcher(pattern, result, user: 'jotaro').puts_search_result(item) }
 
-      let(:pattern)  { 'ze' }
+      let(:pattern) { 'ze' }
+      let(:result)  { double(:result, room: 'Joestars') }
       let(:item) do
-        src  = File.read(File.join('spec', 'data', 'item-list.json'))
-        hash = JSON.parse(src)
-        ::Hashie::Mash.new(hash).items.first
+        path = File.join('spec', 'data', 'item-list.json')
+        extended_items(path, pattern).first
       end
 
       let(:search_result) do
@@ -177,21 +405,4 @@ p
       end
     end
   end
-
-  describe '#contents' do
-    subject { searcher(double(:result)).contents(pattern, item) }
-
-    let(:pattern)  { 'ze' }
-    let(:item) do
-      src  = File.read(File.join('spec', 'data', 'item-list.json'))
-      hash = JSON.parse(src)
-      ::Hashie::Mash.new(hash).items.first
-    end
-
-    it 'should return string for search result contents' do
-      should == "  Date: 2014-05-30T01:38:16.741565+00:00" + "\n" + \
-                "  @jotaro: yareyare da\e[0;31;49mze\e[0m" + "\n" \
-                "\n"
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -7,4 +7,7 @@ RSpec.configure do |config|
   config.order = :random
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hipchat_searcher
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - mgi166
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat
@@ -149,13 +149,14 @@ files:
 - lib/hipchat_searcher/searcher.rb
 - lib/hipchat_searcher/version.rb
 - spec/data/item-list-with-bot.json
+- spec/data/item-list-with-overlap.json
 - spec/data/item-list.json
 - spec/data/room-list.txt
 - spec/hipchat_searcher_spec.rb
 - spec/lib/hipchat_searcher/result_spec.rb
 - spec/lib/hipchat_searcher/searcher_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/mgi166/hipchat_searcher
 licenses:
 - MIT
 metadata: {}
@@ -181,6 +182,7 @@ specification_version: 4
 summary: Search hipchat log on terminal
 test_files:
 - spec/data/item-list-with-bot.json
+- spec/data/item-list-with-overlap.json
 - spec/data/item-list.json
 - spec/data/room-list.txt
 - spec/hipchat_searcher_spec.rb