fmrest-core 0.17.0.rc1 → 0.18.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 312c477604d1cd806fd0e403222baf2485409ee15774b9b0a94da22dee585435
-  data.tar.gz: 2d229e1b3ad0ef228868c6298964a43e0a22ada7e23c8e00aa7d6b8b9be75e98
+  metadata.gz: 41dc491640fb564e4c8fd798a66e86411f24e9e31c9b10cd233ff280d488ee3e
+  data.tar.gz: 0c0e7e91983fdab51ed16657a42b5c7ac92beb4afc6028689732b202a3535129
 SHA512:
-  metadata.gz: aad3c75eb9841885c78f9f0ed583ffc321eb66b1c2437181d84760cb44e52f4d27a3e4ce7d1c30c1697f77b36506075d98e3c925962ba90669198961497567a9
-  data.tar.gz: '0826d82c0a298a5a6ab0aec9f8fc582f73279d19e770080614f4faef368b21d646df33ac6065cf373ccd9e13e9ee6e2feefc66a3367e587883cfbd631dc52698'
+  metadata.gz: dbc7f99b2de4af84ddfca9978e51d187bfa2f94af1ac09745c7e14b3fd60c0b4a4eb492172a686e2a1f3419dacf7af6228a02b1dc7b0e40b2437f529e46b1254
+  data.tar.gz: f6ebda3cfdac93c5c0188fbf2a099619075396a5f9e9c507c390985ccc56ae5d6fb72dd6ddec155d01c3d04ba1bbe9d28fc0295e36f97b0ac864312de6047181

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Changelog
 
+### 0.18.0
+
+* Better support for portals with mismatching field qualifiers
+* Defining an attribute on a model that would collide with an existing method
+  now raises an error
+
+### 0.17.1
+
+* Fixed crash when `fmid_token` is set but `username` isn't
+
 ### 0.17.0
 
 * Added support for Claris ID token login

data/README.md

@@ -543,6 +543,10 @@ class LoggyBee < FmRest::Layout
 end
 ```
 
+## Gotchas
+
+Read about unexpected scenarios in the [gotchas doc](docs/Gotchas.md).
+
 ## API implementation completeness table
 
 FM Data API reference: https://fmhelp.filemaker.com/docs/18/en/dataapi/

data/lib/fmrest/v1/token_session.rb

@@ -100,7 +100,13 @@ module FmRest
             # Strip the host part to just the hostname (i.e. no scheme or port)
             host = @settings.host!
             host = URI(host).hostname if host =~ /\Ahttps?:\/\//
-            "#{host}:#{@settings.database!}:#{@settings.username!}"
+            identity_segment = if fmid_token = @settings.fmid_token
+                                 require "digest"
+                                 Digest::SHA256.hexdigest(fmid_token)
+                               else
+                                 @settings.username!
+                               end
+            "#{host}:#{@settings.database!}:#{identity_segment}"
           end
       end
 

data/lib/fmrest/v1/utils.rb

@@ -8,6 +8,8 @@ module FmRest
       # See https://help.claris.com/en/pro-help/content/finding-text.html
       FM_FIND_OPERATORS_RE = /([@\*#\?!=<>"])/
 
+      FULLY_QUALIFIED_FIELD_NAME_MATCHER = /\A[^:]+::[^:]+\Z/.freeze
+
       # Converts custom script options to a hash with the Data API's expected
       # JSON script format.
       #
@@ -104,6 +106,18 @@ module FmRest
         s.gsub(FM_FIND_OPERATORS_RE, "\\\\\\1")
       end
 
+      # Returns whether the given FileMaker field name is a fully-qualified
+      # name. In other words, whether it contains the string "::".
+      #
+      # Note that this is a simple naive check which doesn't account for
+      # invalid field names.
+      #
+      # @param field_name [String] The field name to test
+      # @return [Boolean] Whether the field is a FQN
+      def is_fully_qualified?(field_name)
+        FULLY_QUALIFIED_FIELD_NAME_MATCHER === field_name.to_s
+      end
+
       private
 
       def convert_script_arguments(script_arguments, suffix = nil)

data/lib/fmrest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FmRest
-  VERSION = "0.17.0.rc1"
+  VERSION = "0.18.0.rc2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmrest-core
 version: !ruby/object:Gem::Version
-  version: 0.17.0.rc1
+  version: 0.18.0.rc2
 platform: ruby
 authors:
 - Pedro Carbajal
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2021-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday