ginjo-rfm 3.0.4 → 3.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmQyNjY1ZmFlZWQyMjdiYTRiMDE5NWNiY2VhMjNjOGMwNzJhZTMwMA==
+    NWQ1ODlhYTI5ZDM2OTkxNDc3MGE5MGEyZjM4YWI2YTA0MzIyMTM1OA==
   data.tar.gz: !binary |-
-    ZjYzOWNlMzAyNDRiNmZmNmM1ODczYTgyNmFjZDdlZDAyZGRhZWNkZQ==
+    NzgwMmY2OTA3OTZkMzYxZTQ2ZmE2NzY1YmFkYmJhMzUxOGEwMGNlYw==
 SHA512:
   metadata.gz: !binary |-
-    ZjgxYThhYjcxM2E2OTE5ZTJmNjk2NGYyZmQ4ZWNlYWQ2OTAxN2RmN2ZmNjBl
-    OTg1NWEzZWVkYzhiODNlMTg2NzEwYWQ4MjNhZjg5MjYwZWZiMzEwNGY5OWQ3
-    ZjUyZTExNDVhNGVkZmE5YWM1OTFlNGVmOGFmMzJhZGFhZmU0OGE=
+    NzVmNWUwZmNlNTAxNmIwNzNlNDkxMDU4NTE3YWY1YzU1ZDg0MDIzZjFhNWVj
+    MTNkZmJhN2QxNDBmOTY4NzE1MzRhMjU4MjIzNGZlODNlZjVhYmVlNTUwMWRk
+    YzU0ZDBkNDRhNjk3MjFhNDBjNzRmNjBjODU5NmY4MmQ1MjgwZjE=
   data.tar.gz: !binary |-
-    ODNmN2M4ODgzZWVmNWM2NGZhYjhlMWIxMDk5NzAyNTlhMTU3N2QyOTZkM2Q2
-    Zjg3MjBiMDZkYzc1MTUyY2RjYjVkMmEwMjc0M2E3YTNiNmEwZTI1YzE3OTRi
-    ZjRlNDQxYjVhMWMzZjg3OGVhMzM0MTAxNzY5YTNjMDhjOTUyMTQ=
+    ODZlYmU4ZTAwMmI3M2FjZDA0ZjE5MDk0NzNhNmNkODJmOTc5NmUxZmI0YzU5
+    OTUxNTM4OTUxZjA5NTdkOTE0ZTZlNjAxMGI3NWMxY2FiOTJmNTJhODQxNDhh
+    N2IxN2VjOWQ0ZDlhMTU0NzNjYjU3NGI3ZTJhOTk0NDM3MGQ1NDM=

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## Ginjo-Rfm 3.0.5
+
+* Fixed parser handling of `<field>` element that's missing a `<data>` element.
+* Fixed coercion of repeating field data.
+* Fixed case where special characters in Filemaker data yielded array instead of string (sax parsing split text).
+* Fixed various bugs in metadata parsing.
+* Detached resultset from Rfm::MetaData::Field instance, now attaching only ResultsetMeta to Field.
+* Fixed ruby-prof rake task.
+* Updated deprecated rspec 2 specs, will now work with rspec 2 or 3.
+* Added more specs for some recently found bugs and for sax parser.
+* Fixed broken ActiveModel Lint specs in Ruby 2.1.
+* General refinements & cleanup.
+* Optimizations to sax_parser.
+* Fixed typo in field.rb that was causing bugs.
+
 ## Ginjo-Rfm 3.0.4
 
 * Corrected reference to @meta in fmpxmllayout.yml. Specs now passing for Layout#load\_layout.

data/lib/rfm.rb

@@ -59,12 +59,8 @@ module Rfm
 	end
 	
 	def_delegators 'Rfm::Factory', :servers, :server, :db, :database, :layout
-	def_delegators 'Rfm::SaxParser', :backend, :backend=
-	def_delegators 'Rfm::SaxParser::Handler', :get_backend
 	def_delegators 'Rfm::Config', :config, :get_config, :config_clear
 	def_delegators 'Rfm::Resultset', :load_data
-	alias_method		:parser, :backend
-	alias_method		:parser=, :backend=
 	
 	def models(*args)
 		Rfm::Base
@@ -75,9 +71,7 @@ module Rfm
 		Rfm::Base
 		Rfm::Factory.modelize(*args)
 	end
-	
-	#attr_accessor :log
-	
+		
 	def logger
 		@@logger ||= get_config[:logger] || Logger.new(STDOUT).tap {|l| l.formatter = proc {|severity, datetime, progname, msg| "#{datetime}: Rfm-#{severity} #{msg}\n"}}
 	end
@@ -88,17 +82,26 @@ module Rfm
 		@@logger = obj
 	end
 	
+	# 	DEFAULT_CLASS = CaseInsensitiveHash
+	# 	TEMPLATE_PREFIX = File.join(File.dirname(__FILE__), 'rfm/utilities/sax/')
+	# 	TEMPLATES = {
+	# 		:fmpxmllayout => 'fmpxmllayout.yml',
+	# 		:fmresultset => 'fmresultset.yml',
+	# 		:fmpxmlresult => 'fmpxmlresult.yml',
+	# 		:none => nil
+	# 	}
 	
+	PARSER_DEFAULTS = {
+		:default_class => CaseInsensitiveHash,
+		:template_prefix => File.join(File.dirname(__FILE__), 'rfm/utilities/sax/'),
+		:templates => {
+			:fmpxmllayout => 'fmpxmllayout.yml',
+			:fmresultset => 'fmresultset.yml',
+			:fmpxmlresult => 'fmpxmlresult.yml',
+			:none => nil
+		}
+	}	
 	
 	extend self
 	
-	SaxParser.default_class = CaseInsensitiveHash
-	SaxParser.template_prefix = File.join(File.dirname(__FILE__), 'rfm/utilities/sax/')
-	SaxParser.templates.merge!({
-		:fmpxmllayout => 'fmpxmllayout.yml',
-		:fmresultset => 'fmresultset.yml',
-		:fmpxmlresult => 'fmpxmlresult.yml',
-		:none => nil
-	})
-
 end # Rfm

data/lib/rfm/VERSION

@@ -1 +1 @@
-3.0.4
+3.0.5

data/lib/rfm/metadata/datum.rb

@@ -1,13 +1,15 @@
-require 'delegate'
+#require 'delegate'
 module Rfm
   module Metadata
   
     class Datum   #< DelegateClass(Field)
     
       def get_mapped_name(name, resultset)
+      	#puts ["\nDATUM#get_mapped_name", "name: #{name}", "mapping: #{resultset.layout.field_mapping.to_yaml}"]
       	(resultset && resultset.layout && resultset.layout.field_mapping[name]) || name
       end
       
+      # NOT sure what this method is for. Can't find a reference to it.
 			def main_callback(cursor)
 				resultset = cursor.top.object
 				name = get_mapped_name(@attributes['name'].to_s, resultset)
@@ -16,7 +18,7 @@ module Rfm
 				cursor.parent.object[name.downcase] = field.coerce(data)
 			end
 			
-			def portal_callback(cursor)
+			def portal_field_element_close_callback(cursor)
 				resultset = cursor.top.object
 				table, name = @attributes['name'].to_s.split('::')
 				#puts ['DATUM_portal_callback_01', table, name].join(', ')
@@ -29,14 +31,15 @@ module Rfm
 			end
       
       # Should return value only.
-			def handler_callback(cursor)
+			def field_element_close_callback(cursor)
 				record = cursor.parent.object
 				resultset = cursor.top.object
 
 				name = get_mapped_name(@attributes['name'].to_s, resultset)
 				field = resultset.field_meta[name]
-				data = @attributes['data']
+				data = @attributes['data'] #'data'
 				#puts ["\nDATUM", name, record.class, resultset.class, data]
+				#puts ["\nDATUM", self.to_yaml]
 				record[name] = field.coerce(data)
 			end
       

data/lib/rfm/metadata/field.rb

@@ -1,8 +1,10 @@
+require 'forwardable'
+
 module Rfm
   module Metadata
   
     # The Field object represents a single FileMaker field. It *does not hold the data* in the field. Instead,
-    # it serves as a source of metadata about the field. For example, if you're script is trying to be highly
+    # it serves as a source of metadata about the field. For example, if your script is trying to be highly
     # dynamic about its field access, it may need to determine the data type of a field at run time. Here's
     # how:
     #
@@ -60,11 +62,14 @@ module Rfm
     class Field
       
       attr_reader :name, :result, :type, :max_repeats, :global
-      meta_attr_accessor :resultset
+      meta_attr_accessor :resultset_meta
+      def_delegator :resultset_meta, :layout_object, :layout_object
       # Initializes a field object. You'll never need to do this. Instead, get your Field objects from
       # Resultset::field_meta
 			def initialize(attributes)
-				_attach_as_instance_variables attributes
+				if attributes && attributes.size > 0
+					_attach_as_instance_variables attributes
+				end
 				self
 			end
     
@@ -72,15 +77,20 @@ module Rfm
       # type of the field. You'll never need to do this: Rfm does it automatically for you when you
       # access field data through the Record object.
       def coerce(value)
-        return nil if (value.nil? or value.empty?)
+        case
+        when (value.nil? or value.empty?); return nil
+        when value.is_a?(Array); return value.collect {|v| coerce(v)}
+        when value.is_a?(Hash); return coerce(value.values[0])
+        end
+        
         case result
         when "text"      then value
         when "number"    then BigDecimal.new(value.to_s)
-        when "date"      then Date.strptime(value, resultset.date_format)
-        when "time"      then DateTime.strptime("1/1/-4712 #{value}", "%m/%d/%Y #{resultset.time_format}")
-        when "timestamp" then DateTime.strptime(value, resultset.timestamp_format)
+        when "date"      then Date.strptime(value, resultset_meta.date_format)
+        when "time"      then DateTime.strptime("1/1/-4712 #{value}", "%m/%d/%Y #{resultset_meta.time_format}")
+        when "timestamp" then DateTime.strptime(value, resultset_meta.timestamp_format)
         when "container" then
-        	resultset_meta = resultset.instance_variable_get(:@meta)
+        	#resultset_meta = resultset.instance_variable_get(:@meta)
         	if resultset_meta && resultset_meta['doctype'] && value.to_s[/\?/]
         		URI.parse(resultset_meta['doctype'].last.to_s).tap{|uri| uri.path, uri.query = value.split('?')}
         	else
@@ -88,22 +98,27 @@ module Rfm
         	end
         else nil
         end
-#       rescue
-#         puts("ERROR in Field#coerce:", name, value, result, $!)
-#         nil
+      rescue
+        puts("ERROR in Field#coerce:", name, value, result, resultset_meta.timestamp_format, $!)
+        nil
       end
       
       def get_mapped_name
-      	(resultset && resultset.layout && resultset.layout.field_mapping[name]) || name
+      	#(resultset_meta && resultset_meta.layout && resultset_meta.layout.field_mapping[name]) || name
+      	layout_object.field_mapping[name] || name
       end
             
-			def main_callback(cursor)
-				self.resultset = cursor.top.object
-				resultset.field_meta[get_mapped_name.to_s.downcase] = self
+			def field_definition_element_close_callback(cursor)
+				#self.resultset = cursor.top.object
+				#resultset_meta = resultset.instance_variable_get(:@meta)
+				self.resultset_meta = cursor.top.object.instance_variable_get(:@meta)
+				#puts ["\nFIELD#field_definition_element_close_callback", resultset_meta]
+				resultset_meta.field_meta[get_mapped_name.to_s.downcase] = self
 			end
 			
-			def portal_callback(cursor)
-				self.resultset = cursor.top.object
+			def relatedset_field_definition_element_close_callback(cursor)
+				#self.resultset = cursor.top.object
+				self.resultset_meta = cursor.top.object.instance_variable_get(:@meta)
 				cursor.parent.object[get_mapped_name.split('::').last.to_s.downcase] = self
 				#puts ['FIELD_portal_callback', name, cursor.parent.object.object_id, cursor.parent.tag, cursor.parent.object[name.split('::').last.to_s.downcase]].join(', ')
 			end

data/lib/rfm/metadata/field_control.rb

@@ -24,62 +24,60 @@ module Rfm
 	  class FieldControl
 	    attr_reader :name, :style, :value_list_name
 	    meta_attr_accessor :layout_meta
+	    
+	    FIELD_CONTROL_STYLE_MAP = {
+				'EDITTEXT'	=>	:edit_box,
+				'POPUPMENU'	=>	:popup_menu,
+				'CHECKBOX'	=>	:checkbox_set,
+				'RADIOBUTTONS'	=>	:radio_button_set,
+				'POPUPLIST'	=>	:popup_list,
+				'CALENDAR'	=>	:calendar,
+				'SCROLLTEXT'	=>	:scrollable,
+			}
 	  
-	  	def initialize(attributes, meta)
+      # def initialize(_attributes, meta)
+      #   puts ["\nFieldControl#initialize", "_attributes: #{_attributes}", "meta: #{meta.class}"]
+      #   self.layout_meta = meta
+      #   _attach_as_instance_variables(_attributes) if _attributes
+      #   self
+      # end
+	  	
+	  	def initialize(meta)
+	  	  #puts ["\nFieldControl#initialize", "meta: #{meta.class}"]
 	  		self.layout_meta = meta
-	  		_attach_as_instance_variables attributes
 	  		self
 	  	end
 	  	
-	  	# Handle manual attachment of STYLE element.
-	  	def handle_style_element(attributes)
-	  		_attach_as_instance_variables attributes, :key_translator=>method(:translate_value_list_key), :value_translator=>method(:translate_style_value)
-	  	end
+			# # Handle manual attachment of STYLE element.
+			# def handle_style_element(attributes)
+			# 	_attach_as_instance_variables attributes, :key_translator=>method(:translate_value_list_key), :value_translator=>method(:translate_style_value)
+			# end
+			# 
+			# def translate_style_value(key, val)
+			# 	#puts ["TRANSLATE_STYLE", raw].join(', ')
+			# 	{
+			# 		'EDITTEXT'	=>	:edit_box,
+			# 		'POPUPMENU'	=>	:popup_menu,
+			# 		'CHECKBOX'	=>	:checkbox_set,
+			# 		'RADIOBUTTONS'	=>	:radio_button_set,
+			# 		'POPUPLIST'	=>	:popup_list,
+			# 		'CALENDAR'	=>	:calendar,
+			# 		'SCROLLTEXT'	=>	:scrollable,
+			# 	}[val] || val
+			# end
 	  	
-	  	def translate_style_value(raw)
-	  		#puts ["TRANSLATE_STYLE", raw].join(', ')
-	  		{
-	  			'EDITTEXT'	=>	:edit_box,
-					'POPUPMENU'	=>	:popup_menu,
-					'CHECKBOX'	=>	:checkbox_set,
-					'RADIOBUTTONS'	=>	:radio_button_set,
-					'POPUPLIST'	=>	:popup_list,
-					'CALENDAR'	=>	:calendar,
-					'SCROLLTEXT'	=>	:scrollable,
-	  		}[raw] || raw
-	  	end
-	  	
-	  	def translate_value_list_key(raw)
-				{'valuelist'=>'value_list_name'}[raw] || raw	  	
-	  	end
+			# def translate_value_list_key(raw)
+			# 	{'valuelist'=>'value_list_name'}[raw] || raw	  	
+			# end
 	  	
 	  	def value_list
 	  		layout_meta.value_lists[value_list_name]
 	  	end
-	  
-			#   def initialize(name, style, value_list_name, value_list)
-			#     @name = name
-			#     case style
-			#     when "EDITTEXT"
-			#       @style = :edit_box
-			#     when "POPUPMENU"
-			#       @style = :popup_menu
-			#     when "CHECKBOX"
-			#       @style = :checkbox_set
-			#     when "RADIOBUTTONS"
-			#       @style = :radio_button_set
-			#     when "POPUPLIST"
-			#       @style = :popup_list
-			#     when "CALENDAR"
-			#       @style = :calendar
-			#     when "SCROLLTEXT"
-			#       @style = :scrollable
-			#     else
-			#       nil
-			#     end
-			#     @value_list_name = value_list_name
-			#     rfm_metaclass.instance_variable_set :@value_list, value_list
-			#   end
+
+      def element_close_handler  #(_cursor)
+      	@type = FIELD_CONTROL_STYLE_MAP[@type] || @type
+        layout_meta.receive_field_control(self)
+      end
 
 	  end
 	end

data/lib/rfm/metadata/layout_meta.rb

@@ -22,11 +22,16 @@ module Rfm
 				self['value_lists'] ||= CaseInsensitiveHash.new
 	    end
 	    
-			def handle_new_field_control(attributes)
-				name = attributes['name']
-				field_control = FieldControl.new(attributes, self)
-				field_controls[get_mapped_name(name)] = field_control
-			end
+      # def handle_new_field_control(attributes)
+      #   name = attributes['name']
+      #   field_control = FieldControl.new(attributes, self)
+      #   field_controls[get_mapped_name(name)] = field_control
+      # end
+      
+      def receive_field_control(fc)
+        #name = fc.name
+        field_controls[get_mapped_name(fc.name)] = fc        
+      end
 			
 			# Should this be in FieldControl object?
       def get_mapped_name(name)

data/lib/rfm/metadata/resultset_meta.rb

@@ -54,12 +54,21 @@ module Rfm
 	  		portal_meta ? portal_meta.keys : []
 	  	end
 						
-	  	def handle_new_field(attributes)
-	  		f = Field.new(attributes)
-	  		# TODO: Re-enable these when you stop using the before_close callback.
-				# 	name = attributes['name']
-				# 	self[name] = f
-	  	end
+			# def handle_new_field(attributes)
+			# 	f = Field.new(attributes)
+			# 	# TODO: Re-enable these when you stop using the before_close callback.
+			# 	# 	name = attributes['name']
+			# 	# 	self[name] = f
+			# end
+			
+			def layout_object
+				self['layout_object']
+			end
+			
+			def attach_layout_object_from_cursor(cursor)
+				self['layout_object'] = cursor.top.object.layout
+				#puts ["\nRESULTSET_META#metadata_element_close_callback", self['layout_object']]
+			end 
 		
 		end
 	end

data/lib/rfm/record.rb

@@ -147,7 +147,7 @@ module Rfm
         self.merge!(@mods) unless @mods == {}
         @loaded = true
       end
-      _attach_as_instance_variables args[1]
+      _attach_as_instance_variables(args[1]) if args[1].is_a? Hash
 			#@loaded = true
 			self
     end

data/lib/rfm/resultset.rb

@@ -49,9 +49,9 @@ module Rfm
 
     
     class << self
-    	def load_data(data)
+    	def load_data(data, object=self.new)
     		Rfm::Connection
-    		Rfm::SaxParser.parse(data, :fmresultset, Rfm::Resultset.new)
+    		Rfm::SaxParser.parse(data, :fmresultset, object)
     	end
     end
     
@@ -111,6 +111,7 @@ module Rfm
 			@meta ||= Metadata::ResultsetMeta.new
 		end
 
+		# Deprecated on 7/29/2014. Stop using.
   	def handle_new_record(attributes)
   		r = Rfm::Record.new(self, attributes, {})
   		self << r
@@ -118,14 +119,15 @@ module Rfm
   	end
   	
   	def end_datasource_element_callback(cursor)
-  		%w(date_format time_format timestamp_format).each{|f| convert_date_time_format(eval(f))}
+  		%w(date_format time_format timestamp_format).each{|f| convert_date_time_format(send(f))}
+  		@meta.attach_layout_object_from_cursor(cursor)
   	end
     
   private
     
-    def check_for_errors(code=@meta['error'].to_i, raise_401=state[:raise_401])
-    	#puts ["\nRESULTSET#check_for_errors", code, raise_401]
-      raise Rfm::Error.getError(code) if code != 0 && (code != 401 || raise_401)
+    def check_for_errors(error_code=@meta['error'].to_i, raise_401=state[:raise_401])
+    	#puts ["\nRESULTSET#check_for_errors", "meta[:error] #{@meta[:error]}", "error_code: #{error_code}", "raise_401: #{raise_401}"]
+      raise Rfm::Error.getError(error_code) if error_code != 0 && (error_code != 401 || raise_401)
     end
 
 	  def convert_date_time_format(fm_format)