picky 0.9.1 → 0.9.2

data/lib/picky/cacher/partial/default.rb

@@ -1,5 +1,5 @@
 module Cacher
   module Partial
-    Default = Substring.new :from => -3, :to => -1
+    Default = Substring.new from: -3, to: -1
   end
 end

data/lib/picky/cacher/partial_generator.rb

@@ -6,7 +6,7 @@ module Cacher
     
     # Generate a partial index based on the given index.
     #
-    def generate strategy = Partial::Substring.new(:from => 1)
+    def generate strategy = Partial::Substring.new(from: 1)
       strategy.generate_from self.index
     end
 

data/lib/picky/cacher/similarity/double_levenshtone.rb

@@ -32,7 +32,7 @@ module Cacher
       # Generates an index for the given index (in exact index style).
       #
       # In the following form:
-      # [:meier, :mueller, :peter, :pater] => { :MR => [:meier], :MLR => [:mueller], :PTR => [:peter, :pater] }
+      # [:meier, :mueller, :peter, :pater] => { MR: [:meier], MLR: [:mueller], PTR: [:peter, :pater] }
       #
       def generate_from index
         hash = hashify index.keys

data/lib/picky/generator.rb

@@ -44,7 +44,7 @@ module Picky
     
     def initialize
       @types = {
-        :project => [Project, :project_name]
+        project: [Project, :project_name]
       }
     end
     

data/lib/picky/index/file/basic.rb

@@ -18,7 +18,7 @@ module Index
       #
       def backup
         prepare_backup backup_path
-        FileUtils.cp cache_path, target, :verbose => true
+        FileUtils.cp cache_path, target, verbose: true
       end
       def backup_path
         ::File.join ::File.dirname(cache_path), 'backup'
@@ -30,7 +30,7 @@ module Index
       # Restore.
       #
       def restore
-        FileUtils.cp backup_file_path_of(cache_path), cache_path, :verbose => true
+        FileUtils.cp backup_file_path_of(cache_path), cache_path, verbose: true
       end
       def backup_file_path_of path
         dir, name = ::File.split path

data/lib/picky/index/file/json.rb

@@ -8,7 +8,7 @@ module Index
         :json
       end
       def load
-        Yajl::Parser.parse ::File.open(cache_path, 'r'), :symbolize_keys => true
+        Yajl::Parser.parse ::File.open(cache_path, 'r'), symbolize_keys: true
       end
       def dump hash
         hash.dump_json cache_path

data/lib/picky/index/type.rb

@@ -19,7 +19,7 @@ module Index
       @combinator  = combinator_for categories, ignore_unassigned_tokens
     end
     def combinator_for categories, ignore_unassigned_tokens
-       Query::Combinator.new @categories, :ignore_unassigned_tokens => ignore_unassigned_tokens
+       Query::Combinator.new @categories, ignore_unassigned_tokens: ignore_unassigned_tokens
     end
     
     #

data/lib/picky/indexers/solr.rb

@@ -40,7 +40,7 @@ module Indexers
       
       results.each do |indexed_id, *values|
         values.each &:downcase!
-        documents << hashed(values).merge(:id => indexed_id, :type => type_name)
+        documents << hashed(values).merge(id: indexed_id, type: type_name)
       end
 
       solr.add documents

data/lib/picky/indexes.rb

@@ -21,7 +21,7 @@ module Indexes
     #      rake index:ordered
     #
     timed_exclaim "INDEXING USING #{Cores.max_processors} PROCESSORS, IN #{randomly ? 'RANDOM' : 'GIVEN'} ORDER."
-    Cores.forked self.fields, { :randomly => randomly } do |field, cores|
+    Cores.forked self.fields, { randomly: randomly } do |field, cores|
       field.index
       field.cache
     end

data/lib/picky/query/solr.rb

@@ -42,7 +42,7 @@ module Query
 
         index_types.each do |index|
           begin
-            response = server.select :q => new_query, :fq => "type:#{index.name}", :hl => true, :'hl.fl' => '*', :'hl.simple.pre' => '<', :'hl.simple.post' => '>', :facet => true
+            response = server.select q: new_query, fq: "type:#{index.name}", hl: true, :'hl.fl' => '*', :'hl.simple.pre' => '<', :'hl.simple.post' => '>', facet: true
           rescue RSolr::RequestError => re
             return results
           end
@@ -58,7 +58,7 @@ module Query
           similar[index.name] = possibilities unless possibilities.empty?
         end
 
-        results.add :similar => similar
+        results.add similar: similar
       end
 
       # TODO

data/lib/picky/results/base.rb

@@ -20,10 +20,10 @@ module Results
     #
     #
     def serialize
-      { :allocations => allocations.to_result,
-        :offset      => offset,
-        :duration    => duration,
-        :total       => total }
+      { allocations: allocations.to_result,
+        offset:      offset,
+        duration:    duration,
+        total:       total }
     end
     # The default format is json.
     #

data/lib/picky/routing.rb

@@ -5,9 +5,9 @@ require 'rack/mount'
 class Routing
   
   @@defaults = {
-    :query_key    => 'query'.freeze,
-    :offset_key   => 'offset'.freeze,
-    :content_type => 'application/octet-stream'.freeze
+    query_key:    'query'.freeze,
+    offset_key:   'offset'.freeze,
+    content_type: 'application/octet-stream'.freeze
   }
   
   def initialize
@@ -32,24 +32,6 @@ class Routing
     routes.call env
   end
   
-  # # Set the defaults.
-  # # 
-  # # Options are:
-  # #  * :query_key  => :query # default
-  # #  * :offset_key => :offset # default
-  # #  
-  # #  * :tokenizer  => Tokenizers::Query.new # default
-  # #
-  # def defaults options = {}
-  #   @defaults[:query_key]    = options[:query_key].to_s  if options[:query_key]
-  #   @defaults[:offset_key]   = options[:offset_key].to_s if options[:offset_key]
-  #   
-  #   @defaults[:tokenizer]    = options[:tokenizer]       if options[:tokenizer]
-  #   @defaults[:content_type] = options[:content_type]    if options[:content_type]
-  #   
-  #   @defaults
-  # end
-  
   #
   #
   def route options = {}
@@ -101,7 +83,7 @@ class Routing
   def default_options url, route_options = {}
     url = normalized url
     
-    options = { :request_method => 'GET' }.merge route_options
+    options = { request_method: 'GET' }.merge route_options
     
     options[:path_info] = url if url
     

data/lib/picky/sources/db.rb

@@ -7,7 +7,7 @@ module Sources
     
     attr_reader :select_statement, :database, :connection_options
     
-    def initialize select_statement, options = { :file => 'app/db.yml' }
+    def initialize select_statement, options = { file: 'app/db.yml' }
       @select_statement = select_statement
       @database         = create_database_adapter
       @options          = options

data/lib/picky/sources/delicious.rb

@@ -11,7 +11,7 @@ module Sources
       require 'www/delicious'
     rescue LoadError
       puts "Delicious gem missing!\nTo use the delicious source, you need to:\n  1. Add the following line to Gemfile:\n     gem 'www-delicious'\n  2. Then, run:\n     bundle update\n"
-      exit(1)
+      exit 1
     end
     
     # Harvests the data to index.
@@ -30,12 +30,12 @@ module Sources
     #
     def get_data
       @generated_id ||= 0
-      @posts ||= WWW::Delicious.new(@username, @password).posts_recent(:count => 100)
+      @posts ||= WWW::Delicious.new(@username, @password).posts_recent(count: 100)
       @posts.each do |post|
         data = {
-          :title => post.title,
-          :tags  => post.tags.join(' '),
-          :url   => post.url.to_s
+          title: post.title,
+          tags:  post.tags.join(' '),
+          url:   post.url.to_s
         }
         @generated_id += 1
         yield @generated_id, data

data/lib/tasks/try.rake

@@ -15,11 +15,7 @@ namespace :try do
   task :query, [:text] => :application do |_, options|
     text = options.text
     
-    # TODO tokenize destroys the original text...
-    #
-    # TODO Use the Query Tokenizer.
-    #
-    puts "\"#{text}\" is query tokenized as #{Tokenizers::Default::Query.tokenize(text.dup).to_a.map(&:to_s).map(&:to_sym)}"
+    puts "\"#{text}\" is query tokenized as #{Tokenizers::Default::Query.tokenize(text).to_a.map(&:to_s).map(&:to_sym)}"
   end
   
   desc "Try the given text with both the index and the query (type:field optional)."

data/spec/lib/cacher/partial/subtoken_spec.rb

@@ -13,29 +13,29 @@ describe Cacher::Partial::Substring do
     end
     describe 'generate_from' do
       it 'should generate the right index' do
-        @cacher.generate_from( :florian => [1], :flavia => [2] ).should == {
-          :florian => [1],
-          :floria => [1],
-          :flori => [1],
-          :flor => [1],
-          :flo => [1],
-          :fl => [1, 2],
-          :f => [1, 2], 
-          :flavia => [2],
-          :flavi => [2],
-          :flav => [2],
-          :fla => [2]
+        @cacher.generate_from(florian: [1], flavia: [2]).should == {
+          florian: [1],
+          floria:  [1],
+          flori:   [1],
+          flor:    [1],
+          flo:     [1],
+          fl:   [1, 2],
+          f:    [1, 2], 
+          flavia:  [2],
+          flavi:   [2],
+          flav:    [2],
+          fla:     [2]
         }
       end
       it "should be fast" do
-        performance_of { @cacher.generate_from( :florian => [1], :flavia => [2] ) }.should < 0.0001
+        performance_of { @cacher.generate_from(florian: [1], flavia: [2]) }.should < 0.0001
       end
       it "should handle duplicate ids" do
-        @cacher.generate_from( :flo => [1], :fla => [1] ).should == {
-          :flo => [1],
-          :fl => [1],
-          :f => [1],
-          :fla => [1]
+        @cacher.generate_from(flo: [1], fla: [1]).should == {
+          flo: [1],
+          fl:  [1],
+          f:   [1],
+          fla: [1]
         }
       end
     end
@@ -43,24 +43,24 @@ describe Cacher::Partial::Substring do
   context 'from set' do
     describe 'negative from' do
       before(:each) do
-        @cacher = Cacher::Partial::Substring.new :from => -2
+        @cacher = Cacher::Partial::Substring.new from: -2
       end
       it 'should generate the right index' do
-        @cacher.generate_from( :florian => [1], :flavia => [2] ).should == {
-          :florian => [1],
-          :floria => [1],
-          :flavia => [2],
-          :flavi => [2]
+        @cacher.generate_from(florian: [1], flavia: [2]).should == {
+          florian: [1],
+          floria:  [1],
+          flavia:  [2],
+          flavi:   [2]
         }
       end
     end
     context "large from" do
       before(:each) do
-        @cacher = Cacher::Partial::Substring.new :from => 10
+        @cacher = Cacher::Partial::Substring.new from: 10
       end
       describe 'generate_from' do
         it 'should generate the right index' do
-          @cacher.generate_from( :florian => [1], :'01234567890' => [2] ).should == {
+          @cacher.generate_from(florian: [1], :'01234567890' => [2] ).should == {
             :florian => [1],
             :'01234567890' => [2],
             :'0123456789' => [2]
@@ -70,7 +70,7 @@ describe Cacher::Partial::Substring do
     end
     context 'default to' do
       before(:each) do
-        @cacher = Cacher::Partial::Substring.new :from => 4
+        @cacher = Cacher::Partial::Substring.new from: 4
       end
       describe 'to' do
         it 'should return the right value' do
@@ -124,7 +124,7 @@ describe Cacher::Partial::Substring do
     end
     context 'to set' do
       before(:each) do
-        @cacher = Cacher::Partial::Substring.new :from => 4, :to => -2
+        @cacher = Cacher::Partial::Substring.new from: 4, to: -2
       end
       describe 'to' do
         it 'should return the right value' do
@@ -150,7 +150,7 @@ describe Cacher::Partial::Substring do
     end
     context 'to set' do
       before(:each) do
-        @cacher = Cacher::Partial::Substring.new :from => 4, :to => 0
+        @cacher = Cacher::Partial::Substring.new from: 4, to: 0
       end
       describe 'to' do
         it 'should return the right value' do

data/spec/lib/query/allocation_spec.rb

@@ -7,6 +7,14 @@ describe Query::Allocation do
     @allocation = Query::Allocation.new @combinations
   end
   
+  describe "eql?" do
+    # TODO This works, but is not acceptable.
+    #
+    it "returns true" do
+      @allocation.eql?(:anything).should == true
+    end
+  end
+  
   describe "hash" do
     it "delegates to the combinations" do
       @combinations.should_receive(:hash).once.with

data/spec/lib/sources/delicious_spec.rb

@@ -1,14 +1,33 @@
 require 'spec_helper'
 
+# TODO Slow spec.
+#
 describe Sources::Delicious do
   
   context "with file" do
     
     describe "check_gem" do
-      # TODO How to actually test this?
-      #
-      it "checks if the gem is there" do
-        lambda { Sources::Delicious.new(:username, :password) }.should_not raise_error
+      before(:each) do
+        @source = Sources::Delicious.allocate
+      end
+      context "doesn't find www/delicious" do
+        before(:each) do
+          @source.should_receive(:require).any_number_of_times.and_raise LoadError
+        end
+        it "puts & exits" do
+          @source.should_receive(:puts).once.with "Delicious gem missing!\nTo use the delicious source, you need to:\n  1. Add the following line to Gemfile:\n     gem 'www-delicious'\n  2. Then, run:\n     bundle update\n"
+          @source.should_receive(:exit).once.with 1
+          
+          @source.check_gem
+        end
+      end
+      context "finds www/delicious" do
+        before(:each) do
+          @source.should_receive(:require).any_number_of_times.and_return
+        end
+        it "checks if the gem is there" do
+          lambda { @source.check_gem }.should_not raise_error
+        end
       end
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +02:00
+date: 2010-10-29 00:00:00 +02:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency