dm-filemaker-adapter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzA1ZDIzZGI0NWJkMDFmNjIyM2Q2NGMwMTQxZWM3MGMwYWU2ZDM0Mg==
+    ZjdlOGM0ZWYwNzU2MzhjZGQ3Y2U3NWZkMDY4ZDdlZTQ4NGMwOTc5MA==
   data.tar.gz: !binary |-
-    M2M4OWE4Nzc1NmMyYTViNmI1NzAwZTFmNDlkNDUyZGY3MDAxMGJkOQ==
+    NmVhZmNlOWYxNGJmOWNhNDA2NmZjODRlNTZjMmI1MTRkYTZkYmU4OA==
 SHA512:
   metadata.gz: !binary |-
-    Y2RmYTdjNjg2YzgwNTFkYzc1ODUyMTAyOThkMzc1ZDIwYTk0ZDA1ZTI1ZDhi
-    ZDRhODFhMjNlNzJhOGNjOTM0YmNkNmQyZjczYzdhMWU0NmVlNjcyM2Y4OTgz
-    NjQ1MDI1M2U1NDZkNzY5NmMxYzkzNDJjYTk4NTg4MGQ2YTFmYmQ=
+    YWI5ZGRmN2FjNWRhMmY1ZTcwMzBmNmJhYjllNjlhZWE1NDFkZWNlYmFlY2Iw
+    OGZlMDMzZjYwZmRiMTVmNjY1MTVjMjhlYzlkNjYzZTUwMGM2OWYwNDVmYmU0
+    ZmNkNDI2NWNkN2Y5MDE0MjEzMWUwMTBlNTg2OGY3NmRjYWVjMTU=
   data.tar.gz: !binary |-
-    YWI2ZjRhM2Q5MmYzOTdhOWM3NmNjNjM3ZDJlNzU1OGY4ZDZhYjQ2ZGMyNWM1
-    NjBlZGJkOWJmNDA1N2NlYTI0OGQ0M2FmODgzZGNjNGI4NTQ4MzVhN2IxYmQw
-    OTRmNjhkNzMyMmVmODFjZTI2NTFmODI1OGFiOTgyNmIwMDVlMjU=
+    MWYwMGEzMGZkMzQ3NmQ2NmNiYTE5YWY0ZGQ1YmEwNzJhODEyMmVjYTExZWVl
+    N2MyZmE1N2VhOTg3NjhmOTE4MDVhMWRmZDZlNmEzODkyYzA4NGYxZGI4NmYx
+    OTYyODIwNzc0NmNiMDc4YzMxZjY5MDJiYmJhMjI1NTQ3ODNlYjE=

data/.gitignore

@@ -16,4 +16,5 @@ mkmf.log
 todo.txt
 .DS_Store
 
-.travis.yml
+.travis.yml
+*local_testing

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

@@ -78,7 +78,7 @@ module DataMapper
         _layout = layout(query.model)
         opts = query.fmp_options
         opts[:template] = self.class.fmresultset_template_path
-        prms = fmp_query(query.conditions)
+        prms = query.to_fmp_query
         #[prms.empty? ? _layout.all(:max_records=>0).foundset_count : _layout.count(prms)]
         [prms.empty? ? _layout.view.total_count : _layout.count(prms)]
       end
@@ -150,9 +150,34 @@ module DataMapper
       	prepend, append = options[:prepend], options[:append]
       	fm_attributes = {}
       	#puts "PREPARE FMP ATTRIBUTES"
+      	#DmProduct.last_query = attributes
+      	#y attributes.operands
+      	
+      	
+      	attributes.dup.each do |key, val|
+      		if key.class.name[/Relationship/]
+      			parent_keys = key.parent_key.to_a   #.collect(){|p| p.name}
+      			child_keys = key.child_key.to_a     #.collect(){|p| p.name}
+      			#puts "RELATIONSHIP PARENT #{key.parent_model_name} #{parent_keys.inspect}"
+      			#puts "RELATIONSHIP CHILD #{key.child_model_name} #{child_keys.inspect}"
+      			#puts "RELATIONSHIP CRITERIA #{val.inspect}"
+      			child_keys.each_with_index do |k, i|
+      				attributes[k] = val[parent_keys[i].name]
+      				attributes.delete key
+      			end
+      		end
+      	end
+      	
+      	# TODO: Handle attributes that have relationship components (major PITA!)
+      	# q.conditions.operands.to_a[0].subject   .parent_key.collect {|p| p.name}
+      	# q.conditions.operands.to_a[0].subject   .child_key.collect {|p| p.name}
+      	# q.conditions.operands.to_a[0].loaded_value[child-key-name]
+      	# new_attributes[child-key-name] = parent-key-value
+      	
+      	#puts "ATTRIBUTES BEFORE attributes_as_fields"
       	#y attributes
       	attributes_as_fields(attributes).each do |key, val|
-      		#puts "EACH ATTRIBUTE class #{val.class}"
+      		#puts "EACH ATTRIBUTE class #{val.class.name}"
       		#puts "EACH ATTRIBUTE value #{val}"
       		new_val = val && [val.is_a?(Fixnum) ? val : val.dup].flatten.inject([]) do |r, v|
       			#puts "INJECTING v"
@@ -169,10 +194,10 @@ module DataMapper
       		#puts new_val
       		fm_attributes[key] = (new_val && new_val.size < 2) ? new_val[0] : new_val
       	end
-      	#puts "FM_ATTRIBUTES"
+      	#puts "FM_ATTRIBUTES OUTPUT"
       	#puts fm_attributes
       	fm_attributes
-      end
+      end # prepare_fmp_attributes
             
       def merge_fmp_response(resource, record)
         resource.model.properties.to_a.each do |property|

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

@@ -1,5 +1,5 @@
 module DataMapper
 	module FilemakerAdapter
-	  VERSION = "0.0.2"
+	  VERSION = "0.0.3"
 	end
 end

data/spec/dm-filemaker-adapter/adapter_spec.rb

@@ -78,7 +78,14 @@ describe DataMapper do
 				end.and_return(Rfm::Resultset.allocate)
 				User.all(:id=>1).inspect
 	  	end
-	  end  
+	  end
+	  
+	  describe '#create' do; it 'does something essential'; end
+	  describe '#update' do; it 'does something essential'; end
+	  describe '#delete' do; it 'does something essential'; end
+	  describe '#layout' do; it 'does something essential'; end
+	  describe '#prepare_fmp_attributes' do; it 'does something essential'; end
+	  describe '#merge_fmp_response' do; it 'does something essential'; end
 	  
 	end # datamapper-adapters-filemaker
 	
@@ -166,7 +173,25 @@ describe DataMapper do
 			
 	  
 	  end	#to_fmp_query
+	  
+	  describe '#fmp_operator' do; it 'does something useful'; end
+	  describe '#fmp_options' do; it 'does something useful'; end
 	
 	end # datamapper-query
 	
+	describe DataMapper::Resource do
+		describe '.included' do
+			it 'Calls original #included method'
+			it 'Extends model with ModelMethods'
+			it 'Includes into model ResourceMethods'
+		end
+	end
+	
+	describe DataMapper::Model do
+		describe '#finalize' do
+			it 'Adds properties for :record_id, :mod_id to model'
+			it 'Calls original #finalize method'
+		end
+	end
+	
 end # datamapper

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm-filemaker-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - William Richardson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_mapper