picky 4.12.6 → 4.12.7

data/lib/picky/categories.rb

@@ -7,6 +7,8 @@ module Picky
     forward :each,
             :first,
             :map,
+            :map!,
+            :include?,
             :to => :categories
 
     each_forward :cache,
@@ -51,7 +53,7 @@ module Picky
     #
     def << category
       reset_qualifier_mapper # TODO Have an add method on QualifierMapper?
-      categories << category
+      categories << category unless categories.include? category # This is wrong, and needs to be handled in index.rb
       category_hash[category.name] = category
     end
 

data/lib/picky/categories_realtime.rb

@@ -9,7 +9,11 @@ module Picky
                  :clear_realtime,
                  :build_realtime_mapping,
                  :to => :categories
-
+  
+    def update object, where = :unshift
+      replace object, where = :unshift
+    end
+    
   end
 
 end

data/lib/picky/category.rb

@@ -167,6 +167,14 @@ module Picky
     def identifier
       :"#{@index.identifier}:#{name}"
     end
+    
+    # Uniquely identified by index name and name.
+    #
+    def == other
+      return false unless other
+      index_name == other.index_name &&
+      name       == other.name
+    end
 
     #
     #

data/lib/picky/category_realtime.rb

@@ -32,7 +32,7 @@ module Picky
     #
     # Note: Takes a hash as opposed to the add/replace method.
     #
-    def replace_from hash
+    def replace_from hash #, id = (hash[:id] || hash['id'] || raise(IdNotGivenException.new)).send(key_format)
       return unless text = hash[from] || hash[from.to_s]
       
       raise IdNotGivenException.new unless id = hash[:id] || hash['id']

data/lib/picky/index_realtime.rb

@@ -6,7 +6,8 @@ module Picky
 
     forward :remove,  # aka "delete".
             :add,     # aka "insert".
-            :replace, # aka "insert or update". Thus, not called update.
+            :replace, # aka "delete then insert".
+            :update,
             :replace_from,
             :clear_realtime,
             :build_realtime_mapping,

data/lib/picky/indexes.rb

@@ -47,6 +47,9 @@ module Picky
     # Registers an index with the indexes.
     #
     def register index
+      # TODO DO not store duplicate indexes.
+      #
+      # self.indexes.delete_if { |existing| existing.name == index.name }
       self.indexes << index
       self.index_mapping[index.name] = index
     end

data/spec/functional/error_messages_spec.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe "Error messages for" do
+
+  context 'missing category method' do
+    let(:index) do
+      Picky::Index.new :error_messages do
+        category :author
+        category :title
+      end
+    end
+    let(:thing) { Struct.new :id, :author } # It is missing the title.
+    it 'is informative when dynamic indexing' do
+      this = thing.new 1, "ohai"
+      
+      # For now, a NoMethodError is enough.
+      #
+      expect { index.add this }.to raise_error(NoMethodError)
+    end
+    it 'is informative when static indexing' do
+      thing = Struct.new :id, :author
+    
+      index.source [thing.new(1, "ohai")]
+
+      # For now, a NoMethodError is enough.
+      #
+      expect { index.index }.to raise_error(NoMethodError)
+    end
+  end
+
+end

data/spec/lib/category_spec.rb

@@ -22,6 +22,21 @@ describe Picky::Category do
 
       category.instance_variable_get(:@symbols).should == nil
     end
+    
+    context '#==' do
+      it 'is identical on the same thing' do
+        category.should == category
+      end
+      it 'looks only at index name and category name' do
+        category.should == described_class.new(:some_category, index)
+      end
+      it 'looks only at index name and category name' do
+        category.should_not == described_class.new(:some_other_category, index)
+      end
+      it 'results in a correct #include?' do
+        [category].include?(described_class.new(:some_category, index)).should == true
+      end
+    end
   end
   
   context 'directories' do

data/spec/lib/indexes_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe Picky::Indexes do
 
-  let(:index) { stub :some_index, :name => :some_index }
+  let(:index) { stub :some_index,   :name => :some_index }
+  let(:index2) { stub :some_index2, :name => :some_index }
 
   context 'with instance' do
     let(:indexes) { Picky::Indexes.new }
@@ -44,6 +45,14 @@ describe Picky::Indexes do
 
         indexes.indexes.should == [index]
       end
+      # it 'does remove duplicates (with same name)' do
+      #   indexes.clear_indexes
+      # 
+      #   indexes.register index
+      #   indexes.register index2
+      # 
+      #   indexes.indexes.should == [index2]
+      # end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.12.6
+  version: 4.12.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.6
+        version: 4.12.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.6
+        version: 4.12.7
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +278,7 @@ files:
 - spec/functional/backends/sqlite_spec.rb
 - spec/functional/custom_delimiters_spec.rb
 - spec/functional/dynamic_weights_spec.rb
+- spec/functional/error_messages_spec.rb
 - spec/functional/exact_first_spec.rb
 - spec/functional/facets_spec.rb
 - spec/functional/ignore_spec.rb
@@ -446,6 +447,7 @@ test_files:
 - spec/functional/backends/sqlite_spec.rb
 - spec/functional/custom_delimiters_spec.rb
 - spec/functional/dynamic_weights_spec.rb
+- spec/functional/error_messages_spec.rb
 - spec/functional/exact_first_spec.rb
 - spec/functional/facets_spec.rb
 - spec/functional/ignore_spec.rb