fabulator-exhibit 0.0.2 → 0.0.3

data/History.txt

@@ -1,7 +1,7 @@
-=== 0.0.1 2010-03-01
+=== 0.0.3 2010-09-07
 
 * 1 major enhancement:
-  * Initial release
+  * Works with Fabulator 0.0.7 and later
 
 === 0.0.2
 
@@ -12,3 +12,9 @@
 
 * 1 minor enhancement:
   * Document dependence on uuid gem in gem spec
+
+=== 0.0.1 2010-03-01
+
+* 1 major enhancement:
+  * Initial release
+

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.email = "jgsmith@tamu.edu"
     gem.homepage = "http://github.com/jgsmith/ruby-fabulator-exhibit"
     gem.authors = ["James Smith"]
-    gem.add_dependency('fabulator', '>= 0.0.1')
+    gem.add_dependency('fabulator', '>= 0.0.7')
     gem.add_dependency('uuid', '>= 2.1.0')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/features/step_definitions/expression_steps.rb

@@ -59,7 +59,7 @@ When /I unify the types? (.*)/ do |ts|
       pn = t.split(/:/, 2)
       [ @context.get_ns(pn[0]), pn[1] ]
     }
-  @type_result = Fabulator::ActionLib.unify_types(
+  @type_result = Fabulator::TagLib.unify_types(
     types.collect { |t|
       pn = t.split(/:/, 2)
       [ @context.get_ns(pn[0]), pn[1] ]

data/features/step_definitions/xml_steps.rb

@@ -10,7 +10,8 @@ Given /the statemachine/ do |doc_xml|
 
   @parser ||= Fabulator::Expr::Parser.new
   if @sm.nil?
-    @sm = Fabulator::Core::StateMachine.new.compile_xml(doc, @context)
+    @sm = Fabulator::Core::StateMachine.new
+    @sm.compile_xml(doc, @context)
   else
     @sm.compile_xml(doc, @context)
   end

data/lib/fabulator/exhibit/actions.rb

@@ -1,20 +1,18 @@
-
 module Fabulator
   EXHIBIT_NS = "http://dh.tamu.edu/ns/fabulator/exhibit/1.0#"
 
-require 'fabulator/exhibit/actions/item'
-require 'fabulator/exhibit/actions/property'
-require 'fabulator/exhibit/actions/type'
-require 'fabulator/exhibit/actions/value'
+  require 'fabulator/exhibit/actions/item'
+  require 'fabulator/exhibit/actions/property'
+  require 'fabulator/exhibit/actions/type'
+  require 'fabulator/exhibit/actions/value'
 
   module Exhibit
     module Actions
-      class Lib
-        include Fabulator::ActionLib
+      class Lib < Fabulator::TagLib
 
         @@databases = { }
 
-        register_namespace EXHIBIT_NS
+        namespace EXHIBIT_NS
 
         action 'database', Database
         action 'item', Item

data/lib/fabulator/exhibit/actions/item.rb

@@ -16,24 +16,24 @@ module Fabulator
 
         def run(context, autovivify = false)
           @context.with(context) do |ctx|
-            items = @select.run(ctx)
+            items = self.select(ctx)
 
             db = @database.run(ctx).first.to_s
 
             items.each do |item|
               info = Fabulator::Exhibit::Actions::Lib.accumulate_item_info do
-                @actions.run(ctx.with_root(item))
+                self.run_actions(ctx.with_root(item))
               end
               info['id'] = (@id.run(ctx.with_root(item)).first.to_s rescue nil)
-              if @mode == 'add'
+              if self.mode == 'add'
                 if info['id'].nil?
                   @@uuid ||= UUID.new
                   info['id'] = @@uuid.generate(:compact)
                 end
-                info['type'] = @type.run(ctx.with_root(item)).first.to_s
-                info['label'] = @label.run(ctx.with_root(item)).first.to_s
+                info['type'] = self.type(ctx.with_root(item)).first.to_s
+                info['label'] = self.label(ctx.with_root(item)).first.to_s
                 Fabulator::Exhibit::Actions::Lib.add_info(db, :items, info)
-              elsif @mode == 'remove' && !info['id'].nil?
+              elsif self.mode == 'remove' && !info['id'].nil?
                 Fabulator::Exhibit::Actions::Lib.remove_info(db, :items, info['id'])
               end
             end
@@ -52,15 +52,15 @@ module Fabulator
         def run(context, autovivify = false)
           ret = [ ]
           @context.with(context) do |ctx|
-            nom = @database.run(ctx).first.to_s
-            mode = @mode.run(ctx).first.to_s
-            scope_type = (@scope_type.run(ctx).first.to_s rescue nil)
+            nom = self.database(ctx).first.to_s
+            m = self.mode(ctx).first.to_s
+            scopeType = (self.scope_type(ctx).first.to_s rescue nil)
             db = nil
-            if mode == 'merge' || !scope_type.nil?
+            if m == 'merge' || !scopeType.nil?
             db = Fabulator::Exhibit::Actions::Lib.fetch_database(nom)
-              if !db.nil? && mode == 'overwrite'  # !scope_type.nil? is a consequence
+              if !db.nil? && m == 'overwrite'  # !scope_type.nil? is a consequence
                 # remove any items of scope_type
-                db[:items].delete_if{ |k,v| v['type'] == scope_type }
+                db[:items].delete_if{ |k,v| v['type'] == scopeType }
               end
             end
             if db.nil?
@@ -69,7 +69,7 @@ module Fabulator
             Fabulator::Exhibit::Actions::Lib.set_database(nom, db)
  
             begin
-              ret = @actions.run(ctx)
+              ret = self.run_actions(ctx)
             ensure
               Fabulator::Exhibit::Actions::Lib.store_database(
                 nom,

data/lib/fabulator/exhibit/actions/property.rb

@@ -10,10 +10,10 @@ module Fabulator
         def run(context, autovivify = false)
           @context.with(context) do |ctx|
             Fabulator::Exhibit::Actions::Lib.add_info(
-              @database.run(ctx).first.to_s, 
+              self.database(ctx).first.to_s, 
               :properties, {
-                'id' => @name.run(ctx).first.to_s,
-                'valueType' => @valueType.run(ctx).first.to_s
+                'id' => self.name(ctx).first.to_s,
+                'valueType' => self.valueType(ctx).first.to_s
               }
             )
           end

data/lib/fabulator/exhibit/actions/type.rb

@@ -10,12 +10,13 @@ module Fabulator
 
         def run(context, autovivify = false)
           @context.with(context) do |ctx|
-            info = { :id => @name.run(ctx).first.to_s }
-            if !@pluralLabel.nil?
-              info['pluralLabel'] = @pluralLabel.run(ctx).first.to_s
+            info = { :id => self.name(ctx).first.to_s }
+            pl = (self.pluralLabel(ctx).first.to_s rescue nil)
+            if !pl.nil?
+              info['pluralLabel'] = pl
             end
             Fabulator::Exhibit::Actions::Lib.add_info(
-              @database.run(ctx).first.to_s, :types, info
+              self.database(ctx).first.to_s, :types, info
             )
           end
         end

data/lib/fabulator/exhibit/actions/value.rb

@@ -11,8 +11,8 @@ module Fabulator
         def run(context, autovivify = false)
           @context.with(context) do |ctx|
             Fabulator::Exhibit::Actions::Lib.add_item_to_accumulator(
-              @name.run(ctx).first.to_s, 
-              @select.run(ctx).collect{ |s| s.value }
+              self.name(ctx).first.to_s,
+              self.select(ctx).collect{ |s| s.value }
             )
           end
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator-exhibit
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 +00:00
+date: 2010-09-07 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 17
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 7
+        version: 0.0.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency