filemaker 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a615cb1d8f876ee6841c8fea702bd31bac1e391
-  data.tar.gz: 7c0a7f2c0107d32f4c6bd0a3031c174e4835071a
+  metadata.gz: f3eeb9794e61e3c3cf1f4c2787e3e8705b2f9c6c
+  data.tar.gz: 1f536f8d4222365920815d72276e8074c1f7acdf
 SHA512:
-  metadata.gz: 5cfe35eab3c94329490679ce176cbe331ae5f1683c64b6d851a26123ce5cb81f6acc35f6ce455932d24f993349be2bf8eaed704cb3e45712e5ce5dbf00c8578f
-  data.tar.gz: 8cfa6854b3d2ae38cedef17cce864fd99a19e3ae71e9c739e4162a3d1a361d66fd53c8866b4815e607399acd2edc432a881517ab77ea5df75fd44b0cf6fb0630
+  metadata.gz: 8594e7753236a5dbf6f1f2acd65a49862dbdc1d2350e117cb49e18aac9dbd4baac593a5d22ed92a60735d31a09f2bf2bf7d434f84c1f0a8aedc0e1642921ba57
+  data.tar.gz: eaf53d15fc516d4dfdc240a38c2857fedc6e966f1167b81fa95108ad4598fa9c3f01344ff0767a3ac9880aa647b01b6acb0af4b91bc1cd1de057c4ed3e5c86e6

data/lib/filemaker/metadata/field.rb

@@ -70,9 +70,8 @@ module Filemaker
           value
         end
       rescue
-        warn "Could not coerce #{value}. Return nil instead."
-        nil
-        # raise Filemaker::Error::CoerceError, msg
+        warn "Could not coerce #{name}: #{value}"
+        value
       end
 
       private

data/lib/filemaker/model.rb

@@ -6,7 +6,7 @@ module Filemaker
     include Components
 
     # @return [Boolean] indicates if this is a new fresh record
-    attr_reader :attributes, :new_record, :record_id, :mod_id
+    attr_reader :attributes, :new_record, :record_id, :mod_id, :portals
 
     included do
       class_attribute :db, :lay, :registry_name, :server, :api, :per_page

data/lib/filemaker/model/builder.rb

@@ -14,6 +14,7 @@ module Filemaker
           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
@@ -36,6 +37,7 @@ module Filemaker
         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

data/lib/filemaker/model/persistable.rb

@@ -66,10 +66,12 @@ module Filemaker
       end
       alias_method :delete, :destroy
 
+      # If value is nil, we convert to empty string so it will get pick up by
+      # `fm_attributes`
       def assign_attributes(new_attributes)
         return if new_attributes.blank?
         new_attributes.each_pair do |key, value|
-          public_send("#{key}=", value) if respond_to?("#{key}=")
+          public_send("#{key}=", (value || '')) if respond_to?("#{key}=")
         end
       end
 

data/lib/filemaker/model/relations.rb

@@ -1,5 +1,6 @@
 require 'filemaker/model/relations/belongs_to'
 require 'filemaker/model/relations/has_many'
+require 'filemaker/model/relations/has_portal'
 
 module Filemaker
   module Model
@@ -21,11 +22,19 @@ module Filemaker
         end
 
         def has_portal(name, options = {})
-          Relations::HasPortal.new(self, name, options)
+          relate_portal(Relations::HasPortal, name, options)
         end
 
         protected
 
+        def relate_portal(type, name, options)
+          name = name.to_s
+
+          define_method(name) do
+            type.new(self, name, options)
+          end
+        end
+
         # Get the single model and cache it to `relations`
         def relate_single(type, name, options)
           name = name.to_s

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

@@ -0,0 +1,24 @@
+require 'filemaker/model/relations/proxy'
+
+module Filemaker
+  module Model
+    module Relations
+      class HasPortal < Proxy
+        def initialize(owner, name, options)
+          super(owner, name, options)
+          build_target
+        end
+
+        def table_name
+          options.fetch(:table_name)
+        end
+
+        protected
+
+        def build_target
+          @target = owner.portals[table_name]
+        end
+      end
+    end
+  end
+end

data/lib/filemaker/record.rb

@@ -67,11 +67,11 @@ module Filemaker
         table_name = relatedset['table']
         records    = []
 
+        @portals[table_name] ||= records
+
         relatedset.xpath('record').each do |record|
-          records << self.class.new(record, resultset, table_name)
+          @portals[table_name] << self.class.new(record, resultset, table_name)
         end
-
-        @portals[table_name] = records
       end
     end
 

data/lib/filemaker/resultset.rb

@@ -101,14 +101,15 @@ module Filemaker
         table_name = relatedset.attribute('table').value
         p_fields     = {}
 
+        @portal_fields[table_name] ||= p_fields
+
         relatedset.xpath('field-definition').each do |definition|
           # Right now, I do not want to mess with the field name
           # name = definition['name'].gsub("#{table_name}::", '')
           name = definition['name']
-          p_fields[name] = Metadata::Field.new(definition, self)
+          @portal_fields[table_name][name] = \
+            Metadata::Field.new(definition, self)
         end
-
-        @portal_fields[table_name] = p_fields
       end
     end
 

data/lib/filemaker/version.rb

@@ -1,3 +1,3 @@
 module Filemaker
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/filemaker/record_spec.rb

@@ -44,6 +44,11 @@ describe Filemaker::Record do
     expect(@record.portals[:PORTAL_1]).to eq @record.portals['portal_1']
   end
 
+  it 'has 4 records for PORTAL_2' do
+    expect(@record.portals[:PORTAL_2].size).to eq 4
+    expect(@record.portals[:PORTAL_2][1]['portal_2::expired']).to be_nil
+  end
+
   it 'key access as plain method' do
     expect(@record.portalid).to eq '1234'
   end

data/spec/filemaker/resultset_spec.rb

@@ -54,6 +54,12 @@ describe Filemaker::Resultset do
     it 'has 2 portals' do
       expect(resultset.portal_fields.size).to eq 2
     end
+
+    it 'PORTAL_2 has 2 fields: Expired and Renewed' do
+      expect(resultset.portal_fields['PORTAL_2'].size).to eq 2
+      expect(resultset.portal_fields['PORTAL_2'].keys).to eq \
+        %w(PORTAL_2::Expired PORTAL_2::Renewed)
+    end
   end
 
   describe 'build records' do

data/spec/support/responses/portal.xml

@@ -18,6 +18,9 @@
     <relatedset-definition table="PORTAL_2">
       <field-definition auto-enter="no" four-digit-year="no" global="no" max-repeat="1" name="PORTAL_2::Expired" not-empty="no" numeric-only="no" result="date" time-of-day="no" type="normal"/>
     </relatedset-definition>
+    <relatedset-definition table="PORTAL_2">
+      <field-definition auto-enter="no" four-digit-year="no" global="no" max-repeat="1" name="PORTAL_2::Renewed" not-empty="no" numeric-only="no" result="date" time-of-day="no" type="normal"/>
+    </relatedset-definition>
   </metadata>
   <resultset count="2" fetch-size="2">
     <record mod-id="mod-id-1" record-id="record-id-1">
@@ -61,6 +64,18 @@
           </field>
         </record>
       </relatedset>
+      <relatedset count="2" table="PORTAL_2">
+        <record mod-id="24" record-id="12492">
+          <field name="PORTAL_2::Renewed">
+            <data>10/4/2014</data>
+          </field>
+        </record>
+        <record mod-id="21" record-id="12591">
+          <field name="PORTAL_2::Renewed">
+            <data>12/12/2014</data>
+          </field>
+        </record>
+      </relatedset>
     </record>
     <record mod-id="mod-id-2" record-id="record-id-2">
       <field name="PortalID">
@@ -103,6 +118,18 @@
           </field>
         </record>
       </relatedset>
+      <relatedset count="2" table="PORTAL_2">
+        <record mod-id="24" record-id="12152">
+          <field name="PORTAL_2::Renewed">
+            <data>12/31/2014</data>
+          </field>
+        </record>
+        <record mod-id="21" record-id="12141">
+          <field name="PORTAL_2::Renewed">
+            <data/>
+          </field>
+        </record>
+      </relatedset>
     </record>
   </resultset>
 </fmresultset>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filemaker
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - mech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -183,6 +183,7 @@ files:
 - lib/filemaker/model/relations.rb
 - lib/filemaker/model/relations/belongs_to.rb
 - lib/filemaker/model/relations/has_many.rb
+- lib/filemaker/model/relations/has_portal.rb
 - lib/filemaker/model/relations/proxy.rb
 - lib/filemaker/model/selectable.rb
 - lib/filemaker/railtie.rb