picky 4.9.0 → 4.10.0

data/lib/picky/extensions/object.rb

@@ -7,7 +7,7 @@ class Object
     exclaim "#{Time.now.strftime("%H:%M:%S")}: #{text}"
   end
 
-  # Just puts the given text.
+  # Just outputs the given text to the logger.
   #
   def exclaim text
     Picky.logger.info text
@@ -17,7 +17,7 @@ class Object
   # Puts a text that informs the user of a missing gem.
   #
   def warn_gem_missing gem_name, message
-    warn "#{gem_name} gem missing!\nTo use #{message}, you need to:\n  1. Add the following line to Gemfile:\n     gem '#{gem_name}'\n     or\n     require '#{gem_name}'\n     for example at the top of your app.rb file.\n  2. Then, run:\n     bundle update\n"
+    Picky.logger.warn "#{gem_name} gem missing!\nTo use #{message}, you need to:\n  1. Add the following line to Gemfile:\n     gem '#{gem_name}'\n     or\n     require '#{gem_name}'\n     for example at the top of your app.rb file.\n  2. Then, run:\n     bundle update\n"
   end
 
   # Indents each line by <tt>amount=2</tt> spaces.

data/lib/picky/index_indexing.rb

@@ -40,7 +40,7 @@ module Picky
     #       user as early as possible.
     #
     def check_source_empty
-      warn %Q{\n\033[1mWarning\033[m, source for index "#{name}" is empty: #{source} (responds true to empty?).\n} if source.respond_to?(:empty?) && source.empty?
+      Picky.logger.warn %Q{\n\033[1mWarning\033[m, source for index "#{name}" is empty: #{source} (responds true to empty?).\n} if source.respond_to?(:empty?) && source.empty?
     end
 
     # Indexes the categories in parallel.

data/lib/picky/loggers/concise.rb

@@ -6,24 +6,8 @@ module Picky
     #
     class Concise < Silent
       
-      attr_reader :tokenized,
-                  :dumped,
-                  :loaded
-      
       def initialize *args
         super *args
-        
-        reset
-      end
-      
-      def reset
-        @tokenized = false
-        @dumped    = false
-        @loaded    = false
-      end
-      
-      def info text
-        io.write text
       end
       
       def tokenize(*)
@@ -39,7 +23,33 @@ module Picky
       end
       
       def progress type = '.'
-        io.write type
+        write type
+      end
+      
+      def adapt_for_logger
+        super
+        def info text
+          output.info text
+        end
+        def warn text
+          output.warn text
+        end
+        def write message
+          output << message
+        end
+      end
+      def adapt_for_io
+        super
+        def info text
+          output.write text
+        end
+        def warn text
+          output.puts text
+          flush
+        end
+        def write message
+          output.write message
+        end
       end
       
     end

data/lib/picky/loggers/silent.rb

@@ -6,16 +6,50 @@ module Picky
     #
     class Silent
       
-      attr_reader :io
+      attr_reader :output
       
-      def initialize io = STDOUT
-        @io = io
+      def initialize output = STDOUT
+        @output = output
+        adapt
+      end
+      
+      # Is the output a logger?
+      #
+      def logger_output?
+        output.respond_to?(:fatal) &&
+        output.respond_to?(:error) &&
+        output.respond_to?(:warn)  &&
+        output.respond_to?(:info)  &&
+        output.respond_to?(:debug)
+      end
+      
+      def adapt
+        logger_output? ? adapt_for_logger : adapt_for_io
+      end
+      
+      def adapt_for_logger
+        def flush
+            
+        end
+      end
+      def adapt_for_io
+        def flush
+          output.flush
+        end
       end
       
       def info(*)
         
       end
       
+      def warn(*)
+        
+      end
+      
+      def write(*)
+        
+      end
+      
       def tokenize(*)
         
       end
@@ -28,12 +62,6 @@ module Picky
         
       end
       
-      # Flush this logger.
-      #
-      def flush
-        io.flush
-      end
-      
     end
     
   end

data/lib/picky/loggers/verbose.rb

@@ -22,12 +22,31 @@ module Picky
         timed_exclaim %Q{  "#{category.identifier}": Loading index from cache.}
       end
       
-      # Puts a text in the form:
-      #   12:34:56: text here
-      #
-      def timed_exclaim text
-        io.puts "#{Time.now.strftime("%H:%M:%S")}: #{text}"
-        flush
+      def adapt_for_logger
+        super
+        def timed_exclaim text
+          output.info "#{Time.now.strftime("%H:%M:%S")}: #{text}"
+        end
+        def warn text
+          output.warn text
+        end
+        def write message
+          output << message
+        end
+      end
+      def adapt_for_io
+        super
+        def timed_exclaim text
+          output.puts "#{Time.now.strftime("%H:%M:%S")}: #{text}"
+          flush
+        end
+        def warn text
+          output.puts text
+          flush
+        end
+        def write message
+          output.write message
+        end
       end
       
     end

data/lib/picky/query/qualifier_category_mapper.rb

@@ -26,7 +26,7 @@ module Picky
       def add category
         category.qualifiers.each do |qualifier|
           sym_qualifier = qualifier.intern
-          warn %Q{Warning: Qualifier "#{qualifier}" already mapped to category #{mapping[sym_qualifier].identifier} (ambiguous qualifier mapping).} if mapping.has_key? sym_qualifier
+          Picky.logger.warn %Q{Warning: Qualifier "#{qualifier}" already mapped to category #{mapping[sym_qualifier].identifier} (ambiguous qualifier mapping).} if mapping.has_key? sym_qualifier
           mapping[sym_qualifier] = category
         end
       end

data/spec/functional/facets_spec.rb

@@ -139,7 +139,7 @@ describe 'facets' do
       it 'is fast enough' do
         performance_of {
           10.times { finder.facets(:age_category, filter: 'surname:meier name:peter') }
-        }.should < 0.003
+        }.should < 0.004
       end
       it 'has one filtered facet' do
         # TODO Fix problems with alternative qualifiers (like :age).
@@ -169,7 +169,7 @@ describe 'facets' do
       it 'is fast enough' do
         performance_of {
           10.times { finder.facets(:age_category, filter: 'surname:meier name:peter', counts: false) }
-        }.should < 0.00275
+        }.should < 0.004
       end
       it 'has one filtered facet' do
         # TODO Fix problems with alternative qualifiers (like :age).

data/spec/lib/extensions/symbol_spec.rb

@@ -13,7 +13,7 @@ describe Symbol do
       performance_of { @token.each_subtoken { |subtoken| } }.should < 0.00065
     end
     it 'is fast enough' do
-      performance_of { @token.each_intoken { |intoken| } }.should < 0.025 # THINK Is this too slow?
+      performance_of { @token.each_intoken { |intoken| } }.should < 0.035 # THINK Is this too slow?
     end
   end
 

data/spec/lib/loader_spec.rb

@@ -12,7 +12,7 @@ describe Picky::Loader do
       performance_of do
         described_class.load_self
         described_class.load_framework
-      end.should < 0.025
+      end.should < 0.04
     end
   end
 

data/spec/lib/loggers/concise_spec.rb

@@ -3,24 +3,48 @@ require 'spec_helper'
 describe Picky::Loggers::Concise do
   
   let(:io) { StringIO.new }
-  let(:logger) { described_class.new io }
+  let(:logger) { described_class.new thing }
 
-  describe 'more complicated test case' do
-    it 'is correct' do
-      logger.info 'Tokenizing '
-      logger.tokenize :some_category
-      logger.tokenize :some_category
-      logger.tokenize :some_category
-      logger.info ' Dumping '
-      logger.dump :some_category
-      logger.dump :some_category
-      logger.info ' Loading '
-      logger.load :some_category
-      logger.load :some_category
-      logger.load :some_category
-      logger.load :some_category
+  context 'with Logger' do
+    let(:thing) { Logger.new io }
+    describe 'more complicated test case' do
+      it 'is correct' do
+        logger.write 'Tokenizing '
+        logger.tokenize :some_category
+        logger.tokenize :some_category
+        logger.tokenize :some_category
+        logger.write ' Dumping '
+        logger.dump :some_category
+        logger.dump :some_category
+        logger.write ' Loading '
+        logger.load :some_category
+        logger.load :some_category
+        logger.load :some_category
+        logger.load :some_category
       
-      io.string.should == 'Tokenizing TTT Dumping DD Loading ....'
+        io.string.should == "Tokenizing TTT Dumping DD Loading ...."
+      end
+    end
+  end
+  context 'with IO' do
+    let(:thing) { io }
+    describe 'more complicated test case' do
+      it 'is correct' do
+        logger.write 'Tokenizing '
+        logger.tokenize :some_category
+        logger.tokenize :some_category
+        logger.tokenize :some_category
+        logger.write ' Dumping '
+        logger.dump :some_category
+        logger.dump :some_category
+        logger.write ' Loading '
+        logger.load :some_category
+        logger.load :some_category
+        logger.load :some_category
+        logger.load :some_category
+      
+        io.string.should == 'Tokenizing TTT Dumping DD Loading ....'
+      end
     end
   end
 

data/spec/lib/loggers/silent_spec.rb

@@ -3,24 +3,47 @@ require 'spec_helper'
 describe Picky::Loggers::Silent do
   
   let(:io) { StringIO.new }
-  let(:logger) { described_class.new io }
-
-  describe 'more complicated test case' do
-    it 'is correct' do
-      logger.info 'Tokenizing '
-      logger.tokenize :some_category
-      logger.tokenize :some_category
-      logger.tokenize :some_category
-      logger.info ' Dumping '
-      logger.dump :some_category
-      logger.dump :some_category
-      logger.info ' Loading '
-      logger.load :some_category
-      logger.load :some_category
-      logger.load :some_category
-      logger.load :some_category
+  let(:logger) { described_class.new thing }
+  context 'with Logger' do
+    let(:thing) { Logger.new io }
+    describe 'more complicated test case' do
+      it 'is correct' do
+        logger.info 'Tokenizing '
+        logger.tokenize :some_category
+        logger.tokenize :some_category
+        logger.tokenize :some_category
+        logger.info ' Dumping '
+        logger.dump :some_category
+        logger.dump :some_category
+        logger.info ' Loading '
+        logger.load :some_category
+        logger.load :some_category
+        logger.load :some_category
+        logger.load :some_category
+      
+        io.string.should == ''
+      end
+    end
+  end
+  context 'with IO' do
+    let(:thing) { io }
+    describe 'more complicated test case' do
+      it 'is correct' do
+        logger.info 'Tokenizing '
+        logger.tokenize :some_category
+        logger.tokenize :some_category
+        logger.tokenize :some_category
+        logger.info ' Dumping '
+        logger.dump :some_category
+        logger.dump :some_category
+        logger.info ' Loading '
+        logger.load :some_category
+        logger.load :some_category
+        logger.load :some_category
+        logger.load :some_category
       
-      io.string.should == ''
+        io.string.should == ''
+      end
     end
   end
 

data/spec/lib/loggers/verbose_spec.rb

@@ -2,31 +2,55 @@ require 'spec_helper'
 
 describe Picky::Loggers::Verbose do
   
+  let(:index) { Picky::Index.new :some_index }
+  let(:category) { Picky::Category.new :some_category, index }
+  let(:file) { stub :file, :path => 'some/path' }
   let(:io) { StringIO.new }
-  let(:logger) { described_class.new io }
-
-  describe 'more complicated test case' do
-    it 'is correct' do
-      index    = Picky::Index.new :some_index
-      category = Picky::Category.new :some_category, index
-      file = stub :file, :path => 'some/path'
+  let(:logger) { described_class.new thing }
+  context 'with Logger' do
+    let(:thing) { Logger.new io }
+    describe 'more complicated test case' do
+      it 'is correct' do
+        Time.stub! :now => Time.new('zeros')
+      
+        logger.info 'Tokenizing '
+        logger.tokenize category, file
+        logger.tokenize category, file
+        logger.tokenize category, file
+        logger.info ' Dumping '
+        logger.dump category
+        logger.dump category
+        logger.info ' Loading '
+        logger.load category
+        logger.load category
+        logger.load category
+        logger.load category
       
-      Time.stub! :now => Time.new('zeros')
+        io.string.should == "00:00:00: Tokenizing \n00:00:00:   \"some_index:some_category\": Tokenized -> some/path.\n00:00:00:   \"some_index:some_category\": Tokenized -> some/path.\n00:00:00:   \"some_index:some_category\": Tokenized -> some/path.\n00:00:00:  Dumping \n00:00:00:   \"some_index:some_category\": Dumped -> index/test/some_index/some_category_*.\n00:00:00:   \"some_index:some_category\": Dumped -> index/test/some_index/some_category_*.\n00:00:00:  Loading \n00:00:00:   \"some_index:some_category\": Loading index from cache.\n00:00:00:   \"some_index:some_category\": Loading index from cache.\n00:00:00:   \"some_index:some_category\": Loading index from cache.\n00:00:00:   \"some_index:some_category\": Loading index from cache.\n"
+      end
+    end
+  end
+  context 'with IO' do
+    let(:thing) { io }
+    describe 'more complicated test case' do
+      it 'is correct' do
+        Time.stub! :now => Time.new('zeros')
       
-      logger.info 'Tokenizing '
-      logger.tokenize category, file
-      logger.tokenize category, file
-      logger.tokenize category, file
-      logger.info ' Dumping '
-      logger.dump category
-      logger.dump category
-      logger.info ' Loading '
-      logger.load category
-      logger.load category
-      logger.load category
-      logger.load category
+        logger.info 'Tokenizing '
+        logger.tokenize category, file
+        logger.tokenize category, file
+        logger.tokenize category, file
+        logger.info ' Dumping '
+        logger.dump category
+        logger.dump category
+        logger.info ' Loading '
+        logger.load category
+        logger.load category
+        logger.load category
+        logger.load category
       
-      io.string.should == "00:00:00: Tokenizing \n00:00:00:   \"some_index:some_category\": Tokenized -> some/path.\n00:00:00:   \"some_index:some_category\": Tokenized -> some/path.\n00:00:00:   \"some_index:some_category\": Tokenized -> some/path.\n00:00:00:  Dumping \n00:00:00:   \"some_index:some_category\": Dumped -> index/test/some_index/some_category_*.\n00:00:00:   \"some_index:some_category\": Dumped -> index/test/some_index/some_category_*.\n00:00:00:  Loading \n00:00:00:   \"some_index:some_category\": Loading index from cache.\n00:00:00:   \"some_index:some_category\": Loading index from cache.\n00:00:00:   \"some_index:some_category\": Loading index from cache.\n00:00:00:   \"some_index:some_category\": Loading index from cache.\n"
+        io.string.should == "00:00:00: Tokenizing \n00:00:00:   \"some_index:some_category\": Tokenized -> some/path.\n00:00:00:   \"some_index:some_category\": Tokenized -> some/path.\n00:00:00:   \"some_index:some_category\": Tokenized -> some/path.\n00:00:00:  Dumping \n00:00:00:   \"some_index:some_category\": Dumped -> index/test/some_index/some_category_*.\n00:00:00:   \"some_index:some_category\": Dumped -> index/test/some_index/some_category_*.\n00:00:00:  Loading \n00:00:00:   \"some_index:some_category\": Loading index from cache.\n00:00:00:   \"some_index:some_category\": Loading index from cache.\n00:00:00:   \"some_index:some_category\": Loading index from cache.\n00:00:00:   \"some_index:some_category\": Loading index from cache.\n"
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement