acts_as_cleo 0.0.4 → 1.0.0

data/Gemfile

@@ -16,6 +16,5 @@ group :development, :test do
   gem 'sqlite3'
 end
 
-
 gem 'happymapper'
 gem 'rails', '>= 3.1.0'

data/VERSION

@@ -1 +1 @@
-0.0.4
+1.0.0

data/acts_as_cleo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "acts_as_cleo"
-  s.version = "0.0.4"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert R. Meyer"]
@@ -60,11 +60,11 @@ Gem::Specification.new do |s|
     "test/models/category.rb",
     "test/models/electronic.rb",
     "test/models/movie.rb",
-    "test/test_acts_as_cleo.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_common_methods.rb",
     "test/unit/test_instance_methods.rb",
     "test/unit/test_model_to_cleo.rb",
     "test/unit/test_result_parser.rb"

data/lib/acts_methods.rb

@@ -7,8 +7,9 @@ module ActsAsCleo
       #Instance Methods Correctly Included
       include InstanceMethods
 
-      after_commit  :set_cleo_id, :sync_with_cleo
-      after_destroy :remove_from_cleo
+      after_create :create_cleo
+      after_update :update_cleo
+      before_destroy :remove_from_cleo
 
       cattr_accessor :cleo_config
 

data/lib/cleo.rb

@@ -19,6 +19,8 @@ module Cleo
     uri = URI.parse(Cleo::Server.url + "#{id}")
     response = self.get(uri)
 
+    return nil if response.body.blank?
+
     Cleo::Result.parse(response.body, :single => true)
   end
 
@@ -43,7 +45,7 @@ module Cleo
     return good_response_code?(response)
   end
 
-  def self.delete(cleo_id)
+  def self.delete(obj_or_id)
 =begin
 
 
@@ -187,6 +189,15 @@ module Cleo
 
 =end
 
+    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.responds_to?("cleo_id")
+      cleo_id = obj_or_id.cleo_id
+    end
+
     result = `curl -v -X DELETE #{Cleo::Server.url}#{cleo_id}`
 
     #TODO I HATE THIS. Make this use Rails and not a fracking curl call

data/lib/instance_methods.rb

@@ -1,34 +1,36 @@
 module ActsAsCleo
   module InstanceMethods
     # callback hooks to keep cleo insync with data
-    def sync_with_cleo
-      if self.persisted?
+    def create_cleo
+      set_cleo_id
+      Cleo.create(self)
+    end
+
+    def update_cleo
         Cleo.update(self)
-      else
-        Cleo.create(self)
-      end
-      #after_update send the data to cleo
     end
 
     def remove_from_cleo
-      Cleo.delete(self) if self.persisted?
+      Cleo.delete(self.cleo_id)
+      cr = cleo_reference
+      cr.delete
     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?
+    end#
     #end callback hooks
 
     def cleo_id
       return nil if self.id.nil?
-      record_type = self.cleo_config[:type]
-      cr = Cleo::Reference.find(:first, :conditions => ["record_type = ? and record_id = ?", record_type, self.id])
+      cr = cleo_reference
 
       return nil if cr.nil?
       return cr.id
     end
 
-    def set_cleo_id
-      #this needs to be rerolled to pull an Cleo::Reference record and persist it.
-      cr = Cleo::Reference.find(:one, :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?
-    end#
+
 
     def to_cleo_result
       #take self and change it into a Cleo::Result and return
@@ -59,5 +61,14 @@ module ActsAsCleo
     end
 
     alias :as_cleo :to_cleo_result
+
+    private
+    def record_type
+      self.cleo_config[:type]
+    end
+
+    def cleo_reference
+      Cleo::Reference.find(:first, :conditions => ["record_type = ? and record_id = ?", record_type, self.id])
+    end
   end
 end

data/test/models/category.rb

@@ -4,4 +4,5 @@
 
 class Category < ActiveRecord::Base
   has_many :books
+  acts_as_cleo
 end

data/test/models/electronic.rb

@@ -7,5 +7,5 @@
 # - price
 
 class Electronic < ActiveRecord::Base
-
+  acts_as_cleo
 end

data/test/unit/test_active_record_callback_hooks.rb

@@ -0,0 +1,35 @@
+require 'helper'
+
+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 book.save!
+    book_id = book.id
+
+    assert book.cleo_id
+    ref = Cleo::Reference.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)
+  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)
+    assert_not_nil cleo_record
+    book.name = "Updated my Cleo"
+    assert book.save!
+
+    updated_cleo_record = Cleo.find(book.cleo_id)
+    assert_equal book.name, updated_cleo_record.name
+    assert_not_equal cleo_record.name, updated_cleo_record.name
+
+    assert book.destroy
+  end
+end

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

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestCommonMethods < Test::Unit::TestCase
+class TestClassMethods < Test::Unit::TestCase
   should "respond to query call" do
     assert Book.respond_to?("query")
   end
@@ -12,7 +12,11 @@ class TestCommonMethods < Test::Unit::TestCase
     assert Cleo.find(book_cleo_id)
 
     assert Cleo.delete(book_cleo_id)
-    assert_nil Cleo.find(book_cleo_id)
   end
-end
 
+  should "be able to query from Klass" do
+    books = Book.query("goog")
+    assert_not_nil books
+    assert_kind_of Array, books
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_cleo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.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: &70303817396620 !ruby/object:Gem::Requirement
+  requirement: &70333743273900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303817396620
+  version_requirements: *70333743273900
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70303817396140 !ruby/object:Gem::Requirement
+  requirement: &70333743273420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70303817396140
+  version_requirements: *70333743273420
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70303817395660 !ruby/object:Gem::Requirement
+  requirement: &70333743272940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303817395660
+  version_requirements: *70333743272940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70303817395180 !ruby/object:Gem::Requirement
+  requirement: &70333743272460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70303817395180
+  version_requirements: *70333743272460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70303817394700 !ruby/object:Gem::Requirement
+  requirement: &70333743271980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70303817394700
+  version_requirements: *70333743271980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70303817394220 !ruby/object:Gem::Requirement
+  requirement: &70333743271500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70303817394220
+  version_requirements: *70333743271500
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70303817393740 !ruby/object:Gem::Requirement
+  requirement: &70333743271020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303817393740
+  version_requirements: *70333743271020
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70303817393260 !ruby/object:Gem::Requirement
+  requirement: &70333743270540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303817393260
+  version_requirements: *70333743270540
 - !ruby/object:Gem::Dependency
   name: fixtures
-  requirement: &70303817392780 !ruby/object:Gem::Requirement
+  requirement: &70333743270060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303817392780
+  version_requirements: *70333743270060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70303817392300 !ruby/object:Gem::Requirement
+  requirement: &70333743269580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70303817392300
+  version_requirements: *70333743269580
 description: LinkedIn Open Source type ahead tool's REST API as a ruby gem
 email: Blue.Dog.Archolite@gmail.com
 executables: []
@@ -172,11 +172,11 @@ files:
 - test/models/category.rb
 - test/models/electronic.rb
 - test/models/movie.rb
-- test/test_acts_as_cleo.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_common_methods.rb
 - test/unit/test_instance_methods.rb
 - test/unit/test_model_to_cleo.rb
 - test/unit/test_result_parser.rb

data/test/test_acts_as_cleo.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestActsAsCleo < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-#    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end