acts_as_cleo 2.4.5 → 3.0.0

data/.rvmrc

@@ -0,0 +1,5 @@
+if [[ -s "~/.rvm/environments/ruby-1.9.2-p318@acts_as_cleo" ]] ; then
+  . "~/.rvm/environments/ruby-1.9.2-p318@acts_as_cleo"
+else
+  rvm --create use "ruby-1.9.2-p318@acts_as_cleo"
+fi

data/VERSION

@@ -1 +1 @@
-2.4.5
+3.0.0

data/acts_as_cleo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "acts_as_cleo"
-  s.version = "2.4.5"
+  s.version = "3.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert R. Meyer"]
-  s.date = "2012-03-29"
+  s.date = "2012-04-11"
   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 = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".rvmrc",
     "Gemfile",
     "LICENSE.txt",
     "README.rdoc",
@@ -24,23 +25,32 @@ Gem::Specification.new do |s|
     "VERSION",
     "acts_as_cleo.gemspec",
     "lib/acts_as_cleo.rb",
+    "lib/acts_as_cleo/acts_as_cleo.rb",
     "lib/acts_as_cleo/acts_methods.rb",
     "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/cleo.rb",
-    "lib/cleo/reference.rb",
-    "lib/cleo/result.rb",
-    "lib/cleo/server.rb",
+    "lib/acts_as_cleo_connection/acts_as_cleo_connection.rb",
+    "lib/acts_as_cleo_connection/acts_methods.rb",
+    "lib/acts_as_cleo_connection/instance_methods.rb",
+    "lib/cleo/base_server.rb",
+    "lib/cleo/cleo.rb",
+    "lib/cleo/connection_server.rb",
+    "lib/cleo/element.rb",
+    "lib/cleo/element_server.rb",
+    "lib/cleo/service.rb",
     "lib/generators/acts_as_cleo/install/install_generator.rb",
     "lib/generators/acts_as_cleo/install/templates/cleo.yml",
     "lib/generators/acts_as_cleo/install/templates/cleo_initalizer.rb",
     "lib/generators/acts_as_cleo/install/templates/install.rb",
-    "lib/generators/acts_as_cleo/install/templates/jobs/cleo_processor.rb",
+    "lib/generators/acts_as_cleo/install/templates/jobs/cleo_connection_processor.rb",
+    "lib/generators/acts_as_cleo/install/templates/jobs/cleo_element_processor.rb",
     "lib/generators/acts_as_cleo/install/templates/update.rb",
     "lib/generators/acts_as_cleo/update/update_generator.rb",
+    "lib/xml/connection.rb",
+    "lib/xml/result.rb",
     "test/config/cleo.yml",
     "test/data/xml/cleo/element.xml",
     "test/data/xml/cleo/elements.xml",
@@ -53,6 +63,7 @@ Gem::Specification.new do |s|
     "test/db/migrate/005_create_authors.rb",
     "test/db/migrate/006_create_postings.rb",
     "test/db/migrate/007_cleo_table.rb",
+    "test/db/testing_db.sqlite",
     "test/fixtures/authors.yml",
     "test/fixtures/books.yml",
     "test/fixtures/categories.yml",

data/lib/acts_as_cleo.rb

@@ -1,15 +1,6 @@
-#load Cleo Module for result and server
-require File.dirname(__FILE__) + '/cleo'
+require File.dirname(__FILE__) + '/cleo/cleo'
+require File.dirname(__FILE__) + '/acts_as_cleo/acts_as_cleo'
+require File.dirname(__FILE__) + '/xml/result'
 
-#Load ActsAsCleo method load
-require File.dirname(__FILE__) + '/acts_as_cleo/acts_methods'
-require File.dirname(__FILE__) + '/acts_as_cleo/class_methods'
-require File.dirname(__FILE__) + '/acts_as_cleo/instance_methods'
-
-module ActsAsCleo
-  include ActsMethods
-
-  require 'rails/railtie' if defined?(Rails)
-end
-
-ActiveRecord::Base.extend ActsAsCleo
+#require File.dirname(__FILE__) + '/acts_as_cleo_connection/acts_as_cleo_connection'
+#require File.dirname(__FILE__) + '/xml/connection'

data/lib/acts_as_cleo/acts_as_cleo.rb

@@ -0,0 +1,11 @@
+#Load ActsAsCleo method load
+require File.dirname(__FILE__) + '/acts_methods'
+require File.dirname(__FILE__) + '/class_methods'
+require File.dirname(__FILE__) + '/instance_methods'
+
+module ActsAsCleo
+  include ActsMethods
+
+end
+
+ActiveRecord::Base.extend ActsAsCleo

data/lib/acts_as_cleo/instance_methods.rb

@@ -2,11 +2,11 @@ module ActsAsCleo
   module InstanceMethods
     # callback hooks to keep cleo insync with data
     def create_cleo
-      Cleo.create(self)
+      Cleo::ElementServer.create(self)
     end
 
     def update_cleo
-      Cleo.update(self)
+      Cleo::ElementServer.update(self)
     end
 
     def remove_from_cleo
@@ -14,12 +14,12 @@ module ActsAsCleo
       current_cleo_id = self.cleo_id
       cr.delete
 
-      Cleo.delete(current_cleo_id)
+      Cleo::ElementServer.delete(current_cleo_id)
     end
 
     def set_cleo_id
-      cr = Cleo::Reference.find(:first, :conditions => ["record_type = ? and record_id = ?", record_type, self.id])
-      cr = Cleo::Reference.create(:record_type => record_type, :record_id => self.id) if cr.nil?
+      cr = Cleo::Element.find(:first, :conditions => ["record_type = ? and record_id = ?", record_type, self.id])
+      cr = Cleo::Element.create(:record_type => record_type, :record_id => self.id) if cr.nil?
     end#
     #end callback hooks
 
@@ -32,8 +32,8 @@ module ActsAsCleo
     end
 
     def to_cleo_result
-      #take self and change it into a Cleo::Result and return
-      cr = Cleo::Result.new
+      #take self and change it into a Cleo::Xml::Result and return
+      cr = Cleo::Xml::Result.new
       cr.term = []
 
       to_process = []
@@ -70,7 +70,7 @@ module ActsAsCleo
     end
 
     def cleo_reference
-      Cleo::Reference.find(:first, :conditions => ["record_type = ? and record_id = ?", record_type, self.id])
+      Cleo::Element.find(:first, :conditions => ["record_type = ? and record_id = ?", record_type, self.id])
     end
 
     private

data/lib/acts_as_cleo_connection/acts_as_cleo_connection.rb

@@ -0,0 +1,13 @@
+#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
+
+module ActsAsCleoConnection
+  include ActsMethods
+end
+
+ActiveRecord::Base.extend ActsAsCleoConnection

data/lib/acts_as_cleo_connection/acts_methods.rb

@@ -0,0 +1,22 @@
+module ActsAsCleoConnection
+  module ActsMethods
+    def acts_as_cleo_connection(opts = {})
+      #push in Instance Methods
+      include InstanceMethods
+
+      after_create :create_cleo_connection
+      after_update :update_cleo_connection
+      before_destroy :remove_cleo_connection
+
+      #Target and Origin calls
+      cattr_accessor :cleo_target
+      cattr_accessor :cleo_origin
+      cattr_accessor :cleo_type
+
+      #Set taggign calls
+      self.cleo_origin = opts[:origin]
+      self.cleo_target = opts[:target]
+      self.cleo_type = opts[:type]
+    end
+  end
+end

data/lib/acts_as_cleo_connection/instance_methods.rb

@@ -0,0 +1,19 @@
+module ActsAsCleoConnection
+  module InstanceMethods
+    def create_cleo_connection
+      Cleo::Connection.create(self)
+    end
+
+    def update_cleo_connection
+      Cleo::Connection.update(self)
+    end
+
+    def remove_cleo_connection
+      Cleo::Connection.delete(self)
+    end
+
+    def disable_cleo_connection
+      Cleo::Connection.disable(self)
+    end
+  end
+end

data/lib/cleo/base_server.rb

@@ -0,0 +1,26 @@
+module Cleo
+  class Base
+    cattr_accessor :async
+    cattr_accessor :queue
+    cattr_accessor :base_url
+    cattr_accessor :auto_flush
+
+    def self.async?
+      async == true
+    end
+
+    def self.auto_flush?
+      auto_flush == true
+    end
+
+    def self.good_response_code?(response)
+      case response
+      when Net::HTTPOK
+        Cleo.flush if self.auto_flush?
+        true   # success response
+      when Net::HTTPClientError, Net::HTTPInternalServerError
+        false  # non-success response
+      end
+    end
+  end
+end

data/lib/cleo/cleo.rb

@@ -0,0 +1,67 @@
+#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'
+
+module Cleo
+  def self.query(query)
+    Cleo::ElementServer.query(query)
+  end
+
+  def self.net_http
+    uri = URI.parse(Cleo::Service.url)
+    Net::HTTP.new(uri.host, uri.port)
+  end
+
+  def self.get(uri)
+    response = net_http.request(Net::HTTP::Get.new(uri.request_uri))
+
+    return response if Cleo::Service.good_response_code?(response)
+  end
+
+  def self.flush
+    uri = URI.parse Cleo::Service.url + "elements/flush"
+    request = Net::HTTP::Post.new(uri.path)
+    Net::HTTP.new(uri.host, uri.port).start { |http| http.request request }
+  end
+
+  def self.configure(new_config)
+    parts = new_config[:url].split("/")
+    parts -=  %w{rest elements connections}
+    parts += %w{rest}
+
+    Cleo::Service.base_url = parts.join('/') + '/'
+
+    Cleo::ElementServer.url = (parts + %w{elements}).join('/') + '/'
+    Cleo::ConnectionServer.url = (parts + %w{connections}).join('/') + '/'
+
+    if new_config.has_key?(:async)
+      Cleo::Service.async = new_config[:async]
+    elsif new_config.has_key?(:run_async)
+      Cleo::Service.async = new_config[:run_async]
+    else
+      Cleo::Service.async = false
+    end
+
+    Cleo::Service.auto_flush = new_config.has_key?(:auto_flush) ? new_config[:auto_flush] : true
+    Cleo::Service.queue = new_config.has_key?(:queue) ? new_config[:queue] : "cleo"
+
+    if new_config.has_key?(:auto_enable_queue) && new_config[:auto_enable_queue]
+      env = ENV['QUEUE'] || ''
+      ENV['QUEUE'] = (env.split(',') << Cleo::Service.queue).uniq.join(',')
+    end
+  end
+
+  def self.load_configuration
+    cleo_file_path = File.join( Rails.root, 'config', 'cleo.yml' )
+
+    if File.exists?( cleo_file_path )
+      Cleo.configure(YAML::load_file( cleo_file_path )[Rails.env].symbolize_keys)
+      true
+    else
+      raise ArgumentError.new("No configuration file found. Check for cleo.yml")
+      false
+    end
+  end
+end

data/lib/cleo/connection_server.rb

@@ -0,0 +1,50 @@
+module Cleo
+  class ConnectionServer < Cleo::Base
+    cattr_accessor :url
+
+    #define delete, update, create dynamically in order to set up reddis backed calls if enabled
+    #Cleo.update(obj) will respect async settings
+    %w{delete update create disable}.each do |mn|
+      define_singleton_method(mn.to_s) do |obj|
+        if Cleo::Service.async?
+          Resque.enqueue(Cleo::ConnectionProcessor, mn,  obj.class.name, obj.id)
+        else
+          Cleo::ConnectionServer.send("execute_#{mn}".to_sym, obj)
+        end
+      end
+    end
+
+    def self.execute_create(con)
+    end
+
+    def self.execute_disable(con)
+    end
+
+    def self.execute_delete(con)
+      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
+                                        )
+
+      uri = URI.parse Cleo::Service.connection_url + "_"
+      request = Net::HTTP::Post.new(uri.path)
+
+      request.body = sender.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
+
+  end
+end

data/lib/cleo/element.rb

@@ -0,0 +1,5 @@
+module Cleo
+  class Element < ActiveRecord::Base
+    self.table_name = 'references'
+  end
+end

data/lib/cleo/element_server.rb

@@ -0,0 +1,81 @@
+module Cleo
+  class ElementServer < Cleo::Base
+    cattr_accessor :url
+
+    #define delete, update, create dynamically in order to set up reddis backed calls if enabled
+    #Cleo.update(obj) will respect async settings
+    %w{delete update create}.each do |mn|
+      define_singleton_method(mn.to_s) do |obj|
+        if Cleo::Service.async?
+          Resque.enqueue(Cleo::ElementProcessor, mn,  obj.class.name, obj.id)
+        else
+          Cleo::ElementServer.send("execute_#{mn}".to_sym, obj)
+        end
+      end
+    end
+
+    def self.find(id)
+      #query by element/id to get from cleo fast
+      uri = URI.parse(Cleo::Service.element_server_url + "#{id}")
+      response = Cleo.get(uri)
+
+      return nil if response.body.blank?
+
+      Cleo::Xml::Result.parse(response.body, :single => true)
+    end
+
+    def self.query(query_param)
+      uri = URI.parse(Cleo::Service.element_server_url + "search?query=#{CGI::escape query_param}")
+      response = Cleo.get(uri)
+
+      Cleo::Xml::Result.parse(response.body, :single => false)
+    end
+
+    def self.execute_update(obj)
+      obj = obj.to_cleo_result unless obj.is_a?(Cleo::Xml::Result)
+
+      uri = URI.parse Cleo::Service.element_server_url + "#{obj.id}"
+      request = Net::HTTP::Put.new(uri.path)
+
+      request.content_type = 'application/xml'
+      request.body = obj.to_xml
+      response = Net::HTTP.new(uri.host, uri.port).start { |http| http.request request }
+
+      return good_response_code?(response)
+    end
+
+    def self.execute_delete(obj_or_id)
+      cleo_id = nil
+
+      if obj_or_id.is_a?(Fixnum)
+        cleo_id = obj_or_id
+      elsif obj_or_id.respond_to?("cleo_id")
+        cleo_id = obj_or_id.cleo_id
+      elsif obj_or_id.is_a?(Cleo::Xml::Result)
+        cleo_id = obj_or_id.id
+      end
+
+      uri = URI.parse Cleo::Service.element_server_url + "#{cleo_id}"
+      request = Net::HTTP::Delete.new(uri.path)
+
+      response = Net::HTTP.new(uri.host, uri.port).start { |http| http.request request }
+
+      return good_response_code?(response)
+    end
+
+    def self.execute_create(obj)
+      obj = obj.to_cleo_result unless obj.is_a?(Cleo::Xml::Result)
+
+      uri = URI.parse self.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
+
+  end
+end

data/lib/cleo/service.rb

@@ -0,0 +1,16 @@
+module Cleo
+  class Service < Cleo::Base
+    def self.url
+      return self.base_url
+    end
+
+    def self.connection_server_url
+      return Cleo::ConnectionServer.url.blank? ? nil : Cleo::ConnectionServer.url
+    end
+
+    def self.element_server_url
+      return Cleo::ElementServer.url.blank? ? nil : Cleo::ElementServer.url
+    end
+
+  end
+end

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

@@ -1 +1 @@
-Cleo::Server.load_configuration
+Cleo.load_configuration

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

@@ -0,0 +1,17 @@
+module Cleo
+  module ConnectionProcessor
+    @queue = Cleo::ConnectionServer.queue
+    def self.perform(operation, klass, klass_id)
+      on_me = Kernel.const_get(klass).find(klass_id)
+
+      case operation.downcase
+      when "create"
+        Cleo::ConnectionServer.execute_create(on_me)
+      when "update"
+        Cleo::ConnectionServer.execute_update(on_me)
+      when "delete"
+        Cleo::ConnectionServer.execute_delete(on_me)
+      end
+    end
+  end
+end

data/lib/generators/acts_as_cleo/install/templates/jobs/{cleo_processor.rb → cleo_element_processor.rb}

@@ -1,16 +1,15 @@
 module Cleo
-  module Processor
-    @queue = Cleo::Server.queue
-
+  module ElementProcessor
+    @queue = Cleo::ElementServer.queue
     def self.perform(operation, klass, klass_id)
       on_me = Kernel.const_get(klass).find(klass_id)
       case operation.downcase
       when "create"
-        Cleo.execute_create(on_me)
+        Cleo::ElementServer.execute_create(on_me)
       when "update"
-        Cleo.execute_update(on_me)
+        Cleo::ElementServer.execute_update(on_me)
       when "delete"
-        Cleo.execute_delete(on_me)
+        Cleo::ElementServer.execute_delete(on_me)
       end
     end
   end

data/lib/xml/connection.rb

@@ -0,0 +1,18 @@
+require 'happymapper'
+
+module Cleo
+  module Xml
+    class Connection
+      include HappyMapper
+      tag 'connection'
+
+      element :source, Integer
+      element :target, Integer
+
+      element :active, Boolean
+      element :strength, Float
+      element :timestamp, Time
+      element :type, String
+    end
+  end
+end

data/lib/xml/result.rb

@@ -0,0 +1,20 @@
+require 'happymapper'
+
+module Cleo
+  module Xml
+    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
+end

data/test/config/cleo.yml

@@ -1,16 +1,16 @@
 # Config file for the acts_as_cleo plugin.
 development:
-  url: "http://localhost:8080/cleo-primer/"
+  url: "http://localhost:3030/cleo-primer/"
 
 test:
-  url: "http://localhost:8080/cleo-primer/"
+  url: "http://localhost:3030/cleo-primer/"
 
 production:
-  url: "http://localhost:8080/cleo-primer/"
+  url: "http://localhost:3030/cleo-primer/"
   run_async: true
   queue: "cleo"
 
 async_test:
-  url: "http://localhost:8080/cleo-primer/"
+  url: "http://localhost:3030/cleo-primer/"
   run_async: true
   queue: "cleo"

data/test/helper.rb

@@ -8,9 +8,20 @@ require 'bundler'
 require 'active_record'
 require 'net/http'
 
-#require acts_as_cleo
 
-require File.dirname(__FILE__) + '/../lib/acts_as_cleo'
+#load Cleo Module for result and server
+require File.dirname(__FILE__) + '/../lib/cleo/cleo'
+
+#load Cleo reference
+require File.dirname(__FILE__) + '/../lib/cleo/element'
+
+#load xml elements
+require File.dirname(__FILE__) + '/../lib/xml/connection'
+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'
 
 begin
   Bundler.setup(:default, :development)
@@ -42,7 +53,7 @@ models_dir = File.join(file_dirname, 'models')
 Dir[ models_dir + '/*.rb'].each { |m| require m }
 
 server_config = {:url => "http://localhost:8080/cleo-primer/", :run_async => false}
-Cleo::Server.configure server_config
+Cleo.configure server_config
 
 class Test::Unit::TestCase
   def setup

data/test/unit/test_active_record_callback_hooks.rb

@@ -4,29 +4,29 @@ class TestActiveRecordCallbacHooks < Test::Unit::TestCase
   should "have all callbacks functioning properly" do
     book = Book.new(:name => "set cleo id", :author => "Rob Meyer")
     assert_nil book.cleo_id
-    assert_nil Cleo::Reference.find(:first, :conditions => ["record_type = ? and record_id = ?", "Book", book.id])
+    assert_nil Cleo::Element.find(:first, :conditions => ["record_type = ? and record_id = ?", "Book", book.id])
 
     assert book.save!
     book_id = book.id
 
     assert book.cleo_id
-    ref = Cleo::Reference.find(:first, :conditions => ["record_type = ? and record_id = ?", "Book", book_id])
+    ref = Cleo::Element.find(:first, :conditions => ["record_type = ? and record_id = ?", "Book", book_id])
     assert_not_nil ref
 
     assert book.destroy
-    assert_nil Cleo::Reference.find(:first, :conditions => ["record_type = ? and record_id = ?", "Book", book_id])
-    assert_nil Cleo.find(ref.id)
+    assert_nil Cleo::Element.find(:first, :conditions => ["record_type = ? and record_id = ?", "Book", book_id])
+    assert_nil Cleo::ElementServer.find(ref.id)
   end
 
   should "update cleo on record update" do
     book = Book.new(:name => "update cleo", :author => "Rob Meyer")
     assert book.save!
-    cleo_record = Cleo.find(book.cleo_id)
+    cleo_record = Cleo::ElementServer.find(book.cleo_id)
     assert_not_nil cleo_record
     book.name = "Updated my Cleo"
     assert book.save!
 
-    updated_cleo_record = Cleo.find(book.cleo_id)
+    updated_cleo_record = Cleo::ElementServer.find(book.cleo_id)
     assert_equal book.name.downcase, updated_cleo_record.name
     assert_not_equal cleo_record.name, updated_cleo_record.name
 

data/test/unit/test_class_methods.rb

@@ -7,11 +7,11 @@ class TestClassMethods < Test::Unit::TestCase
 
   should "find record with book name" do
     book = Book.create(:name => "Otherland", :author => "Tad Williams")
-    assert Cleo.create(book)
+    assert Cleo::ElementServer.create(book)
     book_cleo_id = book.cleo_id
-    assert Cleo.find(book_cleo_id)
+    assert Cleo::ElementServer.find(book_cleo_id)
 
-    assert Cleo.delete(book_cleo_id), "Didn't Delete"
+    assert Cleo::ElementServer.delete(book_cleo_id), "Didn't Delete"
   end
 
   should "be able to query from Klass" do

data/test/unit/test_cleo.rb

@@ -4,69 +4,48 @@ class TestCleo < Test::Unit::TestCase
   def setup
     file = File.open("#{Dir.pwd}/test/data/xml/cleo/testing_element.xml")
     contents = file.read
-    @wedge = Cleo::Result.parse(contents, :singluar => true)
+    @wedge = Cleo::Xml::Result.parse(contents, :singluar => true)
   end
 
   should "create then destroy Testing Object " do
-    code = Cleo.create(@wedge)
+    code = Cleo::ElementServer.create(@wedge)
     assert code
 
-    wa = Cleo.find(@wedge.id)
+    wa = Cleo::ElementServer.find(@wedge.id)
     assert_not_nil wa
     assert_equal @wedge.id, wa.id
 
-    assert Cleo.delete(wa.id), "Didn't delete"
+    assert Cleo::ElementServer.delete(wa.id), "Didn't delete"
   end
 
-  should "get google results from qery" do
-    r = Cleo.query("goog")
-    assert_not_nil r
-    assert_equal 0, r.count
-    assert_kind_of Array, r
-  end
-
-=begin
-This is a bad test and require default value to be in Cleo. Baddd test
-  should "fetch the same record by id" do
-    r = Cleo.query("goog").first
-    assert_equal r.id.blank?, false
-
-
-    i = Cleo.find(r.id)
-    assert_equal r.timestamp, i.timestamp
-    assert_equal r.id, i.id
-  end
-=end
-
   should "create, update, then destroy, Testing Object" do
-    code = Cleo.create(@wedge)
+    code = Cleo::ElementServer.create(@wedge)
     assert code
 
-    wa = Cleo.find(@wedge.id)
+    wa = Cleo::ElementServer.find(@wedge.id)
     assert_not_nil wa
     assert_equal @wedge.id, wa.id
 
     wa.name = "Luke Skywalker"
-    assert Cleo.update(wa)
+    assert Cleo::ElementServer.update(wa)
 
-    wa_update = Cleo.find(@wedge.id)
+    wa_update = Cleo::ElementServer.find(@wedge.id)
     assert_equal "Luke Skywalker", wa_update.name
 
-    assert Cleo.delete(wa.id), "didn't delete"
+    assert Cleo::ElementServer.delete(wa.id), "didn't delete"
   end
 
   should "change the configuration of the server" do
     server_config = {:url => "http://localhost:8080/cleo-primer/", :run_async => true, :queue => "cleo"}
 
-    Cleo::Server.configure server_config
-    assert Cleo::Server.async?
-    assert "cleo", Cleo::Server.queue.to_s
+    Cleo.configure server_config
+    assert Cleo::Service.async?
+    assert "cleo", Cleo::Service.queue.to_s
 
 
     server_config = {:url => "http://localhost:8080/cleo-primer/", :run_async => false}
-    Cleo::Server.configure server_config
-    assert_same false, Cleo::Server.async?
-    assert "cleo", Cleo::Server.queue.to_s
+    Cleo.configure server_config
+    assert_same false, Cleo::Service.async?
+    assert "cleo", Cleo::Service.queue.to_s
   end
 end
-

data/test/unit/test_model_to_cleo.rb

@@ -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 2, cb.terms.count
+    assert_equal 3, cb.terms.count
   end
 end

data/test/unit/test_result_parser.rb

@@ -4,7 +4,7 @@ class TestResult < Test::Unit::TestCase
   def test_parser_gets_correct_element
     file = File.open("#{Dir.pwd}/test/data/xml/cleo/element.xml")
     contents = file.read
-    cr = Cleo::Result.parse(contents, :singluar => true)
+    cr = Cleo::Xml::Result.parse(contents, :singluar => true)
 
     assert_not_equal cr, nil
     assert_equal cr.name, "Cleo Inc."
@@ -13,7 +13,7 @@ class TestResult < Test::Unit::TestCase
   def test_parser_gets_many_elements
     file = File.open("#{Dir.pwd}/test/data/xml/cleo/elements.xml")
     contents = file.read
-    cr = Cleo::Result.parse(contents)
+    cr = Cleo::Xml::Result.parse(contents)
 
     assert_equal 7, cr.count
     assert_match /google/i, cr.first.name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_cleo
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000Z
+date: 2012-04-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: happymapper
-  requirement: &70133557417120 !ruby/object:Gem::Requirement
+  requirement: &70296838476020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133557417120
+  version_requirements: *70296838476020
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70133557416640 !ruby/object:Gem::Requirement
+  requirement: &70296838475540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70133557416640
+  version_requirements: *70296838475540
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70133557416160 !ruby/object:Gem::Requirement
+  requirement: &70296838475060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133557416160
+  version_requirements: *70296838475060
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70133557415680 !ruby/object:Gem::Requirement
+  requirement: &70296838474580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133557415680
+  version_requirements: *70296838474580
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70133557415200 !ruby/object:Gem::Requirement
+  requirement: &70296838474100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70133557415200
+  version_requirements: *70296838474100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70133557414720 !ruby/object:Gem::Requirement
+  requirement: &70296838473620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70133557414720
+  version_requirements: *70296838473620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70133557414240 !ruby/object:Gem::Requirement
+  requirement: &70296838473140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70133557414240
+  version_requirements: *70296838473140
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70133557413760 !ruby/object:Gem::Requirement
+  requirement: &70296838472660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133557413760
+  version_requirements: *70296838472660
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70133557413280 !ruby/object:Gem::Requirement
+  requirement: &70296838472180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133557413280
+  version_requirements: *70296838472180
 - !ruby/object:Gem::Dependency
   name: fixtures
-  requirement: &70133557412800 !ruby/object:Gem::Requirement
+  requirement: &70296838471700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133557412800
+  version_requirements: *70296838471700
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70133557412320 !ruby/object:Gem::Requirement
+  requirement: &70296838471220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133557412320
+  version_requirements: *70296838471220
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70133557411840 !ruby/object:Gem::Requirement
+  requirement: &70296838470740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133557411840
+  version_requirements: *70296838470740
 description: LinkedIn Open Source type ahead tool's REST API as a ruby gem. Now with
   Reddis support.
 email: Blue.Dog.Archolite@gmail.com
@@ -152,6 +152,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
+- .rvmrc
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -159,23 +160,32 @@ files:
 - VERSION
 - acts_as_cleo.gemspec
 - lib/acts_as_cleo.rb
+- lib/acts_as_cleo/acts_as_cleo.rb
 - lib/acts_as_cleo/acts_methods.rb
 - 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/cleo.rb
-- lib/cleo/reference.rb
-- lib/cleo/result.rb
-- lib/cleo/server.rb
+- lib/acts_as_cleo_connection/acts_as_cleo_connection.rb
+- lib/acts_as_cleo_connection/acts_methods.rb
+- lib/acts_as_cleo_connection/instance_methods.rb
+- lib/cleo/base_server.rb
+- lib/cleo/cleo.rb
+- lib/cleo/connection_server.rb
+- lib/cleo/element.rb
+- lib/cleo/element_server.rb
+- lib/cleo/service.rb
 - lib/generators/acts_as_cleo/install/install_generator.rb
 - lib/generators/acts_as_cleo/install/templates/cleo.yml
 - lib/generators/acts_as_cleo/install/templates/cleo_initalizer.rb
 - lib/generators/acts_as_cleo/install/templates/install.rb
-- lib/generators/acts_as_cleo/install/templates/jobs/cleo_processor.rb
+- lib/generators/acts_as_cleo/install/templates/jobs/cleo_connection_processor.rb
+- lib/generators/acts_as_cleo/install/templates/jobs/cleo_element_processor.rb
 - lib/generators/acts_as_cleo/install/templates/update.rb
 - lib/generators/acts_as_cleo/update/update_generator.rb
+- lib/xml/connection.rb
+- lib/xml/result.rb
 - test/config/cleo.yml
 - test/data/xml/cleo/element.xml
 - test/data/xml/cleo/elements.xml
@@ -188,6 +198,7 @@ files:
 - test/db/migrate/005_create_authors.rb
 - test/db/migrate/006_create_postings.rb
 - test/db/migrate/007_cleo_table.rb
+- test/db/testing_db.sqlite
 - test/fixtures/authors.yml
 - test/fixtures/books.yml
 - test/fixtures/categories.yml

data/lib/cleo.rb

@@ -1,116 +0,0 @@
-module Cleo
-  @@net_http = nil
-
-  #define delete, update, create dynamically in order to set up reddis backed calls if enabled
-  #Cleo.update(obj) will respect async settings
-  %w{delete update create}.each do |mn|
-    define_singleton_method(mn.to_s) do |obj|
-      if Cleo::Server.async?
-        Resque.enqueue(Cleo::Processor, mn,  obj.class.name, obj.id)
-      else
-        Cleo.send("execute_#{mn}".to_sym, obj)
-      end
-    end
-  end
-
-  def self.find(id)
-    #query by element/id to get from cleo fast
-    uri = URI.parse(Cleo::Server.url + "#{id}")
-    response = get(uri)
-
-    return nil if response.body.blank?
-
-    Cleo::Result.parse(response.body, :single => true)
-  end
-
-  def self.query(query_param)
-    uri = URI.parse(Cleo::Server.url + "search?query=#{CGI::escape query_param}")
-    response = get(uri)
-
-    Cleo::Result.parse(response.body, :single => false)
-  end
-
-  def self.execute_update(obj)
-    obj = obj.to_cleo_result unless obj.is_a?(Cleo::Result)
-
-    uri = URI.parse Cleo::Server.url + "#{obj.id}"
-    request = Net::HTTP::Put.new(uri.path)
-
-    request.content_type = 'application/xml'
-    request.body = obj.to_xml
-    response = Net::HTTP.new(uri.host, uri.port).start { |http| http.request request }
-
-    return good_response_code?(response)
-  end
-
-
-  def self.execute_delete(obj_or_id)
-
-    cleo_id = nil
-
-    if obj_or_id.is_a?(Cleo::Result)
-      cleo_id = obj_or_id.id
-    elsif obj_or_id.is_a?(Fixnum)
-      cleo_id = obj_or_id
-    elsif obj_or_id.respond_to?("cleo_id")
-      cleo_id = obj_or_id.cleo_id
-    end
-
-    uri = URI.parse Cleo::Server.url + "#{cleo_id}"
-    request = Net::HTTP::Delete.new(uri.path)
-
-    response = Net::HTTP.new(uri.host, uri.port).start { |http| http.request request }
-
-    return good_response_code?(response)
-  end
-
-  def self.execute_create(obj)
-    obj = obj.to_cleo_result unless obj.is_a?(Cleo::Result)
-
-    uri = URI.parse Cleo::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
-
-  private
-  def self.net_http
-    @@net_http unless @@net_http.blank?
-    uri = URI.parse(Cleo::Server.url)
-
-    @@net_http = Net::HTTP.new(uri.host, uri.port)
-  end
-
-  def self.get(uri)
-    response = net_http.request(Net::HTTP::Get.new(uri.request_uri))
-
-    return response if good_response_code?(response)
-  end
-
-  private
-  def self.flush
-    uri = URI.parse Cleo::Server.url + "flush"
-    request = Net::HTTP::Post.new(uri.path)
-    Net::HTTP.new(uri.host, uri.port).start { |http| http.request request }
-  end
-
-  def self.good_response_code?(response)
-    case response
-    when Net::HTTPOK
-      flush if Cleo::Server.auto_flush?
-      true   # success response
-    when Net::HTTPClientError, Net::HTTPInternalServerError
-      false  # non-success response
-    end
-  end
-end
-
-#require Result Class
-require 'cleo/server'
-require 'cleo/result'
-require 'cleo/reference'

data/lib/cleo/reference.rb

@@ -1,5 +0,0 @@
-module Cleo
-  class Reference < ActiveRecord::Base
-
-  end
-end

data/lib/cleo/result.rb

@@ -1,18 +0,0 @@
-require 'happymapper'
-
-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

data/lib/cleo/server.rb

@@ -1,53 +0,0 @@
-module Cleo
-  class Server
-    @@configuration= {:url => 'http://cleo.testingserver.com/cleo-primer/', :run_async => false, :queue => "cleo"}
-
-    def self.configure(new_config)
-      parts = new_config[:url].split("/")
-      parts -=  %w{rest elements}
-      parts +=  %w{rest elements}
-      @@configuration[:url] = parts.join('/') + '/'
-
-      if new_config.has_key?(:async)
-        @@configuration[:async] = new_config[:async]
-      elsif new_config.has_key?(:run_async)
-        @@configuration[:async] = new_config[:run_async]
-      else
-        @@configuration[:async] = false
-      end
-
-      @@configuration[:auto_flush] = new_config.has_key?(:auto_flush) ? new_config[:auto_flush] : true
-      @@configuration[:queue] = new_config.has_key?(:queue) ? new_config[:queue] : "cleo"
-
-      if new_config.has_key?(:auto_enable_queue) && new_config[:auto_enable_queue]
-        env = ENV['QUEUE'] || ''
-        ENV['QUEUE'] = (env.split(',') << @@configuration[:queue]).uniq.join(',')
-      end
-    end
-
-    def self.load_configuration
-      cleo_file_path = File.join( Rails.root, 'config', 'cleo.yml' )
-
-      if File.exists?( cleo_file_path )
-        Cleo::Server.configure(YAML::load_file( cleo_file_path )[Rails.env].symbolize_keys)
-      end
-    end
-
-    #meta these out
-    def self.url
-      @@configuration[:url]
-    end
-
-    def self.auto_flush?
-      @@configuration[:auto_flush]
-    end
-
-    def self.async?
-      @@configuration[:async]
-    end
-
-    def self.queue
-      @@configuration[:queue].to_sym
-    end
-  end
-end