ginjo-rfm 3.0.1 → 3.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDkwZmQwZTdjNWVjZmQwYTc3NGZjYjFlMTI3OTAzMWRiMzBhYzZlOQ==
+    NmQyNjY1ZmFlZWQyMjdiYTRiMDE5NWNiY2VhMjNjOGMwNzJhZTMwMA==
   data.tar.gz: !binary |-
-    YjMyYTRmNWFjYWUzN2ZlNmJmN2E5MWE3MDFhM2E1ZmRlMGFlNWUyZQ==
+    ZjYzOWNlMzAyNDRiNmZmNmM1ODczYTgyNmFjZDdlZDAyZGRhZWNkZQ==
 SHA512:
   metadata.gz: !binary |-
-    NGFhODQ1Mjk0M2YzY2ZhNjhmYTY4NWRiNzZlYTlhZjU1YTE2MjE2NmFiZTIz
-    NGVmYTA5YzEyMmYzNDg2NWQ5YTY0Yjk3ZGI5ZDI5ODBhMmI0ZWIzYmVlY2Vi
-    OGVlZDE4ODk1ZDU2NDQ3YzZkNmU4NmM1OGQyNWEwNWI4MWM4ZjI=
+    ZjgxYThhYjcxM2E2OTE5ZTJmNjk2NGYyZmQ4ZWNlYWQ2OTAxN2RmN2ZmNjBl
+    OTg1NWEzZWVkYzhiODNlMTg2NzEwYWQ4MjNhZjg5MjYwZWZiMzEwNGY5OWQ3
+    ZjUyZTExNDVhNGVkZmE5YWM1OTFlNGVmOGFmMzJhZGFhZmU0OGE=
   data.tar.gz: !binary |-
-    ODhiMjg0Njk1Y2UzMzk2NWY3MDRiMTA5Yzc5MmZmNzkzODQ4ZTIyYzA2YTI4
-    ZGY0MGE4NGNkNjFlMTQ3MzZmZTQyY2YyYjNjNDc3N2I3YjQwYTBjOWRhYmVl
-    NGU0YWMwMjgyNzQxNjNmYzJmODM0Y2Y1NDQ5MGEwMTYwYWU2YTA=
+    ODNmN2M4ODgzZWVmNWM2NGZhYjhlMWIxMDk5NzAyNTlhMTU3N2QyOTZkM2Q2
+    Zjg3MjBiMDZkYzc1MTUyY2RjYjVkMmEwMjc0M2E3YTNiNmEwZTI1YzE3OTRi
+    ZjRlNDQxYjVhMWMzZjg3OGVhMzM0MTAxNzY5YTNjMDhjOTUyMTQ=

data/CHANGELOG.md

@@ -1,9 +1,19 @@
 # Changelog
 
+## Ginjo-Rfm 3.0.4
+
+* Corrected reference to @meta in fmpxmllayout.yml. Specs now passing for Layout#load\_layout.
+* Added error checking to Layout#load\_layout.
+* Fixed setting/saving of repeating fields. Added spec to verify.
+* Fixed rspec rake task, fixed rake spec\_multi.
+* Changed Ox default parse option to not encode special characters. This is now in tune with other parsers' defaults.
+  This fixes (among other things) URLs returned from container fields.
+* Fixed error in gemspec preventing sax templates from being included in gem build.
+
 ## Ginjo-Rfm 3.0.0
 
 * Disabled default port in Connection (was 80), as it was tripping up connections where the port wasn't specified for a :use\_ssl connection on older Rubies.
-* Enabled :ignore\_portals option.
+* Fixes to :ignore\_portals option.
 * Removed runtime dependency on activesupport from gemspec.
 * Added check in Field#coerce to make sure a '?' is in a string before splitting on '?'. This was breaking repeating container fields.
 * Fixed case mismatch in hash key in Factory classes. Added logging of parsing template to logging of parsing backend.
@@ -17,8 +27,6 @@
 * Refined multiple :use handling in Config.
 * Using rspec 2
 * Removed SubLayout.
-* Added field-mapping awareness to :sort\_field query option.
-*	Relaxed requirement that query option keys be symbols - can now be strings.
 * Record.new now automatically creats models based on layout name. Should there be an option to disable this?
 * Removed ActiveSupport requirement (of course, ActiveSupport will load if ActiveModle is used, but that is the users' choice).
 * Removed XmlMini, XmlParser, and related code & specs.
@@ -34,6 +42,11 @@
 * Added connection.rb and moved some methods from Server to Connection.
 * Sax parsing rewrite.
 
+## Ginjo-Rfm 2.1.7
+
+* Added field\_mapping awareness to :sort\_field query option.
+* Relaxed requirement that query option keys be symbols - can now be strings.
+
 ## Ginjo-Rfm 2.1.6
 
 * Fixed typo in Rfm::Record#[]=
@@ -65,9 +78,9 @@
 
 ## Ginjo-Rfm 2.1.0
 
-* Removed `:include\_portals` query option in favor of `:ignore\_portals`.
+* Removed `:include_portals` query option in favor of `:ignore_portals`.
 
-* Added `:max\_portal\_rows` query option.
+* Added `:max_portal_rows` query option.
 
 * Added field-remapping framework to allow model fields with different names than Filemaker fields.
 
@@ -192,7 +205,7 @@
 
 	Example:  
   
-	    result = fm\_server('layout').find({:username => "==#{username}"}, {:include\_portals => true})
+	    result = fm_server('layout').find({:username => "==#{username}"}, {:include_portals => true})
 	    # => This will fetch all records with portal records attached.
   
 	    result.first.portals

data/lib/rfm/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.4

data/lib/rfm/layout.rb

@@ -303,10 +303,22 @@ module Rfm
       prms = params.merge(extra_params)
       map = field_mapping.invert
       options.merge!({:field_mapping => map}) if map && !map.empty?
-      # TODO: Make this part handle string AND symbol keys.
+      # TODO: Make this part handle string AND symbol keys. (isn't this already done?)
       #map.each{|k,v| prms[k]=prms.delete(v) if prms[v]}
-      prms.dup.each_key{|k| prms[map[k.to_s]]=prms.delete(k) if map[k.to_s]}
-
+      
+      #prms.dup.each_key{|k| prms[map[k.to_s]]=prms.delete(k) if map[k.to_s]}
+      prms.dup.each_key do |k|
+      	new_key = map[k.to_s] || k
+      	if prms[new_key].is_a? Array
+					prms[new_key].each_with_index do |v, i|
+	      		prms["#{new_key}(#{i+1})"]=v
+      		end
+      		prms.delete new_key
+      	else
+	      	prms[new_key]=prms.delete(k) if new_key != k
+      	end
+      end
+			
 			#c = Connection.new(action, prms, options, state.merge(:parent=>self))
 			c = Connection.new(action, prms, options, self)
 			rslt = c.parse(template || :fmresultset, Rfm::Resultset.new(self, self))
@@ -374,14 +386,24 @@ module Rfm
   	###  Utility  ###
     
     def load_layout
-    	@loaded = true # This is first so parsing call to 'meta' wont cause infinite loop.
+    	#@loaded = true # This is first so parsing call to 'meta' wont cause infinite loop,
+    	# but I changed parsing template to refer directly to inst var instead of accessor method.
       connection = Connection.new('-view', {'-db' => state[:database], '-lay' => name}, {:grammar=>'FMPXMLLAYOUT'}, self)
-      rslt = connection.parse(:fmpxmllayout, self)
-      #puts ["LAYOUT#load_layout result", rslt.class].join(', ')
-			# @loaded = true
+      begin
+	      connection.parse(:fmpxmllayout, self)
+	      @loaded = true
+	    rescue
+	    	@meta.clear
+	    	raise $!
+	    end
 			@meta
     end
     
+    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)
+    end
+    
 		def field_mapping
 			@field_mapping ||= load_field_mapping(state[:field_mapping])
 		end
@@ -417,7 +439,7 @@ module Rfm
   	end
 				
     
-  	private :load_layout, :get_records, :params
+  	private :load_layout, :get_records, :params, :check_for_errors
       
       
   end # Layout

data/lib/rfm/utilities/sax/fmpxmllayout.yml

@@ -14,8 +14,7 @@ elements:
   attach: none
 - name: errorcode
   attach: none
-  # TODO: Build check_for_errors method in Layout class.
-  #before_close: 'check_for_errors'
+  before_close: 'check_for_errors'
   attributes:
   - name: text
     as_name: error
@@ -29,7 +28,9 @@ elements:
   - name: NAME
     as_name: name
 - name: field
-  handler: [object.meta, handle_new_field_control, _attributes]
+  # Used to be 'object.meta', but that required sloppy 'loaded' indicator handling (or infinite loop),
+  # so now just referring to raw inst var @meta, instead of method .meta.
+  handler: [object.instance_variable_get('@meta'), handle_new_field_control, _attributes]
   attach_attributes: private
   elements:
   - name: style

data/lib/rfm/utilities/sax_parser.rb

@@ -711,10 +711,11 @@ module Rfm
 			  include Handler
 			
 			  def run_parser(io)
+			  	options={:convert_special=>true}
 					case
-					when (io.is_a?(File) or io.is_a?(StringIO)); Ox.sax_parse self, io
-					when io.to_s[/^</]; StringIO.open(io){|f| Ox.sax_parse self, f}
-					else File.open(io){|f| Ox.sax_parse self, f}
+					when (io.is_a?(File) or io.is_a?(StringIO)); Ox.sax_parse self, io, options
+					when io.to_s[/^</]; StringIO.open(io){|f| Ox.sax_parse self, f, options}
+					else File.open(io){|f| Ox.sax_parse self, f, options}
 					end
 				end
 				

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ginjo-rfm
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.4
 platform: ruby
 authors:
 - Geoff Coffey
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -112,6 +112,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement