fmrest 0.2.1 → 0.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/fmrest.gemspec +0 -1
- data/lib/fmrest/spyke/json_parser.rb +6 -8
- data/lib/fmrest/version.rb +1 -1
- metadata +2 -16
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9e9c7970a1312d387699578cbe88a61307c0ed6eb2f7951bde931032fcdbab21
|
4
|
+
data.tar.gz: 0af953e25167c45daf01bf7107b29ebdd6e5ac72ce10dc67e82f3ec70a53ac96
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a6aaea5914f68905024026ff9480b3867ed9f3603925a043ba2b01e421eadf767811c0745b3aabddf837e55c4194dd2050383a35ce574572386fd683a32c5069
|
7
|
+
data.tar.gz: fd4ad5c30ce611a22ad68281ebeda50565e8a92307dc9134f96be28f2695f831cbe857281f1e1969e07548b5c31260bd0f9d07a5f30adc4d921d501f235611c4
|
data/fmrest.gemspec
CHANGED
@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
|
|
28
28
|
spec.add_development_dependency "rspec", "~> 3.0"
|
29
29
|
spec.add_development_dependency "spyke"
|
30
30
|
spec.add_development_dependency "webmock"
|
31
|
-
spec.add_development_dependency "multi_json"
|
32
31
|
spec.add_development_dependency "pry-byebug"
|
33
32
|
spec.add_development_dependency "activerecord"
|
34
33
|
spec.add_development_dependency "sqlite3", "~> 1.3.6"
|
@@ -1,5 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
+
require "json"
|
4
|
+
|
3
5
|
module FmRest
|
4
6
|
module Spyke
|
5
7
|
# Response Faraday middleware for converting FM API's response JSON into
|
@@ -40,7 +42,7 @@ module FmRest
|
|
40
42
|
response = json[:response]
|
41
43
|
|
42
44
|
data = {}
|
43
|
-
data[:mod_id] = response[:modId]
|
45
|
+
data[:mod_id] = response[:modId] if response[:modId]
|
44
46
|
data[:id] = response[:recordId].to_i if response[:recordId]
|
45
47
|
|
46
48
|
build_base_hash(json, true).merge!(data: data)
|
@@ -116,7 +118,7 @@ module FmRest
|
|
116
118
|
# @param json_data [Hash]
|
117
119
|
# @return [Hash] the record data in Spyke format
|
118
120
|
def prepare_record_data(json_data)
|
119
|
-
out = { id: json_data[:recordId].to_i, mod_id: json_data[:modId]
|
121
|
+
out = { id: json_data[:recordId].to_i, mod_id: json_data[:modId] }
|
120
122
|
out.merge!(json_data[:fieldData])
|
121
123
|
out.merge!(prepare_portal_data(json_data[:portalData])) if json_data[:portalData]
|
122
124
|
out
|
@@ -142,7 +144,7 @@ module FmRest
|
|
142
144
|
out[portal_name] =
|
143
145
|
portal_records.map do |portal_fields|
|
144
146
|
attributes = { id: portal_fields[:recordId].to_i }
|
145
|
-
attributes[:mod_id] = portal_fields[:modId]
|
147
|
+
attributes[:mod_id] = portal_fields[:modId] if portal_fields[:modId]
|
146
148
|
|
147
149
|
prefix = portal_options[:attribute_prefix] || portal_name
|
148
150
|
prefix_matcher = /\A#{prefix}::/
|
@@ -191,11 +193,7 @@ module FmRest
|
|
191
193
|
# @param source [String] a JSON string
|
192
194
|
# @return [Hash] the parsed JSON
|
193
195
|
def parse_json(source)
|
194
|
-
|
195
|
-
::MultiJson.load(source, symbolize_keys: true)
|
196
|
-
else
|
197
|
-
::JSON.parse(source, symbolize_names: true)
|
198
|
-
end
|
196
|
+
JSON.parse(source, symbolize_names: true)
|
199
197
|
end
|
200
198
|
end
|
201
199
|
end
|
data/lib/fmrest/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fmrest
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Pedro Carbajal
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-07-
|
11
|
+
date: 2019-07-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|
@@ -120,20 +120,6 @@ dependencies:
|
|
120
120
|
- - ">="
|
121
121
|
- !ruby/object:Gem::Version
|
122
122
|
version: '0'
|
123
|
-
- !ruby/object:Gem::Dependency
|
124
|
-
name: multi_json
|
125
|
-
requirement: !ruby/object:Gem::Requirement
|
126
|
-
requirements:
|
127
|
-
- - ">="
|
128
|
-
- !ruby/object:Gem::Version
|
129
|
-
version: '0'
|
130
|
-
type: :development
|
131
|
-
prerelease: false
|
132
|
-
version_requirements: !ruby/object:Gem::Requirement
|
133
|
-
requirements:
|
134
|
-
- - ">="
|
135
|
-
- !ruby/object:Gem::Version
|
136
|
-
version: '0'
|
137
123
|
- !ruby/object:Gem::Dependency
|
138
124
|
name: pry-byebug
|
139
125
|
requirement: !ruby/object:Gem::Requirement
|