acts_as_cleo 3.0.0 → 3.0.1

data/Rakefile

@@ -30,17 +30,10 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+#  test.pattern = 'test/**/work_*.rb'
+  test.verbose = false
 end
 
-#require 'rcov/rcovtask'
-#Rcov::RcovTask.new do |test|
-#  test.libs << 'test'
-#  test.pattern = 'test/**/test_*.rb'
-#  test.verbose = true
-#  test.rcov_opts << '--exclude "gems/*"'
-#end
-
 task :default => :test
 
 require 'rdoc/task'

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/acts_as_cleo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "acts_as_cleo"
-  s.version = "3.0.0"
+  s.version = "3.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert R. Meyer"]
-  s.date = "2012-04-11"
+  s.date = "2012-04-26"
   s.description = "LinkedIn Open Source type ahead tool's REST API as a ruby gem. Now with Reddis support."
   s.email = "Blue.Dog.Archolite@gmail.com"
   s.extra_rdoc_files = [
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
     "lib/acts_as_cleo/class_methods.rb",
     "lib/acts_as_cleo/instance_methods.rb",
     "lib/acts_as_cleo/private_methods.rb",
-    "lib/acts_as_cleo/result.rb",
     "lib/acts_as_cleo/version.rb",
     "lib/acts_as_cleo_connection/acts_as_cleo_connection.rb",
     "lib/acts_as_cleo_connection/acts_methods.rb",
@@ -70,16 +69,21 @@ Gem::Specification.new do |s|
     "test/fixtures/electronics.yml",
     "test/fixtures/movies.yml",
     "test/helper.rb",
+    "test/models/author.rb",
     "test/models/book.rb",
+    "test/models/category.rb",
     "test/models/movie.rb",
     "test/test_install_generator.rb",
-    "test/unit/test_active_record_callback_hooks.rb",
-    "test/unit/test_acts_methods.rb",
-    "test/unit/test_class_methods.rb",
-    "test/unit/test_cleo.rb",
-    "test/unit/test_instance_methods.rb",
-    "test/unit/test_model_to_cleo.rb",
-    "test/unit/test_result_parser.rb"
+    "test/unit/acts_as_cleo/test_active_record_callback_hooks.rb",
+    "test/unit/acts_as_cleo/test_acts_methods.rb",
+    "test/unit/acts_as_cleo/test_class_methods.rb",
+    "test/unit/acts_as_cleo/test_instance_methods.rb",
+    "test/unit/acts_as_cleo_connection/test_active_record_callbacks.rb",
+    "test/unit/acts_as_cleo_connection/test_acts_methods.rb",
+    "test/unit/cleo/test_cleo.rb",
+    "test/unit/xml/test_model_to_cleo.rb",
+    "test/unit/xml/test_model_to_cleo_connection_test.rb",
+    "test/unit/xml/test_result_parser.rb"
   ]
   s.homepage = "http://github.com/blue-dog-archolite/acts_as_cleo"
   s.licenses = ["MIT"]

data/lib/acts_as_cleo/acts_as_cleo.rb

@@ -5,7 +5,6 @@ require File.dirname(__FILE__) + '/instance_methods'
 
 module ActsAsCleo
   include ActsMethods
-
 end
 
 ActiveRecord::Base.extend ActsAsCleo

data/lib/acts_as_cleo/instance_methods.rb

@@ -49,22 +49,32 @@ module ActsAsCleo
 
       cr.name = self.send(self.cleo_config[:name]).to_s.downcase
       cr.name = cr.term.first if cr.name.blank?
+      cr.name = cr.name.gsub('&', 'and')
 
-      score = self.send(self.cleo_config[:score])
-
-      if score.nil?
-        cr.score = 0
-      elsif score.respond_to?("count")
-        cr.score = score.count
-      else
-        cr.score = score
-      end
+      cr.score = self.cleo_score
 
       cr
     end
 
     alias :as_cleo :to_cleo_result
 
+    def cleo_score
+      s = self.send(self.cleo_config[:score])
+
+      begin
+        return Float(s)
+      rescue ArgumentError => e
+        if s.nil?
+          return 0
+        elsif s.respond_to?("count")
+          return s.count
+        end
+      end
+
+      return s
+    end
+
+
     def record_type
       self.cleo_config[:type]
     end
@@ -76,8 +86,9 @@ module ActsAsCleo
     private
     def clean_terms_for_storage(to_process)
       to_process = to_process.compact.flatten.reject(&:blank?)
-      to_process.collect!{|i| i.split(/\s+/) }.compact.uniq
-      to_process.reject{|i| drop_words.include?(i) }
+      to_process.collect!{|i| i.split(/\W+/).collect(&:strip) }.compact
+      to_process = to_process.reject{|i| drop_words.include?(i) }
+      to_process.uniq
     end
 
     def drop_words

data/lib/acts_as_cleo.rb

@@ -1,6 +1,10 @@
+#Cleo Servers and Configuration
 require File.dirname(__FILE__) + '/cleo/cleo'
+
+#Cleo Element Model and Acts As Functionality
 require File.dirname(__FILE__) + '/acts_as_cleo/acts_as_cleo'
 require File.dirname(__FILE__) + '/xml/result'
 
-#require File.dirname(__FILE__) + '/acts_as_cleo_connection/acts_as_cleo_connection'
-#require File.dirname(__FILE__) + '/xml/connection'
+#Cleo Connection Model and Acts As Functionality
+require File.dirname(__FILE__) + '/acts_as_cleo_connection/acts_as_cleo_connection'
+require File.dirname(__FILE__) + '/xml/connection'

data/lib/acts_as_cleo_connection/acts_as_cleo_connection.rb

@@ -1,10 +1,6 @@
-#Load Cleo
-require File.dirname(__FILE__ + '/cleo')
-
-#Load CleoConnection modules
-%w{acts_methods class_methods instance_methods}.each do |l|
-  require File.dirname(__FILE__ + "/acts_as_cleo_connection/#{l}"
-end
+#Load ActsAsCleoConnection files
+require File.dirname(__FILE__) + '/acts_methods'
+require File.dirname(__FILE__) + '/instance_methods'
 
 module ActsAsCleoConnection
   include ActsMethods

data/lib/acts_as_cleo_connection/acts_methods.rb

@@ -12,11 +12,13 @@ module ActsAsCleoConnection
       cattr_accessor :cleo_target
       cattr_accessor :cleo_origin
       cattr_accessor :cleo_type
+      cattr_accessor :cleo_strength
 
       #Set taggign calls
       self.cleo_origin = opts[:origin]
       self.cleo_target = opts[:target]
       self.cleo_type = opts[:type]
+      self.cleo_strength = opts[:strengh]
     end
   end
 end

data/lib/acts_as_cleo_connection/instance_methods.rb

@@ -1,19 +1,42 @@
 module ActsAsCleoConnection
   module InstanceMethods
     def create_cleo_connection
-      Cleo::Connection.create(self)
+      Cleo::ConnectionServer.create(self)
     end
 
     def update_cleo_connection
-      Cleo::Connection.update(self)
+      Cleo::ConnectionServer.update(self)
     end
 
     def remove_cleo_connection
-      Cleo::Connection.delete(self)
+      Cleo::ConnectionServer.delete(self)
     end
 
     def disable_cleo_connection
-      Cleo::Connection.disable(self)
+      Cleo::ConnectionServer.disable(self)
     end
+
+    def to_cleo_connection
+      source = self.send("#{cleo_origin}")
+      target = self.send("#{cleo_target}")
+      type = self.respond_to?("#{cleo_type}") ? self.send("#{cleo_type}") : cleo_type
+      return nil if target.blank? || source.blank?
+
+      is_active = self.respond_to?(:active) ? self.active : nil
+      str = target.cleo_score + source.cleo_score
+
+      result = Cleo::Xml::Connection.new
+
+      result.source = source.cleo_id
+      result.target = target.cleo_id
+      result.active = is_active
+      result.strength = str
+      result.type = type
+
+      return result
+    end
+
+    alias :as_connection :to_cleo_connection
+
   end
 end

data/lib/cleo/base_server.rb

@@ -1,3 +1,6 @@
+require 'net/http'
+require 'cgi'
+
 module Cleo
   class Base
     cattr_accessor :async

data/lib/cleo/cleo.rb

@@ -1,14 +1,22 @@
 #Load Cleo Sub Modules
+
 require File.dirname(__FILE__) + '/base_server'
 require File.dirname(__FILE__) + '/connection_server'
 require File.dirname(__FILE__) + '/element_server'
 require File.dirname(__FILE__) + '/service'
+require File.dirname(__FILE__) + '/element'
+
+require 'resque'
+
 
 module Cleo
   def self.query(query)
     Cleo::ElementServer.query(query)
   end
 
+  def self.network_query(source_id, query)
+  end
+
   def self.net_http
     uri = URI.parse(Cleo::Service.url)
     Net::HTTP.new(uri.host, uri.port)
@@ -21,9 +29,21 @@ module Cleo
   end
 
   def self.flush
-    uri = URI.parse Cleo::Service.url + "elements/flush"
+    Cleo.flush_elements and Cleo.flush_connections
+  end
+
+  def self.flush_connections
+    uri = URI.parse Cleo::Service.connection_server_url + "flush"
+    request = Net::HTTP::Post.new(uri.path)
+    response = Net::HTTP.new(uri.host, uri.port).start { |http| http.request request }
+    Cleo::Service.good_response_code?(response)
+  end
+
+  def self.flush_elements
+    uri = URI.parse Cleo::Service.element_server_url + "flush"
     request = Net::HTTP::Post.new(uri.path)
-    Net::HTTP.new(uri.host, uri.port).start { |http| http.request request }
+    response = Net::HTTP.new(uri.host, uri.port).start { |http| http.request request }
+    Cleo::Service.good_response_code?(response)
   end
 
   def self.configure(new_config)

data/lib/cleo/connection_server.rb

@@ -15,27 +15,38 @@ module Cleo
     end
 
     def self.execute_create(con)
+      obj = con.as_connection unless con.is_a?(Cleo::Xml::Connection)
+      return true if obj.blank?
+
+      uri = URI.parse Cleo::Service.connection_server_url + "_"
+      request = Net::HTTP::Post.new(uri.path)
+
+      request.body = obj.to_xml
+      request.content_type = 'application/xml'
+
+      response = Net::HTTP.new(uri.host, uri.port).start { |http| http.request request }
+
+      return good_response_code?(response)
     end
 
     def self.execute_disable(con)
+      sender = con.as_connection unless con.is_a?(Cleo::Xml::Connection)
+      return true if sender.blank?
+
+      sender.active = false
+
+      return self.execute_update(sender)
     end
 
     def self.execute_delete(con)
-      self.execute_disable(con)
+      return self.execute_disable(con)
     end
 
     def self.execute_update(con)
-      source = con.send("#{cleo_source}")
-      target = con.send("#{cleo_target}")
-
-      sender = Cleo::Xml::Connection.new(:source => source.cleo_id,
-                                         :target => target.cleo_id,
-                                         :active => con.active,
-                                         :strength => con.strength,
-                                         :type => con.cleo_type
-                                        )
+      sender = con.as_connection unless con.is_a?(Cleo::Xml::Connection)
+      return true if sender.blank?
 
-      uri = URI.parse Cleo::Service.connection_url + "_"
+      uri = URI.parse Cleo::Service.connection_server_url + "_"
       request = Net::HTTP::Post.new(uri.path)
 
       request.body = sender.to_xml

data/lib/cleo/element.rb

@@ -1,5 +1,6 @@
 module Cleo
   class Element < ActiveRecord::Base
-    self.table_name = 'references'
+    self.table_name = 'cleo_references'
+    attr_accessible :record_type, :record_id
   end
 end

data/lib/cleo/element_server.rb

@@ -66,7 +66,8 @@ module Cleo
     def self.execute_create(obj)
       obj = obj.to_cleo_result unless obj.is_a?(Cleo::Xml::Result)
 
-      uri = URI.parse self.url + "_"
+
+      uri = URI.parse Cleo::Service.element_server_url + "_"
       request = Net::HTTP::Post.new(uri.path)
 
       request.body = obj.to_xml

data/lib/generators/acts_as_cleo/install/install_generator.rb

@@ -13,10 +13,11 @@ module ActsAsCleo
 
       #Config file
       copy_file 'cleo.yml', "config/cleo.yml"
-      copy_file 'cleo_initalizer.rb', 'config/initalizers/cleo_initalizer.rb'
+      copy_file 'cleo_initalizer.rb', 'config/initializers/cleo_initalizer.rb'
 
       #Resque workers
-      copy_file "jobs/cleo_processor.rb", "app/jobs/cleo_processor.rb"
+      copy_file "jobs/cleo_connection_processor.rb", "app/jobs/cleo_connection_processor.rb"
+      copy_file "jobs/cleo_element_processor.rb", "app/jobs/cleo_element_processor.rb"
 
       #create migration
       migration_template 'install.rb', 'db/migrate/install_acts_as_cleo.rb'

data/lib/generators/acts_as_cleo/install/templates/install.rb

@@ -1,6 +1,6 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def self.up
-    create_table :references do
+    create_table :cleo_references do |t|
       t.timestamps
       t.string :record_type
       t.integer :record_id
@@ -8,6 +8,6 @@ class <%= migration_class_name %> < ActiveRecord::Migration
   end
 
   def down
-    drop_table :references
+    drop_table :cleo_references
   end
 end

data/lib/generators/acts_as_cleo/install/templates/update.rb

@@ -1,9 +1,9 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def up
-    add_index :references, :record_type, :unique => false
+    add_index :cleo_references, :record_type, :unique => false
   end
 
   def down
-    remove_index :references, :column => :record_type
+    remove_index :cleo_references, :column => :record_type
   end
 end

data/lib/generators/acts_as_cleo/update/update_generator.rb

@@ -14,9 +14,11 @@ module ActsAsCleo
       %w{update create delete}.each do |life|
         remove_file "app/jobs/#{life}.rb"
       end
+      remove_file "app/jobs/cleo_processor.rb"
 
-      #new general processor
-      copy_file "jobs/cleo_processor.rb", "app/jobs/cleo_processor.rb"
+      #Resque workers
+      copy_file "jobs/cleo_connection_processor.rb", "app/jobs/cleo_connection_processor.rb"
+      copy_file "jobs/cleo_element_processor.rb", "app/jobs/cleo_element_processor.rb"
 
       #create migration
       migration_template 'update.rb', 'db/migrate/update_acts_as_cleo.rb'

data/test/helper.rb

@@ -21,7 +21,9 @@ require File.dirname(__FILE__) + '/../lib/xml/result'
 
 #require acts_as_cleo
 require File.dirname(__FILE__) + '/../lib/acts_as_cleo/acts_as_cleo'
-#require File.dirname(__FILE__) + '/../lib/acts_as_cleo_connection'
+
+#require acts_as_cleo_connection
+require File.dirname(__FILE__) + '/../lib/acts_as_cleo_connection/acts_as_cleo_connection'
 
 begin
   Bundler.setup(:default, :development)
@@ -61,7 +63,9 @@ class Test::Unit::TestCase
   end
 
   def teardown
+    Author.destroy_all
     Book.destroy_all
+    Category.destroy_all
     Movie.destroy_all
   end
 end

data/test/models/author.rb

@@ -0,0 +1,5 @@
+class Author < ActiveRecord::Base
+  acts_as_cleo
+  has_many :categories
+  has_many :books
+end

data/test/models/book.rb

@@ -1,11 +1,7 @@
-# Table fields for 'books'
-# - id
-# - category_id
-# - name
-# - author
-
 class Book < ActiveRecord::Base
-  belongs_to :category
+  has_many :category
+  belongs_to :author
+
 
   acts_as_cleo :terms => %w{name author}, :score => "cleo_score", :name => "name"
 

data/test/models/category.rb

@@ -0,0 +1,10 @@
+class Category < ActiveRecord::Base
+  acts_as_cleo_connection :origin => "book", :target => "author", :type => "call_for_type_method"
+
+  belongs_to :book
+  belongs_to :author
+
+  def call_for_type_method(name_return = false)
+    return "InThisCase#{self.class.name}"
+  end
+end

data/test/unit/{test_active_record_callback_hooks.rb → acts_as_cleo/test_active_record_callback_hooks.rb}

@@ -1,8 +1,8 @@
-require 'helper'
+require "#{File.dirname(File.expand_path(__FILE__))}/../../helper"
 
 class TestActiveRecordCallbacHooks < Test::Unit::TestCase
   should "have all callbacks functioning properly" do
-    book = Book.new(:name => "set cleo id", :author => "Rob Meyer")
+    book = Book.new(:name => "set cleo id", :author => Author.new(:name => "Rob Meyer"))
     assert_nil book.cleo_id
     assert_nil Cleo::Element.find(:first, :conditions => ["record_type = ? and record_id = ?", "Book", book.id])
 
@@ -19,7 +19,7 @@ class TestActiveRecordCallbacHooks < Test::Unit::TestCase
   end
 
   should "update cleo on record update" do
-    book = Book.new(:name => "update cleo", :author => "Rob Meyer")
+    book = Book.new(:name => "update cleo", :author => Author.new(:name => "Rob Meyer"))
     assert book.save!
     cleo_record = Cleo::ElementServer.find(book.cleo_id)
     assert_not_nil cleo_record

data/test/unit/{test_acts_methods.rb → acts_as_cleo/test_acts_methods.rb}

@@ -1,10 +1,10 @@
-require 'helper'
+require "#{File.dirname(File.expand_path(__FILE__))}/../../helper"
 
 #Literally checking that the acts_as_cleo tag takes args and sets them as expected
 class TestActsAsMethods < Test::Unit::TestCase
 
   should "respond to and return as_cleo" do
-    book = Book.new(:name => 'Wedge\'s Life', :author => "Luke Skywalker")
+    book = Book.new(:name => 'Wedge\'s Life', :author => Author.create(:name => "Luke Skywalker"))
     assert_equal %w{name author}, book.cleo_config[:terms]
     assert_equal "name", book.cleo_config[:name]
     assert_equal "Book", book.cleo_config[:type]

data/test/unit/{test_class_methods.rb → acts_as_cleo/test_class_methods.rb}

@@ -1,4 +1,4 @@
-require 'helper'
+require "#{File.dirname(File.expand_path(__FILE__))}/../../helper"
 
 class TestClassMethods < Test::Unit::TestCase
   should "respond to query call" do
@@ -6,7 +6,7 @@ class TestClassMethods < Test::Unit::TestCase
   end
 
   should "find record with book name" do
-    book = Book.create(:name => "Otherland", :author => "Tad Williams")
+    book = Book.create(:name => "Otherland", :author => Author.create(:name => "Tad Williams"))
     assert Cleo::ElementServer.create(book)
     book_cleo_id = book.cleo_id
     assert Cleo::ElementServer.find(book_cleo_id)

data/test/unit/{test_instance_methods.rb → acts_as_cleo/test_instance_methods.rb}

@@ -1,4 +1,4 @@
-require 'helper'
+require "#{File.dirname(File.expand_path(__FILE__))}/../../helper"
 
 class TestInstanceMethods < Test::Unit::TestCase
   def setup
@@ -10,6 +10,4 @@ class TestInstanceMethods < Test::Unit::TestCase
       assert @b.respond_to?(resp), "ActiveRecord Model with acts_as_cleo should respond to #{resp}"
     end
   end
-
-  #TODO write tests for the functionality of each of the instance methods
 end

data/test/unit/acts_as_cleo_connection/test_active_record_callbacks.rb

@@ -0,0 +1,29 @@
+require "#{File.dirname(File.expand_path(__FILE__))}/../../helper"
+
+class TestActiveRecordCallbacHooks < Test::Unit::TestCase
+  def setup
+    @author = Author.create(:name => "Von Himler")
+    @book = Book.create(:name => "Rise and Fall", :author => @author)
+  end
+
+  should "have callbacks functioning properly" do
+    category = Category.new(:name => "Sweetness")
+    category.book = @book
+    category.author = @author
+
+    assert_nothing_raised do
+      category.save!
+    end
+
+    book = Book.create(:name => "Fall and Rise", :author => @author)
+    category.book = book
+
+    assert_nothing_raised do
+      category.save!
+    end
+
+#    assert_nothing_raised do
+      category.destroy
+#    end
+  end
+end

data/test/unit/acts_as_cleo_connection/test_acts_methods.rb

@@ -0,0 +1,34 @@
+require "#{File.dirname(File.expand_path(__FILE__))}/../../helper"
+
+class TestActiveRecordCallbacHooks < Test::Unit::TestCase
+  def setup
+    @book = Book.create(:name => "Otherland book 1")
+    @author = Author.create(:name => "Tad Williams")
+    @con = Category.new(:book => @book, :author => @author)
+  end
+
+  should "have acts_as_cleo_connection hooks and respond to them as expected" do
+    con = Category.new(:book => @book, :author => @author)
+
+    assert_not_nil con.book
+    assert_not_nil con.author
+    assert_equal con.author, @author
+    assert_equal con.book, @book
+
+    assert con.respond_to?(:cleo_target)
+    assert con.respond_to?(:cleo_origin)
+    assert con.respond_to?(:cleo_type)
+
+    assert con.respond_to?(:to_cleo_connection)
+    assert con.respond_to?(:as_connection)
+
+    assert con.respond_to?(:create_cleo_connection)
+    assert con.respond_to?(:update_cleo_connection)
+    assert con.respond_to?(:remove_cleo_connection)
+
+    assert_equal con.cleo_origin, "book"
+    assert_equal con.cleo_target, "author"
+    assert_equal con.cleo_type, "call_for_type_method"
+    assert_equal con.send("call_for_type_method"), "InThisCaseCategory"
+  end
+end

data/test/unit/{test_cleo.rb → cleo/test_cleo.rb}

@@ -1,4 +1,4 @@
-require 'helper'
+require "#{File.dirname(File.expand_path(__FILE__))}/../../helper"
 
 class TestCleo < Test::Unit::TestCase
   def setup
@@ -7,6 +7,12 @@ class TestCleo < Test::Unit::TestCase
     @wedge = Cleo::Xml::Result.parse(contents, :singluar => true)
   end
 
+  should "call to Element server from query call" do
+    assert_nothing_raised do
+      Cleo.query("what the hell")
+    end
+  end
+
   should "create then destroy Testing Object " do
     code = Cleo::ElementServer.create(@wedge)
     assert code

data/test/unit/{test_model_to_cleo.rb → xml/test_model_to_cleo.rb}

@@ -1,8 +1,8 @@
-require 'helper'
+require "#{File.dirname(File.expand_path(__FILE__))}/../../helper"
 
 class TestModelToCleo < Test::Unit::TestCase
   should "convert from model to cleo result" do
-    b = Book.new(:name => "Suncrusher", :author => "Tad Williams")
+    b = Book.new(:name => "Suncrusher", :author => Author.create(:name => "Tad Williams"))
     assert b.respond_to?("as_cleo")
     assert b.respond_to?("to_cleo_result")
 
@@ -13,6 +13,6 @@ class TestModelToCleo < Test::Unit::TestCase
 
     assert_equal cb.name, b.name.downcase
     assert_equal cb.score, b.cleo_score
-    assert_equal 3, cb.terms.count
+    assert_equal 2, cb.terms.count
   end
 end

data/test/unit/xml/test_model_to_cleo_connection_test.rb

@@ -0,0 +1,33 @@
+require "#{File.dirname(File.expand_path(__FILE__))}/../../helper"
+
+class TestModelToCleoConnection < Test::Unit::TestCase
+  def setup
+    @book = Book.create(:name => "Otherland book 1")
+    @author = Author.create(:name => "Tad Williams")
+    @con = Category.new(:name => "SiFi", :book => @book, :author => @author)
+  end
+
+  should "convert from model to cleo connection" do
+    assert @con.respond_to?(:cleo_target)
+    assert @con.respond_to?(:cleo_origin)
+
+    assert @con.respond_to?(:to_cleo_connection)
+    assert @con.respond_to?(:as_connection)
+
+    cb = nil
+    assert_nothing_raised do
+      cb = @con.as_connection
+    end
+
+    assert_equal cb.target, @con.send("#{@con.cleo_target}").cleo_id
+    assert_equal cb.source, @con.send("#{@con.cleo_origin}").cleo_id
+
+    cb = nil
+    assert_nothing_raised do
+      cb = @con.to_cleo_connection
+    end
+
+    assert_equal cb.target, @con.send("#{@con.cleo_target}").cleo_id
+    assert_equal cb.source, @con.send("#{@con.cleo_origin}").cleo_id
+  end
+end

data/test/unit/{test_result_parser.rb → xml/test_result_parser.rb}

@@ -1,4 +1,4 @@
-require "#{File.dirname(File.expand_path(__FILE__))}/../helper"
+require "#{File.dirname(File.expand_path(__FILE__))}/../../helper"
 
 class TestResult < Test::Unit::TestCase
   def test_parser_gets_correct_element

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_cleo
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000Z
+date: 2012-04-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: happymapper
-  requirement: &70296838476020 !ruby/object:Gem::Requirement
+  requirement: &70263526410340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296838476020
+  version_requirements: *70263526410340
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70296838475540 !ruby/object:Gem::Requirement
+  requirement: &70263526412300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70296838475540
+  version_requirements: *70263526412300
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70296838475060 !ruby/object:Gem::Requirement
+  requirement: &70263526430940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296838475060
+  version_requirements: *70263526430940
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70296838474580 !ruby/object:Gem::Requirement
+  requirement: &70263530219160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296838474580
+  version_requirements: *70263530219160
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70296838474100 !ruby/object:Gem::Requirement
+  requirement: &70263530311400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70296838474100
+  version_requirements: *70263530311400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70296838473620 !ruby/object:Gem::Requirement
+  requirement: &70263530329100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70296838473620
+  version_requirements: *70263530329100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70296838473140 !ruby/object:Gem::Requirement
+  requirement: &70263538508380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70296838473140
+  version_requirements: *70263538508380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70296838472660 !ruby/object:Gem::Requirement
+  requirement: &70263538660980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296838472660
+  version_requirements: *70263538660980
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70296838472180 !ruby/object:Gem::Requirement
+  requirement: &70263538799200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296838472180
+  version_requirements: *70263538799200
 - !ruby/object:Gem::Dependency
   name: fixtures
-  requirement: &70296838471700 !ruby/object:Gem::Requirement
+  requirement: &70263538798720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296838471700
+  version_requirements: *70263538798720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70296838471220 !ruby/object:Gem::Requirement
+  requirement: &70263538798180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296838471220
+  version_requirements: *70263538798180
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70296838470740 !ruby/object:Gem::Requirement
+  requirement: &70263538797680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70296838470740
+  version_requirements: *70263538797680
 description: LinkedIn Open Source type ahead tool's REST API as a ruby gem. Now with
   Reddis support.
 email: Blue.Dog.Archolite@gmail.com
@@ -165,7 +165,6 @@ files:
 - lib/acts_as_cleo/class_methods.rb
 - lib/acts_as_cleo/instance_methods.rb
 - lib/acts_as_cleo/private_methods.rb
-- lib/acts_as_cleo/result.rb
 - lib/acts_as_cleo/version.rb
 - lib/acts_as_cleo_connection/acts_as_cleo_connection.rb
 - lib/acts_as_cleo_connection/acts_methods.rb
@@ -205,16 +204,21 @@ files:
 - test/fixtures/electronics.yml
 - test/fixtures/movies.yml
 - test/helper.rb
+- test/models/author.rb
 - test/models/book.rb
+- test/models/category.rb
 - test/models/movie.rb
 - test/test_install_generator.rb
-- test/unit/test_active_record_callback_hooks.rb
-- test/unit/test_acts_methods.rb
-- test/unit/test_class_methods.rb
-- test/unit/test_cleo.rb
-- test/unit/test_instance_methods.rb
-- test/unit/test_model_to_cleo.rb
-- test/unit/test_result_parser.rb
+- test/unit/acts_as_cleo/test_active_record_callback_hooks.rb
+- test/unit/acts_as_cleo/test_acts_methods.rb
+- test/unit/acts_as_cleo/test_class_methods.rb
+- test/unit/acts_as_cleo/test_instance_methods.rb
+- test/unit/acts_as_cleo_connection/test_active_record_callbacks.rb
+- test/unit/acts_as_cleo_connection/test_acts_methods.rb
+- test/unit/cleo/test_cleo.rb
+- test/unit/xml/test_model_to_cleo.rb
+- test/unit/xml/test_model_to_cleo_connection_test.rb
+- test/unit/xml/test_result_parser.rb
 homepage: http://github.com/blue-dog-archolite/acts_as_cleo
 licenses:
 - MIT

data/lib/acts_as_cleo/result.rb

@@ -1,16 +0,0 @@
-module Cleo
-  class Result
-    include HappyMapper
-    tag 'element'
-
-    has_many :term, String, :tag => 'term'
-    element :id, Integer
-    element :name, String
-    element :score, Float
-    element :timestamp, Time
-    element :title, String
-    element :url, String
-
-    alias :terms :term
-  end
-end