filemaker 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e51cec7f5db8072eb5c0b218ed4d521641f56b14
-  data.tar.gz: 7d2603cea09ae2a110ae121e6d593508d5363ea3
+  metadata.gz: b2df8ff23dfbe366d62b061a11f6df38bb57d77c
+  data.tar.gz: 92524e645975cd4e6bd65186eb596789033bda7e
 SHA512:
-  metadata.gz: 27613622cc49cbdc5c799d8ded00bbdd171f5a424d12213a16e957c24ee8dd36a8c5cc941a2ccbc61614751498b2540c6da466655295c1798b949db89c7c68f6
-  data.tar.gz: 4bba2a963de990cd2a72b718238b29b18584068d9e185ac972638bd4a9733449eb8a46b581679acbda2850950c2bf72a9d2665153ce4eadd35889c163b6b51a4
+  metadata.gz: 5d3d539088833432a862aa56e010c568f0ee20085fbde57266eeccd5d59159bc6bad112bea84cf118801be03fee28bd5eff0566a88257e03c9954fd0ca7168be
+  data.tar.gz: 87fb6a1df1e0c6c9779a45d2b7ef8d5f950f1c32d98c228a80bc69375e163cf13824e4458ad141538c08d9f554ecce3a08235a82414784707e62d6798ee3cf87

data/lib/filemaker/model/builder.rb

@@ -9,32 +9,13 @@ module Filemaker
         models = []
 
         resultset.each do |record|
-          object = klass.new
-
-          object.instance_variable_set('@new_record', false)
-          object.instance_variable_set('@record_id', record.record_id)
-          object.instance_variable_set('@mod_id', record.mod_id)
-          object.instance_variable_set('@portals', record.portals)
-
-          record.keys.each do |fm_field_name|
-            # record.keys are all lowercase
-            field = klass.find_field_by_name(fm_field_name)
-            next unless field
-
-            # Because we are using ActiveModel::Dirty, so we hydrate directly.
-            object.attributes[field.name] = field.coerce(record[fm_field_name])
-          end
-
-          models << object
+          models << build(record, klass.new)
         end
 
         models
       end
 
-      def single(resultset, klass)
-        record = resultset.first
-        object = klass.new
-
+      def build(record, object)
         object.instance_variable_set('@new_record', false)
         object.instance_variable_set('@record_id', record.record_id)
         object.instance_variable_set('@mod_id', record.mod_id)
@@ -42,10 +23,10 @@ module Filemaker
 
         record.keys.each do |fm_field_name|
           # record.keys are all lowercase
-          field = klass.find_field_by_name(fm_field_name)
+          field = object.class.find_field_by_name(fm_field_name)
           next unless field
 
-          object.public_send("#{field.name}=", record[fm_field_name])
+          object.attributes[field.name] = field.coerce(record[fm_field_name])
         end
 
         object

data/lib/filemaker/model/persistable.rb

@@ -91,20 +91,7 @@ module Filemaker
 
       # If you have calculated field from FileMaker, it will be replaced.
       def replace_new_data(resultset)
-        record = resultset.first
-
-        @new_record = false
-        @record_id = record.record_id
-        @mod_id = record.mod_id
-
-        record.keys.each do |fm_field_name|
-          # record.keys are all lowercase
-          field = self.class.find_field_by_name(fm_field_name)
-          next unless field
-
-          # Because we are using ActiveModel::Dirty, so we hydrate directly.
-          attributes[field.name] = field.coerce(record[fm_field_name])
-        end
+        FileMaker::Model::Builder.build(resultset.first, self)
       end
     end
   end

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

@@ -21,6 +21,10 @@ module Filemaker
           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
         end

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

@@ -70,6 +70,10 @@ module Filemaker
           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
         end

data/lib/filemaker/version.rb

@@ -1,3 +1,3 @@
 module Filemaker
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/spec/filemaker/model/builder_spec.rb

@@ -0,0 +1,43 @@
+describe Filemaker::Model::Builder do
+
+  let(:model) { Job }
+  let(:server) { Object.new }
+  let(:xml) { import_xml_as_string('jobs.xml') }
+  let(:resultset) { Filemaker::Resultset.new(server, xml) }
+
+  context '.build' do
+
+    let(:subject) {
+      Filemaker::Model::Builder.build(resultset.first, model.new)
+    }
+
+    it 'has portals' do
+      expect(subject.portals.keys).to eq([])
+    end
+
+    it 'has a status' do
+      expect(subject.status).to eq("open")
+    end
+    
+    it 'has an jdid' do
+      expect(subject.jdid).to eq("JID1122")
+    end
+    
+    it 'has a modify_date' do
+      expect(subject.modify_date).to eq(Date.parse('2014-08-12'))
+    end
+  end
+
+  context '.collection' do
+
+    let(:subject) { 
+      Filemaker::Model::Builder.collection(resultset, model)
+    }
+
+    it 'is an array of Jobs' do
+      subject.each do |job|
+        expect(job.class).to be(model)
+      end
+    end
+  end
+end

data/spec/support/models.rb

@@ -18,6 +18,18 @@ class Post
   string :candidate_id, :email
 end
 
+class Job
+  include Filemaker::Model
+
+  database :jobs
+  layout   :jobs
+
+  string :status
+  string :jdid, fm_name: 'JDID'
+  date   :modify_date, fm_name: 'modify date'
+
+end
+
 class MyModel
   include Filemaker::Model
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filemaker
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - mech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -203,6 +203,7 @@ files:
 - spec/filemaker/error_spec.rb
 - spec/filemaker/layout_spec.rb
 - spec/filemaker/metadata/field_spec.rb
+- spec/filemaker/model/builder_spec.rb
 - spec/filemaker/model/criteria_spec.rb
 - spec/filemaker/model/relations_spec.rb
 - spec/filemaker/model_spec.rb
@@ -242,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper to FileMaker XML API.
@@ -252,6 +253,7 @@ test_files:
 - spec/filemaker/error_spec.rb
 - spec/filemaker/layout_spec.rb
 - spec/filemaker/metadata/field_spec.rb
+- spec/filemaker/model/builder_spec.rb
 - spec/filemaker/model/criteria_spec.rb
 - spec/filemaker/model/relations_spec.rb
 - spec/filemaker/model_spec.rb