epo 0.0.2 → 0.0.3

data/Rakefile

@@ -23,7 +23,6 @@ spec = Gem::Specification.new do |s|
           'lib/epo.rb',
           'lib/epo/core/db.rb',
           'lib/epo/core/observer.rb',
-          'lib/epo/core/dispatch_observations.rb',
         ]
 
         s.require_path = 'lib'
@@ -32,7 +31,7 @@ spec = Gem::Specification.new do |s|
         s.has_rdoc = true
 
         s.add_dependency('derailleur', '>= 0.0.6')
-        s.add_dependency('welo', '>= 0.1.0')
+        s.add_dependency('welo', '>= 0.1.1')
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

data/lib/epo.rb

@@ -1,6 +1,6 @@
 
 module EPO
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
   AUTHORS = ["crapooze"]
   WEBSITE = "https://github.com/crapooze/epo"
   LICENCE = "MIT"

data/lib/epo/core/db.rb

@@ -185,7 +185,7 @@ module EPO
           end
         end
       else
-        Enumerator.new(self, root, resources, persps, exts)
+        Enumerator.new(self, :batch_save_actions, root, resources, persps, exts)
       end
     end
 

data/lib/epo/core/observer.rb

@@ -2,22 +2,25 @@
 require 'welo'
 require 'find'
 require 'epo/core/db'
-require 'epo/core/dispatch_observations'
 
 module EPO
   # An Observer is a object able to look at the filesystem and 
   # observe resources in it.
   class Observer < Welo::Observer
-    include DispatchObservations
+    alias :on :register
+
     # in EPO, the source of an observation is:
     # - a db object able to make a ruby object from a file path
     # - a file path
     Source = Struct.new(:db, :path) do
       def observe
-        db.read_file(path)
+        yield db.read_file(path)
       end
     end
 
+    # The list of models understood by this observer
+    attr_reader :models
+
     # The DB able to tell if a path is understandable or not
     attr_accessor :db
 
@@ -35,25 +38,38 @@ module EPO
     # Creates a new observer for given models.
     # Will instanciate a new DB.
     def initialize(models=[])
-      super(models)
+      super()
       @db = DB.new(models)
       @structures = {}
       register(:observation) do |o|
-        dispatch(o)
+        event(o.class.resource, o)
       end
     end
 
+    # Returns the node for a db path, or nil if doesnt exist
     def get_node_for_path(path, root=nil)
-      path = path.sub(root,'') if root
+      case root
+      when Regexp
+        path = path.sub(root,'') 
+      when String
+        re = %r{^#{root}}
+        path = path.sub(re,'') 
+      when nil
+        #ok
+      else
+        raise ArgumentError, "can only understand string or regexps as roots" 
+      end
       db.get_route_silent(path)
     end
 
+    # Reads the file to path as a resource dumped EPO-style
     def read_path_as_resource(path, model)
       persp_str = db.persp_and_ext_for_basename(path).first
       persp = model.perspectives.keys.find{|k| k.to_s == persp_str}
       observe_source(Source.new(db, path), structure(model, persp))
     end
 
+    # Handy-cache for mapping (model, persp) pairs to Welo::ObservationStruct
     def structure(model, persp)
       pair = [model, persp]
       @structures[pair] ||= Welo::ObservationStruct.new_for_resource_in_perspective(model, persp)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: epo
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - crapooze
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-27 00:00:00 -04:00
+date: 2011-04-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
         - 0
@@ -40,11 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 1
+        version: 0.1.1
   type: :runtime
   version_requirements: *id002
 description: 
@@ -62,7 +65,6 @@ files:
 - lib/epo.rb
 - lib/epo/core/db.rb
 - lib/epo/core/observer.rb
-- lib/epo/core/dispatch_observations.rb
 has_rdoc: true
 homepage: https://github.com/crapooze/epo
 licenses: []
@@ -77,6 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -85,6 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"

data/lib/epo/core/dispatch_observations.rb

@@ -1,21 +0,0 @@
-
-module EPO
-  module DispatchObservations
-    # Register an event when an observation of a resource
-    # matching a given model is made
-    def on(model,&blk)
-      register(model,&blk)
-    end
-
-    private
-
-    # Call each blocks for an observation registering from the 
-    # observation's resource model
-    def dispatch(observation)
-      blks = registrations[observation.class.resource] || []
-      blks.each do |blk|
-        blk.call(observation)
-      end
-    end
-  end
-end