ocelot 0.0.3 → 0.0.4

data/lib/ocelot.rb

@@ -56,6 +56,7 @@ module Ocelot
         else
           logger.error "Could not write #{target}.#{assoc} adding #{val.class}: #{e.message}"
         end
+        logger.debug e.backtrace
       end
     end
 

data/lib/ocelot/dsl.rb

@@ -135,8 +135,12 @@ module Ocelot
       @p = p
     end
 
+    def inspect_shallow
+      @inspect = Rules::INSPECT_SHALLOW
+    end
+
     def inspect
-      @inspect = true 
+      @inspect = Rules::INSPECT_DEEP
     end
 
     def persist(obj)
@@ -144,7 +148,7 @@ module Ocelot
     end
 
     def save(obj, *args)
-      @inspect = false
+      @inspect = Rules::INSPECT_NONE
       args = [obj, *args]
       instance_exec(*args, &@p)
       return @inspect

data/lib/ocelot/processor.rb

@@ -98,32 +98,55 @@ module Ocelot
         logger.warn "Unrecognised type #{obj.class}"
         @unrecognised << obj.class
       end
+      Rules::INSPECT_NONE
     end
 
-    def go
+    def setup_rules_and_filters
       default_rule   = Rules::DefaultRule.new
       default_filter = Rules::Filter.new
 
       @rules     = Hash.new
       @filters   = Hash.new
-      @saved     = Set.new   
-      @inspected = Set.new   
 
-      array_rule   = ArrayRule.new
- 
       @classes.each { |c| @rules[c] = default_rule; @filters[c] = default_filter }
+
       @rules.merge! @extra_rules
       @filters.merge! @extra_filters
-      seeds = @seeds.collect { |o| [o, "script seed"] } 
 
+      [@rules, @filters].each do |p|
+        class << p 
+          alias :old_index :[]
+          def [](clazz)
+            c = clazz
+            while c
+              return old_index(c) if old_index(c)
+              c = c.superclass
+            end
+          end
+        end
+      end
+
+      debugger
+    end
+
+    def go
+      setup_rules_and_filters
+
+      @saved     = Set.new   
+      @inspected = Set.new   
+
+      array_rule   = ArrayRule.new
+
+      seeds = @seeds.collect { |o| [o, Rules::INSPECT_DEEP, "script seed"] } 
       Graph::Traverser.run(seeds) do |objs, queue|
-        obj, calller = *objs
+        obj, inspect_level, calller = *objs
 
         unless in? @saved, obj
-          @inspected << obj unless process_rule(:obj => obj, :caller => calller)
+          inspect_level = process_rule(:obj => obj, :caller => calller)
+          @inspected << obj unless inspect_level > Rules::INSPECT_NONE
         end
 
-        unless in? @inspected, obj
+        unless in? @inspected, obj and inspect_level > Rules::INSPECT_NONE
           obj.class.reflect_on_all_associations.each do |assoc| 
             safely obj do
               connection.use_source = true
@@ -134,16 +157,20 @@ module Ocelot
                 # simple has_one (A->B handling), save B and conditionally inspect
                 if !assoc.collection?
                   unless in? @saved, value
-                    process_rule(:obj => value, :caller => calller) and (queue << [value, obj_to_s(obj, assoc)])
+                    child_inspect_level = process_rule(:obj => value, :caller => calller) 
+                    if child_inspect_level > Rules::INSPECT_NONE
+                      queue << [value, child_inspect_level, obj_to_s(obj, assoc)]
+                    end
                   end
+
                 # more complicated has many (A-B* and A-mapobj-B*), saving and inspecting each child
                 # monkeypatching the array_rule must yield B and whether to inspect it
                 # be very very very careful, as it handles saving objects whie yielding results
-                else
-                  array_rule.save(obj, value, assoc, self) do |child, inspect| 
+                elsif inspect_level > Rules::INSPECT_SHALLOW
+                  array_rule.save(obj, value, assoc, self) do |child, child_inspect_level| 
                     @saved << child
-                    if inspect
-                      queue << [child, obj_to_s(obj, assoc)] 
+                    if child_inspect_level > Rules::INSPECT_NONE
+                      queue << [child, child_inspect_level,  obj_to_s(obj, assoc)] 
                     else
                       @inspected << child 
                     end
@@ -164,8 +191,8 @@ module Ocelot
           c.process_filter(:obj => obj, :collection => array, :name => assoc.name).each do |val| 
             unless in? c.saved, val 
               use_source_db!
-              inspect = c.process_rule(:obj => val, :caller => obj_to_s(obj)) 
-              yield val, inspect
+              inspect_level = c.process_rule(:obj => val, :caller => obj_to_s(obj)) 
+              yield val, inspect_level
             end
 
             use_target_db!

data/lib/ocelot/rules.rb

@@ -1,5 +1,9 @@
 module Ocelot
   module Rules
+    INSPECT_NONE = 1
+    INSPECT_SHALLOW = 2
+    INSPECT_DEEP = 3 
+
     class Filter < Ocelot::Base
       def filter(value)
         true
@@ -46,7 +50,7 @@ module Ocelot
         obj.id = id
         remove_callbacks(obj)
         save_to_db(obj)
-        true
+        Rules::INSPECT_DEEP
       end
     end
   end

data/ocelot.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "ocelot"
-  s.version     = "0.0.3"
+  s.version     = "0.0.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["spencer p"]
   s.email       = ["exussum@gmail.com"]

metadata

@@ -2,7 +2,7 @@
 name: ocelot
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - spencer p
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -04:00
+date: 2011-05-03 00:00:00 -04:00
 default_executable: 
 dependencies: []