filemaker 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87a4555ad4c5f09c28a044bb5b688fbdc527c374
-  data.tar.gz: f2cff3d87e7644b6a6bfd4390fc5f55216aa410b
+  metadata.gz: 74815c22be9b4664b3517a86e75cc15ee1dc6ac5
+  data.tar.gz: 1671c6d8d7ff017642b03f3acac0883ef34f6082
 SHA512:
-  metadata.gz: b0872f4b1248bcad5ada6c5ce699387d144f3d495b354c8afbf0b145f66534b27c84d6e1a5b136c0e47a10d30cd18fd3eed5bd4f7ea102b71b6dba423d2834cb
-  data.tar.gz: 805aea2ce462c4aa61648136adbcd6a7ba50151cddc9d408bfcba3d4ae3523350c2f14e1d24e3f6e38d03e3cd9b9e6a5ce3cd801e6a5aa11a06907025ab38661
+  metadata.gz: 7b7308d7c3d585c5344d33686f85924e94562ff7331cd8b6a7fc16a0c2878f18980483b75e74818a2b2e99e65754d6ccc06197096c2fa38f9e0384b306edf545
+  data.tar.gz: cfcb4506718f4889b58f2fe5da37d5554ed178ed13a51456b4dbfe1b8eeb36340647733ec54e0810b0ff68325c8b8828531646e27e04b5683b7ccdd048b93ea0

data/lib/filemaker/model/relations/belongs_to.rb

@@ -13,20 +13,34 @@ module Filemaker
           options.fetch(:reference_key) { "#{@name}_id" }
         end
 
+        def source_key
+          options.fetch(:source_key) { nil }
+        end
+
+        def reference_value
+          owner.public_send(reference_key.to_sym)
+        end
+
+        # Order: source_key first, reference_key next, then identity
+        # all must be findable using `to find_field_by_name`
+        def final_reference_key
+          target_class.find_field_by_name(source_key).try(:name) ||
+          target_class.find_field_by_name(reference_key).try(:name) ||
+          target_class.identity.try(:name)
+        end
+
         protected
 
+        # Single `=` match whole word or (match empty)
+        # Double `==` match entire field
+        # If the field value contains underscore or space like 'FM_notified'
+        # or 'FM notified', a single `=` may not match correctly.
         def build_target
-          key_value = owner.public_send(reference_key.to_sym)
-
-          if key_value.blank?
-            @target = nil
-          else
-            # Single `=` match whole word or (match empty)
-            # Double `==` match entire field
-            # If the field value contains underscore or space like 'FM_notified'
-            # or 'FM notified', a single `=` may not match correctly.
-            @target = target_class.where(reference_key => "=#{key_value}").first
-          end
+          @target = nil if reference_value.blank? || final_reference_key.blank?
+
+          @target = target_class.where(
+            final_reference_key => "=#{reference_value}"
+          ).first
         end
       end
     end

data/lib/filemaker/model/relations/has_many.rb

@@ -15,6 +15,20 @@ module Filemaker
           options.fetch(:reference_key) { owner.identity.name }
         end
 
+        def reference_value
+          owner.public_send(reference_key.to_sym)
+        end
+
+        def source_key
+          options.fetch(:source_key) { nil }
+        end
+
+        def final_reference_key
+          target_class.find_field_by_name(source_key).try(:name) ||
+          target_class.find_field_by_name(reference_key).try(:name) ||
+          target_class.identity.try(:name)
+        end
+
         # Append a model or array of models to the relation. Will set the owner
         # ID to the children.
         #
@@ -67,17 +81,11 @@ module Filemaker
         protected
 
         def build_target
-          key_value = owner.public_send(reference_key.to_sym)
+          @target = [] if reference_value.blank? || final_reference_key.blank?
 
-          if key_value.blank?
-            @target = nil # Or should we return empty array?
-          else
-            # Single `=` match whole word or (match empty)
-            # Double `==` match entire field
-            # If the field value contains underscore or space like 'FM_notified'
-            # or 'FM notified', a single `=` may not match correctly.
-            @target = target_class.where(reference_key => "=#{key_value}")
-          end
+          @target = target_class.where(
+            final_reference_key => "=#{reference_value}"
+          )
         end
       end
     end

data/lib/filemaker/version.rb

@@ -1,3 +1,3 @@
 module Filemaker
-  VERSION = '0.0.15'.freeze
+  VERSION = '0.0.16'.freeze
 end

data/spec/filemaker/model/relations_spec.rb

@@ -1,5 +1,5 @@
 describe Filemaker::Model::Relations do
-  it 'every model has a relations hash' do
+  it 'every model has a relations hash to store associations' do
     expect(MyModel.new.relations).to eq({})
   end
 
@@ -8,16 +8,22 @@ describe Filemaker::Model::Relations do
       before do
         @model = MyModel.new(candidate_id: '123')
         allow(Candidate).to receive(:where).and_return([Candidate.new])
+        allow(Member).to receive(:where).and_return([Member.new])
       end
 
       it 'appends _id to missing reference_key' do
         expect(@model.candidate.reference_key).to eq 'candidate_id'
+        expect(@model.candidate.final_reference_key).to eq 'candidate_id'
       end
 
       it 'target class should be Candidate' do
         expect(@model.candidate.target_class).to eq Candidate
       end
 
+      it 'reference_value is 123' do
+        expect(@model.candidate.reference_value).to eq '123'
+      end
+
       it 'owner belongs to MyModel' do
         expect(@model.candidate.owner).to eq @model
       end
@@ -27,6 +33,11 @@ describe Filemaker::Model::Relations do
         expect(@model.relations.fetch('candidate')).to eq \
           @model.candidate.target
       end
+
+      it 'uses identity for missing reference_key' do
+        expect(@model.member.reference_key).to eq 'member_id'
+        expect(@model.member.final_reference_key).to eq 'id'
+      end
     end
 
     context 'when using supplied reference_key' do
@@ -41,6 +52,30 @@ describe Filemaker::Model::Relations do
 
       it 'will use the supplied reference_key' do
         expect(@model.applicant.reference_key).to eq :name
+        expect(@model.applicant.final_reference_key).to eq 'name'
+      end
+
+      it 'reference_value is ABC' do
+        expect(@model.applicant.reference_value).to eq 'ABC'
+      end
+    end
+
+    context 'when using source key' do
+      before do
+        @model = MyModel.new(manager_id: 'MG1')
+        allow(Manager).to receive(:where).and_return([Manager.new])
+      end
+
+      it 'will use manager_id as final_reference_key' do
+        expect(@model.manager.final_reference_key).to eq 'mg_id'
+      end
+
+      it 'reference_key is still manager_id' do
+        expect(@model.manager.reference_key).to eq 'manager_id'
+      end
+
+      it 'another_manager has different reference_key' do
+        expect(@model.another_manager.reference_key).to eq :candidate_id
       end
     end
   end
@@ -53,6 +88,7 @@ describe Filemaker::Model::Relations do
     context 'when using default reference_key' do
       it 'will use owner identity name' do
         expect(@model.posts.reference_key).to eq 'candidate_id'
+        expect(@model.posts.final_reference_key).to eq 'candidate_id'
       end
 
       it 'target class should be Post' do
@@ -75,6 +111,22 @@ describe Filemaker::Model::Relations do
 
       it 'will use the supplied reference_key' do
         expect(@model.posters.reference_key).to eq :email
+        expect(@model.posters.final_reference_key).to eq 'email'
+      end
+    end
+
+    context 'when using source key' do
+      before do
+        @model = Project.new
+      end
+
+      it 'will use id as reference_key' do
+        expect(@model.project_members.reference_key).to eq :id
+      end
+
+      it 'will use project_id as source_key' do
+        expect(@model.project_members.source_key).to eq :project_id
+        expect(@model.project_members.final_reference_key).to eq 'project_id'
       end
     end
   end

data/spec/filemaker/model_spec.rb

@@ -37,6 +37,8 @@ describe Filemaker::Model do
         'name',
         'email',
         'ca id',
+        'member_id',
+        'manager_id',
         'created_at',
         'modifieddate',
         'salary',

data/spec/support/models.rb

@@ -6,10 +6,15 @@ end
 
 class Candidate
   include Filemaker::Model
+
+  string :candidate_id
 end
 
 class User
   include Filemaker::Model
+
+  string :name
+  string :email
 end
 
 class Post
@@ -29,6 +34,19 @@ class Job
   date   :modify_date, fm_name: 'modify date'
 end
 
+class Member
+  include Filemaker::Model
+
+  string :id, identity: true
+end
+
+class Manager
+  include Filemaker::Model
+
+  string :id, identity: true
+  string :mg_id
+end
+
 class MyModel
   include Filemaker::Model
 
@@ -37,13 +55,33 @@ class MyModel
 
   belongs_to :candidate
   belongs_to :applicant, class_name: User, reference_key: :name
+  belongs_to :member
+  belongs_to :manager, source_key: :mg_id
+  belongs_to :another_manager, class_name: Manager, source_key: :mg_id, reference_key: :candidate_id
   has_many :posts
   has_many :posters, class_name: User, reference_key: :email
 
   string :name, :email, default: 'UNTITLED'
   string :candidate_id, fm_name: 'CA ID', identity: true
+  string :member_id
+  string :manager_id
   date :created_at
   datetime :updated_at, fm_name: 'ModifiedDate'
   money :salary
   integer :age, fm_name: 'passage of time'
 end
+
+class Project
+  include Filemaker::Model
+
+  string :id, identity: true
+
+  has_many :project_members, source_key: :project_id, reference_key: :id
+end
+
+class ProjectMember
+  include Filemaker::Model
+
+  string :member_id
+  string :project_id
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filemaker
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - mech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -273,3 +273,4 @@ test_files:
 - spec/support/responses/portal.xml
 - spec/support/responses/scriptnames.xml
 - spec/support/xml_loader.rb
+has_rdoc: