olsen 0.0.9 → 0.0.10

data/CHANGELOG

@@ -1,4 +1,5 @@
 [0.0.4] initial public release...working in a lot of ways, but no docs
 [0.0.6] added olsen executable to init and process jobs, added pdf generation, unit tests
 [0.0.7] added README
+[0.0.8] updated docs, fixed a filter issue
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    olsen (0.0.8)
+    olsen (0.0.9)
       sadie
 
 GEM

data/lib/olsen.rb

@@ -38,11 +38,14 @@ class Olsen
         filters.respond_to? "each" \
             or return value
         
-        instance = Sadie::getCurrentSadieInstance
+        sadie = Sadie::getCurrentSadieInstance
         
         fhnd = "filter.#{filters[0]}"
         puts "fetching filter: #{fhnd}"
-        f = instance.get fhnd
+        
+        sadie.isset? fhnd \
+            or raise "olsen error: filter(#{fhnd}) does not exist"
+        f = sadie.get fhnd
         
         if filters.length > 1
             rem = filters[1..(filters.length-1)]
@@ -71,6 +74,7 @@ class Olsen
     end
     
     def self.registerFilter( name, &block )
+        puts "registering filter: #{name}"
         instance = Sadie::getCurrentSadieInstance
         instance.set "filter.#{name}", block
     end
@@ -111,7 +115,10 @@ class Olsen
             "lib/olsen/primer_plugins"
         )
         if ! File.exists? plugins_dirpath   # for dev
-            plugins_dirpath = "lib/olsen/primer_plugins"
+            plugins_dirpath = File.expand_path "lib/olsen/primer_plugins"
+        end        
+        if ! File.exists? plugins_dirpath   # for dev
+            plugins_dirpath = File.join "/home/fred/Source/LMSys/olsen", "lib/olsen/primer_plugins"
         end        
         storage.addPrimerPluginsDirPath plugins_dirpath
         storage.initializePrimers
@@ -160,12 +167,12 @@ class Olsen
         
     end
 
-    def registerFilter( filter, &block )
-        defined? @filters \
-            or @filters = Hash.new
-        
-        @filters["filter"] = block
-    end
+#     def registerFilter( filter, &block )
+#         defined? @filters \
+#             or @filters = Hash.new
+#         
+#         @filters["filter"] = block
+#     end
     
     def filter( filter_name, value )
         defined? @filters \

data/lib/olsen/primer_plugins/Filter.plugin.rb

@@ -1,6 +1,6 @@
 Sadie::registerPrimerPlugin( { "match" => /\.filter.rb$/,
                                "accepts-block" => false,
-                               "prime-on-init" => false } ) do |sadie, key_prefix, primer_file_filepath|
+                               "prime-on-init" => true } ) do |sadie, key_prefix, primer_file_filepath|
     
     # basically, just loading a ruby file
     load primer_file_filepath

data/lib/olsen/version.rb

@@ -1,3 +1,3 @@
 class Olsen
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: olsen
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000Z
+date: 2012-04-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sadie
-  requirement: &20469200 !ruby/object:Gem::Requirement
+  requirement: &13593940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20469200
+  version_requirements: *13593940
 description: Olsen is a reporting tool intended to be used with Sadie.
 email:
 - fred@landmetrics.com