fmrest 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0368b81402b25d33d32a77ce58c6d815ba4b40a61bc2a2b2da2f13fe6e90ba71'
-  data.tar.gz: 18f5a9d7b338b818ddb90a0fff59aa0f95bdd472ad6dfb4568dcde0812de8a56
+  metadata.gz: f0334b98968b68371d61a1f46c010937feb87bb5137b6e688c0096daf73b168a
+  data.tar.gz: c6585502bbb1a8005ea0f8a618c47d53b40b9412778a51e8154ab79393814ce5
 SHA512:
-  metadata.gz: 5714a35a16de760709a189b93c6258b8688315820bcf5d51902ca495a1d26f2fae0b15c80f476bc245b8a13a1d7fe4e3958d0b24f5808400cabba4dbfea0b5c9
-  data.tar.gz: 34d059fc99d94a3496f2d8f2aaea549be22da05a3a47e6e928bb4910e1d9247ecb6358002d2826bc92fbd911f94b0c644c49c8bcbd876cc4324299ce29db2b4b
+  metadata.gz: 433e6b05959fd64afbffddd2065df862449b3a3dcebe13780182b28bd6847f6263d4b2faffa3cef7d0a0f7949005ec1a1b9e8f7825129868bf49bd3833784ab5
+  data.tar.gz: 542d824f1cbb3c87722105a24b6bf2fdecd0d522a1a6d796d660a4c806ec83b356c50f400c9d37ce472cd2c4781ea1a50ecc533c361c4d6c02e19d47d625fb47

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Changelog
 
+### 0.3.3
+
+* Fix encoding of paths for layouts with brackets in them (e.g. `"\[Very Ugly\]
+  Layout"`)
+* Raise an error if `"id"` is assigned as an attribute on a model, as it's
+  currently a reserved method name by Spyke
+
 ### 0.3.2
 
 * Fix support for ActiveSupport < 5.2

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

@@ -79,6 +79,8 @@ module FmRest
           end
 
           def _fmrest_define_attribute(from, to)
+            raise ArgumentError, "attribute name `id' is reserved for the recordId" if from.to_s == "id"
+
             # 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

data/lib/fmrest/v1/paths.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "uri"
-
 module FmRest
   module V1
     module Paths
@@ -12,25 +10,34 @@ module FmRest
       end
 
       def record_path(layout, id = nil)
-        url = "layouts/#{URI.escape(layout.to_s)}/records"
+        url = "layouts/#{url_encode(layout)}/records"
         url += "/#{id}" if id
         url
       end
 
       def container_field_path(layout, id, field_name, field_repetition = 1)
         url = record_path(layout, id)
-        url += "/containers/#{URI.escape(field_name.to_s)}"
+        url += "/containers/#{url_encode(field_name)}"
         url += "/#{field_repetition}" if field_repetition
         url
       end
 
       def find_path(layout)
-        "layouts/#{URI.escape(layout.to_s)}/_find"
+        "layouts/#{url_encode(layout)}/_find"
       end
 
       def globals_path
         "globals"
       end
+
+      private
+
+      # Borrowed from ERB::Util
+      def url_encode(s)
+        s.to_s.b.gsub(/[^a-zA-Z0-9_\-.]/n) { |m|
+          sprintf("%%%02X", m.unpack("C")[0])
+        }
+      end
     end
   end
 end

data/lib/fmrest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FmRest
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fmrest
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Pedro Carbajal
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday