ginjo-rfm 1.4.4 → 2.0.pre31

data/lib/rfm/version.rb

@@ -1,6 +1,6 @@
 module Rfm
 	VERSION_DEFAULT = 'none'
-	VERSION = File.read(PATH + '/rfm/VERSION').lines.first.chomp  rescue VERSION_DEFAULT #File.read(File.join(File.expand_path(File.dirname(File.dirname(File.dirname(__FILE__)))), 'VERSION')) rescue VERSION_DEFAULT
+	VERSION = File.read(PATH + '/rfm/VERSION').lines.first.chomp  rescue VERSION_DEFAULT
   VERSION.instance_eval do
   	def components; VERSION.split('.'); end
   	def major; components[0]; end

data/lib/rfm/xml_mini/hpricot.rb

@@ -0,0 +1,133 @@
+require 'active_support/core_ext/kernel/reporting'
+require 'active_support/core_ext/object/blank'
+require 'stringio'
+
+module ActiveSupport # @private :nodoc:
+  module XmlMini_Hpricot # @private :nodoc:
+    extend self
+
+    CONTENT_KEY = '__content__'.freeze
+
+    # Parse an XML Document string or IO into a simple hash
+    #
+    # Same as XmlSimple::xml_in but doesn't shoot itself in the foot,
+    # and uses the defaults from Active Support.
+    #
+    # data::
+    #   XML Document string or IO to parse
+    def parse(data)
+      if !data.respond_to?(:read)
+        data = StringIO.new(data || '')
+      end
+
+      char = data.getc
+      if char.nil?
+        {}
+      else
+        data.ungetc(char)
+        silence_warnings { require 'hpricot' } unless defined?(Hpricot)
+        doc = Hpricot.XML(data)
+
+        if doc.root
+          merge_element!({}, doc.root)
+        else
+          raise Hpricot::ParseError,
+            "The document #{doc.to_s.inspect} does not have a valid root"
+        end
+      end
+    end
+
+    private
+      # Convert an XML element and merge into the hash
+      #
+      # hash::
+      #   Hash to merge the converted element into.
+      # element::
+      #   XML element to merge into hash
+      def merge_element!(hash, element)
+        merge!(hash, element.name, collapse(element)) if element.respond_to? :name
+      end
+
+      # Actually converts an XML document element into a data structure.
+      #
+      # element::
+      #   The document element to be collapsed.
+      def collapse(element)
+        hash = get_attributes(element)
+
+        if element.respond_to? :children
+          element.each_child {|child| merge_element!(hash, child) unless child.text? }
+          merge_texts!(hash, element) unless empty_content?(element)
+          hash
+        else
+          merge_texts!(hash, element)
+        end
+      end
+
+      # Merge all the texts of an element into the hash
+      #
+      # hash::
+      #   Hash to add the converted element to.
+      # element::
+      #   XML element whose texts are to be merged into the hash
+      def merge_texts!(hash, element)
+        unless element.respond_to? :children and element.children[0].text?
+          hash
+        else
+          # must use value to prevent double-escaping
+          texts = ''
+          #element.texts.each { |t| texts << t.value }
+          #texts << element.children[0].to_s
+          element.each_child { |child| texts << child.inner_text }
+          merge!(hash, CONTENT_KEY, texts)
+          texts
+        end
+      end
+
+      # Adds a new key/value pair to an existing Hash. If the key to be added
+      # already exists and the existing value associated with key is not
+      # an Array, it will be wrapped in an Array. Then the new value is
+      # appended to that Array.
+      #
+      # hash::
+      #   Hash to add key/value pair to.
+      # key::
+      #   Key to be added.
+      # value::
+      #   Value to be associated with key.
+      def merge!(hash, key, value)
+        if hash.has_key?(key)
+          if hash[key].instance_of?(Array)
+            hash[key] << value
+          else
+            hash[key] = [hash[key], value]
+          end
+        elsif value.instance_of?(Array)
+          hash[key] = [value]
+        else
+          hash[key] = value
+        end
+        hash
+      end
+
+      # Converts the attributes array of an XML element into a hash.
+      # Returns an empty Hash if node has no attributes.
+      #
+      # element::
+      #   XML element to extract attributes from.
+      def get_attributes(element)
+        attributes = {}
+        element.attributes.to_hash.each { |n,v| attributes[n] = v } if element.respond_to? :attributes
+        attributes
+      end
+
+      # Determines if a document element has text content
+      #
+      # element::
+      #   XML element to be checked.
+      def empty_content?(element)
+        #element.texts.join.blank?
+        element.children.nil? #or element.children[0].to_s.blank?
+      end
+  end
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ginjo-rfm
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  hash: 1923831879
+  prerelease: 4
   segments: 
-  - 1
-  - 4
-  - 4
-  version: 1.4.4
+  - 2
+  - 0
+  - pre
+  - 31
+  version: 2.0.pre31
 platform: ruby
 authors: 
 - Geoff Coffey
@@ -19,24 +20,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-06 00:00:00 Z
+date: 2011-12-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 9
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: i18n
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +50,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -78,35 +81,77 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
+        - 1
+        - 3
         - 0
-        version: "0"
+        version: 1.3.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: yard
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 3
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        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.
 email: http://groups.google.com/group/rfmcommunity
 executables: []
@@ -116,9 +161,10 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.md
-files: 
-- lib/rfm.rb
+- CHANGELOG.md
 - lib/rfm/VERSION
+files: 
+- lib/rfm/base.rb
 - lib/rfm/database.rb
 - lib/rfm/error.rb
 - lib/rfm/layout.rb
@@ -130,11 +176,19 @@ 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/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.rb
+- lib/rfm/VERSION
 - LICENSE
 - README.md
-homepage: http://sixfriedrice.com/wp/products/rfm/
+- CHANGELOG.md
+homepage: https://rubygems.org/gems/ginjo-rfm
 licenses: []
 
 post_install_message: 
@@ -156,12 +210,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -171,3 +227,4 @@ specification_version: 3
 summary: Ruby to Filemaker adapter
 test_files: []
 
+has_rdoc: