filemaker 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e8d2b8704500b90fa6649ad585301c88f94e420bb34f4cd620a1c7c53abe9d
-  data.tar.gz: 65fff04efa068012d5fcc54a1877c50b15434dde10040ad41a146b3889267f77
+  metadata.gz: 760eb94b95fc1aacf25f18cf284780211c18c9fda1beaf4a53a6be49e3fd0aae
+  data.tar.gz: f1525fe3dbfb0697b72fd5d031c64fc93d5d9b0ee50d5d755336ef909344703b
 SHA512:
-  metadata.gz: a858783d95970eca0e7166f84e494a755885b86674c895574b3563fbfee44f4b2fc8c249a20580062c5c649c9bb9b6812230e7e787235ac5fcdaca396b111810
-  data.tar.gz: 4e5b6d9fc0d0ae3bf85ded1daee20c85e4fbac8d657fbfd4ce56231e8d5ac4a49837c8a41a966d2050d0455fbe302688c43c0181df4bd3bf4c700786bbd0f69f
+  metadata.gz: b56eaf97df56cbf2d1ff8b5359128a2251046a55834da211fc163c274b4e294cf713e44f0fd2470cf7306b1b9be05b15d5ceac5df77b201e9ac4c6068d925104
+  data.tar.gz: e0430af65e889355a80085cb8972e79daf665dd8735541e270936e563f27d9c51abd3022df191564305f32ed9b148b7e0d3ea665eeb082e91ed10f70329d5ad4

data/.rubocop.yml

@@ -16,7 +16,7 @@ MethodLength:
   Enabled: false
 
 LineLength:
-  Max: 80
+  Max: 120
 
 SpecialGlobalVars:
   Enabled: false

data/README.md

@@ -1,6 +1,7 @@
 # Filemaker
 
 [![Build Status](https://travis-ci.org/mech/filemaker-ruby.svg?branch=master)](https://travis-ci.org/mech/filemaker-ruby)
+[![security](https://hakiri.io/github/mech/filemaker-ruby/master.svg)](https://hakiri.io/github/mech/filemaker-ruby/master)
 
 A Ruby wrapper to FileMaker XML API.
 
@@ -220,23 +221,24 @@ Model.not(name: 'Bob')
 ```ruby
 # (q0);(q1)
 # (Singapore) OR (Malaysia)
-Model.in(nationality: %w(Singapore Malaysia))
+Model.in(nationality: %w[Singapore Malaysia])
 
 # (q0,q1)
+# (nationality AND age)
 # Essentially the same as:
 # Model.where(nationality: 'Singapore', age: 30)
 Model.in(nationality: 'Singapore', age: 30)
 
 # (q0);(q1);(q2);(q3)
-Model.in({ nationality: %w(Singapore Malaysia) }, { age: [20, 30] })
+Model.in({ nationality: %w[Singapore Malaysia] }, { age: [20, 30] })
 
 # (q0,q2);(q1,q2)
 # (Singapore AND male) OR (Malaysia AND male)
-Model.in(nationality: %w(Singapore Malaysia), gender: 'male')
+Model.in(nationality: %w[Singapore Malaysia], gender: 'male')
 
 # !(q0);!(q1)
 # NOT(Singapore) OR NOT(Malaysia)
-Model.not_in(nationality: %w(Singapore Malaysia))
+Model.not_in(nationality: %w[Singapore Malaysia])
 
 # !(q0,q1)
 Model.not_in(name: 'Lee', age: '< 40')

data/filemaker.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'typhoeus'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.7'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.10.4'
   spec.add_runtime_dependency 'activemodel'
   spec.add_runtime_dependency 'globalid'
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.7'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'pry-byebug'

data/lib/filemaker/model.rb

@@ -41,8 +41,8 @@ module Filemaker
 
     def cache_key
       return "#{model_key}/new" if new_record?
-      return "#{model_key}/#{id}-#{updated_at.to_datetime.utc.to_s(:number)}" \
-        if respond_to?(:updated_at) && send(:updated_at)
+      return "#{model_key}/#{id}-#{updated_at.to_datetime.utc.to_s(:number)}" if respond_to?(:updated_at) && send(:updated_at)
+
       "#{model_key}/#{id}"
     end
 
@@ -59,7 +59,11 @@ module Filemaker
     end
 
     def fm_attributes
-      self.class.with_model_fields(attributes)
+      self.class.with_model_fields_for_query(attributes)
+    end
+
+    def create_attributes
+      self.class.with_model_fields_for_creation(attributes)
     end
 
     def dirty_attributes
@@ -69,7 +73,7 @@ module Filemaker
       end
 
       # We need to use serialize_for_update instead
-      self.class.with_model_fields(dirty, use_query: false)
+      self.class.with_model_fields_for_update(dirty)
     end
 
     private
@@ -129,7 +133,7 @@ module Filemaker
       # is an array. Without the test and expectation setup, debugging the
       # output will take far longer to realise. This reinforce the belief that
       # TDD is in fact a valuable thing to do.
-      def with_model_fields(criterion, use_query: true)
+      def with_model_fields_for_query(criterion)
         accepted_fields = {}
 
         criterion.each_pair do |key, value|
@@ -141,23 +145,61 @@ module Filemaker
 
           # We do not serialize at this point, as we are still in Ruby-land.
           # Filemaker::Server will help us serialize into FileMaker format.
-          if value.is_a? Array
-            temp = []
-            value.each do |v|
-              temp << if use_query
-                        field.serialize_for_query(v)
-                      else
-                        field.serialize_for_update(v)
-                      end
+          if value.is_a?(Array)
+            accepted_fields[field.fm_name] = value.map { |v| field.serialize_for_query(v) }
+          else
+            accepted_fields[field.fm_name] = field.serialize_for_query(value)
+          end
+        end
+
+        accepted_fields
+      end
+
+      def with_model_fields_for_creation(criterion)
+        accepted_fields = {}
+
+        criterion.each_pair do |key, value|
+          field = find_field_by_name(key)
+
+          # Do not process nil value
+          next unless field && value
+
+          # We do not serialize at this point, as we are still in Ruby-land.
+          # Filemaker::Server will help us serialize into FileMaker format.
+          if value.is_a?(Array)
+            field.max_repeat.times do |idx|
+              index = idx + 1
+              repeated_fm_name = "#{field.fm_name}(#{index})"
+              accepted_fields[repeated_fm_name] = field.serialize_for_update(value[idx])
             end
+          else
+            accepted_fields[field.fm_name] = field.serialize_for_update(value)
+          end
+        end
+
+        accepted_fields
+      end
+
+      def with_model_fields_for_update(criterion)
+        accepted_fields = {}
 
-            accepted_fields[field.fm_name] = temp
+        criterion.each_pair do |key, value|
+          field = find_field_by_name(key)
+
+          next unless field
+
+          # Able to process nil value only for update
+
+          # We do not serialize at this point, as we are still in Ruby-land.
+          # Filemaker::Server will help us serialize into FileMaker format.
+          if value.is_a?(Array)
+            field.max_repeat.times do |idx|
+              index = idx + 1
+              repeated_fm_name = "#{field.fm_name}(#{index})"
+              accepted_fields[repeated_fm_name] = field.serialize_for_update(value[idx])
+            end
           else
-            accepted_fields[field.fm_name] = if use_query
-                                               field.serialize_for_query(value)
-                                             else
-                                               field.serialize_for_update(value)
-                                             end
+            accepted_fields[field.fm_name] = field.serialize_for_update(value)
           end
         end
 

data/lib/filemaker/model/batches.rb

@@ -1,22 +1,24 @@
 module Filemaker
   module Model
     module Batches
-      def in_batches(batch_size: 200, options: {})
+      def in_batches(batch_size: 200, options: {}, sleep: 0)
         output = []
         total = self.in(options).count
         pages = (total / batch_size.to_f).ceil
         1.upto(pages) do |page|
+          sleep(sleep)
           output.concat self.in(options).per(batch_size).page(page)
         end
 
         output
       end
 
-      def where_batches(batch_size: 200, options: {})
+      def where_batches(batch_size: 200, options: {}, sleep: 0)
         output = []
         total = where(options).count
         pages = (total / batch_size.to_f).ceil
         1.upto(pages) do |page|
+          sleep(sleep)
           output.concat where(options).per(batch_size).page(page)
         end
 

data/lib/filemaker/model/builder.rb

@@ -33,6 +33,15 @@ module Filemaker
           value = field.cast(record[fm_field_name])
           object.public_send(setter, value)
 
+          if record[fm_field_name].is_a?(Array) && field.max_repeat > 1
+            field.max_repeat.times do |idx|
+              index = idx + 1
+              repeated_setter = "#{field.name}__#{index}="
+              repeated_value = field.cast(record[fm_field_name][idx])
+              object.public_send(repeated_setter, repeated_value)
+            end
+          end
+
           # So after hydrating, we do not say it was dirty
           object.clear_changes_information
         end

data/lib/filemaker/model/field.rb

@@ -1,11 +1,12 @@
 module Filemaker
   module Model
     class Field
-      attr_reader :name, :type, :default_value, :fm_name
+      attr_reader :name, :type, :default_value, :fm_name, :max_repeat
 
       def initialize(name, type, options = {})
         @name = name
         @type = type
+        @max_repeat = options.fetch(:max_repeat) { 1 }
         @default_value = serialize_for_update(options.fetch(:default) { nil })
 
         # We need to downcase because Filemaker::Record is
@@ -16,7 +17,9 @@ module Filemaker
       # Will delegate to the underlying @type for casting
       # From raw input to Ruby type
       def cast(value)
-        return value if skip_modifying_value(value)
+        return value if value.nil?
+        return value if value.is_a?(Array) && @max_repeat > 1
+
         @type.__filemaker_cast_to_ruby_object(value)
       rescue StandardError => e
         warn "[#{e.message}] Could not cast: #{name}=#{value}"
@@ -26,8 +29,22 @@ module Filemaker
       # Convert to Ruby type situable for making FileMaker update
       # For attr_writer
       def serialize_for_update(value)
-        return value if skip_modifying_value(value)
-        @type.__filemaker_serialize_for_update(value)
+        return value if value.nil?
+
+        if value.is_a?(Array) && @max_repeat > 1
+          value.map { |v| @type.__filemaker_serialize_for_update(v) }
+
+          # @max_repeat.times do |idx|
+          #   index = idx + 1
+          #   repeated_field_name = "@#{@name}__#{index}"
+          #   repeated_field_value = @type.__filemaker_serialize_for_update(value[idx])
+          #   instance_eval do
+          #     instance_variable_set(repeated_field_name, repeated_field_value)
+          #   end
+          # end
+        else
+          @type.__filemaker_serialize_for_update(value)
+        end
       rescue StandardError => e
         warn "[#{e.message}] Could not serialize for update: #{name}=#{value}"
         value
@@ -35,21 +52,16 @@ module Filemaker
 
       # Convert to Ruby type situable for making FileMaker query
       def serialize_for_query(value)
-        return value if skip_modifying_value(value)
+        return value if value.nil?
+        return value if value =~ /^==|=\*/
+        return value if value =~ /(\.\.\.)/
+        return value if value =~ /\A(<|<=|>|>=)/
+
         @type.__filemaker_serialize_for_query(value)
       rescue StandardError => e
         warn "[#{e.message}] Could not serialize for query: #{name}=#{value}"
         value
       end
-
-      # Doc why we skip it!
-      # TODO - we may need to customize it for query and update. For example
-      # query will bypass `==`, but update do not need to care.
-      def skip_modifying_value(value)
-        return true if value.nil?
-        return true if value =~ /^==|=\*/
-        return true if value =~ /(\.\.\.)/
-      end
     end
   end
 end

data/lib/filemaker/model/fields.rb

@@ -64,6 +64,24 @@ module Filemaker
             field_names.each do |name|
               add_field(name, Filemaker::Model::Type.registry[type], options)
               create_accessors(name)
+
+              next unless options[:max_repeat] && options[:max_repeat] > 1
+
+              # We have repeating fields
+              # It will create [max_repeat] number of attribute with names like:
+              # xxx__1, xxx__2, xxx__3
+              # Their fm_name will be xxx(1), xxx(2), xxx(3)
+              options[:max_repeat].times do |idx|
+                index = idx + 1
+                repeated_field_name = "#{name}__#{index}"
+                fm_name = (options.fetch(:fm_name) { name }).to_s.downcase.freeze
+                add_field(
+                  repeated_field_name,
+                  Filemaker::Model::Type.registry[type],
+                  options.merge(fm_name: "#{fm_name}(#{index})")
+                )
+                create_accessors(repeated_field_name)
+              end
             end
           end
         end
@@ -105,10 +123,17 @@ module Filemaker
 
         # Find FileMaker's real name given either the attribute name or the real
         # FileMaker name.
+        # FIXME - This may have ordering problem. If fm_name is the same as the
+        # field name.
         def find_field_by_name(name)
           name = name.to_s
           fields.values.find do |f|
             f.name == name || f.fm_name == name
+
+            # Unfortunately can't use this as builder.rb need to find field based
+            # on fm_name
+            # Always find by attribute name for now
+            # f.name == name
           end
         end
       end

data/lib/filemaker/model/findable.rb

@@ -6,6 +6,7 @@ module Filemaker
         :skip,
         :order,
         :find,
+        :id,
         :first,
         :recid,
         :in,

data/lib/filemaker/model/persistable.rb

@@ -10,9 +10,9 @@ module Filemaker
       # Call save! but do not raise error.
       def save
         save!
-      rescue StandardError
-        errors.add(:base) << $! # Does this works?
-        nil
+      rescue StandardError => e
+        errors.add(:base) << e.message # Does this works?
+        false
       end
 
       def save!
@@ -27,7 +27,7 @@ module Filemaker
         run_callbacks :create do
           options = {}
           yield options if block_given?
-          resultset = api.new(fm_attributes, options)
+          resultset = api.new(create_attributes, options)
           changes_applied
           replace_new_data(resultset)
         end
@@ -51,10 +51,18 @@ module Filemaker
 
       def update_attributes(attrs = {})
         return self if attrs.blank?
+
         assign_attributes(attrs)
         save
       end
 
+      def update_attributes!(attrs = {})
+        return self if attrs.blank?
+
+        assign_attributes(attrs)
+        save!
+      end
+
       # Use -delete to remove the record backed by the model.
       # @return [Filemaker::Model] frozen instance
       def destroy

data/lib/filemaker/model/relations.rb

@@ -45,9 +45,9 @@ module Filemaker
           #   job.company(true)
           define_method(name) do |force_reload = false|
             if force_reload
-              @relations[name] = type.new(self, name, options)
+              @relations[name] = type.init(self, name, options)
             else
-              @relations[name] ||= type.new(self, name, options)
+              @relations[name] ||= type.init(self, name, options)
             end
           end
 
@@ -58,8 +58,9 @@ module Filemaker
           # save and return the identity ID, then we update the parent's
           # reference_key.
           define_method("#{name}=") do |object|
-            params = { "#{name}_id" => object.public_send("#{name}_id") }
-            update_attributes(params)
+            return nil if object.nil?
+
+            @relations[name] = object
           end
 
           # Creator

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

@@ -22,7 +22,7 @@ module Filemaker
         end
 
         # Order: source_key first, reference_key next, then identity
-        # all must be findable using `to find_field_by_name`
+        # all must be findable using `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) ||
@@ -36,11 +36,13 @@ module Filemaker
         # If the field value contains underscore or space like 'FM_notified'
         # or 'FM notified', a single `=` may not match correctly.
         def build_target
-          @target = nil if reference_value.blank? || final_reference_key.blank?
-
-          @target = target_class.where(
-            final_reference_key => "=#{reference_value}"
-          ).first
+          @target = if reference_value.blank? || final_reference_key.blank?
+                      nil
+                    else
+                      target_class.where(
+                        final_reference_key => "==#{reference_value}"
+                      ).first
+                    end
         end
       end
     end

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

@@ -42,6 +42,7 @@ module Filemaker
         def <<(*args)
           docs = args.flatten
           return concat(docs) if docs.size > 1
+
           if (doc = docs.first)
             create(doc)
           end
@@ -81,11 +82,13 @@ module Filemaker
         protected
 
         def build_target
-          @target = [] if reference_value.blank? || final_reference_key.blank?
-
-          @target = target_class.where(
-            final_reference_key => "=#{reference_value}"
-          )
+          @target = if reference_value.blank? || final_reference_key.blank?
+                      []
+                    else
+                      target_class.where(
+                        final_reference_key => "==#{reference_value}"
+                      )
+                    end
         end
       end
     end

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

@@ -6,7 +6,7 @@ module Filemaker
       class Proxy
         instance_methods.each do |method|
           undef_method(method) unless
-            method =~ /(^__|^send|^object_id|^respond_to|^tap|^extend)/
+            method =~ /^(__.*|send|object_id|equal\?|respond_to\?|tap|public_send)$/
         end
 
         attr_accessor :owner, :target, :options
@@ -21,8 +21,15 @@ module Filemaker
           @class_name = options.fetch(:class_name) { name.to_s.classify }
         end
 
+        # Create will not return the proxy if target was NilClass
+        def self.init(owner, name, options)
+          new_instance = new(owner, name, options)
+          new_instance.target.nil? ? nil : new_instance
+        end
+
         def target_class
           return @class_name if @class_name.is_a?(Class)
+
           @class_name.constantize
         end
 

data/lib/filemaker/model/selectable.rb

@@ -16,7 +16,7 @@ module Filemaker
         chains.delete(:in)
 
         @selector ||= {}
-        selector.merge!(klass.with_model_fields(criterion))
+        selector.merge!(klass.with_model_fields_for_query(criterion))
         yield options if block_given?
         self
       end
@@ -39,7 +39,8 @@ module Filemaker
         return where(criterion) if criterion.is_a? Hash
 
         # Find using model ID (may not be the -recid)
-        id = criterion.to_s.gsub(/\A=*/, '=') # Always append '=' for ID
+        # Always append double '=' for ID instead of just one '='
+        id = criterion.to_s.gsub(/\A=*/, '==')
 
         # If we are finding with ID, we just limit to one and return
         # immediately. Last resort is to use the recid to find.
@@ -68,11 +69,7 @@ module Filemaker
           chains.delete(:in)
           @selector ||= {}
 
-          criterion = if operator == 'bw'
-                        klass.with_model_fields(criterion, use_query: false)
-                      else
-                        klass.with_model_fields(criterion)
-                      end
+          criterion = klass.with_model_fields_for_query(criterion)
 
           criterion.each_key do |key|
             selector["#{key}.op"] = operator
@@ -87,6 +84,7 @@ module Filemaker
         end
       end
 
+      alias id find
       alias equals eq
       alias contains cn
       alias begins_with bw
@@ -115,7 +113,7 @@ module Filemaker
         @selector ||= []
 
         become_array(criterion).each do |hash|
-          accepted_hash = klass.with_model_fields(hash)
+          accepted_hash = klass.with_model_fields_for_query(hash)
           accepted_hash['-omit'] = true if negating
           @selector << accepted_hash
         end
@@ -153,7 +151,7 @@ module Filemaker
         end
 
         @selector ||= {}
-        selector.merge!(klass.with_model_fields(criterion))
+        selector.merge!(klass.with_model_fields_for_query(criterion))
         options[:lop] = 'or'
         yield options if block_given?
         self

data/lib/filemaker/model/type.rb

@@ -1,5 +1,6 @@
 require 'filemaker/model/types/text'
 require 'filemaker/model/types/date'
+require 'filemaker/model/types/date_time'
 require 'filemaker/model/types/time'
 require 'filemaker/model/types/big_decimal'
 require 'filemaker/model/types/integer'
@@ -21,7 +22,8 @@ module Filemaker
       register(:string, Filemaker::Model::Types::Text)
       register(:text, Filemaker::Model::Types::Text)
       register(:date, Filemaker::Model::Types::Date)
-      register(:datetime, Filemaker::Model::Types::Time)
+      register(:datetime, Filemaker::Model::Types::DateTime)
+      register(:time, Filemaker::Model::Types::Time)
       register(:money, Filemaker::Model::Types::BigDecimal)
       register(:number, Filemaker::Model::Types::BigDecimal)
       register(:integer, Filemaker::Model::Types::Integer)

data/lib/filemaker/model/types/big_decimal.rb

@@ -3,17 +3,23 @@ module Filemaker
     module Types
       class BigDecimal
         def self.__filemaker_cast_to_ruby_object(value)
+          return nil if value.nil?
           return value if value.is_a?(::BigDecimal)
+
           BigDecimal(value.to_s)
         end
 
         def self.__filemaker_serialize_for_update(value)
+          return nil if value.nil?
           return value if value.is_a?(::BigDecimal)
+
           BigDecimal(value.to_s)
         end
 
         def self.__filemaker_serialize_for_query(value)
+          return nil if value.nil?
           return value if value.is_a?(::BigDecimal)
+
           BigDecimal(value.to_s)
         end
       end

data/lib/filemaker/model/types/date.rb

@@ -3,19 +3,25 @@ module Filemaker
     module Types
       class Date
         def self.__filemaker_cast_to_ruby_object(value)
+          return nil if value.nil?
           return value if value.is_a?(::Date)
+
           ::Date.parse(value.to_s)
         end
 
         def self.__filemaker_serialize_for_update(value)
+          return nil if value.nil?
           return value if value.is_a?(::Date)
+
           ::Date.parse(value.to_s)
         end
 
         def self.__filemaker_serialize_for_query(value)
           # If we are doing date range query like
           # Model.where(date: '12/2018')
+          return nil if value.nil?
           return value if value.is_a?(::Date) || value.is_a?(String)
+
           ::Date.parse(value.to_s)
         end
       end

data/lib/filemaker/model/types/date_time.rb

@@ -0,0 +1,28 @@
+module Filemaker
+  module Model
+    module Types
+      class DateTime
+        def self.__filemaker_cast_to_ruby_object(value)
+          return nil if value.nil?
+          return value if value.is_a?(::Time)
+
+          ::Time.parse(value.to_s)
+        end
+
+        def self.__filemaker_serialize_for_update(value)
+          return nil if value.nil?
+          return value if value.is_a?(::Time)
+
+          ::Time.parse(value.to_s)
+        end
+
+        def self.__filemaker_serialize_for_query(value)
+          return nil if value.nil?
+          return value if value.is_a?(::Time) || value.is_a?(String)
+
+          ::Time.parse(value.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/filemaker/model/types/integer.rb

@@ -3,17 +3,23 @@ module Filemaker
     module Types
       class Integer
         def self.__filemaker_cast_to_ruby_object(value)
+          return nil if value.nil?
           return value if value.is_a?(::Integer)
+
           value.to_i
         end
 
         def self.__filemaker_serialize_for_update(value)
+          return nil if value.nil?
           return value if value.is_a?(::Integer)
+
           value.to_i
         end
 
         def self.__filemaker_serialize_for_query(value)
+          return nil if value.nil?
           return value if value.is_a?(::Integer)
+
           value.to_i
         end
       end

data/lib/filemaker/model/types/text.rb

@@ -3,14 +3,20 @@ module Filemaker
     module Types
       class Text
         def self.__filemaker_cast_to_ruby_object(value)
+          return nil if value.nil?
+
           value.to_s
         end
 
         def self.__filemaker_serialize_for_update(value)
+          return nil if value.nil?
+
           value.to_s
         end
 
         def self.__filemaker_serialize_for_query(value)
+          return nil if value.nil?
+
           value.to_s
         end
       end

data/lib/filemaker/model/types/time.rb

@@ -3,18 +3,25 @@ module Filemaker
     module Types
       class Time
         def self.__filemaker_cast_to_ruby_object(value)
-          return value if value.is_a?(::Time)
+          return nil if value.nil?
+          return value.strftime("%H:%M") if value.is_a?(::Time)
+
           ::Time.parse(value.to_s)
         end
 
         def self.__filemaker_serialize_for_update(value)
-          return value if value.is_a?(::Time)
-          ::Time.parse(value.to_s)
+          return nil if value.nil?
+          return value.strftime("%H:%M") if value.is_a?(::Time) || value.is_a?(::DateTime)
+
+          # Could be a string like "09:00" already
+          value
         end
 
         def self.__filemaker_serialize_for_query(value)
-          return value if value.is_a?(::Time) || value.is_a?(String)
-          ::Time.parse(value.to_s)
+          return nil if value.nil?
+          return value.strftime("%H:%M") if value.is_a?(::Time)
+
+          value
         end
       end
     end

data/lib/filemaker/record.rb

@@ -22,8 +22,7 @@ module Filemaker
         # `field` is Nokogiri::XML::Element
         field_name = field['name']
         # Right now, I do not want to mess with the field name
-        # field_name.gsub!(Regexp.new(portal_table_name + '::'), '')
-        #   \if portal_table_name
+        # field_name.gsub!(Regexp.new(portal_table_name + '::'), '') if portal_table_name
         datum = []
 
         metadata_fields = if portal_table_name
@@ -45,15 +44,15 @@ module Filemaker
     end
 
     def [](key)
-      raise(Filemaker::Errors::InvalidFieldError, "Invalid field: #{key}") \
-        unless key?(key)
+      raise(Filemaker::Errors::InvalidFieldError, "Invalid field: #{key}") unless key?(key)
+
       super
     end
 
     def []=(key, value)
       if @ready
-        raise(Filemaker::Errors::InvalidFieldError, "Invalid field: #{key}") \
-        unless key?(key)
+        raise(Filemaker::Errors::InvalidFieldError, "Invalid field: #{key}") unless key?(key)
+
         @dirty[key] = value
       else
         super
@@ -80,6 +79,7 @@ module Filemaker
 
     def normalize_data(datum)
       return nil if datum.empty?
+
       datum.size == 1 ? datum.first : datum
     end
 
@@ -87,6 +87,7 @@ module Filemaker
       method = symbol.to_s
       return self[method] if key?(method)
       return @dirty[$`] = args.first if method =~ /(=)$/ && key?($`)
+
       super
     end
 

data/lib/filemaker/server.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 require 'typhoeus'
 require 'filemaker/configuration'
 
@@ -102,12 +103,10 @@ module Filemaker
 
       args.each do |key, value|
         case value
-        when DateTime
+        when DateTime, Time
           args[key] = value.strftime('%m/%d/%Y %H:%M:%S')
         when Date
           args[key] = value.strftime('%m/%d/%Y')
-        when Time
-          args[key] = value.strftime('%H:%M')
         else
           # Especially for range operator (...), we want to output as String
           args[key] = value.to_s

data/lib/filemaker/version.rb

@@ -1,3 +1,3 @@
 module Filemaker
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/spec/filemaker/model/builder_spec.rb

@@ -25,6 +25,13 @@ describe Filemaker::Model::Builder do
       expect(subject.modify_date).to eq(Date.parse('2014-08-12'))
     end
 
+    it 'has repeated fields' do
+      expect(subject.bonus).to eq [BigDecimal(1000), BigDecimal(2000), BigDecimal(3000)]
+      expect(subject.bonus__1).to eq BigDecimal(1000)
+      expect(subject.bonus__2).to eq BigDecimal(2000)
+      expect(subject.bonus__3).to eq BigDecimal(3000)
+    end
+
     it 'is not dirty' do
       expect(subject.changed?).to eq false
       expect(subject.changes).to be_empty

data/spec/filemaker/model/criteria_spec.rb

@@ -60,7 +60,13 @@ describe Filemaker::Model::Criteria do
       it 'will use the identity to find' do
         allow(criteria).to receive(:first).and_return([])
         criteria.find(22)
-        expect(criteria.selector).to eq({ 'ca id' => '=22' })
+        expect(criteria.selector).to eq({ 'ca id' => '==22' })
+      end
+
+      it 'alias id to find' do
+        allow(criteria).to receive(:first).and_return([])
+        criteria.id(22)
+        expect(criteria.selector).to eq({ 'ca id' => '==22' })
       end
     end
 

data/spec/filemaker/model/relations_spec.rb

@@ -34,10 +34,11 @@ describe Filemaker::Model::Relations do
           @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
+      # Comment this test - because we return nil instead of Proxy object
+      # 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
 
       it 'proxy blank?' do
         expect(@model.candidate.blank?).to eq false
@@ -79,9 +80,10 @@ describe Filemaker::Model::Relations 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
+      # Comment this test - because we return nil instead of Proxy object
+      # it 'another_manager has different reference_key' do
+      #   expect(@model.another_manager.reference_key).to eq :candidate_id
+      # end
     end
   end
 
@@ -105,7 +107,7 @@ describe Filemaker::Model::Relations do
       end
 
       it 'returns criteria instead of an array of model objects' do
-        expect(@model.posts).to be_a Filemaker::Model::Criteria
+        expect(@model.posts.class).to eq Filemaker::Model::Criteria
       end
     end
 

data/spec/filemaker/model/types_spec.rb

@@ -35,26 +35,45 @@ describe Filemaker::Model::Types do
     end
   end
 
-  context 'Types::Time' do
+  context 'Types::DateTime' do
     it 'assign as a time' do
       model.updated_at = Time.new(2018, 1, 1, 12, 12, 12)
       expect(model.updated_at).to be_a Time
       expect(model.updated_at).to eq Time.new(2018, 1, 1, 12, 12, 12)
     end
 
+    it 'assign as a datetime but return as time' do
+      model.updated_at = DateTime.new(2018, 1, 1, 12, 12, 12)
+      expect(model.updated_at).to be_a Time
+      expect(model.updated_at).to eq Time.parse(model.updated_at.to_s)
+    end
+
     it 'can query as a string' do
       c = MyModel.where(updated_at: '2018')
       expect(c.selector['modifieddate']).to be_a String
       expect(c.selector['modifieddate']).to eq '2018'
     end
 
-    it 'can query as a time' do
+    it 'can query as a datetime' do
       c = MyModel.where(updated_at: Time.new(2018, 1, 1, 12, 12, 12))
       expect(c.selector['modifieddate']).to be_a Time
       expect(c.selector['modifieddate']).to eq Time.new(2018, 1, 1, 12, 12, 12)
     end
   end
 
+  context 'Types::DateTime' do
+    it 'assign as time' do
+      model.time_in = DateTime.new(2019, 1, 1, 9, 0, 0)
+      expect(model.time_in).to be_a String
+      expect(model.time_in).to eq '09:00'
+    end
+
+    it 'query with HH:MM format' do
+      c = MyModel.where(time_in: Time.new(2019, 1, 1, 15, 45, 0))
+      expect(c.selector['time_in']).to eq '15:45'
+    end
+  end
+
   context 'Types::BigDecimal' do
     it 'assign as a big decimal' do
       model.salary = '25'

data/spec/filemaker/model_spec.rb

@@ -88,7 +88,12 @@ describe Filemaker::Model do
         'created_at',
         'modifieddate',
         'salary',
-        'passage of time'
+        'bonus',
+        'bonus(1)',
+        'bonus(2)',
+        'bonus(3)',
+        'passage of time',
+        'time_in'
       ]
   end
 
@@ -103,23 +108,23 @@ describe Filemaker::Model do
   # end
 
   it 'accepts date range as string' do
-    model.created_at = '1/1/2016...1/31/2016'
-    expect(model.created_at).to be_a String
+    c = MyModel.where(created_at: '1/1/2016...1/31/2016')
+    expect(c.selector['created_at']).to be_a String
   end
 
   it 'accepts number range as string' do
-    model.salary = '1000...2000'
-    expect(model.salary).to be_a String
+    c = MyModel.where(salary: '1000...2000')
+    expect(c.selector['salary']).to be_a String
   end
 
   it 'accepts == for any type' do
-    model.salary = '=='
-    expect(model.salary).to eq '=='
+    c = MyModel.where(salary: '==')
+    expect(c.selector['salary']).to eq '=='
   end
 
   it 'accepts =* for any type' do
-    model.age = '=*'
-    expect(model.age).to eq '=*'
+    c = MyModel.where(age: '=*')
+    expect(c.selector['passage of time']).to eq '=*'
   end
 
   it 'check for presence of name and salary' do

data/spec/support/models.rb

@@ -32,6 +32,7 @@ class Job
   string :status
   string :jdid, fm_name: 'JDID'
   date   :modify_date, fm_name: 'modify date'
+  money :bonus, max_repeat: 3
 end
 
 class Member
@@ -72,7 +73,9 @@ class MyModel
   date :created_at
   datetime :updated_at, fm_name: 'ModifiedDate'
   money :salary
+  money :bonus, max_repeat: 3
   integer :age, fm_name: 'passage of time'
+  time :time_in
 end
 
 class Project

data/spec/support/responses/jobs.xml

@@ -13,6 +13,7 @@
     <field-definition auto-enter="no" four-digit-year="no" global="no" max-repeat="1" name="experience &amp; qualification" not-empty="no" numeric-only="no" result="text" time-of-day="no" type="normal"/>
     <field-definition auto-enter="no" four-digit-year="no" global="no" max-repeat="1" name="location" not-empty="no" numeric-only="no" result="text" time-of-day="no" type="normal"/>
     <field-definition auto-enter="no" four-digit-year="no" global="no" max-repeat="1" name="Salary" not-empty="no" numeric-only="no" result="text" time-of-day="no" type="normal"/>
+    <field-definition auto-enter="no" four-digit-year="no" global="no" max-repeat="3" name="Bonus" not-empty="no" numeric-only="no" result="text" time-of-day="no" type="normal"/>
     <field-definition auto-enter="no" four-digit-year="no" global="no" max-repeat="1" name="JD Cat" not-empty="no" numeric-only="no" result="text" time-of-day="no" type="normal"/>
     <field-definition auto-enter="no" four-digit-year="no" global="no" max-repeat="1" name="JobType" not-empty="no" numeric-only="no" result="text" time-of-day="no" type="normal"/>
     <field-definition auto-enter="yes" four-digit-year="no" global="no" max-repeat="1" name="modify date" not-empty="no" numeric-only="no" result="date" time-of-day="no" type="normal"/>
@@ -39,6 +40,11 @@
       <field name="Salary">
         <data>Negotiable</data>
       </field>
+      <field name="Bonus">
+        <data>1000</data>
+        <data>2000</data>
+        <data>3000</data>
+      </field>
       <field name="JD Cat">
         <data>IT &amp; Telecommunications</data>
       </field>
@@ -74,6 +80,11 @@
       <field name="Salary">
         <data>Negotiable</data>
       </field>
+      <field name="Bonus">
+        <data>4000</data>
+        <data>5000</data>
+        <data>6000</data>
+      </field>
       <field name="JD Cat">
         <data>Administrative &amp; Related</data>
       </field>
@@ -109,6 +120,11 @@
       <field name="Salary">
         <data>6000 - 7000</data>
       </field>
+      <field name="Bonus">
+        <data>7000</data>
+        <data>8000</data>
+        <data>9000</data>
+      </field>
       <field name="JD Cat">
         <data>IT &amp; Telecommunications</data>
       </field>
@@ -144,6 +160,11 @@
       <field name="Salary">
         <data>Negotiable</data>
       </field>
+      <field name="Bonus">
+        <data>1000</data>
+        <data></data>
+        <data></data>
+      </field>
       <field name="JD Cat">
         <data>IT &amp; Telecommunications</data>
       </field>
@@ -179,6 +200,11 @@
       <field name="Salary">
         <data>3000 - 5500</data>
       </field>
+      <field name="Bonus">
+        <data></data>
+        <data></data>
+        <data></data>
+      </field>
       <field name="JD Cat">
         <data>IT &amp; Telecommunications</data>
       </field>
@@ -196,4 +222,4 @@
       </field>
     </record>
   </resultset>
-</fmresultset>
+</fmresultset>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filemaker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - mech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -70,30 +70,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,7 @@ files:
 - lib/filemaker/model/type.rb
 - lib/filemaker/model/types/big_decimal.rb
 - lib/filemaker/model/types/date.rb
+- lib/filemaker/model/types/date_time.rb
 - lib/filemaker/model/types/email.rb
 - lib/filemaker/model/types/integer.rb
 - lib/filemaker/model/types/text.rb
@@ -253,8 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper to FileMaker XML API.