believer 0.2.8 → 0.2.9

data/lib/believer.rb

@@ -1,9 +1,22 @@
 module Believer
-  VERSION = '0.1'
+
+  FEATURES = {}
+
+  def self.features
+    FEATURES
+  end
+
 end
 
 require 'active_model'
 
+begin
+  require 'active_model/observing'
+  Believer.features[:active_model_observing] = true
+rescue LoadError => le
+  Believer.features[:active_model_observing] = false
+end
+
 require 'active_support/concern'
 require 'active_support/core_ext'
 require 'active_support/core_ext/module/delegation'
@@ -43,7 +56,11 @@ require 'believer/callbacks'
 require 'believer/finder_methods'
 
 require 'believer/log_subscriber'
-require 'believer/observer'
+
+if Believer.features[:active_model_observing]
+  require 'believer/observer'
+end
+
 require 'believer/relation'
 
 require 'believer/create_table'

data/lib/believer/base.rb

@@ -15,7 +15,10 @@ module Believer
     include Counting
     include DDL
 
-    include ::ActiveModel::Observing
+    if Believer.features[:active_model_observing]
+      include ::ActiveModel::Observing
+    end
+
 
     # The Cassandra row ID
     attr_accessor :id

data/lib/believer/observer.rb

@@ -1,36 +1,38 @@
-require 'active_model/observing'
+if Believer.features[:active_model_observing]
+  require 'active_model/observing'
 
-module Believer
+  module Believer
 
-  class Observer < ::ActiveModel::Observer
+    class Observer < ::ActiveModel::Observer
 
-    protected
+      protected
 
-    def observed_classes
-      klasses = super
-      klasses + klasses.map { |klass| klass.descendants }.flatten
-    end
-
-    def add_observer!(klass)
-      super
-      define_callbacks klass
-    end
+      def observed_classes
+        klasses = super
+        klasses + klasses.map { |klass| klass.descendants }.flatten
+      end
 
-    def define_callbacks(klass)
-      observer = self
-      observer_name = observer.class.name.underscore.gsub('/', '__')
+      def add_observer!(klass)
+        super
+        define_callbacks klass
+      end
 
-      Believer::Callbacks::CALLBACKS.each do |callback|
-        next unless respond_to?(callback)
-        callback_meth = :"_notify_#{observer_name}_for_#{callback}"
-        unless klass.respond_to?(callback_meth)
-          klass.send(:define_method, callback_meth) do |&block|
-            observer.update(callback, self, &block)
+      def define_callbacks(klass)
+        observer = self
+        observer_name = observer.class.name.underscore.gsub('/', '__')
+
+        Believer::Callbacks::CALLBACKS.each do |callback|
+          next unless respond_to?(callback)
+          callback_meth = :"_notify_#{observer_name}_for_#{callback}"
+          unless klass.respond_to?(callback_meth)
+            klass.send(:define_method, callback_meth) do |&block|
+              observer.update(callback, self, &block)
+            end
+            klass.send(callback, callback_meth)
           end
-          klass.send(callback, callback_meth)
         end
       end
     end
-  end
 
-end
+  end
+end

data/lib/believer/test/test_run_life_cycle.rb

@@ -5,7 +5,10 @@ module Believer
       extend ActiveSupport::Concern
 
       included do
-        Believer::Base.observers = Destructor
+        #Believer::Base.observers = Destructor
+        Believer::Base.after_save do |model|
+          Destructor.instance.after_save(model)
+        end
 
         after(:each) do
           Destructor.instance.cleanup
@@ -13,8 +16,9 @@ module Believer
       end
 
       # Detroys all CqlRecord::Base instances created
-      class Destructor < Believer::Observer
-        observe Believer::Base
+      class Destructor# < Believer::Observer
+        include Singleton
+#        observe Believer::Base
 
         def cleanup
           unless @observed_models.nil? || @observed_models.empty?
@@ -30,12 +34,12 @@ module Believer
         end
 
         def observed_models
-          return @observed_models.dup unless @observed_models.nil?
+          return @observed_models.dup.to_a unless @observed_models.nil?
           []
         end
 
         def after_save(model)
-          @observed_models ||= []
+          @observed_models ||= Set.new
           @observed_models << model
         end
 

data/lib/believer/version.rb

@@ -1,5 +1,5 @@
 module Believer
   module Version
-    VERSION = '0.2.8'
+    VERSION = '0.2.9'
   end
 end

data/spec/believer/test_run_life_cycle_spec.rb

@@ -25,14 +25,9 @@ describe Believer::Test::TestRunLifeCycle do
     expect(@monitor.kill_count).to eql @created.size
   end
 
-  after :each do
-  end
-
-  before :each do
-  end
-
   it "should clean all created objects, even after a fail" do
-    expect(Believer::Test::TestRunLifeCycle::Destructor.instance.observed_models.size).to eql CREATE_COUNT
+    puts "Observed models: \n#{Believer::Test::TestRunLifeCycle::Destructor.instance.observed_models.join("\n")}"
+    expect(Believer::Test::TestRunLifeCycle::Destructor.instance.observed_models.size).to eql Fly.create_count
   end
 
   class Monitor
@@ -52,6 +47,14 @@ describe Believer::Test::TestRunLifeCycle do
     primary_key :name
 
     attr_accessor :kill_monitor
+    cattr_accessor :create_count
+
+    def initialize(attrs)
+      super
+      self.class.create_count ||= 0
+      self.class.create_count += 1
+      puts "Created #{self.class.create_count}"
+    end
 
     before_destroy do
       self.kill_monitor.destroyed

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: believer
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Jerphaes van Blijenburgh
@@ -39,7 +39,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -2179262306
+        hash: 373958899
         segments: 
         - 1
         - 1