dm-filemaker-adapter 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDE2YzRlM2E5YjU3NzFjYjAyZjM2NGVhMzE4YjExM2U4MjVmOGI2NA==
+    ZDRmNWUzZGU0Mzk5MGU5OTYwMmUxMGQ0ODdhZGViYTEwYTI1OWIwYQ==
   data.tar.gz: !binary |-
-    ZTkzMmU3MmM2MmVlNmVkYmI2N2RiOTUwYzc5MDNlZWIyZTY5N2VlNg==
+    ZTk4ZWM3ODc2MmRlYmIxOWJjZmFiZGYxMzUwNTk1OTYyODdiYzMyZA==
 SHA512:
   metadata.gz: !binary |-
-    ZmMzZDIyNTgyZTZlYmQwZGU3M2U2YTg2MzcxMGFhMzRkODM0MzhiZDRhMjEz
-    NzZkYmExZjEzNTAwNmE2ZDk4Y2YwMzNjZWMyYTJhMzAzNjg0NTljOTM0YTYz
-    ZDgzMjczZWExYTk4NmFmNTlkYzZlMjZmMmE4MDU5NTMzZWNkYjk=
+    MWVhYmQ3MjYwZmMxMzdiNTBhZGE1ODEwODVkOGMzM2Q0Y2FlMzRiODA5ZjBh
+    ZDBhMDVmZTIzODYwOTQ5YjFlMzIwNjc4ZDBhZjA4YjEwNTkzYTFjNzFhOTg0
+    N2VlNDRhZDlkMDkxYjk0OTA1NTUzMjFlZDBhNGQ2MGFiNzM0YTI=
   data.tar.gz: !binary |-
-    MTg2MDViODIyNTU4NzRiZGUxOTkzZWRlYjFkODcxYjhlMzVlYzZjMGU4NzJk
-    N2E4NWYxYWQ2NmRiMjQ4N2ZlMjlhNmNkOWM2ZTFiNDI5NjkyN2ViZWU5OTg5
-    Y2NmY2JiODY3NWM0ZmI4NDFkYjRlMWUxMTBjM2JjM2ExYTkzNzA=
+    NWI3ZTBmZTdiM2UwMTJlZmRlZDNlYThlYzEzMTA4MWY1MzRmM2U2ZGIwNzM2
+    NjY3MzRhZmMwZmU2YTU0Yzk1ODE3N2Q3OTJhODMyOTQ1OGZhNGQyYTdmZTU3
+    M2UyMmNhYTllZThjYzExMTI3NmM1ODM1OWNiZjUyNGVlNDY2ODE=

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 gemspec
 
 # Only enable this if you are testing against a local copy of ginjo-rfm.
-gem 'ginjo-rfm', :path=>'../GinjoRfm.git/'
+# gem 'ginjo-rfm', :path=>'../GinjoRfm.git/'

data/dm-filemaker-adapter.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   
   spec.add_dependency "data_mapper"
-  spec.add_dependency "ginjo-rfm"
+  spec.add_dependency "ginjo-rfm", '~> 3.0'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dm-filemaker-adapter/adapter.rb

@@ -6,6 +6,7 @@ module DataMapper
   
     class FilemakerAdapter < AbstractAdapter
       VERSION = DataMapper::FilemakerAdapter::VERSION
+      
       FMRESULTSET_TEMPLATE = {:template => File.expand_path('../dm-fmresultset.yml', __FILE__)}
 
 
@@ -228,10 +229,6 @@ module DataMapper
         def layout
           @layout ||= Rfm.layout(storage_name, repository.adapter.options.merge(FMRESULTSET_TEMPLATE).symbolize_keys)
         end
-        
-        # Not how to do this. Doesn't work anywhere I've tried it:
-				#extend Forwardable
-				#def_delegators :layout, *layout.class.instance_methods.select {|m| m.to_s[/^[a-z]/]}
       end
       
       # Instance methods included in model.

data/lib/dm-filemaker-adapter/core_patches.rb

@@ -139,6 +139,20 @@ module DataMapper
 end # DataMapper
 
 module Rfm
+
+	# Monkey patch for Rfm <= v3.0.8. (Rfm v1 or v2 will not work for DM)
+	if (Rfm::VERSION.major.to_i == 3 and Rfm::VERSION.minor.to_i < 1 and Rfm::VERSION.patch.to_i < 9)
+		Rfm::Connection.class_eval do
+			Rfm::SaxParser::TEMPLATE_PREFIX.replace ''
+			alias_method :parse_original, :parse
+			def parse(*args)
+				args[0] = DataMapper::Adapters::FilemakerAdapter::FMRESULTSET_TEMPLATE[:template]
+				parse_original(*args)
+			end
+		end
+	end
+
+
 	class Resultset
 	  
 	  # Does custom processing during each record-to-resource translation done in DataMapper::Model#load
@@ -152,27 +166,30 @@ module Rfm
 					#puts "MODEL#LOAD custom processing RECORD #{record.class} RESOURCE #{resource.class}"
 					#puts record.inspect
 	        # For Testing:
-	        #resource.instance_variable_set(:@record, record)
+	        resource.instance_variable_set(:@record, record)
 	        # WBR - Loads portal data into DM model attached to this resource.
 	        portals = record.instance_variable_get(:@portals)
-	        #puts "MODEL#LOAD record #{record.class} portals #{portals.keys rescue 'no portals'}"
+	        #puts "MODEL#LOAD record: #{record.class} portals: #{portals.keys rescue 'no portals'}"
 	        #if record.respond_to?(:portals) && record.portals.kind_of?(Hash) && record.portals.any?
 	        model = resource.class
+	        return unless model.kind_of?(DataMapper::Model)
+	        #puts "MODEL#LOAD resource class: #{model}"
 	        if portals.kind_of?(Hash) && portals.any?
 	          begin
-	          #puts record.portals.to_yaml
-	          portal_keys = portals.keys
-	          #puts "PORTALS: #{portal_keys}"
-	          portal_keys.each do |portal_key|
-	          	#relat = model.relationships.to_a.find{|r| storage_name = r.child_model.storage_names[:default]; portal_key.to_s == storage_name }
-	          	relat = model.relationships.to_a.find{|r| storage_name = r.child_model.storage_name; portal_key.to_s == storage_name }
-	          	if relat
-		          	#puts "BUILDING RELATIONSHIP FROM PORTAL: #{relat.name} #{relat.child_model.name}"
-		          	resource.instance_variable_set(relat.instance_variable_name, relat.child_model.load(record.instance_variable_get(:@portals)[portal_key], relat.child_model.query) )
-	          	end
-	          end
+		          #puts record.portals.to_yaml
+		          portal_keys = portals.keys
+		          #puts "PORTALS: #{portal_keys}"
+		          portal_keys.each do |portal_key|
+		          	#relat = model.relationships.to_a.find{|r| storage_name = r.child_model.storage_names[:default]; portal_key.to_s == storage_name }
+		          	relat = model.relationships.to_a.find{|r| storage_name = r.child_model.storage_name; portal_key.to_s == storage_name }
+		          	if relat
+			          	#puts "BUILDING RELATIONSHIP FROM PORTAL: #{relat.name} #{relat.child_model.name}"
+			          	resources_from_portal = relat.child_model.load(record.instance_variable_get(:@portals)[portal_key], relat.child_model.query)
+			          	resource.instance_variable_set(relat.instance_variable_name, resources_from_portal)
+		          	end
+		          end
 	          rescue
-	            puts "ERROR LOADING PORTALS #{$!}"
+	            #puts "ERROR LOADING PORTALS #{$!}"
 	          end
 	        end
 					resource.instance_variable_set(:@_record_id, record.instance_variable_get(:@record_id))

data/lib/dm-filemaker-adapter/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
 	module FilemakerAdapter
-	  VERSION = "0.0.4"
+	  VERSION = "0.0.5"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm-filemaker-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - William Richardson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_mapper
@@ -28,16 +28,16 @@ dependencies:
   name: ginjo-rfm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement