fmrest-spyke 0.15.2 → 0.17.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +24 -9
- data/README.md +61 -8
- data/lib/fmrest/spyke/model/rescuable.rb +27 -0
- data/lib/fmrest/spyke/model/serialization.rb +8 -0
- data/lib/fmrest/spyke/model.rb +2 -0
- metadata +6 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 19e4983cff9d5959b2e9263687daaf18d779fcf6d284cbb6ec8844c1623beabf
|
4
|
+
data.tar.gz: 0e558a94cf0b26f5ffe1258f33385f0e016a73ae55aa200ea6768160c746ebd1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1af0c0918fe48374fd2dbe5f20bbeb8f0f7e9f73537233f9b530ea53ec37c3ceffba5612c244ce0c9553c66a2090dcd1d8330581940f6713660cbc6b1a362dd0
|
7
|
+
data.tar.gz: 75abe05bdbfec9e21d0bc3e6dcc5c10d3bbdb66213382c494e3b7511f4c00c628b5ad054ca81e486c4c614a3c9832f60787000a5d990399488ce7027c59a45e1
|
data/CHANGELOG.md
CHANGED
@@ -1,8 +1,23 @@
|
|
1
1
|
## Changelog
|
2
2
|
|
3
|
+
### 0.17.1
|
4
|
+
|
5
|
+
* Fixed crash when `fmid_token` is set but `username` isn't
|
6
|
+
|
7
|
+
### 0.17.0
|
8
|
+
|
9
|
+
* Added support for Claris ID token login
|
10
|
+
* Added ability to use procs in settings
|
11
|
+
* Added `Rescuable` mixin
|
12
|
+
|
13
|
+
### 0.16.0
|
14
|
+
|
15
|
+
* Added `FmRest.logger=`
|
16
|
+
* Handle serialization of `nil`, `true` and `false` values
|
17
|
+
|
3
18
|
### 0.15.2
|
4
19
|
|
5
|
-
*
|
20
|
+
* Fixed autoloading of `FmRest::Layout`
|
6
21
|
|
7
22
|
### 0.15.0
|
8
23
|
|
@@ -18,13 +33,13 @@
|
|
18
33
|
|
19
34
|
### 0.13.1
|
20
35
|
|
21
|
-
*
|
36
|
+
* Fixed downloading of container field data from FMS19+
|
22
37
|
|
23
38
|
### 0.13.0
|
24
39
|
|
25
40
|
* Split `fmrest` gem into `fmrest-core` and `fmrest-spyke`. `fmrest` becomes a
|
26
41
|
wrapper for the two new gems.
|
27
|
-
*
|
42
|
+
* Fixed bug preventing connection databases with spaces in their names.
|
28
43
|
* Improved portal support with ability to delete portal records, and better
|
29
44
|
refreshing of portal records after saving the parent.
|
30
45
|
* `FmRest::Spyke::Base#__record_id` and `FmRest::Spyke::Base#__mod_id` now
|
@@ -39,7 +54,7 @@
|
|
39
54
|
|
40
55
|
### 0.11.1
|
41
56
|
|
42
|
-
*
|
57
|
+
* Fixed a couple crashes due to missing constants
|
43
58
|
|
44
59
|
### 0.11.0
|
45
60
|
|
@@ -54,7 +69,7 @@
|
|
54
69
|
|
55
70
|
### 0.10.1
|
56
71
|
|
57
|
-
*
|
72
|
+
* Fixed `URI.escape` obsolete warning messages in Ruby 2.7 by replacing it with
|
58
73
|
`URI.encode_www_form_component`
|
59
74
|
([PR#40](https://github.com/beezwax/fmrest-ruby/pull/40))
|
60
75
|
|
@@ -128,20 +143,20 @@
|
|
128
143
|
|
129
144
|
### 0.3.2
|
130
145
|
|
131
|
-
*
|
146
|
+
* Fixed support for ActiveSupport < 5.2
|
132
147
|
([#27](https://github.com/beezwax/fmrest-ruby/issues/27))
|
133
148
|
|
134
149
|
### 0.3.0
|
135
150
|
|
136
|
-
*
|
151
|
+
* Added Moneta token store
|
137
152
|
|
138
153
|
### 0.2.5
|
139
154
|
|
140
|
-
*
|
155
|
+
* Fixed crash in `fetch_container_data` when no proxy options were set
|
141
156
|
|
142
157
|
### 0.2.4
|
143
158
|
|
144
159
|
* Use `String#=~` instead of `String#match?` for Ruby <2.4 compatibility (Fixes
|
145
160
|
[#26](https://github.com/beezwax/fmrest-ruby/issues/26))
|
146
|
-
*
|
161
|
+
* Deprecated `FmRest.config` in favor of `FmRest.default_connection_settings`
|
147
162
|
* Honor Faraday SSL and proxy settings when fetching container files
|
data/README.md
CHANGED
@@ -125,6 +125,10 @@ The minimum required connection settings are `:host`, `:database`, `:username`
|
|
125
125
|
and `:password`, but fmrest-ruby has many other options you can pass when
|
126
126
|
setting up a connection (see [full list](#full-list-of-available-options) below).
|
127
127
|
|
128
|
+
If you're using FileMaker Cloud you may need to pass `:fmid_token` instead
|
129
|
+
of the regular `:username` and `:password`. See the [main document on
|
130
|
+
connecting to FileMaker Cloud](docs/FileMakerCloud.md) for more info.
|
131
|
+
|
128
132
|
`:ssl` and `:proxy` are forwarded to the underlying
|
129
133
|
[Faraday](https://github.com/lostisland/faraday) connection. You can use this
|
130
134
|
to, for instance, disable SSL verification:
|
@@ -149,9 +153,11 @@ Option | Description | Format
|
|
149
153
|
`:username` | A Data API-ready account | String | None
|
150
154
|
`:password` | Your password | String | None
|
151
155
|
`:account_name` | Alias of `:username` | String | None
|
156
|
+
`:fmid_token` | Claris ID token (only needed for FileMaker Cloud) | String | None
|
152
157
|
`:ssl` | SSL options to be forwarded to Faraday | Faraday SSL options | None
|
153
158
|
`:proxy` | Proxy options to be forwarded to Faraday | Faraday proxy options | None
|
154
159
|
`:log` | Log JSON responses to STDOUT | Boolean | `false`
|
160
|
+
`:log_level` | Which log level to log into | Values accepted by `Logger#level=` | `:debug`
|
155
161
|
`:coerce_dates` | See section on [date fields](#date-fields-and-timezones) | Boolean \| `:hybrid` \| `:full` | `false`
|
156
162
|
`:date_format` | Date parsing format | String (FM date format) | `"MM/dd/yyyy"`
|
157
163
|
`:timestamp_format` | Timestmap parsing format | String (FM date format) | `"MM/dd/yyyy HH:mm:ss"`
|
@@ -282,10 +288,12 @@ Also, if not set, your model will try to use
|
|
282
288
|
#### Connection settings overlays
|
283
289
|
|
284
290
|
There may be cases where you want to use a different set of connection settings
|
285
|
-
depending on context
|
286
|
-
provided by the user in a web
|
287
|
-
|
288
|
-
|
291
|
+
depending on context, or simply change the connection settings over time. For
|
292
|
+
example, if you want to use username and password provided by the user in a web
|
293
|
+
application, or if you're connecting using an expiring Claris ID token. Since
|
294
|
+
`.fmrest_config` is set at the class level, changing the username/password for
|
295
|
+
the model in one context would also change it in all other contexts, leading to
|
296
|
+
security issues.
|
289
297
|
|
290
298
|
To solve this scenario, fmrest-ruby provides a way of defining thread-local and
|
291
299
|
reversible connection settings overlays through
|
@@ -322,7 +330,7 @@ Requests a Data API session token using the connection settings in
|
|
322
330
|
|
323
331
|
You normally don't need to use this method as fmrest-ruby will automatically
|
324
332
|
request and store session tokens for you (provided that `:autologin` is
|
325
|
-
`true`).
|
333
|
+
`true` in the connection settings, which it is by default).
|
326
334
|
|
327
335
|
### FmRest::Layout.logout
|
328
336
|
|
@@ -451,13 +459,48 @@ field values on the database that model is configured for.
|
|
451
459
|
See the [main document on setting global field values](docs/GlobalFields.md)
|
452
460
|
for details.
|
453
461
|
|
462
|
+
### Rescuable mixin
|
463
|
+
|
464
|
+
Sometimes you may want to handle Data API errors at the model level. For
|
465
|
+
instance, if you're logging in to a file hosted by FileMaker Cloud using a
|
466
|
+
Claris ID token, and you want to be able to renew said token when it fails to
|
467
|
+
log you in. For such cases fmrest-ruby provides an off-by-default mixin called
|
468
|
+
`Rescuable` that provides convenience macros for that. If you've used Ruby on
|
469
|
+
Rails you may be familiar with its syntax from controllers. E.g.
|
470
|
+
|
471
|
+
```ruby
|
472
|
+
class BeeBase < FmRest::Layout
|
473
|
+
include FmRest::Spyke::Model::Rescuable
|
474
|
+
|
475
|
+
rescue_from FmRest::APIError::SystemError, with: :notify_admin_of_system_error
|
476
|
+
|
477
|
+
# Shorthand for rescue_with FmRest::APIError::AccountError, ...
|
478
|
+
rescue_account_error { ClarisIDTokenManager.expire_token }
|
479
|
+
|
480
|
+
def self.notify_admin_of_system_error(e)
|
481
|
+
# Shoot an email to the FM admin...
|
482
|
+
end
|
483
|
+
end
|
484
|
+
```
|
485
|
+
|
486
|
+
Since `Rescuable` uses `ActiveSupport::Rescuable` internally, you may want to
|
487
|
+
check [Rails'
|
488
|
+
documentation](https://api.rubyonrails.org/classes/ActiveSupport/Rescuable/ClassMethods.html)
|
489
|
+
too for details on how it works.
|
490
|
+
|
491
|
+
One caveat of using `rescue_from` is that it always catches exceptions at the
|
492
|
+
class level, so if you pass a method name to `with:` that method has to be a
|
493
|
+
class method. Also note that this will only catch exceptions raised during an
|
494
|
+
API call to the Data API server (in other words, only on actions that perform
|
495
|
+
an HTTP request).
|
496
|
+
|
454
497
|
## Logging
|
455
498
|
|
456
499
|
If using `fmrest-spyke` with Rails then pretty log output will be set up for
|
457
500
|
you automatically by Spyke (see [their
|
458
501
|
README](https://github.com/balvig/spyke#log-output)).
|
459
502
|
|
460
|
-
You can also enable simple Faraday
|
503
|
+
You can also enable simple Faraday logging of raw requests (useful for
|
461
504
|
debugging) by passing `log: true` in the options hash for either
|
462
505
|
`FmRest.default_connection_settings=` or your models' `fmrest_config=`, e.g.:
|
463
506
|
|
@@ -478,7 +521,17 @@ class LoggyBee < FmRest::Layout
|
|
478
521
|
end
|
479
522
|
```
|
480
523
|
|
481
|
-
|
524
|
+
You can also pass `log_level` to connection settings to change the severity of
|
525
|
+
log output (defaults to `:debug`).
|
526
|
+
|
527
|
+
By default fmrest-ruby logs to STDOUT or to Rails' logger object if available.
|
528
|
+
You can change this by providing your own logger object to `FmRest.logger=`:
|
529
|
+
|
530
|
+
```ruby
|
531
|
+
FmRest.logger = Logger.new("fmrest.log")
|
532
|
+
```
|
533
|
+
|
534
|
+
If you need to set up more complex logging for your models you can use the
|
482
535
|
`faraday` block inside your class to inject your own logger middleware into the
|
483
536
|
Faraday connection, e.g.:
|
484
537
|
|
@@ -499,7 +552,7 @@ FM Data API reference: https://fmhelp.filemaker.com/docs/18/en/dataapi/
|
|
499
552
|
| Log in using HTTP Basic Auth | Yes | Yes |
|
500
553
|
| Log in using OAuth | No | No |
|
501
554
|
| Log in to an external data source | No | No |
|
502
|
-
| Log in using
|
555
|
+
| Log in using Claris ID account | Yes | Yes |
|
503
556
|
| Log out | Yes | Yes |
|
504
557
|
| Get product information | Manual* | No |
|
505
558
|
| Get database names | Manual* | No |
|
@@ -0,0 +1,27 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module FmRest
|
4
|
+
module Spyke
|
5
|
+
module Model
|
6
|
+
module Rescuable
|
7
|
+
extend ::ActiveSupport::Concern
|
8
|
+
|
9
|
+
include ::ActiveSupport::Rescuable
|
10
|
+
|
11
|
+
class_methods do
|
12
|
+
def request(*args)
|
13
|
+
begin
|
14
|
+
super
|
15
|
+
rescue => e
|
16
|
+
rescue_with_handler(e) || raise
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
def rescue_account_error(with: nil, &block)
|
21
|
+
rescue_from APIError::AccountError, with: with, &block
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
@@ -73,6 +73,10 @@ module FmRest
|
|
73
73
|
# Modifies the given hash in-place encoding non-string values (e.g.
|
74
74
|
# dates) to their string representation when appropriate.
|
75
75
|
#
|
76
|
+
# nil gets converted to empty string as the Data API doesn't accept
|
77
|
+
# nulls in JSON. Likewise, true and false get converted to 1 and 0
|
78
|
+
# respectively.
|
79
|
+
#
|
76
80
|
def serialize_values!(params)
|
77
81
|
params.transform_values! do |value|
|
78
82
|
case value
|
@@ -80,6 +84,10 @@ module FmRest
|
|
80
84
|
FmRest::V1.convert_datetime_timezone(value.to_datetime, fmrest_config.timezone).strftime(FmRest::V1::Dates::FM_DATETIME_FORMAT)
|
81
85
|
when *FmRest::V1.date_classes
|
82
86
|
value.strftime(FmRest::V1::Dates::FM_DATE_FORMAT)
|
87
|
+
when nil
|
88
|
+
""
|
89
|
+
when true, false
|
90
|
+
value ? 1 : 0
|
83
91
|
else
|
84
92
|
value
|
85
93
|
end
|
data/lib/fmrest/spyke/model.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fmrest-spyke
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.17.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Pedro Carbajal
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-08-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fmrest-core
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 0.
|
19
|
+
version: 0.17.1
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 0.
|
26
|
+
version: 0.17.1
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: spyke
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -64,6 +64,7 @@ files:
|
|
64
64
|
- lib/fmrest/spyke/model/http.rb
|
65
65
|
- lib/fmrest/spyke/model/orm.rb
|
66
66
|
- lib/fmrest/spyke/model/record_id.rb
|
67
|
+
- lib/fmrest/spyke/model/rescuable.rb
|
67
68
|
- lib/fmrest/spyke/model/serialization.rb
|
68
69
|
- lib/fmrest/spyke/model/uri.rb
|
69
70
|
- lib/fmrest/spyke/portal.rb
|
@@ -89,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
89
90
|
- !ruby/object:Gem::Version
|
90
91
|
version: '0'
|
91
92
|
requirements: []
|
92
|
-
rubygems_version: 3.
|
93
|
+
rubygems_version: 3.2.3
|
93
94
|
signing_key:
|
94
95
|
specification_version: 4
|
95
96
|
summary: FileMaker Data API ORM client library
|