sunspot_stats 0.0.2 → 0.0.3

data/README.md

@@ -50,6 +50,11 @@ Usually Suspot use the dismax for searches, here we extend to edismax to manage
 
 a OR (b AND c) works.
 
+## TODO
+
+Some more test!
+
+
 ## Contributing
 
 1. Fork it

data/lib/dsl/field_query.rb

@@ -13,7 +13,7 @@ module Sunspot
 
       def stat(field_name, options = {})
         field = @setup.field(field_name)
-        options[:facet] = @setup.field(options[:facet]) if options[:facet].present?
+        options[:facet] = @setup.field(options[:facet]) if !options[:facet].nil?
         stat = @query.add_stat(Sunspot::Query::FieldStat.new(field, options))
         @search.add_field_stat(field, options)
       end

data/lib/query/field_stat.rb

@@ -23,7 +23,7 @@ module Sunspot
           :stats  => 'true',
           :"stats.field" => @field.indexed_name
         }
-        params.merge!({:"stats.facet"    => @options[:facet].indexed_name}) if @options[:facet].present?
+        params.merge!({:"stats.facet"    => @options[:facet].indexed_name}) if !@options[:facet].nil?
         params
       end
     end

data/lib/sunspot_stats/version.rb

@@ -1,3 +1,3 @@
 module SunspotStats
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/api/query/spec_helper.rb

@@ -0,0 +1 @@
+require File.expand_path('spec_helper', File.join(File.dirname(__FILE__), '..'))

data/spec/api/query/stats_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe "stats component" do
+  it "sends stats parameters to solr" do
+    session.search Content do
+      stat :visibility, :facet => :published_at
+    end
+
+    connection.should have_last_search_including(:stats, "true")
+    connection.should have_last_search_including(:"stats.field", "visibility_f")
+    connection.should have_last_search_including(:"stats.facet", "published_at_d")
+  end
+  
+end

data/spec/api/search/spec_helper.rb

@@ -0,0 +1 @@
+require File.expand_path('spec_helper', File.join(File.dirname(__FILE__), '..'))

data/spec/api/search/stats_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe 'stats', :type => :search do
+  it 'returns field name for facet' do
+    #stub_stat(:visibility)
+    result = session.search Content do
+      stat :visibility, :facet => :published_at
+    end
+
+    result.stat(:visibility).field_name.should == :visibility
+  end
+
+end

data/spec/api/spec_helper.rb

@@ -0,0 +1,3 @@
+require File.expand_path('spec_helper', File.join(File.dirname(__FILE__), '..'))
+
+Dir.glob(File.join(File.dirname(__FILE__), '**', '*_examples.rb')).each { |shared| require(shared) }

data/spec/ext.rb

@@ -0,0 +1,11 @@
+module Solr
+  class Document
+    def field_by_name(field_name)
+      @fields.find { |field| field.name.to_s == field_name.to_s }
+    end
+
+    def fields_by_name(field_name)
+      @fields.select { |field| field.name.to_s == field_name.to_s }
+    end
+  end
+end

data/spec/helpers/indexer_helper.rb

@@ -0,0 +1,17 @@
+module IndexerHelper
+  def post(attrs = {})
+    @post ||= Post.new(attrs)
+  end
+
+  def last_add
+    @connection.adds.last
+  end
+
+  def value_in_last_document_for(field_name)
+    @connection.adds.last.last.field_by_name(field_name).value
+  end
+
+  def values_in_last_document_for(field_name)
+    @connection.adds.last.last.fields_by_name(field_name).map { |field| field.value }
+  end
+end

data/spec/helpers/integration_helper.rb

@@ -0,0 +1,8 @@
+module IntegrationHelper
+  def self.included(base)
+    base.before(:all) do
+      Sunspot.config.solr.url = ENV['SOLR_URL'] || 'http://localhost:8983/solr'
+      Sunspot.reset!(true)
+    end
+  end
+end

data/spec/helpers/mock_session_helper.rb

@@ -0,0 +1,13 @@
+module MockSessionHelper
+  def config
+    @config ||= Sunspot::Configuration.build
+  end
+
+  def connection
+    @connection ||= Mock::Connection.new
+  end
+
+  def session
+    @session ||= Sunspot::Session.new(config, connection)
+  end
+end

data/spec/helpers/query_helper.rb

@@ -0,0 +1,26 @@
+module QueryHelper
+  def get_filter_tag(boolean_query)
+    connection.searches.last[:fq].each do |fq|
+      if match = fq.match(/^\{!tag=(.+)\}#{Regexp.escape(boolean_query)}$/)
+        return match[1]
+      end
+    end
+    nil
+  end
+
+  def subqueries(param)
+    q = connection.searches.last[:q]
+    subqueries = []
+    subqueries = q.scan(%r(_query_:"\{!dismax (.*?)\}(.*?)"))
+    subqueries.map do |subquery|
+      params = {}
+      subquery[0].scan(%r((\S+?)='(.+?)')) do |key, value|
+        params[key.to_sym] = value
+      end
+      unless subquery[1].empty?
+        params[:v] = subquery[1]
+      end
+      params
+    end
+  end
+end

data/spec/helpers/search_helper.rb

@@ -0,0 +1,55 @@
+module SearchHelper
+  def stub_nil_results
+    connection.response = { 'response' => nil }
+  end
+
+  def stub_full_results(*results)
+    count =
+      if results.last.is_a?(Integer) then results.pop
+      else results.length
+      end
+    docs = results.map do |result|
+      instance = result.delete('instance')
+      result.merge('id' => "#{instance.class.name} #{instance.id}")
+    end
+    response = {
+      'response' => {
+        'docs' => docs,
+        'numFound' => count
+      }
+    }
+    connection.response = response
+    response
+  end
+
+  def stub_results(*results)
+    stub_full_results(
+      *results.map do |result|
+        if result.is_a?(Integer)
+          result
+        else
+          { 'instance' => result }
+        end
+      end
+    )
+  end
+
+  def stub_stat(name, values)
+    connection.response = {
+      'facet_counts' => {
+        'facet_fields' => {
+          name.to_s => values.to_a.sort_by { |value, count| -count }.flatten
+        }
+      }
+    }
+  end
+
+  def stat_field_name(result, field_name)
+    result.stat(field_name).rows.map { |row| row.field_name }
+  end
+
+  def values(result, field_name)
+    result.stat(field_name).rows.map { |row| row.value }
+  end
+  
+end

data/spec/mocks/adapters.rb

@@ -0,0 +1,32 @@
+class AbstractModel
+end
+
+class Model < AbstractModel
+end
+
+class AbstractModelInstanceAdapter < Sunspot::Adapters::InstanceAdapter
+end
+
+class AbstractModelDataAccessor < Sunspot::Adapters::DataAccessor
+end
+
+Sunspot::Adapters::InstanceAdapter.register(AbstractModelInstanceAdapter, AbstractModel)
+Sunspot::Adapters::DataAccessor.register(AbstractModelDataAccessor, AbstractModel)
+
+
+module MixInModel
+end
+
+class MixModel
+  include MixInModel
+end
+
+class MixInModelInstanceAdapter < Sunspot::Adapters::InstanceAdapter
+end
+
+class MixInModelDataAccessor < Sunspot::Adapters::DataAccessor
+end
+
+Sunspot::Adapters::InstanceAdapter.register(MixInModelInstanceAdapter, MixInModel)
+Sunspot::Adapters::DataAccessor.register(MixInModelDataAccessor, MixInModel)
+

data/spec/mocks/connection.rb

@@ -0,0 +1,126 @@
+module Mock
+  class ConnectionFactory
+    def connect(opts)
+      if @instance
+        raise('Factory can only create an instance once!')
+      else
+        @instance = Connection.new(opts)
+      end
+    end
+
+    def new(url = nil)
+      if @instance
+        raise('Factory can only create an instance once!')
+      else
+        @instance = Connection.new(url)
+      end
+    end
+
+    def instance
+      @instance ||= Connection.new
+    end
+  end
+
+  class Connection
+    attr_reader :adds, :commits, :optims, :searches, :message, :opts, :deletes_by_query
+    attr_accessor :response
+    attr_writer :expected_handler
+    undef_method :select # annoyingly defined on Object
+
+    def initialize(opts = {})
+      @opts = opts
+      @message = OpenStruct.new
+      @adds, @deletes, @deletes_by_query, @commits, @optims, @searches = Array.new(6) { [] }
+      @expected_handler = :select
+    end
+
+    def add(documents)
+      @adds << Array(documents)
+    end
+
+    def delete_by_id(ids)
+      @deletes << Array(ids)
+    end
+
+    def delete_by_query(query)
+      @deletes_by_query << query
+    end
+
+    def commit
+      @commits << Time.now
+    end
+
+    def optimize
+      @optims << Time.now
+    end
+
+    def post(path, params)
+      unless path == "#{@expected_handler}"
+        raise ArgumentError, "Expected request to #{@expected_handler} request handler"
+      end
+      @searches << @last_search = params[:data]
+      @response || {}
+    end
+
+    def method_missing(method, *args, &block)
+      get("#{method}", *args)
+    end
+
+    def has_add_with?(*documents)
+      @adds.any? do |add|
+        documents.all? do |document|
+          add.any? do |added|
+            if document.is_a?(Hash)
+              document.all? do |field, value|
+                added.fields_by_name(field).map do |field|
+                  field.value.to_s
+                end == Array(value).map { |v| v.to_s }
+              end
+            else
+              !added.fields_by_name(document).empty?
+            end
+          end
+        end
+      end
+    end
+
+    def has_delete?(*ids)
+      @deletes.any? do |delete|
+        delete & ids == ids
+      end
+    end
+
+    def has_delete_by_query?(query)
+      @deletes_by_query.include?(query)
+    end
+
+    def has_last_search_with?(params)
+      with?(@last_search, params) if @last_search
+    end
+
+    def has_last_search_including?(key, *values)
+      return unless @last_search
+      if @last_search.has_key?(key)
+        if @last_search[key].is_a?(Array)
+          (@last_search[key] & values).length == values.length
+        elsif values.length == 1
+          @last_search[key] == values.first
+        end
+      end
+    end
+
+    private
+
+    def with?(request, params)
+      if params.respond_to?(:all?)
+        params.all? do |key, value|
+          if request.has_key?(key)
+            request[key] == value
+          end
+        end
+      else
+        request.has_key?(params)
+      end
+    end
+  end
+end

data/spec/mocks/content.rb

@@ -0,0 +1,12 @@
+require File.join(File.dirname(__FILE__), 'super_class')
+
+class Content < SuperClass
+  attr_accessor :body, :visibility, :published_at
+end
+
+Sunspot.setup(Content) do
+  text :body
+  float :visibility
+  time :published_at
+end
+

data/spec/mocks/mock_adapter.rb

@@ -0,0 +1,30 @@
+require File.join(File.dirname(__FILE__), 'content')
+
+module MockAdapter
+  class InstanceAdapter < Sunspot::Adapters::InstanceAdapter
+    def id
+      @instance.id
+    end
+  end
+
+  class DataAccessor < Sunspot::Adapters::DataAccessor
+    def load(id)
+      @clazz.get(id.to_i)
+    end
+
+    def load_all(ids)
+      all = @clazz.get_all(ids.map { |id| id.to_i })
+      if @custom_title
+        all.each { |item| item.title = @custom_title }
+      end
+      all
+    end
+
+    def custom_title=(custom_title)
+      @custom_title = custom_title
+    end
+  end
+end
+
+Sunspot::Adapters::DataAccessor.register(MockAdapter::DataAccessor, MockRecord)
+Sunspot::Adapters::InstanceAdapter.register(MockAdapter::InstanceAdapter, MockRecord)

data/spec/mocks/mock_record.rb

@@ -0,0 +1,52 @@
+class MockRecord
+  IDS = Hash.new { |h, k| h[k] = 0 }
+  QUERY_COUNTS = Hash.new { |h, k| h[k] = 0 }
+  INSTANCES = Hash.new { |h, k| h[k] = {} }
+
+  attr_reader :id
+
+  class <<self
+    def reset!
+      IDS[name.to_sym] = 0
+      INSTANCES[name.to_sym] = {}
+    end
+  end
+
+  def initialize(attrs = {})
+    @id = attrs.delete(:id) || IDS[self.class.name.to_sym] += 1
+    INSTANCES[self.class.name.to_sym][@id] = self
+    attrs.each_pair do |name, value|
+      send(:"#{name}=", value)
+    end
+  end
+
+  def self.inherited(base)
+    base.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def get(id)
+      QUERY_COUNTS[self.name.to_sym] += 1
+      get_instance(id)
+    end
+
+    def get_all(ids)
+      QUERY_COUNTS[self.name.to_sym] += 1
+      ids.map { |id| get_instance(id) }.compact.sort_by { |instance| instance.id }
+    end
+
+    def query_count
+      QUERY_COUNTS[self.name.to_sym]
+    end
+
+    private
+
+    def get_instance(id)
+      INSTANCES[self.name.to_sym][id]
+    end
+  end
+
+  def destroy
+    INSTANCES[self.class.name.to_sym].delete(@id)
+  end
+end

data/spec/mocks/super_class.rb

@@ -0,0 +1,2 @@
+class SuperClass < MockRecord
+end

data/spec/spec_helper.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+require 'ostruct'
+require 'sunspot'
+require 'sunspot_stats'
+
+require File.join(File.dirname(__FILE__), 'mocks', 'mock_record.rb')
+Dir.glob(File.join(File.dirname(__FILE__), 'mocks', '**', '*.rb')).each do |file|
+  require file unless File.basename(file) == 'mock_record.rb'
+end
+Dir.glob(File.join(File.dirname(__FILE__), "helpers", "*.rb")).each do |file|
+  require file
+end
+require File.join(File.dirname(__FILE__), 'ext')
+
+RSpec.configure do |config|
+  # Mock session available to all spec/api tests
+  config.include MockSessionHelper,
+                 :type => :api,
+                 :example_group => {:file_path => /spec[\\\/]api/}
+
+  # Real Solr instance is available to integration tests
+  config.include IntegrationHelper,
+                 :type => :integration,
+                 :example_group => {:file_path => /spec[\\\/]integration/}
+
+  # Nested under spec/api
+  [:indexer, :query, :search].each do |spec_type|
+    helper_name = "#{spec_type}_helper"
+
+    config.include Sunspot::Util.full_const_get(Sunspot::Util.camel_case(helper_name)),
+                   :type          => spec_type,
+                   :example_group => {:file_path => /spec[\\\/]api[\\\/]#{spec_type}/}
+  end
+end
+
+def without_class(clazz)
+  Object.class_eval { remove_const(clazz.name.to_sym) }
+  yield
+  Object.class_eval { const_set(clazz.name.to_sym, clazz) }
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - duccio giovannelli
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-14 00:00:00 +02:00
+date: 2012-07-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,24 @@ files:
 - lib/search/stat_search.rb
 - lib/sunspot_stats.rb
 - lib/sunspot_stats/version.rb
+- spec/api/query/spec_helper.rb
+- spec/api/query/stats_spec.rb
+- spec/api/search/spec_helper.rb
+- spec/api/search/stats_spec.rb
+- spec/api/spec_helper.rb
+- spec/ext.rb
+- spec/helpers/indexer_helper.rb
+- spec/helpers/integration_helper.rb
+- spec/helpers/mock_session_helper.rb
+- spec/helpers/query_helper.rb
+- spec/helpers/search_helper.rb
+- spec/mocks/adapters.rb
+- spec/mocks/connection.rb
+- spec/mocks/content.rb
+- spec/mocks/mock_adapter.rb
+- spec/mocks/mock_record.rb
+- spec/mocks/super_class.rb
+- spec/spec_helper.rb
 - sunspot_stats.gemspec
 has_rdoc: true
 homepage: https://github.com/giovannelli/sunspot_stats
@@ -104,5 +122,22 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Added the statsComponent to sunspot
-test_files: []
-
+test_files: 
+- spec/api/query/spec_helper.rb
+- spec/api/query/stats_spec.rb
+- spec/api/search/spec_helper.rb
+- spec/api/search/stats_spec.rb
+- spec/api/spec_helper.rb
+- spec/ext.rb
+- spec/helpers/indexer_helper.rb
+- spec/helpers/integration_helper.rb
+- spec/helpers/mock_session_helper.rb
+- spec/helpers/query_helper.rb
+- spec/helpers/search_helper.rb
+- spec/mocks/adapters.rb
+- spec/mocks/connection.rb
+- spec/mocks/content.rb
+- spec/mocks/mock_adapter.rb
+- spec/mocks/mock_record.rb
+- spec/mocks/super_class.rb
+- spec/spec_helper.rb