acts_as_cleo 1.0.0 → 1.1.0

data/Gemfile

@@ -18,3 +18,4 @@ end
 
 gem 'happymapper'
 gem 'rails', '>= 3.1.0'
+gem 'resque'

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/acts_as_cleo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "acts_as_cleo"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert R. Meyer"]
@@ -23,13 +23,16 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "acts_as_cleo.gemspec",
-    "config/cleo.yml",
+    "config/cleo_example.yml",
     "lib/acts_as_cleo.rb",
     "lib/acts_as_cleo/result.rb",
     "lib/acts_as_cleo/version.rb",
     "lib/acts_methods.rb",
     "lib/class_methods.rb",
     "lib/cleo.rb",
+    "lib/cleo/jobs/create.rb",
+    "lib/cleo/jobs/delete.rb",
+    "lib/cleo/jobs/update.rb",
     "lib/cleo/reference.rb",
     "lib/cleo/result.rb",
     "lib/cleo/server.rb",
@@ -81,6 +84,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<happymapper>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_runtime_dependency(%q<resque>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
@@ -92,6 +96,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<happymapper>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.1.0"])
+      s.add_dependency(%q<resque>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -104,6 +109,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<happymapper>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.1.0"])
+    s.add_dependency(%q<resque>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/config/{cleo.yml → cleo_example.yml}

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

data/lib/acts_as_cleo.rb

@@ -12,11 +12,12 @@ end
 
 ActiveRecord::Base.extend ActsAsCleo
 
-root_path = Rails.root.nil? ? "#{File.dirname(File.expand_path(__FILE__))}/../"  : Rails.root
+root_path = Rails.root.nil? ? "#{File.dirname(File.expand_path(__FILE__))}/../test"  : Rails.root
 cleo_file_path = File.join( root_path, 'config', 'cleo.yml' )
 
 if File.exists?( cleo_file_path )
-  Cleo::Server.server_locations = YAML::load_file( cleo_file_path )[Rails.env].symbolize_keys
+  puts cleo_file_path
+  Cleo::Server.configure(YAML::load_file( cleo_file_path )[Rails.env].symbolize_keys)
 else
   raise LoadError.new("No cleo.yml found. Please viery that you have a copy of cleo.yml in your config directory.")
 end

data/lib/cleo/jobs/create.rb

@@ -0,0 +1,12 @@
+module Cleo
+  module Resque
+    module Update
+      @queue = Cleo::Server.queue
+
+      def self.perform(klass, klass_id)
+        to_create = Kernel.const_get(klass).find(klass_id)
+        Cleo.create(to_create)
+      end
+    end
+  end
+end

data/lib/cleo/jobs/delete.rb

@@ -0,0 +1,14 @@
+module Cleo
+  module Resque
+    module Update
+      @queue = Cleo::Server.queue
+
+      def self.perform(klass, klass_id)
+        to_delete = Kernel.const_get(klass).find(klass_id)
+        Cleo.delete(to_delete.cleo_id)
+        cr = Cleo::Reference.find(:first, :conditions => ["record_type = ? and record_id = ?", klass, to_delete.id])
+        cr.delete
+      end
+    end
+  end
+end

data/lib/cleo/jobs/update.rb

@@ -0,0 +1,12 @@
+module Cleo
+  module Resque
+    module Update
+      @queue = Cleo::Server.queue
+
+      def self.perform(klass, klass_id)
+        to_update = Kernel.const_get(klass).find(klass_id)
+        Cleo.update(to_update)
+      end
+    end
+  end
+end

data/lib/cleo/server.rb

@@ -1,16 +1,36 @@
 module Cleo
   class Server
-    @@server_location = {:url => 'http://cleo.testingserver.com/cleo-primer/' }
+    @@configuration= {:url => 'http://cleo.testingserver.com/cleo-primer/', :run_async => false, :queue => "cleo"}
 
-    def self.server_locations=(new_locations)
-      parts = new_locations[:url].split("/")
+    def self.configure(new_config)
+      parts = new_config[:url].split("/")
       parts -=  %w{rest elements}
       parts +=  %w{rest elements}
-      @@server_location[:url] = parts.join('/') + '/'
+      @@configuration[:url] = parts.join('/') + '/'
+
+      @@configuration[:run_async] = new_config.has_key?(:run_async) ? new_config[:run_async] : false
+      @@configuration[:queue] = new_config.has_key?(:queue) ? new_config[:queue] : "cleo"
+
+      env = ENV['QUEUE'] || ''
+      ENV['QUEUE'] = (env.split(',') << @@configuration[:queue]).uniq.join(',')
+
+      if @@configuration[:run_async]
+        require 'resque'
+        %w{create update delete}.each{|life| require File.dirname(__FILE__) + "/jobs/#{life}" }
+      end
     end
 
+    #meta these out
     def self.url
-      @@server_location[:url]
+      @@configuration[:url]
+    end
+
+    def self.async?
+      @@configuration[:run_async]
+    end
+
+    def self.queue
+      @@configuration[:queue].to_sym
     end
   end
 end

data/lib/instance_methods.rb

@@ -3,17 +3,29 @@ module ActsAsCleo
     # callback hooks to keep cleo insync with data
     def create_cleo
       set_cleo_id
-      Cleo.create(self)
+      if Cleo::Server.async?
+        Resque.enqueue(Cleo::Resque::Create, self.record_type.classify, self.id)
+      else
+        Cleo.create(self)
+      end
     end
 
     def update_cleo
+      if Cleo::Server.async?
+        Resque.enqueue(Cleo::Resque::Update, self.record_type.classify, self.id)
+      else
         Cleo.update(self)
+      end
     end
 
     def remove_from_cleo
-      Cleo.delete(self.cleo_id)
-      cr = cleo_reference
-      cr.delete
+      if Cleo::Server.async?
+        Resque.enqueue(Cleo::Resque::Delete, self.record_type.classify, self.id)
+      else
+        Cleo.delete(self.cleo_id)
+        cr = cleo_reference
+        cr.delete
+      end
     end
 
     def set_cleo_id
@@ -30,8 +42,6 @@ module ActsAsCleo
       return cr.id
     end
 
-
-
     def to_cleo_result
       #take self and change it into a Cleo::Result and return
       cr = Cleo::Result.new

data/test/config/cleo.yml

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

data/test/unit/test_cleo.rb

@@ -56,5 +56,15 @@ class TestCleo < Test::Unit::TestCase
 
     assert Cleo.delete(wa.id)
   end
+
+  should "change the configuration of the server" do
+    root_path = Rails.root.nil? ? "#{File.dirname(File.expand_path(__FILE__))}/../"  : Rails.root
+    cleo_file_path = File.join( root_path, 'config', 'cleo.yml' )
+
+    Cleo::Server.configure YAML::load_file( cleo_file_path )['async_test'].symbolize_keys
+    assert Cleo::Server.async?
+    assert "cleo", Cleo::Server.queue.to_s
+
+  end
 end
 

data/test/unit/test_instance_methods.rb

@@ -5,8 +5,8 @@ class TestInstanceMethods < Test::Unit::TestCase
     @b = Book.new
   end
 
-  %w{cleo_id cleo_id= sync_with_cleo set_cleo_id remove_from_cleo to_cleo_result as_cleo}.each do |resp|
-    should "respond to cleo_id and cleo_id=" do
+  %w{cleo_id update_cleo remove_from_cleo create_cleo set_cleo_id to_cleo_result as_cleo}.each do |resp|
+    should "respond to #{resp}" do
       assert @b.respond_to?(resp), "ActiveRecord Model with acts_as_cleo should respond to #{resp}"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_cleo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: happymapper
-  requirement: &70333743273900 !ruby/object:Gem::Requirement
+  requirement: &70302933187960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333743273900
+  version_requirements: *70302933187960
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70333743273420 !ruby/object:Gem::Requirement
+  requirement: &70302933187480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333743273420
+  version_requirements: *70302933187480
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: &70302933187000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70302933187000
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70333743272940 !ruby/object:Gem::Requirement
+  requirement: &70302933186520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333743272940
+  version_requirements: *70302933186520
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70333743272460 !ruby/object:Gem::Requirement
+  requirement: &70302933186040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70333743272460
+  version_requirements: *70302933186040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70333743271980 !ruby/object:Gem::Requirement
+  requirement: &70302933185560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70333743271980
+  version_requirements: *70302933185560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70333743271500 !ruby/object:Gem::Requirement
+  requirement: &70302933185080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70333743271500
+  version_requirements: *70302933185080
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70333743271020 !ruby/object:Gem::Requirement
+  requirement: &70302933184600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333743271020
+  version_requirements: *70302933184600
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70333743270540 !ruby/object:Gem::Requirement
+  requirement: &70302933184120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333743270540
+  version_requirements: *70302933184120
 - !ruby/object:Gem::Dependency
   name: fixtures
-  requirement: &70333743270060 !ruby/object:Gem::Requirement
+  requirement: &70302933183640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333743270060
+  version_requirements: *70302933183640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70333743269580 !ruby/object:Gem::Requirement
+  requirement: &70302933183160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333743269580
+  version_requirements: *70302933183160
 description: LinkedIn Open Source type ahead tool's REST API as a ruby gem
 email: Blue.Dog.Archolite@gmail.com
 executables: []
@@ -135,13 +146,16 @@ files:
 - Rakefile
 - VERSION
 - acts_as_cleo.gemspec
-- config/cleo.yml
+- config/cleo_example.yml
 - lib/acts_as_cleo.rb
 - lib/acts_as_cleo/result.rb
 - lib/acts_as_cleo/version.rb
 - lib/acts_methods.rb
 - lib/class_methods.rb
 - lib/cleo.rb
+- lib/cleo/jobs/create.rb
+- lib/cleo/jobs/delete.rb
+- lib/cleo/jobs/update.rb
 - lib/cleo/reference.rb
 - lib/cleo/result.rb
 - lib/cleo/server.rb