order_already 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d0792edcb48d855dd6d7fe7f7e7bd28ee198f6144a816e4b7594f49ea7fe32
-  data.tar.gz: bc0bb4eafc7c7f01bdbb90e3a5ab20b59abc74f797509f0da4f592ba946ca628
+  metadata.gz: e9133e5102bbf4b0b4f6ef2207ee536e63dc6ac7d44181aedae6f1e179ebd22c
+  data.tar.gz: 69ce14225f00f535e165be4c951692bdb5d7c372595e59c9bd2ba9c51496d009
 SHA512:
-  metadata.gz: 57752a7bf98a638194b27db452a8028e30cfe94e2490972ee3b9164e72c3e20e6fbb3db4db9c1b6e3a1987259daf29e69b78657578a42342d68377d11e127a50
-  data.tar.gz: 16d4471e24105b2641ff0640963e3de6a2eff56dc84e0ea104415b1b4cbbe77ab146fcb71df6938f60f4bf1158b5fcf0bdee2d7e2c22939a8209669c83455d29
+  metadata.gz: 76eca41dc67a98dd12273bbd49eb4a4f21db9d2540ed976939adb4c66099a1d9216c2d178667536ff4e79f4a41b85c71f8dfa5fab9dbfdf9886130b98ab2041e
+  data.tar.gz: '04979a7b87e416ac7d81df70a3f4f8c2e12f7b1b04211c879dc86cdb13124c8ebdbea5010fb76e52c5b87edc10030497444248c269c05db4f776038097626921'

data/README.md

@@ -47,6 +47,19 @@ class GenericWork < ActiveFedora::Base
 end
 ```
 
+Included, as of v0.3.1, is the `order_already/spec_helper`.  This provides the custom matcher: `have_already_ordered_attributes`.
+
+```ruby
+require 'spec_helper'
+require 'order_already/spec_helper'
+
+RSpec.describe GenericWork do
+  subject { described_class.new }
+
+  it { is_expected.to have_already_ordered_attributes(:creator, :contributor) }
+end
+```
+
 As of v0.2.0, the `OrderAlready.for` method takes a `:serializer` keyword.  By default this is the preserve the order of the input serializers.
 
 ## Development

data/lib/order_already/spec_helper.rb

@@ -0,0 +1,14 @@
+RSpec::Matchers.define :have_already_ordered_attributes do |*expected_attributes|
+  match do |actual|
+    actual.already_ordered_attributes.map(&:to_sym).sort == expected_attributes.map(&:to_sym).sort
+  end
+
+  failure_message do |actual|
+    actual_attrs = actual.already_ordered_attributes.map(&:to_sym).sort
+    expected_attrs = expected_attributes.map(&:to_sym).sort
+
+    "Expected that #{actual} would have the following ordered attributes:\n" \
+    "#{expected_attrs.inspect}.\n"
+    "Actual: #{actual_attrs.inspect}\n"
+  end
+end

data/lib/order_already/version.rb

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

data/lib/order_already.rb

@@ -62,6 +62,10 @@ module OrderAlready
       define_method(:attribute_is_ordered_already?) do |attribute|
         ordered_attributes.include?(attribute.to_sym)
       end
+
+      define_method(:already_ordered_attributes) do
+        ordered_attributes
+      end
     end
   end
 
@@ -77,7 +81,9 @@ module OrderAlready
     # @param arr [Array]
     # @return [Array]
     def self.deserialize(arr)
-      return [] if arr&.empty?
+      arr = arr&.compact || []
+      arr = arr.reject(&:empty?)
+      return [] if arr.empty?
 
       sort(arr).map do |val|
         get_value(val)
@@ -91,7 +97,9 @@ module OrderAlready
     # @param arr [Array]
     # @return [Array]
     def self.serialize(arr)
-      return [] if arr&.empty?
+      arr = arr&.compact || []
+      arr = arr.reject(&:empty?)
+      return [] if arr.empty?
 
       arr = sanitize(arr)
 
@@ -104,6 +112,8 @@ module OrderAlready
     end
 
     def self.sanitize(values)
+      return if values.nil?
+
       full_sanitizer = Rails::Html::FullSanitizer.new
       sanitized_values = Array.new(values.size, '')
       empty = TOKEN_DELIMITER * 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: order_already
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Jeremy Friesen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails-html-sanitizer
@@ -71,11 +71,11 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - lib/order_already.rb
+- lib/order_already/spec_helper.rb
 - lib/order_already/version.rb
 - order_already.gemspec
 homepage: https://github.com/scientist-softserv/order_already
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A tiny gem to provide naive sorting for Fedora Commons properties.

data/Gemfile.lock

@@ -1,92 +0,0 @@
-PATH
-  remote: .
-  specs:
-    order_already (0.2.1)
-      rails-html-sanitizer (~> 1.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (7.0.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    bixby (5.0.2)
-      rubocop (= 1.28.2)
-      rubocop-ast
-      rubocop-performance
-      rubocop-rails
-      rubocop-rspec
-    concurrent-ruby (1.1.10)
-    crass (1.0.6)
-    diff-lcs (1.5.0)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.19.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    minitest (5.16.3)
-    nokogiri (1.13.9-arm64-darwin)
-      racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.1.2.1)
-      ast (~> 2.4.1)
-    racc (1.6.0)
-    rack (3.0.0)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.1)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.28.2)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.17.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.15.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.15.2)
-      activesupport (>= 4.2.0)
-      rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
-
-PLATFORMS
-  arm64-darwin-21
-
-DEPENDENCIES
-  bixby (~> 5.0, >= 5.0.2)
-  order_already!
-  rake (~> 13.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   2.3.9