ginjo-rfm 2.1.1 → 2.1.2

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## Ginjo-Rfm 2.1.2
+
+* Fixed config.rb so that :file_path (to user-defined yml config file) can be specified as a single path string
+	or as an array of path strings.
+
+## Ginjo-Rfm 2.1.1
+
+* Bug fixes
+
+* Specs passing in Ruby 1.8.7, 1.9.2.
+
 ## Ginjo-Rfm 2.1.0
 
 * Removed `:include_portals` query option in favor of `:ignore_portals`.
@@ -15,11 +26,9 @@
 * Added grammar translation layer between xml parser and Rfm, allowing all supported xml grammars to be used with Rfm.
 	This will also streamline changes/additions to Filemaker's xml grammar(s).
 	
-* Added ability to manually import fmprestulset and fmpxmlresult data (from file, variable, etc.).
-
 * Fixed case statement for ruby 1.9
  
-* Configuration `:use` option is now works for all Rfm objects that respond to `config`.
+* Configuration `:use` option now works for all Rfm objects that respond to `config`.
 
 ## Ginjo-Rfm 2.0.2
 

data/README.md

@@ -15,19 +15,35 @@ Rfm is a Ruby-Filemaker adapter, a Ruby gem that allows scripts and applications
 
 ## New in version  2.1
 
-ginjo-rfm 2.1 is a combination of new features, bug fixes, and a lot of code refactoring.
+Ginjo-rfm 2.1 has a combination of new features, bug fixes, and a lot of code refactoring.
 Most api calls remain the same, but a good deal of underlying code has been transformed
-to support, and take advantage of, the progress of technologies surrounding Ruby.
+to support and take advantage of the progress of technologies surrounding Ruby.
 
 * Portals are now included by default.
 	Removed `:include_portals` query option in favor of `:ignore_portals`.
 	Added `:max_portal_rows` query option.
 * Added field-remapping framework to allow model fields with different names than Filemaker fields.
+
+        class User < Rfm::Base
+          config :field_mapping => {
+            #<filemaker-field-name>  =>  <rfm-field-name>
+            'userName'               => 'login',
+            'First Name'             => 'first_name',
+            'Last Name'              => 'last_name',
+            'IDperson'               => 'person_id'     
+          }
+        end
+
+        User.find(:login=>'bill')    # => [{'login' => 'bill', 'first_name' => 'Bill', ...}, ...]
+
 * Fixed date/time/timestamp translations when writing data to Filemaker.
 * Detached new Server objects from Factory.servers hash, so wont reuse or stack-up servers.
 * Added grammar translation layer between xml parser and Rfm, allowing all supported xml grammars to be used with Rfm.
   This will also streamline changes/additions to Filemaker's xml grammar(s).
 * Added ability to manually import fmpresultset and fmpxmlresult data (from file, variable, etc.).
+
+        Rfm::Resultset.load_data(file_or_string).
+
 * Compatibility fixes for ruby 1.9.
 * Configuration `:use` option now works for all Rfm objects that respond to `config`.
 
@@ -179,7 +195,7 @@ Get the total count of all records in the table
 
 	  MyModel.total_count
 
-Get the portal names (table-occurence names) on the current layout
+Get the portal names (table-occurrence names) on the current layout
 
 	  MyModel.portal_names
 
@@ -689,26 +705,30 @@ To delete the record whose recid is 200:
 
 	   my_layout.delete(200)
 
-All of these methods return an Rfm::Result::ResultSet object (see below), and every one of them takes an optional parameter (the very last one) with additional options. For example, to find just a page full of records, you can do this:
+All of these methods return an Rfm::Resultset object (see below), and every one of them takes an optional parameter (the very last one) with additional options. For example, to find just a page full of records, you can do this:
 
 	   my_layout.find({:state => "AZ"}, {:max_records => 10, :skip_records => 100})
 
-For a complete list of the available options, see the "expand_options" method in the Rfm::Server object in the file named rfm_command.rb.
+For a complete list of the available options, see the "expand_options" method in the Rfm::Server object in the file named server.rb.
 
-Finally, if filemaker returns an error when executing any of these methods, an error will be raised in your ruby script. There is one exception to this, though. If a find results in no records being found (FileMaker error # 401) I just ignore it and return you a ResultSet with zero records in it. If you prefer an error in this case, add :raise_on_401 => true to the options you pass the Rfm::Server when you create it.
+Finally, if filemaker returns an error when executing any of these methods, an error will be raised in your ruby script. There is one exception to this, though. If a find results in no records being found (FileMaker error # 401) I just ignore it and return you a Resultset with zero records in it. If you prefer an error in this case, add :raise_on_401 => true to the options you pass the Rfm::Server when you create it.
 
 
-### ResultSet and Record Objects
+### Resultset and Record Objects
 
-Any method on the Layout object that returns data will return a ResultSet object. Rfm::Result::ResultSet is a subclass of Array, so first and foremost, you can use it like any other array:
+Any method on the Layout object that returns data will return a Resultset object. Rfm::Resultset is a subclass of Array, so first and foremost, you can use it like any other array:
 
 	   my_result = my_layout.any
 	   my_result.size  # returns '1'
-	   my_result[0]    # returns the first record (an Rfm::Result::Record object)
+	   my_result[0]    # returns the first record (an Rfm::Record object)
 
-The ResultSet object also tells you information about the fields and portals in the result. ResultSet#fields and ResultSet#portals are both standard ruby hashes, with strings for keys. The fields hash has Rfm::Result::Field objects for values. The portals hash has another hash for its values. This nested hash is the fields on the portal. This would print out all the field names:
+The Resultset object also tells you information about the fields and portals in the result. Resultset#field\_meta and Resultset#portal\_meta are both standard ruby hashes, with strings for keys. The fields hash has Rfm::Metadata::Field objects for values. The portals hash has another hash for its values. This nested hash is the fields on the portal. This would print out all the field names:
 
-	   my_result.fields.each { |name, field| puts name }
+	   my_result.field_meta.each { |name, field| puts name }
+	
+Or, as a convenience, you can do this:
+
+    my_result.field_names
 
 This would print out the tables each portal on the layout is associated with. Below each table name, and indented, it will print the names of all the fields on each portal.
 
@@ -717,7 +737,11 @@ This would print out the tables each portal on the layout is associated with. Be
 	     fields.each { |name, field| puts "\t#{name}"}
 	   }
 
-But most importantly, the ResultSet contains record objects. Rfm::Result::Record is a subclass of Hash, so it can be used in many standard ways. This code would print the value in the 'first_name' field in the first record of the ResultSet:
+Also as a convenience, you can do this:
+
+    my_result.portal_names
+
+But most importantly, the Resultset contains record objects. Rfm::Record is a subclass of Hash, so it can be used in many standard ways. This code would print the value in the 'first_name' field in the first record of the Resultset:
 
 	   my_record = my_result[0]
 	   puts my_record["first_name"]
@@ -726,7 +750,7 @@ As a convenience, if your field names are valid ruby method names (ie, they don'
 
 	   puts my_record.first_name
 
-Since ResultSets are arrays and Records are hashes, you can take advantage of Ruby's wonderful expressiveness. For example, to get a comma-separated list of the full names of all the people in California, you could do this:
+Since Resultsets are arrays and Records are hashes, you can take advantage of Ruby's wonderful expressiveness. For example, to get a comma-separated list of the full names of all the people in California, you could do this:
 
 	   my_layout.find(:state => 'CA').collect {|rec| "#{rec.first_name} #{rec.last_name}"}.join(", ")
 
@@ -746,7 +770,7 @@ If you want to detect concurrent modification, you can do this instead:
 
 This version will refuse to update the database and raise an error if the record was modified after it was loaded but before it was saved.
 
-Record objects also have portals. While the portals in a ResultSet tell you about the tables and fields the portals show, the portals in a Record have the actual data. For example, if an Order record has Line Item records, you could do this:
+Record objects also have portals. While the portals in a Resultset tell you about the tables and fields the portals show, the portals in a Record have the actual data. For example, if an Order record has Line Item records, you could do this:
 
 	   my_order = order_layout.any[0]  # the [0] is important!
 	   my_lines = my_order.portals["Line Items"]

data/lib/rfm/VERSION

@@ -1,2 +1 @@
-2.1.1
-
+2.1.2

data/lib/rfm/utilities/config.rb

@@ -124,9 +124,9 @@ module Rfm
 		def get_config_file
 			@@config_file_data ||= (
 				config_file_name = @config[:file_name] || (RFM_CONFIG[:file_name] rescue nil) || 'rfm.yml'
-				config_file_paths = [''] | (@config[:file_path] || (RFM_CONFIG[:file_path] rescue nil) || %w( config/ ))
-				config_file_paths.collect do |f|
-					(YAML.load_file("#{f}#{config_file_name}") rescue {})
+				config_file_paths = [''] | [(@config[:file_path] || (RFM_CONFIG[:file_path] rescue nil) || %w( config/ ))].flatten
+				config_file_paths.collect do |path|
+					(YAML.load_file(File.join(path, config_file_name)) rescue {})
 				end.inject({}){|h,a| h.merge(a)}
 			) || {}
 		end

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ginjo-rfm
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 2.1.2
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 1
-  version: 2.1.1
 platform: ruby
-authors: 
+authors:
 - Geoff Coffey
 - Mufaddal Khumri
 - Atsushi Matsuo
@@ -18,193 +13,212 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: diff-lcs
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: libxml-ruby
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: hpricot
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hpricot
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: ox
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ox
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-description: Rfm lets your Ruby scripts and Rails applications talk directly to your Filemaker server. Ginjo-rfm includes ActiveModel compatibility, multiple XML parsers, compound Filemaker find requests, and a configuration API.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Rfm lets your Ruby scripts and Rails applications talk directly to your
+  Filemaker server. Ginjo-rfm includes ActiveModel compatibility, multiple XML parsers,
+  compound Filemaker find requests, and a configuration API.
 email: http://groups.google.com/group/rfmcommunity
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
 - CHANGELOG.md
 - lib/rfm/VERSION
-files: 
+files:
 - lib/rfm/base.rb
 - lib/rfm/database.rb
 - lib/rfm/error.rb
@@ -223,7 +237,6 @@ files:
 - lib/rfm/utilities/factory.rb
 - lib/rfm/utilities/fmpxmlresult.rb
 - lib/rfm/utilities/fmresultset.rb
-- lib/rfm/utilities/sax_parser.rb
 - lib/rfm/utilities/xml_parser.rb
 - lib/rfm/version.rb
 - lib/rfm/xml_mini/hpricot.rb
@@ -237,41 +250,33 @@ files:
 - CHANGELOG.md
 homepage: https://rubygems.org/gems/ginjo-rfm
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -510283232379124376
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Ruby to Filemaker adapter
 test_files: []
-
 has_rdoc: 

data/lib/rfm/utilities/sax_parser.rb

@@ -1,298 +0,0 @@
-# From https://github.com/ohler55/ox
-#gem 'ox', '1.8.5'
-require 'stringio'
-require 'ox'
-require 'delegate'
-require 'yaml'
-require 'rfm'
-
-
-#####  CORE PATCHES  #####
-
-module Saxable
-  
-  # Default callbacks for Saxable objects.
-	def parent;	@parent || self end
-  def start_el(name, attributes); self end
-  def attribute(name,value); (self[name]=value) rescue nil end
-  def end_el(value); true end
-  
-  def self.included(base) 
-    attr_accessor :parent, :_new_element, :_new_element_name, :_new_element_attributes
-    
-    class << base
-      
-      attr_reader :_start_el_lambdas
-      # This is a class method that allows shortcut config, kinda like 'before_filter'.
-      # Helper shortcut method to be used in Saxable method at class level.
-      # When this loads, it will define a more elaborate hidden start_el operation.
-      # Lambdas needed to allow multiple start_el calls at Saxable object class level.
-      def start_el(el, kls)
-        @_start_el_lambdas ||= []
-        
-        # Disable this to use the non-lambda version.       
-        @_start_el_lambdas << lambda do |slf|
-          name = slf._new_element_name
-          if (name.match(el) if el.is_a? Regexp) || name == el
-            sub = Object.const_get(kls.to_s).new rescue kls.new
-            sub.parent = slf
-            sub.merge!(slf._new_element_attributes) rescue nil
-            slf._new_element = sub
-            yield(slf) if block_given?
-            return slf._new_element
-          else
-            #return slf
-            return nil
-          end
-        end
-        
-        # This is the actual instance-level start_el method.
-        # The lambda version will call multiple lambdas,
-        # whereas the single version will only call once.
-        define_method :start_el do |name, attributes|
-          # This is for the lambda version.
-          self._new_element_name = name
-          self._new_element_attributes = attributes
-        #
-        # This is the non-lambda one-shot only version.
-        #
-        #   if (name.match(el) if el.is_a? Regexp) || name == el
-        #     self._new_element = Object.const_get(kls.to_s).new
-        #     self._new_element.parent = self
-        #     self._new_element_name = name
-        #     yield(self) if block_given?
-        #     return self._new_element
-        #   else
-        #     return self
-        #     #return nil
-        #   end
-        #
-        # This is the lambda version
-        # 
-          begin
-          result = (self.class.instance_variable_get(:@_start_el_lambdas).compact.each{|e| @sub = e.call(self); break if @sub}; @sub || self)
-          #self.class.instance_variable_get(:@_start_el).last.call(self, parent, name) rescue nil || self
-          #puts "Successfully processed lambdas"
-          result
-          rescue
-          #puts "Errors processing lambdas: #{$!}"
-          self
-          end
-        #
-        end
-      end
-      
-      def end_el(el)
-        define_method :end_el do |name|
-          if (name.match(el) if el.is_a? Regexp) || name == el
-            self._new_element_name = name
-            yield(self) if block_given?
-            return true
-          end
-        end
-      end
-      
-      def element(*args)
-      	options = args.last.is_a?(Hash) ? args.pop : {}
-      	start_el args[0].to_s, options[:class] do |slf|
-      		slf.is_a? Hash
-      			slf[slf._new_element_name] = slf._new_element
-      		elsif slf.is_a? Array
-      			slf << slf._new_element
-      		end
-      	end
-      end
-      
-    end
-  end
-
-end # Saxable
-
-class Hash
-  include Saxable
-end
-class Array
-  include Saxable
-end
-
-
-module SaxHandler
-  
-  def self.included(base)
-    def base.build(io, initial_object)
-  		handler = new(initial_object)
-  		handler.run_parser(io)
-  		handler.cursor
-  	end
-  end
-  
-  def initialize(initial_object)
-  	init_element_buffer
-    initial_object.parent = set_cursor initial_object
-  end
-	
-	def cursor
-		@cursor
-	end
-	
-	def set_cursor(obj)
-		@cursor = obj
-	end
-	
-  def init_element_buffer
-  	@element_buffer = {:name=>nil, :attr=>{}}
-  end
-  
-  def send_element_buffer
-  	if element_buffer?
-	  	set_cursor cursor.start_el(@element_buffer[:name], @element_buffer[:attr])
-	  	init_element_buffer
-	  end
-	end
-	
-	def element_buffer?
-		@element_buffer[:name] && !@element_buffer[:name].empty?
-	end
-
-  # Add a node to an existing element.
-	def _start_element(name, attributes=nil)
-		send_element_buffer
-		if attributes.nil?
-			@element_buffer = {:name=>name, :attr=>{}}
-		else
-			set_cursor cursor.start_el(name, attributes)
-		end
-	end
-	
-	# Add attribute to existing element.
-	def _attribute(name, value)
-		@element_buffer[:attr].merge!({name=>value})
-    #cursor.attribute(name,value)
-	end
-	
-	# Add 'content' attribute to existing element.
-	def _text(value)
-		if !element_buffer?
-			cursor.attribute('content', value)
-		else
-			@element_buffer[:attr].merge!({'content'=>value})
-			send_element_buffer
-		end
-	end
-	
-	# Close out an existing element.
-	def _end_element(value)
-		send_element_buffer
-		cursor.end_el(value) and set_cursor cursor.parent
-	end
-  
-end # SaxHandler
-
-
-
-#####  XML PARSERS - SAX HANDLERS  #####
-
-class OxFmpSax < ::Ox::Sax
-
-  include SaxHandler
-
-  def run_parser(io)
-		#Ox.sax_parse(self, io)
-		File.open(io){|f| Ox.sax_parse self, f}
-	end
-	
-  def start_element(name); _start_element(name.to_s.downcase);        end
-  def end_element(name);   _end_element(name.to_s.downcase);          end
-  def attr(name, value);   _attribute(name.to_s.downcase, value);     end
-  def text(value);         _text(value);                              end
-  
-end # OxFmpSax
-
-
-class FmResultset < Hash
-  start_el 'datasource', :Datasource do |slf|
-    slf[slf._new_element_name] = slf._new_element
-  end
-  start_el 'resultset', :Resultset do |slf|
-    slf[slf._new_element_name] = slf._new_element
-  end
-  start_el 'metadata', :Metadata do |slf|
-    slf[slf._new_element_name] = slf._new_element
-  end
-end
-
-class Datasource < Hash
-  start_el /.*/i, :Hash
-end
-
-class Metadata < Array
-  start_el 'field-definition', :Hash do |slf|
-    slf << slf._new_element
-  end
-end
-
-class Resultset < Array
-  start_el 'record', :Record do |slf|
-    slf << slf._new_element
-  end
-  # Enable this to kill attribute parsing for this object.
-  #def attribute(*args); end
-end
-
-class Record < Hash
-  start_el 'field', :Field
-end
-
-class Field < Hash    
-  end_el 'field' do |slf|
-    slf.parent[slf['name']] = slf['content']
-  end
-end
-
-# This gives a generic tree structure.
-class Hash
-  start_el /.*/i, :Hash do |slf|
-    name, sub = slf._new_element_name, slf._new_element
-    
-    if slf[name].is_a? Array
-      slf[name] << sub
-    elsif slf.has_key? name
-      tmp = slf[name]
-      slf[name] = [tmp]
-      slf[name] << sub
-    else
-      slf[name] = sub
-    end
-  end
-  
-  end_el /.*/i do |slf|
-    parent, name = slf.parent, slf._new_element_name
-    #parent[name]=nil if slf.empty?  # Use nil for empty nodes.
-    #parent.delete(name) if slf.empty? # Delete empty nodes.
-    parent[name] = slf.values[0] unless slf.size > 1 or parent.size > 2 # Reduce unnecessary nodes.
-  end
-  
-end
-
-
-#####  DATA  #####
-
-FM = 'local_testing/resultset.xml'
-FMP = 'local_testing/resultset_with_portals.xml'
-XML = 'local_testing/data_fmpxmlresult.xml'
-XMP = 'local_testing/data_with_portals_fmpxmlresult.xml'
-LAY = 'local_testing/layout.xml'
-XMD = 'local_testing/db_fmpxmlresult.xml'
-FMB = 'local_testing/resultset_with_bad_data.xml'
-SP = 'local_testing/SplashLayout.xml'
-
-S = StringIO.new(%{
-<top name="top01">
-	<middle name="middle01" />
-  <middle name="middle02">
-    <bottom name="bottom01">bottom-text</bottom>
-  </middle>
-  <middle name="middle03">middle03-text</middle>
-</top>
-})
-