picky 0.0.8 → 0.0.9

data/bin/picky

@@ -5,7 +5,7 @@ begin
   require 'picky/generator'
 rescue LoadError => e
   require 'rubygems'
-  picky_path = File.expand_path('../../lib', __FILE__)
+  picky_path = File.expand_path '../../lib', __FILE__
   $:.unshift(picky_path) if File.directory?(picky_path) && !$:.include?(picky_path)
   require 'picky/generator'
 end

data/lib/deployment.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'constants'))
+require File.expand_path '../constants', __FILE__
 
 module Picky
   module Capistrano

data/lib/picky/generator.rb

@@ -49,7 +49,7 @@ module Picky
       
       def initialize name, *args
         @name = name
-        @prototype_project_basedir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'prototype_project'))
+        @prototype_project_basedir = File.expand_path '../../../prototype_project', __FILE__
       end
       
       #
@@ -134,7 +134,7 @@ module Picky
       #
       #
       def target_directory
-        File.expand_path File.join(Dir.pwd, name)
+        File.expand_path name, Dir.pwd
       end
       
       def created entry

data/lib/picky/helpers/measuring.rb

@@ -2,44 +2,18 @@
 #
 module Helpers
   module Measuring
-
-    def log_performance(name, performed_on = '', &block)
-      time_begin = Time.now.to_f
-
-      lambda(&block).call
-
-      duration = Time.now.to_f - time_begin
-
-      # PerformanceLog.info("#{'%30s' % name}: #{'%2.10f' % duration} #{performed_on}")
-      duration
-    end
-
+    
     # Returns a duration in seconds.
     #
     def timed(*args, &block)
       block_to_be_measured = lambda(&block)
-
+      
       time_begin = Time.now.to_f
-
+      
       block_to_be_measured.call(*args)
-
+      
       Time.now.to_f - time_begin
     end
-
-    def profiled_html(mode = :cpu_time, &block)
-      require 'ruby-prof'
-
-      RubyProf.measure_mode = "RubyProf::#{mode.to_s.upcase}".constantize
-
-      result = RubyProf.profile &block
-
-      printer = RubyProf::GraphHtmlPrinter.new(result)
-      File.open('log/profiler.html', 'w') do |f|
-        printer.print(f)
-      end
-
-      system 'open log/profiler.html'
-    end
-
+    
   end
 end

data/lib/picky/initializers/ext.rb

@@ -1,6 +1 @@
-# TODO Remove as soon as gem compiling is ok.
-#
-# Dir.chdir File.join(File.dirname(__FILE__), '../ext/ruby19') do
-#   %x{ ruby extconf.rb && make }
-# end
-require File.expand_path(File.join(File.dirname(__FILE__), '../ext/ruby19/performant'))
+require File.expand_path '../../ext/ruby19/performant', __FILE__

data/lib/picky/loader.rb

@@ -100,7 +100,6 @@ module Loader
     load_relative 'helpers/gc'
     load_relative 'helpers/cache'
     load_relative 'helpers/measuring'
-    load_relative 'helpers/search'
     
     # Signal handling
     #

data/lib/picky/query/weigher.rb

@@ -19,6 +19,7 @@ module Query
         # Expand the combinations.
         #
         possible_combinations = tokens.possible_combinations_in index
+        
         # Optimization for ignoring tokens that allocate to nothing and
         # can be ignored.
         # For example in a context search, where "florian" is not
@@ -26,39 +27,39 @@ module Query
         #
         possible_combinations.compact!
         expanded_combinations = expand_combinations_from possible_combinations
-
+        
         # TODO Rewrite.
         #
         # expanded_combinations.map! { |expanded_combination| Combinations.new(index, expanded_combination) }
-
-        if expanded_combinations.empty?
-          previous_allocations
-        else
-          # The recombination part, where
-          # [
-          #  [a,a,b,b,c,c]
-          #  [d,e,d,e,d,e]
-          # ]
-          # becomes
-          # [
-          #  [a,d],
-          #  [a,e],
-          #  [b,d],
-          #  [b,e],
-          #  [c,d],
-          #  [c,e]
-          # ]
-          #
-          expanded_combinations = expanded_combinations.shift.zip(*expanded_combinations)
-          
-          # Wrap into a real combination.
-          #
-          expanded_combinations.map! { |expanded_combination| Combinations.new(index, expanded_combination) }
-          
-          # Add the possible allocations to the ones we already have.
-          #
-          previous_allocations + expanded_combinations.map(&:pack_into_allocation)
-        end
+        
+        #
+        #
+        next previous_allocations if expanded_combinations.empty?
+        
+        # The recombination part, where
+        # [
+        #  [a,a,b,b,c,c]
+        #  [d,e,d,e,d,e]
+        # ]
+        # becomes
+        # [
+        #  [a,d],
+        #  [a,e],
+        #  [b,d],
+        #  [b,e],
+        #  [c,d],
+        #  [c,e]
+        # ]
+        #
+        expanded_combinations = expanded_combinations.shift.zip(*expanded_combinations)
+        
+        # Wrap into a real combination.
+        #
+        expanded_combinations.map! { |expanded_combination| Combinations.new(index, expanded_combination) }
+        
+        # Add the possible allocations to the ones we already have.
+        #
+        previous_allocations + expanded_combinations.map(&:pack_into_allocation)
       end)
     end
     

data/lib/picky/sources/db.rb

@@ -123,11 +123,7 @@ module Sources
     def harvest_statement_with_offset type, field, offset
       statement = harvest_statement type, field
       
-      if statement.include? 'WHERE'
-        statement += ' AND'
-      else
-        statement += ' WHERE'
-      end
+      statement += statement.include?('WHERE') ? ' AND' : ' WHERE'
       
       "#{statement} st.id > #{offset} LIMIT #{chunksize}"
     end

data/lib/picky-tasks.rb

@@ -1,4 +1,4 @@
-all_rake_files = File.expand_path File.join(File.dirname(__FILE__), 'tasks', '*.rake')
+all_rake_files = File.expand_path '../tasks/*.rake', __FILE__
 
 Dir[all_rake_files].each do |rakefile|
   next if rakefile =~ /spec\.rake$/

data/lib/picky.rb

@@ -1,16 +1,14 @@
 # Require the constants.
 #
-# TODO Move to app?
-#
-require File.expand_path(File.join(File.dirname(__FILE__), 'constants'))
+require File.expand_path '../constants', __FILE__
 
 # Library bundling.
 #
-require File.expand_path(File.join(File.dirname(__FILE__), 'bundling'))
+require File.expand_path '../bundling', __FILE__
 
 # Loader which handles framework and app loading.
 #
-require File.expand_path(File.join(File.dirname(__FILE__), 'picky', 'loader'))
+require File.expand_path '../picky/loader', __FILE__
 
 # Load the framework
 #

data/lib/tasks/framework.rake

@@ -1,4 +1,4 @@
 desc "Loads the framework."
 task :framework do
-  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'picky'))
+  require File.expand_path '../../picky', __FILE__
 end

data/prototype_project/app/application.rb

@@ -34,10 +34,13 @@ class PickySearch < Application # The App Constant needs to be identical in appl
     stopwords(/\b(and|the|of|it|in|for)\b/)
     split_text_on(/[\s\/\-\,\&]+/)
     
+    # The example defines two queries that use the same index(es).
+    #
+    # A Full query returns ids, combinations, and counts.
+    # A Live query does return all that Full returns, without ids.
+    #
     route %r{^/books/full}, Query::Full.new(Indexes[:books])
     route %r{^/books/live}, Query::Live.new(Indexes[:books])
-    
-    root 200
   end
   
 end

data/prototype_project/app/logging.rb

@@ -1,7 +1,7 @@
 # Standard logging.
 #
 require 'logger'
-PickyLog = Loggers::Search.new ::Logger.new(File.expand_path(File.join(PICKY_ROOT, 'log/search.log')))
+PickyLog = Loggers::Search.new ::Logger.new(File.expand_path('log/search.log', PICKY_ROOT))
 
 # Example with using the syslog logger.
 # Falling back to the standard log if it isn't available.

data/prototype_project/config.ru

@@ -16,7 +16,7 @@ require 'picky'
 #
 Loader.load_application
 
-# Load the data. This loads data from cache files e.g. "some_index/*_index.dump" into constant Indexes::SomeIndex.
+# Load the data. This loads data from cache files e.g. "some_index/*_index.dump" into Indexes[:some_index]
 #
 Indexes.load_from_cache
 

data/prototype_project/script/console

@@ -14,13 +14,13 @@ end
 libs =  " -r irb/completion"
 libs << %( -r "picky" )
 
-ENV['PICKY_ENV'] = case ARGV.first
-  when "p"; "production"
-  when "d"; "development"
-  when "t"; "test"
-  else
-    ARGV.first || ENV['PICKY_ENV'] || 'development'
-end
+mapping = {
+  'p' => 'production',
+  'd' => 'development',
+  't' => 'test'
+}
+given_env = ARGV.first
+ENV['PICKY_ENV'] = mapping[given_env] || given_env || ENV['PICKY_ENV'] || 'development'
 
 puts "Use \x1b[1;30mLoader.load_application\x1b[m to load app."
 puts "Use \x1b[1;30mIndexes.load_from_cache\x1b[m after that to load indexes."

data/spec/lib/generator_spec.rb

@@ -56,6 +56,12 @@ describe Picky::Generator do
       end
     end
     
+    describe "prototype_project_basedir" do
+      it "should be the right basedir" do
+        @generator.prototype_project_basedir.should == File.expand_path('../../../prototype_project', __FILE__)
+      end
+    end
+    
     describe "generate" do
       it "should do things in order" do
         @generator.should_receive(:create_target_directory).once.ordered
@@ -109,7 +115,7 @@ describe Picky::Generator do
       it "should return the right filename" do
         @generator.stub! :target_directory => 'some_target_directory'
         
-        test_filename = File.expand_path File.join(@generator.prototype_project_basedir, '/some/file/name')
+        test_filename = File.expand_path 'some/file/name', @generator.prototype_project_basedir
         
         @generator.target_filename_for(test_filename).should == 'some_target_directory/some/file/name'
       end
@@ -126,7 +132,7 @@ describe Picky::Generator do
     
     describe "target_directory" do
       it "should return the right dir name" do
-        @generator.target_directory.should == File.expand_path(File.join(__FILE__, '..', '..', '..', 'some_name'))
+        @generator.target_directory.should == File.expand_path('../../../some_name', __FILE__)
       end
     end
     

data/spec/lib/helpers/measuring_spec.rb

@@ -2,17 +2,11 @@ require 'spec_helper'
 
 describe Helpers::Measuring do
   include Helpers::Measuring
-
+  
   describe "#timed" do
     it "should return some duration" do
       timed { 1 + 3 }.should_not be_nil
     end
   end
-
-  describe "#log_performance" do
-    it "should log" do
-      log_performance('hello') { 10000*10000 }
-    end
-  end
-
+  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +02:00
+date: 2010-10-09 00:00:00 +02:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,6 @@ files:
 - lib/picky/helpers/cache.rb
 - lib/picky/helpers/gc.rb
 - lib/picky/helpers/measuring.rb
-- lib/picky/helpers/search.rb
 - lib/picky/index/bundle.rb
 - lib/picky/index/category.rb
 - lib/picky/index/combined.rb
@@ -88,7 +87,6 @@ files:
 - lib/picky/initializers/mysql.rb
 - lib/picky/loader.rb
 - lib/picky/loggers/search.rb
-- lib/picky/performant/array.rb
 - lib/picky/query/allocation.rb
 - lib/picky/query/allocations.rb
 - lib/picky/query/base.rb
@@ -162,7 +160,6 @@ files:
 - spec/lib/helpers/cache_spec.rb
 - spec/lib/helpers/gc_spec.rb
 - spec/lib/helpers/measuring_spec.rb
-- spec/lib/helpers/search_spec.rb
 - spec/lib/index/bundle_partial_generation_speed_spec.rb
 - spec/lib/index/bundle_spec.rb
 - spec/lib/index/category_spec.rb
@@ -170,7 +167,6 @@ files:
 - spec/lib/indexers/field_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/loggers/search_spec.rb
-- spec/lib/performant/array_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
 - spec/lib/query/base_spec.rb
@@ -247,7 +243,6 @@ test_files:
 - spec/lib/helpers/cache_spec.rb
 - spec/lib/helpers/gc_spec.rb
 - spec/lib/helpers/measuring_spec.rb
-- spec/lib/helpers/search_spec.rb
 - spec/lib/index/bundle_partial_generation_speed_spec.rb
 - spec/lib/index/bundle_spec.rb
 - spec/lib/index/category_spec.rb
@@ -255,7 +250,6 @@ test_files:
 - spec/lib/indexers/field_spec.rb
 - spec/lib/loader_spec.rb
 - spec/lib/loggers/search_spec.rb
-- spec/lib/performant/array_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
 - spec/lib/query/base_spec.rb

data/lib/picky/helpers/search.rb

@@ -1,27 +0,0 @@
-module Helpers
-  module Search
-
-    def status_class_for(results_count)
-      case results_count
-        when (51..100)
-          :lots
-        when (26..50)
-          :many
-        when (16..25)
-          :several
-        when (8..15)
-          :some
-        when (2..7)
-          :few
-        when 1
-          :one
-        when 0
-          :none
-        else
-          :too_many
-      end
-    end
-
-  end
-
-end

data/lib/picky/performant/array.rb

@@ -1,23 +0,0 @@
-module Performant
-  # This class will be enriched with c-methods
-  #
-  class Array
-
-    # Chooses a good algorithm for intersecting arrays.
-    #
-    # Note: The sort order will be changed.
-    #
-    def self.intersect array_of_arrays
-      array_of_arrays.sort! { |a, b| a.size <=> b.size }
-
-      if (array_of_arrays.sum(&:size) < 20_000)
-        Performant::Array.brute_force_intersect array_of_arrays
-      else
-        array_of_arrays.inject([]) do |total, elements|
-          total.empty? ? elements : elements & total
-        end
-      end
-    end
-
-  end
-end

data/spec/lib/helpers/search_spec.rb

@@ -1,50 +0,0 @@
-require 'spec_helper'
-
-describe 'Helpers::Search' do
-  include Helpers::Search
-
-  def self.it_should_return_class_for(klass, x)
-    it "should return class #{klass} for #{x} items" do
-      status_class_for(x).should == klass
-    end
-  end
-
-  describe "search_status_class_for" do
-    it_should_return_class_for :none,  0
-    it_should_return_class_for :one,   1
-    it_should_return_class_for :few,   2
-    it_should_return_class_for :few,   3
-    it_should_return_class_for :few,   4
-    it_should_return_class_for :few,   5
-    it_should_return_class_for :few,   6
-    it_should_return_class_for :few,   7
-    it_should_return_class_for :some,  8
-    it_should_return_class_for :some,  9
-    it_should_return_class_for :some, 10
-    it_should_return_class_for :some, 11
-    it_should_return_class_for :some, 12
-    it_should_return_class_for :some, 13
-    it_should_return_class_for :some, 14
-    it_should_return_class_for :some, 15
-    it_should_return_class_for :several, 16
-    it_should_return_class_for :several, 17
-    it_should_return_class_for :several, 18
-    it_should_return_class_for :several, 19
-    it_should_return_class_for :several, 20
-    it_should_return_class_for :several, 21
-    it_should_return_class_for :several, 22
-    it_should_return_class_for :several, 23
-    it_should_return_class_for :several, 24
-    it_should_return_class_for :several, 25
-    it_should_return_class_for :many, 26
-    it_should_return_class_for :many, 27
-    it_should_return_class_for :many, 28
-    it_should_return_class_for :many, 29
-    # etc.
-    it_should_return_class_for :lots, 51
-    # etc.
-    it_should_return_class_for :too_many, 101
-    # etc.
-  end
-
-end

data/spec/lib/performant/array_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe 'performant array' do
-
-  # describe "brute_force_intersect" do
-  #   it "should intersect correctly" do
-  #     arys = [[3,4], [1,2,3,4], [3,4,5,8,9]]
-  #
-  #     Performant::Array.brute_force_intersect(arys.sort_by(&:size)).should == [3,4]
-  #   end
-  # end
-
-end