thinking-sphinx-shoulda-matchers 0.0.1 → 0.0.2

data/.gitignore

@@ -1,4 +1,6 @@
 *.gem
+*.swp
+*.swo
 .bundle
 Gemfile.lock
 pkg/*

data/README.md

@@ -1,26 +1,41 @@
 # Thinking Sphinx matchers
 Ok, so here I present you my first gem. It was created out of necessity and I hope to both be useful to the community and learn a lot in the process!
 
+
 # Installation
 To install the matchers you only have to add the gem to your test group in `Gemfile`:
 
-> group :test do
->   gem 'thinking-sphinx-shoulda-matchers'
-> end
+     group :test do
+       gem 'thinking-sphinx-shoulda-matchers'
+     end
+
 
 # Use
-> describe "fields" do
->   it { should index :name, :from => :client, :as => :client_name }
->   it { should index :content }
-> end
->
-> describe "attributes" do
->   it { should have_attribute :user_id, :as => :users }
-> end
+     describe "fields" do
+       it { should index :name, :from = :client, :as = :client_name }
+       it { should index :content }
+     end
+    
+     describe "attributes" do
+       it { should have_attribute :user_id, :as = :users }
+     end
+
+Field options
+    :from
+    :as
+    :facet
+    :sortable
+
+Attribute Field options
+    :as
+    :facet
 
 # References
 [1] http://openmonkey.com/2009/07/19/thinking-sphinx-rspec-matchers/
+
 [2] https://gist.github.com/21755
 
+
 # Credits
 Thanks to Pal Allan from http://freelancing-gods.com/ for creating Thinking Sphinx!
+Thanks to Tim Riley for the initial version of the matcher

data/lib/thinking-sphinx-shoulda-matchers/attribute_matcher.rb

@@ -2,22 +2,27 @@ require 'rspec'
 
 RSpec::Matchers.define(:have_attribute) do |attribute, args|
   options = args.nil? ? {} : args.dup
+  options[:facet] ||= false
 
   match do |model|
     if model.sphinx_indexes?
       model.class.define_indexes
-      model.sphinx_indexes.first.attributes.select {|f| f.columns.first.__name == attribute && f.alias == options[:as] }.count == 1
+      model.sphinx_indexes.first.attributes.select {|a|
+        a.columns.first.__name == attribute &&
+        a.alias == options[:as] &&
+        (a.faceted.nil? ? true : a.faceted == options[:facet])
+      }.count == 1
     else
       false
     end
   end
 
   failure_message_for_should do |actual|
-    "expected #{actual} to have an attribute for #{attribute.to_sym}"
+    "expected #{actual} to have an attribute for #{attribute.to_sym} with params #{args}"
   end
 
   failure_message_for_should_not do |actual|
-    "expected #{actual} not to define an attribute for #{attribute.to_sym}"
+    "expected #{actual} not to define an attribute for #{attribute.to_sym} with params #{args}"
   end
 
   description do

data/lib/thinking-sphinx-shoulda-matchers/field_matcher.rb

@@ -3,22 +3,30 @@ require 'rspec'
 RSpec::Matchers.define(:index) do |field, args|
   options = args.nil? ? {} : args.dup
   options[:from] = Array(options[:from])
+  options[:sortable] ||= false
+  options[:facet] ||= false
 
   match do |model|
     if model.sphinx_indexes?
       model.class.define_indexes
-      model.sphinx_indexes.first.fields.select {|f| f.columns.first.__name == field && f.columns.first.__stack == options[:from] && f.alias == options[:as] }.count == 1
+      model.sphinx_indexes.first.fields.select {|f|
+        f.columns.first.__name == field &&
+        f.columns.first.__stack == options[:from] &&
+        f.alias == options[:as] &&
+        f.sortable == options[:sortable] &&
+        (f.faceted.nil? ? true : f.faceted == options[:facet])
+      }.count == 1
     else
       false
     end
   end
 
   failure_message_for_should do |actual|
-    "expected #{actual} to define an index for #{field.to_sym}"
+    "expected #{actual} to define an index for #{field.to_sym} with params #{args}"
   end
 
   failure_message_for_should_not do |actual|
-    "expected #{actual} not to define an index for #{field.to_sym}"
+    "expected #{actual} not to define an index for #{field.to_sym} with params #{args}"
   end
 
   description do

data/thinking-sphinx-shoulda-matchers.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "thinking-sphinx-shoulda-matchers"
-  s.version     = "0.0.1"
+  s.version     = "0.0.2"
   s.authors     = ["Alejandro Andres"]
   s.email       = ["fuzzy.alej@gmail.com"]
   s.homepage    = "http://alejandroandres.com/"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx-shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-23 00:00:00.000000000Z
+date: 2011-11-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152353880 !ruby/object:Gem::Requirement
+  requirement: &2153106220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152353880
+  version_requirements: *2153106220
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152349620 !ruby/object:Gem::Requirement
+  requirement: &2153104840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152349620
+  version_requirements: *2153104840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152347780 !ruby/object:Gem::Requirement
+  requirement: &2153103580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152347780
+  version_requirements: *2153103580
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152342580 !ruby/object:Gem::Requirement
+  requirement: &2153101840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152342580
+  version_requirements: *2153101840
 description: Shoulda matchers for Thinking Sphinx
 email:
 - fuzzy.alej@gmail.com