picky 4.4.1 → 4.4.2

data/aux/picky/cli.rb

@@ -2,7 +2,7 @@ module Picky
 
   # A very simple CLI selector.
   #
-  class CLI # :nodoc:all
+  class CLI
 
     # Execute a command.
     #

data/lib/picky/analyzer.rb

@@ -3,7 +3,7 @@
 
 # Analyzes indexes (index bundles, actually).
 #
-class Analyzer # :nodoc:all
+class Analyzer
 
   attr_reader :analysis, :comments
 

data/lib/picky/calculations/location.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Calculations # :nodoc:all
+  module Calculations
 
     # A location calculation recalculates a 1-d location
     # to the Picky internal 1-d "grid".

data/lib/picky/character_substituters/west_european.rb

@@ -12,7 +12,7 @@ module Picky
     #
     class WestEuropean
 
-      def initialize # :nodoc:
+      def initialize
         @chars = ActiveSupport::Multibyte.proxy_class
       end
 
@@ -45,7 +45,7 @@ module Picky
         }.pack 'U*'
       end
 
-      def to_s # :nodoc:
+      def to_s
         self.class.name
       end
 

data/lib/picky/deployment.rb

@@ -1,7 +1,7 @@
 require File.expand_path '../constants', __FILE__
 
-module Picky # :nodoc:
-  module Capistrano # :nodoc:all
+module Picky
+  module Capistrano
 
     # Include all
     #

data/lib/picky/ext/ruby19/extconf.rb

@@ -1,4 +1,6 @@
-puts 'Compiling with Ruby 1.9'
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC'] 
+
+puts "Compiling on Ruby 1.9 with CC set to #{RbConfig::MAKEFILE_CONFIG['CC']}."
 require 'mkmf'
 
 abort 'need ruby.h' unless have_header("ruby.h")

data/lib/picky/extensions/array.rb

@@ -1,6 +1,6 @@
 # The Array class we all know and love.
 #
-class Array # :nodoc:all
+class Array
 
   # Cluster-uniqs equal neighborly elements.
   #

data/lib/picky/extensions/class.rb

@@ -1,6 +1,6 @@
 # The original Class class.
 #
-class Class # :nodoc:all
+class Class
 
   def instance_delegate *methods
     methods.each do |method|

data/lib/picky/extensions/hash.rb

@@ -1,6 +1,6 @@
 # Extensions for the Hash.
 #
-class Hash # :nodoc:all
+class Hash
 
   # Use yajl's encoding.
   #

data/lib/picky/extensions/module.rb

@@ -1,6 +1,6 @@
 # The original Module class.
 #
-class Module # :nodoc:all
+class Module
 
   def each_delegate *methods
     options = methods.pop

data/lib/picky/extensions/object.rb

@@ -1,4 +1,4 @@
-class Object # :nodoc:all
+class Object
   
   # TODO Remove.
   

data/lib/picky/extensions/string.rb

@@ -1,6 +1,6 @@
 # Extending the String class.
 #
-class String # :nodoc:all
+class String
 
   # Returns a _single_ double metaphone code
   # for this string.

data/lib/picky/extensions/symbol.rb

@@ -1,6 +1,6 @@
 # Extending the Symbol class.
 #
-class Symbol # :nodoc:all
+class Symbol
 
   # Returns a _single_ double metaphone code
   # for this symbol.

data/lib/picky/generators/similarity/phonetic.rb

@@ -27,7 +27,7 @@ module Picky
 
         # Tries to require the text gem.
         #
-        def check_gem # :nodoc:
+        def check_gem
           require 'text'
         rescue LoadError
           warn_gem_missing 'text', 'a phonetic Similarity'

data/lib/picky/index.rb

@@ -288,7 +288,7 @@ module Picky
     # THINK Will have to write a wrapper that combines two categories that are
     # indexed simultaneously, since lat/lng are correlated.
     #
-    def geo_categories lat_name, lng_name, radius, options = {} # :nodoc:
+    def geo_categories lat_name, lng_name, radius, options = {}
 
       # Extract lat/lng specific options.
       #
@@ -316,7 +316,7 @@ module Picky
 
     end
 
-    def to_stats # :nodoc:
+    def to_stats
       stats = <<-INDEX
 #{name} (#{self.class}):
 #{"source:            #{source}".indented_to_s}

data/lib/picky/indexers/base.rb

@@ -35,7 +35,7 @@ module Picky
         source.reconnect! if source.respond_to?(:reconnect!)
       end
 
-      def check source # :nodoc:
+      def check source
         raise "Trying to index without a source for #{@index_or_category.name}." unless source
       end
 

data/lib/picky/loader.rb

@@ -2,7 +2,7 @@ module Picky
 
   # Loads the search engine and it
   #
-  module Loader # :nodoc:all
+  module Loader
 
     class << self
 

data/lib/picky/performant.rb

@@ -1,6 +1,6 @@
 module Picky
 
-  module Performant # :nodoc:all
+  module Performant
     # C Code here.
   end
 

data/lib/picky/query/allocation.rb

@@ -1,11 +1,17 @@
 module Picky
 
   module Query
-
-    # An allocation has a number of combinations:
-    # [token, index] [other_token, other_index], ...
+    
+    # An Allocation contains an ordered list of
+    # tuples (Combinations).
+    # The Combinations are ordered according to the order
+    # of the words in the query.
+    #
+    # It offers convenience methods to calculate the #ids etc.
+    #
+    # An Allocation is normally contained in an Allocations container.
     #
-    class Allocation # :nodoc:all
+    class Allocation
 
       attr_reader :count,
                   :score,

data/lib/picky/query/allocations.rb

@@ -2,9 +2,17 @@ module Picky
 
   module Query
 
-    # Container class for allocations.
+    # Container class for Allocation s.
     #
-    class Allocations # :nodoc:all
+    # This class is asked by the Results class to
+    # compile and process a query.
+    # It then asks each Allocation to process their
+    # ids and scores.
+    #
+    # It also offers convenience methods to access #ids
+    # of its Allocation s.
+    #
+    class Allocations
 
       delegate :each,
                :empty?,
@@ -88,8 +96,11 @@ module Picky
         end
       end
       
-      # Same as #process! but with this added parameter: 
-      #  * unique: If ids have already been found, do not find them anymore (if true)
+      # Same as #process! but removes duplicate ids from results.
+      #
+      # Note that in the result later on an allocation won't be
+      # included if it contains no ids (even in case they have been
+      # eliminated by the unique constraint in this method).
       #
       # Note: Slower than #process! especially with large offsets.
       #

data/lib/picky/query/combination.rb

@@ -2,16 +2,12 @@ module Picky
 
   module Query
 
-    # Describes the combination of a token (the text) and
-    # the index (the bundle): [text, index_bundle]
+    # Describes the Combination of a Token (the text) and
+    # the index (the bundle): [text, index_bundle].
     #
-    # A combination is a single part of an allocation:
-    # [..., [text2, index_bundle2], ...]
+    # An Allocation consists of an ordered number of Combinations.
     #
-    # An allocation consists of a number of combinations:
-    # [[text1, index_bundle1], [text2, index_bundle2], [text3, index_bundle1]]
-    #
-    class Combination # :nodoc:all
+    class Combination
 
       attr_reader :token,
                   :category
@@ -74,7 +70,7 @@ module Picky
       end
 
       # Example:
-      #  "exact title:Peter*:peter"
+      #   "exact title:Peter*:peter"
       #
       def to_s
         "#{category.bundle_for(token).identifier}(#{to_result.join(':')})"

data/lib/picky/query/combinations.rb

@@ -2,14 +2,15 @@ module Picky
 
   module Query
 
-    # Combinations are a number of Combination-s.
+    # Combinations represent an ordered list of Combination s.
     #
-    # They are the core of an allocation.
-    # An allocation consists of a number of combinations.
+    # Combinations contain methods for calculating score (including
+    # the boost) and ids for each of its Combination s.
+    #    
+    # They are the core of an Allocation.
+    # An Allocation consists of a number of Combinations.
     #
-    # Base Combinations contain methods for calculating score and ids.
-    #
-    class Combinations # :nodoc:all
+    class Combinations
 
       attr_reader :combinations
 
@@ -36,8 +37,8 @@ module Picky
       # that are passed in, are removed.
       #
       # Note: This method is not totally independent of the calculate_ids one.
-      #       Since identifiers are only nullified, we need to not include the
-      #       ids that have an associated identifier that is nil.
+      # Since identifiers are only nullified, we need to not include the
+      # ids that have an associated identifier that is nil.
       #
       def remove categories = []
         @combinations.reject! { |combination| categories.include?(combination.category) }

data/lib/picky/query/indexes_check.rb

@@ -14,13 +14,13 @@ module Picky
         #
         # Picky will raise a Query::Indexes::DifferentBackendsError.
         #
-        def check_backends indexes # :nodoc:
+        def check_backends indexes
           backends = indexes.map &:backend
           backends.uniq! &:class
           raise_different backends if backends.size > 1
           backends
         end
-        def raise_different backends # :nodoc:
+        def raise_different backends
           raise DifferentBackendsError.new(backends)
         end
 
@@ -31,7 +31,7 @@ module Picky
     # Currently it isn't possible using Memory and Redis etc.
     # indexes in the same query index group.
     #
-    class DifferentBackendsError < StandardError # :nodoc:all
+    class DifferentBackendsError < StandardError
       def initialize backends
         @backends = backends
       end

data/lib/picky/query/qualifier_category_mapper.rb

@@ -6,7 +6,7 @@ module Picky
 
     # Collection class for qualifiers.
     #
-    class QualifierCategoryMapper # :nodoc:all
+    class QualifierCategoryMapper
 
       attr_reader :mapping
       

data/lib/picky/query/token.rb

@@ -9,7 +9,7 @@ module Picky
     # It also knows whether it needs to look for similarity (bla~),
     # or whether it is a partial (bla*).
     #
-    class Token # :nodoc:all
+    class Token
 
       attr_reader :text, :original
       attr_writer :similar

data/lib/picky/query/tokens.rb

@@ -6,7 +6,7 @@ module Picky
 
     # This class primarily handles switching through similar token constellations.
     #
-    class Tokens # :nodoc:all
+    class Tokens
 
       attr_reader :ignore_unassigned
 

data/lib/picky/rack/harakiri.rb

@@ -1,4 +1,4 @@
-module Rack # :nodoc:
+module Rack
 
   # Simple Rack Middleware to kill Unicorns after X requests.
   #

data/lib/picky/search.rb

@@ -227,7 +227,7 @@ module Picky
 
     # Gets sorted allocations for the tokens.
     #
-    def sorted_allocations tokens, amount = nil # :nodoc:
+    def sorted_allocations tokens, amount = nil
       indexes.prepared_allocations_for tokens, boosts, amount
     end
 

data/lib/picky/statistics.rb

@@ -6,7 +6,7 @@ module Picky
 
   # Gathers various statistics.
   #
-  class Statistics # :nodoc:all
+  class Statistics
 
     def initialize
       @indexes = ["\033[1mIndexes analysis\033[m:"]

data/lib/tasks/try.rb

@@ -1,5 +1,9 @@
 module Picky
-
+  
+  # Try is used by
+  #   rake try[text,index,category]
+  # to test how the text would be indexed and processed during a search.
+  #
   class Try
 
     attr_reader :text, :specific

data/spec/functional/backends/memory_json_utf8_spec.rb

@@ -13,6 +13,25 @@ describe Picky::Backends::Memory::JSON do
     it "works with cyrillic characters" do
       backend.dump_json key: 'й'
     end
+    it "works with ascii strings" do
+      # See https://github.com/floere/picky/pull/69.
+      #
+      # Rails sets both encodings to UTF-8.
+      #
+      old_default_external = Encoding.default_external
+      old_default_internal = Encoding.default_internal
+      Encoding.default_external = 'UTF-8'
+      Encoding.default_internal = 'UTF-8'
+      
+      ascii = "\xE5".force_encoding 'ASCII-8BIT'
+      # ascii.encode('UTF-8') # Uncomment this to get the error mentioned in the pull request.
+      backend.dump_json ascii => ascii # Pass in the string as both key and value
+      
+      # Reset encodings.
+      #
+      Encoding.default_external = old_default_external
+      Encoding.default_internal = old_default_internal
+    end
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70307499892700 !ruby/object:Gem::Requirement
+  requirement: &70255381661400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70307499892700
+  version_requirements: *70255381661400
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70307499891000 !ruby/object:Gem::Requirement
+  requirement: &70255381659920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.4.1
+        version: 4.4.2
   type: :development
   prerelease: false
-  version_requirements: *70307499891000
+  version_requirements: *70255381659920
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70307499888240 !ruby/object:Gem::Requirement
+  requirement: &70255381674980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307499888240
+  version_requirements: *70255381674980
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70307499901520 !ruby/object:Gem::Requirement
+  requirement: &70255381674320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307499901520
+  version_requirements: *70255381674320
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70307499899220 !ruby/object:Gem::Requirement
+  requirement: &70255381673560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307499899220
+  version_requirements: *70255381673560
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70307499897140 !ruby/object:Gem::Requirement
+  requirement: &70255381672800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70307499897140
+  version_requirements: *70255381672800
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70307499895940 !ruby/object:Gem::Requirement
+  requirement: &70255381672420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70307499895940
+  version_requirements: *70255381672420
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -521,3 +521,4 @@ test_files:
 - spec/lib/statistics_spec.rb
 - spec/lib/tasks/try_spec.rb
 - spec/lib/tokenizer_spec.rb
+has_rdoc: