soulmate_rails 0.2.1 → 0.3.0

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.3@soulmate_rails --create
+rvm 1.9.3-p385@soulmate_rails --create

data/Gemfile

@@ -1,2 +1,6 @@
 source 'http://rubygems.org'
 gemspec
+
+group :development do
+  gem 'supermodel', :git => 'git@github.com:dhruvasagar/supermodel.git'
+end

data/Rakefile

@@ -20,5 +20,12 @@ end
 
 desc 'Open an irb session preloaded with this library'
 task :console do
-  sh 'irb -rubygems -I lib -r soulmate_rails.rb'
+  sh 'irb -rubygems -I lib:spec -r soulmate_rails.rb -r spec_helper.rb'
+end
+
+desc 'Release the gem'
+task :release => :build do
+  sh "git tag -a 'v#{SoulmateRails::VERSION}' -m 'Version #{SoulmateRails::VERSION}'"
+  sh 'git push origin master --tags'
+  sh "gem push pkg/soulmate_rails-#{SoulmateRails::VERSION}.gem"
 end

data/lib/soulmate_rails/model_additions.rb

@@ -9,7 +9,7 @@ module SoulmateRails
     end
 
     def update_index_for(attribute, options={})
-      loader = instance_variable_get("@#{loader_for(attribute)}") || instance_variable_set("@#{loader_for(attribute)}", Soulmate::Loader.new(loader_for(attribute)))
+      loader = instance_variable_get("@#{self.class.name_for(attribute)}_loader") || instance_variable_set("@#{self.class.name_for(attribute)}_loader", Soulmate::Loader.new(self.class.name_for(attribute)))
       item = {
         'id' => "#{attribute}_#{self.id}",
         'term' => send(attribute),
@@ -35,18 +35,14 @@ module SoulmateRails
         end
       end
 
-      loader.add(item, options)
+      loader.add(item)
     end
 
     def remove_index_for(attribute)
-      loader = instance_variable_get("@#{loader_for(attribute)}") || instance_variable_set("@#{loader_for(attribute)}", Soulmate::Loader.new(loader_for(attribute)))
+      loader = instance_variable_get("@#{self.class.name_for(attribute)}") || instance_variable_set("@#{self.class.name_for(attribute)}", Soulmate::Loader.new(self.class.name_for(attribute)))
       loader.remove('id' => "#{attribute}_#{self.id}")
     end
 
-    def loader_for(attribute)
-      "#{self.class.normalized_class_name}_#{attribute}"
-    end
-
     module ClassMethods
       def autocomplete(attribute, options={})
         define_method "update_index_for_#{attribute}" do
@@ -66,16 +62,19 @@ module SoulmateRails
       end
 
       def search_by(attribute, term, options={})
-        matcher = instance_variable_get("@#{matcher_for(attribute)}") || instance_variable_set("@#{matcher_for(attribute)}", Soulmate::Matcher.new(matcher_for(attribute)))
+        matcher = instance_variable_get("@#{name_for(attribute)}_matcher") || instance_variable_set("@#{name_for(attribute)}_matcher", Soulmate::Matcher.new(name_for(attribute)))
         matches = matcher.matches_for_term(term, options)
-        matches = matches.map do |match|
-          object = find(match['id'].split('_')[-1].to_i)
-          object.soulmate_data = match['data'].symbolize_keys if object && match['data']
+
+        hash = {}
+        matches.each {|m| hash[m['id'].split('_')[-1].to_i] = m}
+
+        where(:id => hash.keys).map do |object|
+          object.soulmate_data = hash[object.id]['data'].symbolize_keys if hash[object.id] && hash[object.id]['data']
           object
         end
       end
 
-      def matcher_for(attribute)
+      def name_for(attribute)
         "#{normalized_class_name}_#{attribute}"
       end
 

data/lib/soulmate_rails/version.rb

@@ -1,7 +1,7 @@
 module SoulmateRails
   MAJOR = 0
-  MINOR = 2
-  PATCH = 1
+  MINOR = 3
+  PATCH = 0
 
   VERSION = [MAJOR, MINOR, PATCH].compact.join('.')
 end

data/spec/soulmate_rails/model_additions_spec.rb

@@ -1,10 +1,5 @@
 require 'spec_helper'
 
-require 'samples/models/user_single'
-require 'samples/models/user_multiple'
-require 'samples/models/user_aliases'
-require 'samples/models/user_data'
-
 module SoulmateRails
   describe ModelAdditions do
     context 'autocomplete for name' do

data/spec/spec_helper.rb

@@ -1,17 +1,22 @@
+require 'rspec'
 require 'supermodel'
 require 'mock_redis'
 require 'soulmate_rails'
 
+require 'samples/models/user_single'
+require 'samples/models/user_multiple'
+require 'samples/models/user_aliases'
+require 'samples/models/user_data'
+
 TestRoot = File.expand_path(File.dirname(__FILE__))
 
 RSpec.configure do |config|
   config.order = 'random'
   config.color_enabled = true
 
-  config.before(:each) do
+  config.before(:suite) do
     redis = MockRedis.new
     redis.flushdb
     Soulmate.redis = redis
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: soulmate_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4388796581995930831
+      hash: -1107948345985026072
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -181,10 +181,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4388796581995930831
+      hash: -1107948345985026072
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Redis-backed autocompletion engine for Rails