fabulator-xml 0.0.4 → 0.0.5

data/History.txt

@@ -3,6 +3,7 @@
 * 1 minor enhancement
   * Bump minimum version of Fabulator
   * ActionLib => TagLib
+  * register_type => has_type
 
 === 0.0.3 2010-08-16
 

data/Rakefile

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

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/features/types.feature

@@ -13,7 +13,7 @@ Feature: Type unification
       And the prefix x as "http://dh.tamu.edu/ns/fabulator/xml/1.0#"
     When I run the expression (x:parse-string("<foo />")/@type)
     Then I should get 1 item
-      And item 0 should be [f:uri-prefix('x') + 'document']
+      And item 0 should be [f:uri('x:document')]
 
   Scenario: Get the type of a parsed string value
     Given a context
@@ -21,7 +21,7 @@ Feature: Type unification
       And the prefix x as "http://dh.tamu.edu/ns/fabulator/xml/1.0#"
     When I run the expression (x:document("<foo />")/@type)
     Then I should get 1 item
-      And item 0 should be [f:uri-prefix('x') + 'document']
+      And item 0 should be [f:uri('x:document')]
 
   Scenario: Get the value of an element
     Given a context
@@ -29,5 +29,5 @@ Feature: Type unification
       And the prefix x as "http://dh.tamu.edu/ns/fabulator/xml/1.0#"
     When I run the expression (x:path(x:parse-string("<foo><bar>baz</bar></foo>"), "/foo/bar")/@type)
     Then I should get 1 item
-      And item 0 should be [f:uri-prefix('x') + 'node']
+      And item 0 should be [f:uri('x:node')]
 

data/lib/fabulator/xml/actions.rb

@@ -8,37 +8,36 @@ module Fabulator
 
         namespace XML_NS
 
-        register_type 'document', {
-          :to => [
-            { :type => [ FAB_NS, 'string' ],
-              :weight => 1.0,
-              :convert => lambda { |x| x.anon_node(x.value.to_s, [ FAB_NS, 'string' ]) }
-            }
-          ],
-          :from => [
-            { :type => [ FAB_NS, 'string' ],
-              :weight => 1.0,
-              :convert => lambda { |x| (x.anon_node(LibXML::XML::Document.string(x.value), [ XML_NS, 'document' ]) rescue nil) }
-            }
-          ]
-        }
+        has_type :document do
+          going_to [ FAB_NS, 'string' ] do
+            weight 1.0
+            converting do |x|
+              x.root.value.to_s
+            end
+          end
+ 
+          coming_from [ FAB_NS, 'string' ] do
+            weight 1.0
+            converting do |x|
+              (x.root.anon_node(LibXML::XML::Document.string(x.root.value), [ XML_NS, 'document' ]) rescue nil)
+            end
+          end
+        end
 
-        register_type 'node', {
-          :to => [
-            { :type => [ FAB_NS, 'string' ],
-              :weight => 1.0,
-              :convert => lambda { |x|
-                x.anon_node(
-                  (
-                    x.value.is_a?(LibXML::XML::Node) ? x.value.content :
-                    x.value.is_a?(LibXML::XML::Attr) ? x.value.value :
-                    x.value.to_s
-                  ), [ FAB_NS, 'string' ]
-                )
-              }
-            }
-          ]
-        }
+        has_type :node do
+          going_to [ FAB_NS, 'string' ] do
+            weight 1.0
+            converting do |x|
+              x.root.anon_node(
+                (
+                  x.root.value.is_a?(LibXML::XML::Node) ? x.root.value.content :
+                  x.root.value.is_a?(LibXML::XML::Attr) ? x.root.value.value :
+                  x.root.value.to_s
+                ), [ FAB_NS, 'string' ]
+              )
+            end
+          end
+        end
 
         function 'parse-string', [ XML_NS, 'document' ] do |ctx, args|
           args[0].collect { |a|

data/script/console

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# File: script/console
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+
+libs =  " -r irb/completion"
+# Perhaps use a console_lib to store any extra methods I may want available in the cosole
+# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
+libs <<  " -r #{File.dirname(__FILE__) + '/../lib/fabulator-xml.rb'}"
+puts "Loading fabulator-xml gem"
+exec "#{irb} #{libs} --simple-prompt"

data/script/destroy

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Generate.new.run(ARGV)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fabulator-xml
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +00:00
+date: 2010-10-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 13
         segments: 
         - 0
         - 0
-        - 7
-        version: 0.0.7
+        - 9
+        version: 0.0.9
   type: :runtime
   version_requirements: *id001
 description: XML functions and types for the Fabulator engine.
@@ -58,6 +58,9 @@ files:
 - lib/fabulator/xml.rb
 - lib/fabulator/xml/actions.rb
 - lib/fabulator/xml/version.rb
+- script/console
+- script/destroy
+- script/generate
 - test/test_fabulator-xml.rb
 - test/test_helper.rb
 has_rdoc: true