positioning 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2863317333ca4e36b7c8aecb178fb38f4489fc4dd76eb771c053769eb82cfbe2
-  data.tar.gz: 13ad7808c1beb5ffaff7d97849b48e194915eeb043e541254843bb22ecfc167d
+  metadata.gz: 2fa6907a0507b7978c58578596c4e6ca16b7e334eb98b3fa42cba47a0d0b89b5
+  data.tar.gz: ed8f3126f69cb0f8780244a05d48e46abd0b64468ad47838f0d5827b4fa943ff
 SHA512:
-  metadata.gz: dfcf0d2652e7c9e7ac65e5a1c885edae966ec0d7bc7119b3691c13b2c34c8ad434c6a7e8590e0ff76e550000cddd8cc3b2b2daf72b0626803d988ed21d6e8d7c
-  data.tar.gz: bcdd1517650a8327eaa63ebed37bdcf2cc236beaad383eed23c3e063dfca1031c00714acf99542e8dca0d7320a53fcba6181da24f1e60fe0e4c706e870dd23ae
+  metadata.gz: 5d35b26bf717252dc30d828b2fff2b5b36c82ccd5b33d5480798cc57e38bacf9434120d2a478d448998c368286272a9dc2604cb8d3ebd071da0a55c8fa4ad5ba
+  data.tar.gz: 3b9c21bb1a3fe42c0799ffe6e991b29f7c17fd4efec8ff3b159afa41cd8a6b8b1e975e47c8e69e22dfd673352b105f2c55d85887a07d90e528b2cd0c54b3a318

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.1.6] - 2024-03-05
+
+- Allow the position to be passed as a JSON object so that we can pass in complex positions from the browser more easily.
+
+## [0.1.5] - 2024-03-04
+
+- Allow empty strings to represent nil for the purposes of solidifying a position
+
 ## [0.1.4] - 2024-03-04
 
 - Fix bug relating to relative position hash coming from Rails being a Hash With Indifferent Access

data/lib/positioning/mechanisms.rb

@@ -96,16 +96,27 @@ module Positioning
     end
 
     def solidify_position
-      position_before_type_cast = @positioned.read_attribute_before_type_cast @column
-      position_before_type_cast.to_sym if position_before_type_cast.is_a? String
-      position_before_type_cast = position_before_type_cast.symbolize_keys if position_before_type_cast.is_a? Hash
+      position_before_type_cast = @positioned.read_attribute_before_type_cast(@column)
+
+      if position_before_type_cast.is_a? String
+        begin
+          position_before_type_cast = JSON.parse(position_before_type_cast, symbolize_names: true)
+        rescue JSON::ParserError
+        end
+
+        if position_before_type_cast.is_a?(String) && position_before_type_cast.present?
+          position_before_type_cast = position_before_type_cast.to_sym
+        end
+      elsif position_before_type_cast.is_a? Hash
+        position_before_type_cast = position_before_type_cast.symbolize_keys
+      end
 
       case position_before_type_cast
       when Integer
         self.position = position_before_type_cast.clamp(1..last_position)
-      when :first, {after: nil}
+      when :first, {after: nil}, {after: ""}
         self.position = 1
-      when nil, :last, {before: nil}
+      when nil, "", :last, {before: nil}, {before: ""}
         self.position = last_position
       when Hash
         relative_position, relative_record_or_primary_key = *position_before_type_cast.first
@@ -135,8 +146,9 @@ module Positioning
 
       unless position.is_a? Integer
         raise Error.new,
-          "`#{@column}` must be an Integer, :first, :last, before: #{base_class.name}, " \
-          "after: #{base_class.name}, or nil"
+          %(`#{@column}` must be an Integer, :first, :last, ) +
+            %{before: (#{base_class.name}, #{primary_key_column}, nil, or ""), } +
+            %{after: (#{base_class.name}, #{primary_key_column}, nil or ""), nil or ""}
       end
     end
 

data/lib/positioning/version.rb

@@ -1,3 +1,3 @@
 module Positioning
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: positioning
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Brendon Muir
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport