fmrest-spyke 0.17.0.rc1 → 0.18.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d90ab7cfdd1a358ceb0c8abcea9d456f3b97a1b9629346a208c72cdf9b627860
-  data.tar.gz: 65888738c1d5ceff390c10a86f012162b3659ca75319b9f0c70a326ba5d7178e
+  metadata.gz: 1e542d636795f376392e6da0d5a7177e0c2133a4d1b534d9c52d5dcdc5b808b9
+  data.tar.gz: 870414e64e6a1170ca77d809b89cdb1da9e3279e3dd14f2145f141fd8ff18298
 SHA512:
-  metadata.gz: 5b5deb4e31f490766dbd17ef17c822fe38f1387c5b5e16ed7dea9d343983e470352c0be482758901ae9fe1c28e145ad8f49102e0b4aa8ff4d9f381e20e42130d
-  data.tar.gz: f5f500c34a809a34bc375cc62d9c7d7a39318a4172db72c2466a0fe906738406eca3c46493db7df0e1e8a1d0427cc64ee586e3134e6d53dbc8b69977adf07a69
+  metadata.gz: 7bdb182e4d580b33b1dfccd125d69573c9020de3118e21ae83fce8f7f2ede2e186a2eb5b8bf2b09f9be0569bb9cc3ac812b0d978d993653943c01366aa3ab64b
+  data.tar.gz: 681f99b637ba62caa6a0e57e976302143e2189ae49a4b6843eba7a492f0cabd1363bf2382d3ca15a7df7ed5d6a5eb115cc0aae07491edd71f87b94f6a35b684b

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/spyke/model/associations.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "fmrest/spyke/portal_builder"
 require "fmrest/spyke/portal"
 
 module FmRest
@@ -13,6 +14,8 @@ module FmRest
         included do
           # Keep track of portal options by their FM keys as we could need it
           # to parse the portalData JSON in SpykeFormatter
+          #
+          # TODO: Replace this with options in PortalBuilder
           class_attribute :portal_options, instance_accessor: false, instance_predicate: false
 
           # class_attribute supports a :default option since ActiveSupport 5.2,
@@ -40,11 +43,13 @@ module FmRest
           #   end
           #
           def has_portal(name, options = {})
-            create_association(name, Portal, options)
+            # This is analogous to Spyke's create_association method, but using
+            # our custom builder instead
+            self.associations = associations.merge(name => PortalBuilder.new(self, name, Portal, options))
 
             # Store options for SpykeFormatter to use if needed
             portal_key = options[:portal_key] || name
-            self.portal_options = portal_options.merge(portal_key.to_s => options.dup.merge(name: name.to_s)).freeze
+            self.portal_options = portal_options.merge(portal_key.to_s => options.dup.merge(name: name.to_s).freeze).freeze
 
             define_method "#{name.to_s.singularize}_ids" do
               association(name).map(&:id)

data/lib/fmrest/spyke/model/attributes.rb

@@ -94,11 +94,17 @@ module FmRest
           end
 
           def _fmrest_define_attribute(from, to)
+            if existing_method = ((method_defined?(from) || private_method_defined?(from)) && from) ||
+                                 ((method_defined?("#{from}=") || private_method_defined?("#{from}=")) && "#{from}=")
+
+              raise ArgumentError, "You tried to define an attribute named `#{from}' on `#{name}', but this will generate a instance method `#{existing_method}', which is already defined by FmRest::Layout."
+            end
+
             # We use a setter here instead of injecting the hash key/value pair
             # directly with #[]= so that we don't change the mapped_attributes
             # hash on the parent class. The resulting hash is frozen for the
             # same reason.
-            self.mapped_attributes = mapped_attributes.merge(from => to).freeze
+            self.mapped_attributes = mapped_attributes.merge(from => to.to_s).freeze
 
             _fmrest_attribute_methods_container.module_eval do
               define_method(from) do

data/lib/fmrest/spyke/model/global_fields.rb

@@ -6,8 +6,6 @@ module FmRest
       module GlobalFields
         extend ::ActiveSupport::Concern
 
-        FULLY_QUALIFIED_FIELD_NAME_MATCHER = /\A[^:]+::[^:]+\Z/.freeze
-
         class_methods do
           def set_globals(values_hash)
             connection.patch(FmRest::V1.globals_path, {
@@ -26,7 +24,7 @@ module FmRest
                 next
               end
 
-              unless FULLY_QUALIFIED_FIELD_NAME_MATCHER === k.to_s
+              unless V1.is_fully_qualified?(k.to_s)
                 raise ArgumentError, "global fields must be given in fully qualified format (table name::field name)"
               end
 

data/lib/fmrest/spyke/model/serialization.rb

@@ -26,7 +26,7 @@ module FmRest
         def serialize_for_portal(portal)
           params =
             changed_params.except(:__record_id).transform_keys do |key|
-              "#{portal.attribute_prefix}::#{key}"
+              V1.is_fully_qualified?(key) ? key : "#{portal.attribute_prefix}::#{key}"
             end
 
           params[:recordId] = __record_id.to_s if __record_id

data/lib/fmrest/spyke/portal_builder.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module FmRest
+  module Spyke
+    class PortalBuilder < ::Spyke::Associations::Builder
+      attr_reader :options
+
+      def klass
+        begin
+          super
+        rescue NameError => e
+          ::FmRest::Layout
+        end
+      end
+    end
+  end
+end

data/lib/fmrest/spyke/spyke_formatter.rb

@@ -195,8 +195,8 @@ module FmRest
         out
       end
 
-      # Extracts `recordId` and strips the `"PortalName::"` field prefix for each
-      # portal
+      # Extracts `recordId` and strips the `"tableName::"` field qualifier for
+      # each portal
       #
       # Sample `json_portal_data`:
       #
@@ -210,19 +210,33 @@ module FmRest
       # @return [Hash] the portal data in Spyke format
       def prepare_portal_data(json_portal_data)
         json_portal_data.each_with_object({}) do |(portal_name, portal_records), out|
+
           portal_options = @model.portal_options[portal_name.to_s] || {}
+          portal_builder = portal_options[:name] && @model.associations[portal_options[:name].to_sym]
+          portal_class = portal_builder && portal_builder.klass
+          portal_attributes = (portal_class && portal_class.mapped_attributes.values) || []
 
           out[portal_name] =
             portal_records.map do |portal_fields|
               attributes = { __record_id: portal_fields[:recordId] }
               attributes[:__mod_id] = portal_fields[:modId] if portal_fields[:modId]
 
-              prefix = portal_options[:attribute_prefix] || portal_name
-              prefix_matcher = /\A#{prefix}::/
+              qualifier = portal_options[:attribute_prefix] || portal_name
+              qualifier_matcher = /\A#{qualifier}::/
 
               portal_fields.each do |k, v|
                 next if :recordId == k || :modId == k
-                attributes[k.to_s.gsub(prefix_matcher, "").to_sym] = v
+
+                stripped_field_name = k.to_s.gsub(qualifier_matcher, "")
+
+                # Only use the non-qualified attribute name if it was defined
+                # that way on the portal model, otherwise default to the fully
+                # qualified name
+                if portal_attributes.include?(stripped_field_name)
+                  attributes[stripped_field_name.to_sym] = v
+                else
+                  attributes[k.to_sym] = v
+                end
               end
 
               attributes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmrest-spyke
 version: !ruby/object:Gem::Version
-  version: 0.17.0.rc1
+  version: 0.18.0.rc2
 platform: ruby
 authors:
 - Pedro Carbajal
 autorequire:
 bindir: bin
 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: fmrest-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0.rc1
+        version: 0.18.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0.rc1
+        version: 0.18.0.rc2
 - !ruby/object:Gem::Dependency
   name: spyke
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +68,7 @@ files:
 - lib/fmrest/spyke/model/serialization.rb
 - lib/fmrest/spyke/model/uri.rb
 - lib/fmrest/spyke/portal.rb
+- lib/fmrest/spyke/portal_builder.rb
 - lib/fmrest/spyke/relation.rb
 - lib/fmrest/spyke/spyke_formatter.rb
 - lib/fmrest/spyke/validation_error.rb