ginjo-rfm 3.0.10 → 3.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzE0NWI5NTNjMDVhM2M0ZjZjMzI2Y2FiNDcyOGRiZmIxMGFlMmRiZQ==
+    M2MxNTI1ZTEyNTc4NjNkYzQ3OTFlNDNlZTVjODFkN2FlNTBiZWUyNw==
   data.tar.gz: !binary |-
-    MDY0MjgyNjJlYjM5NjBhNmVkYzFiN2NiMjI1ZWI3N2MzNzJiMDIxYQ==
+    OGRkNjViNjkxNjQ5NWMzNWI3OGI3MzE4ZjQ2Zjk4MTYwZDU2N2ZmYw==
 SHA512:
   metadata.gz: !binary |-
-    NTcxNTk2YWQ2NzMwYjJmZDEwZWJmNjA3Nzc2MDIxNTBlMTc2OTY1ZjhkYmQx
-    MmU5ZjA3ZGU1MDY0NTY3NDlkNDA5YTc5MTNjNDNjZTdhZWY4NGQ2NmRmOTY1
-    OTMxNzkwZWVhZjkzZDhjOGViNGYyYjYzZDRmMTc3NzQyNmU2OTM=
+    MjM5ZGE5ODFjNmY0NDdhNzYxMDNhOTBjY2VlMDdkMTZhMGFkMDJiMWU2ZTVl
+    OWQzNmRiMDM5MjMzY2RhZjI2MTVkZWNiMTlkNjIyZWMzNTVjZmY5Y2QxODMx
+    NWRhZjI0OTQyYzhhODI5MzMzNmY3MjIyODI4NmU1NzM2ZjI3ODI=
   data.tar.gz: !binary |-
-    MjY3MTNmYjBkNGU4YTE4ZTQ0MzA4YWU1NGQxYzY0NDdlZGIxOTQ2MGM4MGE2
-    Yjc2NTVlNDFhMjc5MzU4NDE3MGRlMjQ3NjFhMmY0Yzg1NjkwN2Q0YmJhMzky
-    YWEwZDg3ZTNhYzUwOWU2YWFkYTAwMWY4YTYxMmNjMTI5OTQwZDA=
+    MGEyMzYxYmM2MjYyN2MyMjdmNzMxZmQzZDEzMDNiNjRhNzhiNTM0NjE0ZDMz
+    YjMyNDFkMTBhMTVmNWVhM2U4ZmIzMWZmZDZhODFjYjA3ZjVhMTYzMWJiNjlm
+    NTFhN2M3NjAwZjI4NGJmMjc4ZGZhNmUzNDQyOTViNjZiZmZkYTA=

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## Ginjo-Rfm 3.0.11
+
+* Scoping fixes, changes, additions:
+
+  Now takes proc or array of hashes or hash.
+  
+  Scope_args for scope proc now defaults to model instance.
+
+  Now handles omits - puts them at end of request array.
+
+* Support for rom-fmp 0.0.4 - query chaining with compound fm queries.
+
+* Basic support for portal field writes.
+    
+        record['my_relationship::my_field.0'] = 'Adds a new portal record with data for my_field, if auto-create enabled'
+        record.update_attributes! 'my_relationship::my_field.3' => 'Updates my_field in 3rd portal record, if exists'
+
+* Fix Base#save! to store raised exceptions in errors, if possible.
+
+* Fix CompoundQuery to handle nil values in query params.
+
 ## Ginjo-Rfm 3.0.10
 
 * Fixed bug where missing metadata would cause errors when creating/editing records.

data/lib/rfm/VERSION

@@ -1 +1 @@
-3.0.10
+3.0.11

data/lib/rfm/base.rb

@@ -151,7 +151,7 @@ module Rfm
     def update_attributes(new_attr)
       new_attr.each do |k,v|
         k = k.to_s.downcase
-        if keys.include?(k)
+        if key?(k) || (layout.field_keys.include?(k.split('.')[0]) rescue nil)
           @mods[k] = v
           self[k] = v
         else
@@ -201,14 +201,19 @@ module Rfm
       else
         self.create
       end
+    rescue
+      (self.errors[:base] rescue []) << $!
+      raise $!     
     end
 
     # Same as save!, but will not raise error.
     def save
       save!
+    # rescue
+    #   (self.errors[:base] rescue []) << $!
+    #   return nil
     rescue
-      (self.errors[:base] rescue []) << $!
-      return nil
+      nil
     end
 
     # Just like Layout#save_if_not_modified, but with callbacks & validations.

data/lib/rfm/record.rb

@@ -209,8 +209,11 @@ module Rfm
 
     def []=(key, val)
       key_string = key.to_s.downcase
-      return super unless @loaded # is this needed?
-      raise Rfm::ParameterError, "You attempted to modify a field (#{key_string}) that does not exist in the current Filemaker layout." unless self.key?(key_string)
+      key_string_base = key_string.split('.')[0]
+      return super unless @loaded # is this needed? yes, for loading fresh records.
+      unless self.key?(key_string) || (layout.field_keys.include?(key_string_base) rescue nil)
+        raise Rfm::ParameterError, "You attempted to modify a field (#{key_string}) that does not exist in the current Filemaker layout."
+      end
       # @mods[key_string] = val
       # TODO: This needs cleaning up.
       # TODO: can we get field_type from record instead?

data/lib/rfm/utilities/compound_query.rb

@@ -75,6 +75,7 @@ module Rfm
       input_hash.each do |key,val|
         query_tag = []
         val = val.rfm_force_array
+        val << nil if val.empty?
         val.each do |v|
           @key_values["-q#{key_counter}"] = field_mapping[key] || key
           @key_values["-q#{key_counter}.value"] = v

data/lib/rfm/utilities/scope.rb

@@ -17,27 +17,40 @@ module Rfm
     # instead of above scope constant.
 
     def find(*args)
-      new_args = apply_scope(*args)
+      new_args = apply_scope(args)
       super(*new_args)
     end
 
     def count(*args)
-      new_args = apply_scope(*args)
+      new_args = apply_scope(args)
       super(*new_args)
     end
 
-    # Mix scope requests with user requests (sorta like a cross-join of requests).
-    def apply_scope(*args)
+    # Mix scope requests with user requests with a constraining AND logic.
+    # Also handles request options.
+    def apply_scope(args, input_scope=nil)
+      #puts "APPLY_SCOPE args:#{args} input_scope:#{input_scope}"
       opts = (args.size > 1 && args.last.is_a?(Hash) ? args.pop : {})
-      scope = [opts.delete(:scope) || self::SCOPE.call(opts.delete(:scope_args))].flatten
+      scope_args = opts.delete(:scope_args) || self
+      raw_scope = input_scope || opts.delete(:scope) || self::SCOPE
+      scope = [raw_scope.is_a?(Proc) ? raw_scope.call(scope_args) : raw_scope].flatten.compact
+      #puts "APPLY_SCOPE scope:#{scope}"
+      
       return [args].flatten(1).push(opts) if !(args[0].is_a?(Array) || args[0].is_a?(Hash)) || scope.size < 1
       scoped_requests = []
+      scope_omits = []
       scope.each do |scope_req|
+        if scope_req[:omit]
+          scope_omits.push scope_req
+          next
+        end
         [args].flatten.each do |req|
           scoped_requests.push(req[:omit] ? req : req.merge(scope_req))
         end
       end
-      scoped_query = [scoped_requests, opts]
+      scoped_requests = [args].flatten if scoped_requests.empty? 
+      scoped_query = [scoped_requests | scope_omits, opts]
+      #puts "APPLY SCOPE output:#{scoped_query}"
       scoped_query
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ginjo-rfm
 version: !ruby/object:Gem::Version
-  version: 3.0.10
+  version: 3.0.11
 platform: ruby
 authors:
 - Bill Richardson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel