ginjo-rfm 2.1.0 → 2.1.1

data/lib/rfm/VERSION

@@ -1,2 +1,2 @@
-2.1.0
+2.1.1
 

data/lib/rfm/base.rb

@@ -254,7 +254,7 @@ module Rfm
 		  			
 			# Just like Layout#find, but searching by record_id will return a record, not a resultset.
 	  	def find(find_criteria, options={})
-	  		#puts "base.find-#{layout}"
+	  		#puts "base.find-#{layout.object_id}"
 	  	  r = layout.find(find_criteria, options)
 	  	  if ![Hash,Array].include?(find_criteria.class) and r.size == 1
 	  	    r[0]

data/lib/rfm/layout.rb

@@ -209,7 +209,7 @@ module Rfm
 	    #   myLayout.find 54321
 	    #
 	    def find(find_criteria, options = {})
-	    	#puts "layout.find-#{self}"
+	    	#puts "layout.find-#{self.object_id}"
 	    	options.merge!({:field_mapping => field_mapping}) if field_mapping
 				get_records(*Rfm::CompoundQuery.new(find_criteria, options))
 	    end

data/lib/rfm/utilities/sax_parser.rb

@@ -0,0 +1,298 @@
+# 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>
+})
+

metadata

@@ -1,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ginjo-rfm
-version: !ruby/object:Gem::Version
-  version: 2.1.0
+version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: 
+  segments: 
+  - 2
+  - 1
+  - 1
+  version: 2.1.1
 platform: ruby
-authors:
+authors: 
 - Geoff Coffey
 - Mufaddal Khumri
 - Atsushi Matsuo
@@ -13,212 +18,193 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-03-21 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.5
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  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
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  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
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rdoc
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    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
-        version: 1.3.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         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: *id005
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    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'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  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
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: redcarpet
   prerelease: false
-  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
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    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'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    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'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: hpricot
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    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'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: ox
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id012 !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.
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        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.
 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
@@ -237,6 +223,7 @@ 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
@@ -250,33 +237,41 @@ 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1763595399021498150
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       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: