sunspot_association 0.0.2 → 0.1.0

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    sunspot_association (0.0.1)
+    sunspot_association (0.0.2)
       activerecord (~> 3.0)
-      sunspot_solr
+      sunspot_rails
 
 GEM
   remote: http://rubygems.org/
@@ -85,7 +85,6 @@ GEM
     sunspot_rails (1.3.3)
       nokogiri
       sunspot (= 1.3.3)
-    sunspot_solr (2.0.0)
     sunspot_test (0.4.0)
       sunspot_rails (>= 1.2.1)
     terminal-table (1.4.5)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 YOURNAME
+Copyright 2013 Arjen Oosterkamp
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,23 +1,39 @@
 # sunspot_association [![Gem Version](https://badge.fury.io/rb/sunspot_association.png)](http://badge.fury.io/rb/sunspot_association) [![Build Status](https://secure.travis-ci.org/Arjeno/sunspot_association.png?branch=master)](http://travis-ci.org/Arjeno/sunspot_association) [![Dependency Status](https://gemnasium.com/Arjeno/sunspot_association.png)](https://gemnasium.com/Arjeno/sunspot_association) [![Coverage Status](https://coveralls.io/repos/Arjeno/sunspot_association/badge.png?branch=master)](https://coveralls.io/r/Arjeno/sunspot_association)
 
-Automatically reindex ActiveRecord associations using Sunspot.
+Automatic association (re)indexing for your searchable Sunspot models.
 
-## Usage
-
-Add to your Gemfile:
+## Pure magic
 
 ```ruby
-gem 'sunspot_association'
+class User < ActiveRecord::Base
+  belongs_to :company
+  searchable do
+    associate :text, :company, :name, :phone
+  end
+end
 ```
 
-Add to your model:
+## What it does
+
+The above example will convert to:
 
 ```ruby
-class Company < ActiveRecord::Base
-  sunspot_associate :orders, :fields => :name
+searchable do
+  text :company_name do; company.name end
+  text :company_phone do; company.phone end
 end
 ```
 
+It will also hook into `Company` and watch it for changes
+
+## Usage
+
+Add to your Gemfile:
+
+```ruby
+gem 'sunspot_association'
+```
+
 ## Example
 
 ```ruby
@@ -25,50 +41,24 @@ class User < ActiveRecord::Base
   belongs_to :company
 
   searchable do
-    text :company_name do; company.try(:name) end
-  end
-end
+    associate :text, :company, :name, :phone
+    associate :string, :company, :address, :stored => true
 
-class Order < ActiveRecord::Base
-  belongs_to :company
-
-  searchable do
-    text :company_name do; company.try(:name) end
+    # Converts to:
+    # => text :company_name do; company.name end
+    # => text :company_phone do; company.phone end
+    # => string :company_address, { :stored => true } do; company.address end
   end
 end
 
 class Company < ActiveRecord::Base
-  has_many :orders
   has_many :users
 
-  sunspot_associate :orders, :users
-
-  # Or only track changes for the name field
-  # => sunspot_associate :orders, :users, :fields => :name
+  # This configuration is automatically added by the searchable DSL
+  # => sunspot_associate :users, :fields => [:name, :phone, :address]
 end
 ```
 
 ## License
 
-Copyright (c) 2013 Arjen Oosterkamp
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+sunspot_association is distributed under the MIT License, copyright © 2013 Arjen Oosterkamp

data/lib/sunspot_association/model.rb

@@ -0,0 +1,107 @@
+require 'active_record'
+
+module SunspotAssociation
+  module Model
+
+    extend ActiveSupport::Concern
+
+    included do
+
+      ## Attributes
+
+      cattr_accessor :sunspot_association_configuration
+
+      after_create  Proc.new { |o| o.reindex_sunspot_associations!(:create) }
+      after_update  Proc.new { |o| o.reindex_sunspot_associations!(:update) }
+      after_destroy Proc.new { |o| o.reindex_sunspot_associations!(:destroy) }
+
+    end
+
+    module ClassMethods
+
+      def sunspot_associate?
+        self.sunspot_association_configuration != {}
+      end
+
+      # Reindex associations when a model changes
+      #
+      # Options:
+      #
+      # :fields
+      # => Field(s) to watch for changes
+      #
+      # :on_create
+      # => Specifies if it should reindex associations when a record is created
+      #
+      # Examples:
+      #
+      # => sunspot_associate :orders, :fields => :name
+      # => sunspot_associate :orders, :users, :fields => [:name, :phone], :on_create => true
+      #
+      def sunspot_associate(*args)
+        options = args.extract_options!
+        fields  = options.delete(:fields)
+
+        self.sunspot_association_configuration ||= {}
+
+        args.each do |object|
+          default = { :fields => [] }
+          config  = self.sunspot_association_configuration[object] || default
+
+          # Fields
+          config[:fields] += Array(fields)
+          config[:fields].compact!
+          config[:fields].uniq!
+
+          config.merge!(options)
+
+          self.sunspot_association_configuration[object] = config
+        end
+      end
+
+      def reset_sunspot_associations!
+        self.sunspot_association_configuration = {}
+      end
+
+    end
+
+    # Main callback method, checks if it should reindex an association
+    def reindex_sunspot_associations!(event)
+      self.class.sunspot_association_configuration.each do |object, config|
+        case event
+        when :create
+          reindex_sunspot_association!(object) if config[:on_create]
+        when :update
+          reindex_sunspot_association!(object) if reindex_sunspot_association?(object)
+        when :destroy
+          reindex_sunspot_association!(object)
+        end
+      end
+    end
+
+    # Checks if an association should be reindexed
+    # => reindex_sunspot_association?(:orders) => true
+    def reindex_sunspot_association?(object)
+      if (config = (self.class.sunspot_association_configuration || {})[object]).present?
+        if config[:fields].present?
+          return ! (changed & (config[:fields] || []).map(&:to_s)).empty?
+        else
+          return changed.any?
+        end
+      end
+
+      false
+    end
+
+    # Reindexes an association using Sunspot.index
+    def reindex_sunspot_association!(object)
+      return false unless self.class.sunspot_associate?
+      return false unless self.respond_to?(object)
+
+      Sunspot.index self.send(object)
+    end
+
+  end
+end
+
+ActiveRecord::Base.send(:include, SunspotAssociation::Model)

data/lib/sunspot_association/searchable.rb

@@ -0,0 +1,77 @@
+require 'sunspot/rails'
+
+module SunspotAssociation
+  module Searchable
+
+    extend ActiveSupport::Concern
+
+    # Index association fields
+    #
+    # Options:
+    #
+    # :inverse_name - see `setup_association_reindex`
+    #
+    # :index_on_change
+    # => Boolean or array
+    # => Defaults to `fields`
+    # => Set to false to disable automatic reindexing
+    # => Set to true to reindex for every update
+    # => Pass array of fields to specifically watch
+    #
+    # Examples:
+    #
+    # => associate :text, :company, :name
+    # => associate :text, :company, :name, :phone
+    # => associate :text, :company, :name, :phone, :inverse_name => :company_users
+    #
+    def associate(type, association_name, *fields)
+      options = fields.extract_options!
+
+      inverse_name    = options.delete(:inverse_name)
+      index_on_change = options.delete(:index_on_change)
+
+      fields.each do |field|
+        name = [association_name, field].join('_')
+        self.send(type, name, options) do
+          self.send(association_name).send(field)
+        end
+      end
+
+      unless index_on_change == false
+        fields_to_watch = fields
+
+        if index_on_change.is_a?(Array)
+          fields_to_watch = index_on_change
+        elsif index_on_change == true
+          fields_to_watch = []
+        end
+
+        setup_association_reindex association_name, fields_to_watch, { :inverse_name => inverse_name }
+      end
+    end
+
+    # Set up automatic reindexing using `sunspot_associate`
+    #
+    # Options:
+    #
+    # :inverse_name
+    # => Name of inverse association to use, for example :company_users
+    #
+    # Examples:
+    #
+    # => setup_association_reindex :company, [:name]
+    # => setup_association_reindex :company, [:name], :inverse_name => :company_users
+    #
+    def setup_association_reindex(association_name, fields, options={})
+      searchable_class  = @setup.clazz
+      association       = searchable_class.reflect_on_association(association_name)
+      association_class = association.klass
+      inverse_name      = options[:inverse_name] || searchable_class.name.pluralize.downcase.to_sym
+
+      association_class.sunspot_associate inverse_name, :fields => fields
+    end
+
+  end
+end
+
+Sunspot::DSL::Fields.send(:include, SunspotAssociation::Searchable)

data/lib/sunspot_association/version.rb

@@ -1,3 +1,3 @@
 module SunspotAssociation
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/sunspot_association.rb

@@ -1,110 +1,6 @@
-require 'active_record'
 require 'sunspot_association/version'
+require 'sunspot_association/model'
+require 'sunspot_association/searchable'
 
 module SunspotAssociation
-  module Model
-
-    extend ActiveSupport::Concern
-
-    included do
-
-      ## Attributes
-
-      cattr_accessor :sunspot_association_configuration
-
-      ## Callbacks
-
-      after_create  Proc.new { |o| o.reindex_sunspot_associations!(:create) }
-      after_update  Proc.new { |o| o.reindex_sunspot_associations!(:update) }
-      after_destroy Proc.new { |o| o.reindex_sunspot_associations!(:destroy) }
-
-    end
-
-    module ClassMethods
-
-      def sunspot_associate?
-        self.sunspot_association_configuration != {}
-      end
-
-      # Reindex associations when a model changes
-      #
-      # Options:
-      #
-      # :fields
-      # => Field(s) to watch for changes
-      #
-      # :on_create
-      # => Specifies if it should reindex associations when a record is created
-      #
-      # Examples:
-      #
-      # => sunspot_associate :orders, :fields => :name
-      # => sunspot_associate :orders, :users, :fields => [:name, :phone], :on_create => true
-      #
-      def sunspot_associate(*args)
-        options = args.extract_options!
-        fields  = options.delete(:fields)
-
-        self.sunspot_association_configuration ||= {}
-
-        args.each do |object|
-          default = { :fields => [] }
-          config  = self.sunspot_association_configuration[object] || default
-
-          # Fields
-          config[:fields] += Array(fields)
-          config[:fields].compact!
-          config[:fields].uniq!
-
-          config.merge!(options)
-
-          self.sunspot_association_configuration[object] = config
-        end
-      end
-
-      def reset_sunspot_associations!
-        self.sunspot_association_configuration = {}
-      end
-
-    end
-
-    # Main callback method, checks if it should reindex an association
-    def reindex_sunspot_associations!(event)
-      self.class.sunspot_association_configuration.each do |object, config|
-        case event
-        when :create
-          reindex_sunspot_association!(object) if config[:on_create]
-        when :update
-          reindex_sunspot_association!(object) if reindex_sunspot_association?(object)
-        when :destroy
-          reindex_sunspot_association!(object)
-        end
-      end
-    end
-
-    # Checks if an association should be reindexed
-    # => reindex_sunspot_association?(:orders) => true
-    def reindex_sunspot_association?(object)
-      if (config = (self.class.sunspot_association_configuration || {})[object]).present?
-        if config[:fields].present?
-          return ! (changed & (config[:fields] || []).map(&:to_s)).empty?
-        else
-          return changed.any?
-        end
-      end
-
-      false
-    end
-
-    # Reindexes an association using Sunspot.index
-    def reindex_sunspot_association!(object)
-      return false unless self.class.sunspot_associate?
-      return false unless self.respond_to?(object)
-
-      Sunspot.index self.send(object)
-    end
-
-  end
 end
-
-ActiveRecord::Base.send(:include, SunspotAssociation::Model)

data/spec/sunspot_association/model_spec.rb

@@ -0,0 +1,165 @@
+require 'spec_helper'
+
+describe SunspotAssociation::Model do
+
+  with_model :User do
+    table do |t|
+      t.belongs_to :company
+      t.string :name
+      t.timestamps
+    end
+
+    model do
+      belongs_to :company
+    end
+  end
+
+  with_model :Order do
+    table do |t|
+      t.belongs_to :company
+      t.string :number
+      t.timestamps
+    end
+
+    model do
+      belongs_to :company
+    end
+  end
+
+  with_model :Company do
+    table do |t|
+      t.string :name
+      t.string :number
+      t.timestamps
+    end
+
+    model do
+      has_many :orders
+      has_many :users
+    end
+  end
+
+  let(:company) { Company.create({ :name => 'Company name', :number => '1' }) }
+  let(:order) { Order.create({ :number => '1', :company => company }) }
+  let(:user) { User.create({ :name => 'John Doe', :company => company }) }
+
+  before(:each) do
+    Company.sunspot_associate :orders, :fields => :name
+    Company.sunspot_associate :users, :on_create => true
+  end
+
+  after(:each) do
+    Company.reset_sunspot_associations!
+  end
+
+  describe :sunspot_association_configuration do
+
+    it do
+      Company.sunspot_association_configuration.should == {
+        :orders => { :fields => [:name] },
+        :users  => { :fields => [], :on_create => true }
+      }
+    end
+
+    context 'with multiple objects' do
+
+      before(:each) do
+        Company.sunspot_associate :orders, :users, :fields => :name, :on_create => true
+      end
+
+      it do
+        Company.sunspot_association_configuration.should == {
+          :orders => { :fields => [:name], :on_create => true },
+          :users  => { :fields => [:name], :on_create => true },
+        }
+      end
+
+    end
+
+  end
+
+  describe :reindex_sunspot_association? do
+
+    subject { company }
+
+    context 'without changes' do
+
+      it { company.reindex_sunspot_association?(:orders).should be_false }
+      it { company.reindex_sunspot_association?(:users).should be_false }
+
+    end
+
+    context 'with changes' do
+
+      before(:each) { company.name = 'Name change' }
+
+      it { company.reindex_sunspot_association?(:orders).should be_true }
+      it { company.reindex_sunspot_association?(:users).should be_true }
+
+    end
+
+    context 'with any change' do
+
+      before(:each) { company.number = '5' }
+
+      it { company.reindex_sunspot_association?(:orders).should be_false }
+      it { company.reindex_sunspot_association?(:users).should be_true }
+
+    end
+
+  end
+
+  describe :callbacks do
+
+    context :after_create do
+
+      let(:company) { Company.new }
+      after(:each) { company.save }
+
+      it do
+        company.should_not_receive(:reindex_sunspot_association!).with(:orders)
+        company.should_receive(:reindex_sunspot_association!).with(:users)
+      end
+
+    end
+
+    context :after_update do
+
+      context 'with tracked change' do
+
+        after(:each) { company.update_attributes({ :name => 'name change' }) }
+
+        it do
+          company.should_receive(:reindex_sunspot_association!).with(:orders)
+          company.should_receive(:reindex_sunspot_association!).with(:users)
+        end
+
+      end
+
+      context 'with untracked change' do
+
+        after(:each) { company.update_attributes({ :number => '5' }) }
+
+        it do
+          company.should_not_receive(:reindex_sunspot_association!).with(:orders)
+          company.should_receive(:reindex_sunspot_association!).with(:users)
+        end
+
+      end
+
+    end
+
+    context :after_destroy do
+
+      after(:each) { company.destroy }
+
+      it do
+        company.should_receive(:reindex_sunspot_association!).with(:orders)
+        company.should_receive(:reindex_sunspot_association!).with(:users)
+      end
+
+    end
+
+  end
+
+end

data/spec/sunspot_association/searchable_spec.rb

@@ -0,0 +1,263 @@
+require 'spec_helper'
+
+describe SunspotAssociation::Searchable do
+
+  ## Shared examples
+
+  shared_examples_for 'a searchable field' do |searchable_field, type, stored|
+    stored ||= false
+
+    let(:field) { fetch_fields(searchable_field, model) }
+    let(:data) { field.build }
+
+    subject { field }
+
+    it { should be_present }
+    it { data.instance_variable_get(:@stored).should == stored }
+    it { data.type.class.should == type } if type
+  end
+
+  ## Methods
+
+  def fetch_fields(name, model)
+    fields = Sunspot::Setup.for(model).field_factories
+    fields += Sunspot::Setup.for(model).text_field_factories
+    fields += Sunspot::Setup.for(model).dynamic_field_factories
+
+    fields.flatten!
+
+    found_fields = fields.collect do |f|
+      f if f.name == name
+    end.compact
+
+    found_fields.count > 1 ? found_fields : found_fields.first
+  end
+
+  ## Models
+
+  with_model :User do
+    table do |t|
+      t.belongs_to :company
+      t.string :name
+      t.timestamps
+    end
+
+    model do
+      include Sunspot::Rails::Searchable
+      belongs_to :company
+    end
+  end
+
+  with_model :Company do
+    table do |t|
+      t.string :name
+      t.string :phone
+      t.timestamps
+    end
+
+    model do
+      has_many :users
+    end
+  end
+
+  describe :associate do
+
+    describe :setup_association_reindex do
+
+      after(:each) do
+        Company.reset_sunspot_associations!
+      end
+
+      subject { Company.sunspot_association_configuration }
+
+      describe 'default' do
+
+        before(:each) do
+          User.searchable do
+            associate :text, :company, :name
+          end
+        end
+
+        it { should == { :users => { :fields => [:name] } } }
+
+      end
+
+      describe :inverse_name do
+
+        before(:each) do
+          User.searchable do
+            associate :text, :company, :name, :inverse_name => :company_users
+          end
+        end
+
+        it { should == { :company_users => { :fields => [:name] } } }
+
+      end
+
+      describe :index_on_change do
+
+        context 'with true' do
+
+          before(:each) do
+            User.searchable do
+              associate :text, :company, :name, :index_on_change => true
+            end
+          end
+
+          it { should == { :users => { :fields => [] } } }
+
+        end
+
+        context 'with false' do
+
+          before(:each) do
+            User.searchable do
+              associate :text, :company, :name, :index_on_change => false
+            end
+          end
+
+          it { should == {} }
+
+        end
+
+        context 'with array' do
+
+          before(:each) do
+            User.searchable do
+              associate :text, :company, :pretty_address, :index_on_change => [:address]
+            end
+          end
+
+          it { should == { :users => { :fields => [:address] } } }
+
+        end
+
+      end
+
+    end
+
+    describe :sunspot_settings do
+
+      let(:model) { User }
+
+      describe :text do
+
+        before(:each) do
+          User.searchable do
+            associate :text, :company, :name
+          end
+        end
+
+        it_should_behave_like 'a searchable field', :company_name, Sunspot::Type::TextType
+
+        it do
+          Company.sunspot_association_configuration.should == {
+            :users => { :fields => [:name] }
+          }
+        end
+
+        context 'with multiple' do
+
+          describe 'in one call' do
+
+            before(:each) do
+              User.searchable do
+                associate :text, :company, :name, :phone
+              end
+            end
+
+            it_should_behave_like 'a searchable field', :company_name, Sunspot::Type::TextType
+            it_should_behave_like 'a searchable field', :company_phone, Sunspot::Type::TextType
+
+            it do
+              Company.sunspot_association_configuration.should == {
+                :users => { :fields => [:name, :phone] }
+              }
+            end
+
+          end
+
+          describe 'in multiple calls' do
+
+            before(:each) do
+              User.searchable do
+                associate :text, :company, :name
+                associate :text, :company, :phone
+              end
+            end
+
+            it_should_behave_like 'a searchable field', :company_name, Sunspot::Type::TextType
+            it_should_behave_like 'a searchable field', :company_phone, Sunspot::Type::TextType
+
+            it do
+              Company.sunspot_association_configuration.should == {
+                :users => { :fields => [:name, :phone] }
+              }
+            end
+
+          end
+
+        end
+
+      end
+
+      describe :string do
+
+        before(:each) do
+          User.searchable do
+            associate :string, :company, :name
+          end
+        end
+
+        it_should_behave_like 'a searchable field', :company_name, Sunspot::Type::StringType
+
+        context 'with stored' do
+
+          before(:each) do
+            User.searchable do
+              associate :string, :company, :name, :stored => true
+            end
+          end
+
+          it_should_behave_like 'a searchable field', :company_name, Sunspot::Type::StringType, true
+
+        end
+
+        context 'with multiple' do
+
+          describe 'in one call' do
+
+            before(:each) do
+              User.searchable do
+                associate :string, :company, :name, :phone
+              end
+            end
+
+            it_should_behave_like 'a searchable field', :company_name, Sunspot::Type::StringType
+            it_should_behave_like 'a searchable field', :company_phone, Sunspot::Type::StringType
+
+          end
+
+          describe 'in multiple calls' do
+
+            before(:each) do
+              User.searchable do
+                associate :string, :company, :name
+                associate :string, :company, :phone
+              end
+            end
+
+            it_should_behave_like 'a searchable field', :company_name, Sunspot::Type::StringType
+            it_should_behave_like 'a searchable field', :company_phone, Sunspot::Type::StringType
+
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/spec/sunspot_association_spec.rb

@@ -1,165 +1,4 @@
 require 'spec_helper'
 
 describe SunspotAssociation do
-
-  with_model :User do
-    table do |t|
-      t.belongs_to :company
-      t.string :name
-      t.timestamps
-    end
-
-    model do
-      belongs_to :company
-    end
-  end
-
-  with_model :Order do
-    table do |t|
-      t.belongs_to :company
-      t.string :number
-      t.timestamps
-    end
-
-    model do
-      belongs_to :company
-    end
-  end
-
-  with_model :Company do
-    table do |t|
-      t.string :name
-      t.string :number
-      t.timestamps
-    end
-
-    model do
-      has_many :orders
-      has_many :users
-    end
-  end
-
-  let(:company) { Company.create({ :name => 'Company name', :number => '1' }) }
-  let(:order) { Order.create({ :number => '1', :company => company }) }
-  let(:user) { User.create({ :name => 'John Doe', :company => company }) }
-
-  before(:each) do
-    Company.sunspot_associate :orders, :fields => :name
-    Company.sunspot_associate :users, :on_create => true
-  end
-
-  after(:each) do
-    Company.reset_sunspot_associations!
-  end
-
-  describe :sunspot_association_configuration do
-
-    it do
-      Company.sunspot_association_configuration.should == {
-        :orders => { :fields => [:name] },
-        :users  => { :fields => [], :on_create => true }
-      }
-    end
-
-    context 'with multiple objects' do
-
-      before(:each) do
-        Company.sunspot_associate :orders, :users, :fields => :name, :on_create => true
-      end
-
-      it do
-        Company.sunspot_association_configuration.should == {
-          :orders => { :fields => [:name], :on_create => true },
-          :users  => { :fields => [:name], :on_create => true },
-        }
-      end
-
-    end
-
-  end
-
-  describe :reindex_sunspot_association? do
-
-    subject { company }
-
-    context 'without changes' do
-
-      it { company.reindex_sunspot_association?(:orders).should be_false }
-      it { company.reindex_sunspot_association?(:users).should be_false }
-
-    end
-
-    context 'with changes' do
-
-      before(:each) { company.name = 'Name change' }
-
-      it { company.reindex_sunspot_association?(:orders).should be_true }
-      it { company.reindex_sunspot_association?(:users).should be_true }
-
-    end
-
-    context 'with any change' do
-
-      before(:each) { company.number = '5' }
-
-      it { company.reindex_sunspot_association?(:orders).should be_false }
-      it { company.reindex_sunspot_association?(:users).should be_true }
-
-    end
-
-  end
-
-  describe :callbacks do
-
-    context :after_create do
-
-      let(:company) { Company.new }
-      after(:each) { company.save }
-
-      it do
-        company.should_not_receive(:reindex_sunspot_association!).with(:orders)
-        company.should_receive(:reindex_sunspot_association!).with(:users)
-      end
-
-    end
-
-    context :after_update do
-
-      context 'with tracked change' do
-
-        after(:each) { company.update_attributes({ :name => 'name change' }) }
-
-        it do
-          company.should_receive(:reindex_sunspot_association!).with(:orders)
-          company.should_receive(:reindex_sunspot_association!).with(:users)
-        end
-
-      end
-
-      context 'with untracked change' do
-
-        after(:each) { company.update_attributes({ :number => '5' }) }
-
-        it do
-          company.should_not_receive(:reindex_sunspot_association!).with(:orders)
-          company.should_receive(:reindex_sunspot_association!).with(:users)
-        end
-
-      end
-
-    end
-
-    context :after_destroy do
-
-      after(:each) { company.destroy }
-
-      it do
-        company.should_receive(:reindex_sunspot_association!).with(:orders)
-        company.should_receive(:reindex_sunspot_association!).with(:users)
-      end
-
-    end
-
-  end
-
 end

data/sunspot_association.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Arjen Oosterkamp"]
   s.email       = ["mail@arjen.me"]
   s.homepage    = ""
-  s.summary     = %q{Automatically reindex ActiveRecord associations using Sunspot}
-  s.description = %q{Automatically reindex ActiveRecord associations using Sunspot}
+  s.summary     = %q{Automatic association (re)indexing for your searchable Sunspot models.}
+  s.description = %q{Automatic association (re)indexing for your searchable Sunspot models.}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -26,5 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "coveralls"
 
   s.add_dependency "activerecord", "~> 3.0"
-  s.add_dependency "sunspot_solr"
+  s.add_dependency "sunspot_rails"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunspot_association
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: sunspot_solr
+  name: sunspot_rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -123,7 +123,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Automatically reindex ActiveRecord associations using Sunspot
+description: Automatic association (re)indexing for your searchable Sunspot models.
 email:
 - mail@arjen.me
 executables: []
@@ -139,8 +139,12 @@ files:
 - README.md
 - Rakefile
 - lib/sunspot_association.rb
+- lib/sunspot_association/model.rb
+- lib/sunspot_association/searchable.rb
 - lib/sunspot_association/version.rb
 - spec/spec_helper.rb
+- spec/sunspot_association/model_spec.rb
+- spec/sunspot_association/searchable_spec.rb
 - spec/sunspot_association_spec.rb
 - sunspot_association.gemspec
 homepage: ''
@@ -166,8 +170,10 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Automatically reindex ActiveRecord associations using Sunspot
+summary: Automatic association (re)indexing for your searchable Sunspot models.
 test_files:
 - spec/spec_helper.rb
+- spec/sunspot_association/model_spec.rb
+- spec/sunspot_association/searchable_spec.rb
 - spec/sunspot_association_spec.rb
 has_rdoc: