dm-filemaker-adapter 0.0.3 → 0.0.4

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

@@ -24,36 +24,12 @@ require 'spec_helper'
 # end
 
 describe DataMapper do
-	before :each do
-		DataMapper.setup(:default, 'filemaker://user:pass@hostname.com/DatabaseName')
-		class ::User
-			include DataMapper::Resource
-			property :id, Serial
-			property :email, String
-			property :username, String
-			property :activated_at, DateTime
-			
-			has n, :orders
-		end
-		class ::Order
-			include DataMapper::Resource
-			property :id, Serial
-			property :total, Decimal
-			
-			belongs_to :user
-		end
-		DataMapper.finalize
-	end
 
 	describe DataMapper::Adapters::FilemakerAdapter do
 
 	  it 'Has a version number' do
 	    expect(DataMapper::Adapters::FilemakerAdapter::VERSION).not_to be nil
 	  end
-	
-	  it 'Does something useful' do
-	    expect(true).to eq(true)
-	  end
 	  
 	  it 'Supports model classes' do
 	  	expect(User.ancestors.include?(DataMapper::Adapters::FilemakerAdapter::ResourceMethods)).to eq(true)
@@ -78,13 +54,77 @@ describe DataMapper do
 				end.and_return(Rfm::Resultset.allocate)
 				User.all(:id=>1).inspect
 	  	end
+	  	
+	  	# Fix this to work with current relationships (not portals).
+			# it 'returns related datasets?' do
+			# 	# allow(User.layout).to receive(:find).and_return({
+			# 	# 	'users'=>[{'id'=>100, 'email'=>'abc@def.com', 'username'=>'abc', 'activated_at'=>DateTime.now}],
+			# 	# 	'orders'=>[{'user_id'=>100, 'total'=>123, 'id'=>999}]
+			# 	# })
+			# 	allow(User.layout).to receive(:find).and_return([
+			# 		{'id'=>100, 'email'=>'abc@def.com', 'username'=>'abc', 'activated_at'=>DateTime.now, :@orders=>[{'id'=>999, 'user_id'=>100, 'todal'=>123}] }
+			# 	])
+			# 	user = User.get(100)
+			# 	puts "USER"
+			# 	puts user.inspect
+			# 	puts "USER-ORDERS"
+			# 	puts user.instance_variable_get(:@orders).inspect
+			# 	puts user.instance_variables.inspect
+			# 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 '#prepare_fmp_attributes' do
+	  	before(:each) {allow_any_instance_of(Rfm::Layout).to receive(:find).and_return(Rfm::Resultset.allocate)}
+	  	before(:each)	{@original_method = DataMapper.repository.adapter.method(:prepare_fmp_attributes)}  
+	  	
+	  	it 'Converts dm attributes to fmp attributes' do
+	  		expect(DataMapper.repository.adapter).to receive(:prepare_fmp_attributes) do |attributes, *args|
+	  			expect(attributes.keys.first.class).to eq(DataMapper::Property::String)
+	  			expect(@original_method.call(attributes, *args)).to eq({"email"=>"==abc@def.com"})
+	  			{"email"=>"==abc@def.com"}
+	  		end
+	  		User.all(:email=>'abc@def.com').inspect
+	  	end
+	  	
+	  	it 'Converts dm relationship object to fmp attributes' do
+	  		allow(User.layout).to receive(:find).and_return([{'id'=>100, 'email'=>'abc@def.com', 'username'=>'abc', 'activated_at'=>DateTime.now}])
+	  		user = User.get(100)
+	  		expect(DataMapper.repository.adapter).to receive(:prepare_fmp_attributes) do |attributes, *args|
+	  			expect((attributes.keys.first.class.name)[/Relationship/]).to eq('Relationship')
+	  			expect(attributes.keys.first.parent_key.first.class).to eq(DataMapper::Property::Serial)
+	  			#puts 'RAW ATTRIBUTES'
+	  			#puts attributes.class
+	  			#puts attributes.to_yaml
+	  			original_method_result = @original_method.call(attributes, *args)
+	  			expect(original_method_result).to eq({"user_id"=>"==100"})
+	  			#puts "PROCESSED ATTRIBUTES"
+	  			#puts original_method_result.to_yaml
+	  			original_method_result
+	  		end
+	  		
+	  		user_orders = user.orders.inspect
+	  		#puts "USER ORDERS INSPECT"
+	  		#puts user_orders
+	  	end
+	  	
+	  	it 'Applies comparison logic to operand value' do
+	  		expect(DataMapper.repository.adapter).to receive(:prepare_fmp_attributes) do |attributes, *args|
+		  		expect((attributes.keys.first.class.name)[/DateTime/]).to eq('DateTime')
+		  		expect((args.first.values.first)).to eq('>')
+	  			original_method_result = @original_method.call(attributes, *args)
+	  			expect(original_method_result.values.first[0] == '>').to eq(true)
+	  			original_method_result
+	  		end
+	  		User.all(:activated_at.gt=>DateTime.now).inspect
+	  	end
+	  end
+	  
 	  describe '#merge_fmp_response' do; it 'does something essential'; end
 	  
 	end # datamapper-adapters-filemaker
@@ -187,11 +227,44 @@ describe DataMapper do
 		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
+	# This is now obsolete. Redo these specs to handle Model#load monkey-patching.
+	# describe DataMapper::Model do
+	# 	describe '#finalize' do
+	# 		it 'Adds properties for :_record_id, :_mod_id to resource' do
+	# 			allow(User.layout).to receive(:find).and_return([{'id'=>100, 'email'=>'abc@def.com', 'username'=>'abc', 'activated_at'=>DateTime.now}])
+	# 			user = User.get(100)
+	# 			expect(user._record_id).to eq('something')
+	# 			expect(user._mod_id).to eq('something')
+	# 		end
+	# 			
+	# 		it 'Calls original #finalize method'
+	# 	end
+	# end
 	
 end # datamapper
+
+
+describe Rfm::Resultset do
+	describe '#map' do
+		it 'Adds properties for :_record_id, :_mod_id to resource' do
+			expect_any_instance_of(Rfm::Connection).to receive(:http_fetch).and_return(RESULT_SET_WITH_PORTALS)
+			project = Project.first
+			expect(project.instance_variable_get(:@_record_id)).to eq('499')
+			expect(project.instance_variable_get(:@_mod_id)).to eq('86')
+		end
+
+		it 'Adds properties for :_record_id, :_mod_id to nested (portal) resource' do
+			expect_any_instance_of(Rfm::Connection).to receive(:http_fetch).and_return(RESULT_SET_WITH_PORTALS)
+			project = Project.first
+			#puts project.items.inspect
+			#puts Project.instance_variable_get(:@record).inspect
+			expect(project.items[1].instance_variable_get(:@_record_id)).to eq('2470')
+			expect(project.items[1].instance_variable_get(:@_mod_id)).to eq('137')
+		end
+	end
+end
+
+
+
+
+

data/spec/spec_helper.rb

@@ -1,2 +1,61 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'dm-filemaker-adapter'
+
+DB_CONFIG = {
+  adapter:            'filemaker',
+  host:               'my.host.com',
+  account_name:       'developer',
+  password:           '12345',
+  database:           'my_database',
+  ssl:                'true',
+  port:               443,
+  root_cert:          false,
+  log_actions:        false,
+  log_responses:      false,
+  log_parser:         false	  
+}
+
+RESULT_SET_WITH_PORTALS = File.read(File.expand_path('../data/resultset_with_portals.xml', __FILE__)).tap do |dat|
+	dat.define_singleton_method(:body){self}
+end
+
+
+DataMapper.setup(:default, DB_CONFIG)
+
+class User
+	include DataMapper::Resource
+	property :id, Serial
+	property :email, String
+	property :username, String
+	property :activated_at, DateTime
+	
+	has n, :orders
+end
+
+class Order
+	include DataMapper::Resource
+	property :id, Serial
+	property :total, Decimal
+	property :user_id, Integer
+	
+	belongs_to :user
+end
+
+class Project
+	include DataMapper::Resource
+	storage_names[:default] = 'Project Data Entry New'
+	property :id, String, :key=>true, :field=>'ClientPO'
+	
+	has n, :items
+end
+
+class Item
+	include DataMapper::Resource
+	storage_names[:default] = 'projectlineitems'	
+	property :id, String, :key=>true, :field=>'ItemNumber'
+	property :project_id, String
+	
+	belongs_to :project
+end
+
+DataMapper.finalize

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm-filemaker-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - William Richardson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_mapper
@@ -99,6 +99,8 @@ files:
 - lib/dm-filemaker-adapter/core_patches.rb
 - lib/dm-filemaker-adapter/dm-fmresultset.yml
 - lib/dm-filemaker-adapter/version.rb
+- spec/data/resultset_with_duplicate_portals.xml
+- spec/data/resultset_with_portals.xml
 - spec/dm-filemaker-adapter/adapter_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -126,5 +128,7 @@ signing_key:
 specification_version: 4
 summary: Filemaker adapter for DataMapper
 test_files:
+- spec/data/resultset_with_duplicate_portals.xml
+- spec/data/resultset_with_portals.xml
 - spec/dm-filemaker-adapter/adapter_spec.rb
 - spec/spec_helper.rb