ginjo-rfm 2.0.pre31 → 2.0.0

data/lib/rfm/utilities/factory.rb

@@ -64,6 +64,8 @@ module Rfm
     
     end # DbFactory
     
+    
+    
     class LayoutFactory < Rfm::CaseInsensitiveHash # :nodoc: all
     
       def initialize(server, database)
@@ -78,23 +80,34 @@ module Rfm
       
       def all
         if !@loaded
-	        Rfm::Resultset.new(@server, @server.connect(@database.account_name, @database.password, '-layoutnames', {"-db" => @database.name}).body, nil).each {|record|
+	        get_layout_names.each {|record|
 	          name = record['LAYOUT_NAME']
-	          self[name] = Rfm::Layout.new(name, @database) if self[name] == nil
+	        	begin
+	          	(self[name] = Rfm::Layout.new(name, @database)) unless !self[name].nil? or name.to_s.strip == ''
+	          rescue
+	          	$stderr.puts $!
+	          end
 	        }
           @loaded = true
         end
         self
       end
+      
+      def get_layout_names_xml
+      	@server.connect(@database.account_name, @database.password, '-layoutnames', {"-db" => @database.name})
+      end
+      
+      def get_layout_names
+      	Rfm::Resultset.new(@server, get_layout_names_xml.body, nil)
+      end
     
     	def names
     		keys
     	end
-    	
-
-    
     end # LayoutFactory
     
+    
+    
     class ScriptFactory < Rfm::CaseInsensitiveHash # :nodoc: all
     
       def initialize(server, database)

data/lib/rfm/utilities/xml_parser.rb

@@ -10,16 +10,34 @@ module Rfm
 		BACKENDS = ActiveSupport::OrderedHash.new
 		
 		BACKENDS[:jdom]					= {:require=>'jdom',			:class =>	'JDOM'}
+
+		BACKENDS[:oxsax]				= {:require=>'ox',	  :class =>	proc{
+																# rexmlsax module is part of Rfm, not XmlMini,
+																# and needs to be handed manually to XmlMini.
+																require File.join(File.dirname(__FILE__), '../xml_mini/ox_sax.rb')
+																ActiveSupport::XmlMini_OxSAX}}
+
 		BACKENDS[:libxml]				= {:require=>'libxml',		:class =>	'LibXML'}
+
 		BACKENDS[:libxmlsax]		= {:require=>'libxml',		:class =>	'LibXMLSAX'}
+
 		BACKENDS[:nokogirisax]	= {:require=>'nokogiri',	:class =>	proc{ActiveSupport::VERSION; 'NokogiriSAX'}}
+
 		BACKENDS[:nokogiri]			= {:require=>'nokogiri',	:class =>	'Nokogiri'}
+
 		BACKENDS[:hpricot]			= {:require=>'hpricot',	  :class =>	proc{
 																# Hpricot module is part of Rfm, not XmlMini,
 																# and needs to be handed manually to XmlMini.
 																require File.join(File.dirname(__FILE__), '../xml_mini/hpricot.rb')
 																ActiveSupport::XmlMini_Hpricot}}
+
 		BACKENDS[:rexml]				= {:require=>'rexml/document',	:class=>'REXML'}
+
+		BACKENDS[:rexmlsax]			= {:require=>'rexml/parsers/sax2parser',	  :class =>	proc{
+																# rexmlsax module is part of Rfm, not XmlMini,
+																# and needs to be handed manually to XmlMini.
+																require File.join(File.dirname(__FILE__), '../xml_mini/rexml_sax.rb')
+																ActiveSupport::XmlMini_REXMLSAX}}
 		
 		
 		# Main parsing method.

data/lib/rfm/xml_mini/ox_sax.rb

@@ -0,0 +1,91 @@
+begin
+  require 'ox'
+rescue LoadError => e
+  $stderr.puts "You don't have Ox installed in your application. Please add it to your Gemfile and run bundle install"
+  raise e
+end
+require 'active_support/core_ext/object/blank'
+require 'stringio'
+
+# = XmlMini Ox implementation using a SAX-based parser
+# This Ox Sax parser was lifted directly from multi_xml gem.
+module ActiveSupport
+  module XmlMini_OxSAX # @private :nodoc: all
+
+    extend self
+    
+    def parse_error
+      Exception
+    end
+
+    def parse(io)
+      if !io.respond_to?(:read)
+        io = StringIO.new(io || '')
+      end
+      handler = Handler.new
+      ::Ox.sax_parse(handler, io, :convert_special => true)
+      handler.doc
+    end
+
+
+
+    class Handler
+      attr_accessor :stack
+
+      def initialize()
+        @stack = []
+      end
+      
+      def doc
+        @stack[0]
+      end
+
+      def attr(name, value)
+        unless @stack.empty?
+          append(name, value)
+        end
+      end
+
+      def text(value)
+        append('__content__', value)
+      end
+
+      def cdata(value)
+        append('__content__', value)
+      end
+
+      def start_element(name)
+        if @stack.empty?
+          @stack.push(Hash.new)
+        end
+        h = Hash.new
+        append(name, h)
+        @stack.push(h)
+      end
+
+      def end_element(name)
+        @stack.pop()
+      end
+
+      def error(message, line, column)
+        raise Exception.new("#{message} at #{line}:#{column}")
+      end
+
+      def append(key, value)
+        key = key.to_s
+        h = @stack.last
+        if h.has_key?(key)
+          v = h[key]
+          if v.is_a?(Array)
+            v << value
+          else
+            h[key] = [v, value]
+          end
+        else
+          h[key] = value
+        end
+      end
+
+    end # Handler
+  end
+end

data/lib/rfm/xml_mini/rexml_sax.rb

@@ -0,0 +1,81 @@
+require 'rexml/parsers/sax2parser'
+require 'rexml/sax2listener'
+require 'rexml/document'
+require 'active_support/core_ext/object/blank'
+require 'stringio'
+
+# = XmlMini REXML implementation using the SAX2 parser
+module ActiveSupport
+  module XmlMini_REXMLSAX
+    extend self
+
+    # Class that will build the hash while the XML document
+    # is being parsed using streaming events.
+    class HashBuilder
+    	include REXML::SAX2Listener
+
+      CONTENT_KEY   = '__content__'.freeze
+      HASH_SIZE_KEY = '__hash_size__'.freeze
+
+      attr_reader :hash
+
+      def current_hash
+        @hash_stack.last
+      end
+
+      def start_document
+        @hash = {}
+        @hash_stack = [@hash]
+      end
+
+      def end_document
+        raise "Parse stack not empty!" if @hash_stack.size > 1
+      end
+
+      def error(error_message)
+        raise error_message
+      end
+
+      def start_element(uri, name, qname, attrs = [])
+      	#puts "START_ELEMENT #{name}"
+      	#y attrs
+        new_hash = { CONTENT_KEY => '' }.merge(Hash[attrs])
+        new_hash[HASH_SIZE_KEY] = new_hash.size + 1
+
+        case current_hash[name]
+          when Array then current_hash[name] << new_hash
+          when Hash  then current_hash[name] = [current_hash[name], new_hash]
+          when nil   then current_hash[name] = new_hash
+        end
+
+        @hash_stack.push(new_hash)
+      end
+
+      def end_element(uri, name, qname)
+        if current_hash.length > current_hash.delete(HASH_SIZE_KEY) && current_hash[CONTENT_KEY].blank? || current_hash[CONTENT_KEY] == ''
+          current_hash.delete(CONTENT_KEY)
+        end
+        @hash_stack.pop
+      end
+
+      def characters(string)
+      	return unless string and current_hash[CONTENT_KEY]
+      	#puts "CHARACTERS #{string}"
+        current_hash[CONTENT_KEY] << string
+      end
+
+      alias_method :cdata, :characters
+    end
+
+    attr_accessor :document_class
+    self.document_class = HashBuilder
+
+    def parse(data)
+      document = self.document_class.new
+      parser = REXML::Parsers::SAX2Parser.new(data)
+      parser.listen(document)
+      parser.parse
+      document.hash
+    end
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ginjo-rfm
 version: !ruby/object:Gem::Version 
-  hash: 1923831879
-  prerelease: 4
+  hash: 15
+  prerelease: 
   segments: 
   - 2
   - 0
-  - pre
-  - 31
-  version: 2.0.pre31
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Geoff Coffey
@@ -20,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-24 00:00:00 Z
+date: 2012-01-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -39,7 +38,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -50,7 +49,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -97,7 +96,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: diff-lcs
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -111,7 +110,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
+  name: yard
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -125,7 +124,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: libxml-ruby
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -139,7 +138,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: nokogiri
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -152,7 +151,35 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id009
-description: Rfm brings your FileMaker data to Ruby. Now your Ruby scripts and Rails applications can talk directly to your FileMaker server.
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: ox
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
+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: []
 
@@ -176,13 +203,15 @@ files:
 - lib/rfm/resultset.rb
 - lib/rfm/server.rb
 - lib/rfm/utilities/case_insensitive_hash.rb
-- lib/rfm/utilities/complex_query.rb
+- lib/rfm/utilities/compound_query.rb
 - lib/rfm/utilities/config.rb
 - lib/rfm/utilities/core_ext.rb
 - lib/rfm/utilities/factory.rb
 - lib/rfm/utilities/xml_parser.rb
 - lib/rfm/version.rb
 - lib/rfm/xml_mini/hpricot.rb
+- lib/rfm/xml_mini/ox_sax.rb
+- lib/rfm/xml_mini/rexml_sax.rb
 - lib/rfm.rb
 - lib/rfm/VERSION
 - LICENSE

data/lib/rfm/utilities/complex_query.rb

@@ -1,64 +0,0 @@
-module Rfm
-
-  module ComplexQuery # @private :nodoc:
-		# Methods for Rfm::Layout to build complex queries
-		# Perform RFM find using complex boolean logic (multiple value options for a single field)
-		# Mimics creation of multiple find requests for "or" logic
-		# Use: rlayout_object.query({'fieldOne'=>['val1','val2','val3'], 'fieldTwo'=>'someValue', ...})
-		def query(hash_or_recid, options = {})
-		  if hash_or_recid.kind_of? Hash
-		    get_records('-findquery', assemble_query(hash_or_recid), options)
-		  else
-		    get_records('-find', {'-recid' => hash_or_recid.to_s}, options)
-		  end
-		end
-
-		# Build ruby params to send to -query action via RFM
-		def assemble_query(query_hash)
-			key_values, query_map = build_key_values(query_hash)
-			key_values.merge("-query"=>query_translate(array_mix(query_map)))
-		end
-
-		# Build key-value definitions and query map  '-q1...'
-		def build_key_values(qh)
-			key_values = {}
-			query_map = []
-			counter = 0
-			qh.each_with_index do |ha,i|
-				ha[1] = ha[1].to_a
-				query_tag = []
-				ha[1].each do |v|
-					key_values["-q#{counter}"] = ha[0]
-					key_values["-q#{counter}.value"] = v
-					query_tag << "q#{counter}"
-					counter += 1
-				end
-				query_map << query_tag
-			end
-			return key_values, query_map
-		end
-
-		# Build query request logic for FMP requests  '-query...'
-		def array_mix(ary, line=[], rslt=[])
-			ary[0].to_a.each_with_index do |v,i|
-				array_mix(ary[1,ary.size], (line + [v]), rslt)
-				rslt << (line + [v]) if ary.size == 1
-			end
-			return rslt
-		end
-
-		# Translate query request logic to string
-		def query_translate(mixed_ary)
-			rslt = ""
-			sub = mixed_ary.collect {|a| "(#{a.join(',')})"}
-			sub.join(";")
-		end
-
-	end # ComplexQuery
-
-	#   class Layout
-	#   	require 'rfm/layout'
-	#     include ComplexQuery
-	#   end
-  
-end # Rfm