globalid 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f36292e3297f3b86657a1f78ddbc66b49ca68c180ed19a982da42b6b8c217d3
-  data.tar.gz: 7283f395e6ee9f52b6eca60ef6bb30bff5f18aebfc6967a4d01b2562b5c05535
+  metadata.gz: 52c4368f15fc8952c9d79189ed9a78e649e0142421721aef338625c19b24c3b9
+  data.tar.gz: 4d6d1c379d45ccaf5761488c540d19cac9d0488b578564964edd88c52073c511
 SHA512:
-  metadata.gz: f49b754df08e92cfca61de31d9df0a79ffdeaec3866da4210bfb293fe76043402294d9fede88f0d11f74e2d16beb962cde3cfc475806db8c99d7d17b5d7b43e1
-  data.tar.gz: 96870a2787b2267b91413096d2096f364d67ed1d059d4244110500310f592516c3c3dab815f147d739d7fde7bb4a8e22d538130dc6fef21e23b22c02e032c4c9
+  metadata.gz: 49ff5a4b4d4f68afdffa67a85b5aebfb3b2f518257ffec22be8a60a29ac5596a67552aae46bebab28a4fe6b37a5802ac520b0f567098617110b2f54c4a74cfcb
+  data.tar.gz: f6ba35dc2c080b0c996bd4529cec1438a35545c693cc0271e25c6b7bdaa8f759de61f26ae6ecf16487d89c7e6e5afc41caab7114541cd8a54ebdf9e2a3ce1f60

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2016 David Heinemeier Hansson
+Copyright (c) 2014-2023 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -18,4 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/lib/global_id/fixture_set.rb

@@ -2,12 +2,20 @@
 
 class GlobalID
   module FixtureSet
-    def signed_global_id(fixture_set_name, label, column_type: :integer, **options)
-      identifier = identify(label, column_type)
-      model_name = default_fixture_model_name(fixture_set_name)
-      uri = URI::GID.build([GlobalID.app, model_name, identifier, {}])
+    def global_id(fixture_set_name, label, column_type: :integer, **options)
+      create_global_id(fixture_set_name, label, column_type: column_type, klass: GlobalID, **options)
+    end
 
-      SignedGlobalID.new(uri, **options)
+    def signed_global_id(fixture_set_name, label, column_type: :integer, **options)
+      create_global_id(fixture_set_name, label, column_type: column_type, klass: SignedGlobalID, **options)
     end
+
+    private
+      def create_global_id(fixture_set_name, label, klass:, column_type: :integer, **options)
+        identifier = identify(label, column_type)
+        model_name = default_fixture_model_name(fixture_set_name)
+        uri = URI::GID.build([GlobalID.app, model_name, identifier, {}])
+        klass.new(uri, **options)
+      end
   end
 end

data/lib/global_id/global_id.rb

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'active_support/core_ext/string/inflections'  # For #model_class constantize
 require 'active_support/core_ext/array/access'
 require 'active_support/core_ext/object/try'          # For #find
@@ -35,18 +34,12 @@ class GlobalID
 
     private
       def parse_encoded_gid(gid, options)
-        new(Base64.urlsafe_decode64(repad_gid(gid)), options) rescue nil
-      end
-
-      # We removed the base64 padding character = during #to_param, now we're adding it back so decoding will work
-      def repad_gid(gid)
-        padding_chars = gid.length.modulo(4).zero? ? 0 : (4 - gid.length.modulo(4))
-        gid + ('=' * padding_chars)
+        new(Base64.urlsafe_decode64(gid), options) rescue nil
       end
   end
 
   attr_reader :uri
-  delegate :app, :model_name, :model_id, :params, :to_s, to: :uri
+  delegate :app, :model_name, :model_id, :params, :to_s, :deconstruct_keys, to: :uri
 
   def initialize(gid, options = {})
     @uri = gid.is_a?(URI::GID) ? gid : URI::GID.parse(gid)
@@ -57,7 +50,13 @@ class GlobalID
   end
 
   def model_class
-    model_name.constantize
+    model = model_name.constantize
+
+    unless model <= GlobalID
+      model
+    else
+      raise ArgumentError, "GlobalID and SignedGlobalID cannot be used as model_class."
+    end
   end
 
   def ==(other)
@@ -70,7 +69,10 @@ class GlobalID
   end
 
   def to_param
-    # remove the = padding character for a prettier param -- it'll be added back in parse_encoded_gid
-    Base64.urlsafe_encode64(to_s).sub(/=+$/, '')
+    Base64.urlsafe_encode64(to_s, padding: false)
+  end
+
+  def as_json(*)
+    to_s
   end
 end

data/lib/global_id/locator.rb

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'active_support/core_ext/enumerable' # For Enumerable#index_by
 
 class GlobalID

data/lib/global_id/railtie.rb

@@ -3,7 +3,6 @@ require 'rails/railtie'
 rescue LoadError
 else
 require 'global_id'
-require 'active_support'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/integer/time'
 

data/lib/global_id/signed_global_id.rb

@@ -1,4 +1,3 @@
-require 'global_id'
 require 'active_support/message_verifier'
 require 'time'
 

data/lib/global_id/uri/gid.rb

@@ -98,6 +98,10 @@ module URI
       "gid://#{app}#{path}#{'?' + query if query}"
     end
 
+    def deconstruct_keys(_keys)
+      {app: app, model_name: model_name, model_id: model_id, params: params}
+    end
+
     protected
       def set_path(path)
         set_model_components(path) unless defined?(@model_name) && @model_id
@@ -123,9 +127,6 @@ module URI
     private
       COMPONENT = [ :scheme, :app, :model_name, :model_id, :params ].freeze
 
-      # Extracts model_name and model_id from the URI path.
-      PATH_REGEXP = %r(\A/([^/]+)/?([^/]+)?\z)
-
       def check_host(host)
         validate_component(host)
         super
@@ -138,18 +139,18 @@ module URI
 
       def check_scheme(scheme)
         if scheme == 'gid'
-          super
+          true
         else
           raise URI::BadURIError, "Not a gid:// URI scheme: #{inspect}"
         end
       end
 
       def set_model_components(path, validate = false)
-        _, model_name, model_id = path.match(PATH_REGEXP).to_a
-        model_id = CGI.unescape(model_id) if model_id
-
+        _, model_name, model_id = path.split('/', 3)
         validate_component(model_name) && validate_model_id(model_id, model_name) if validate
 
+        model_id = CGI.unescape(model_id) if model_id
+
         @model_name = model_name
         @model_id = model_id
       end
@@ -162,7 +163,7 @@ module URI
       end
 
       def validate_model_id(model_id, model_name)
-        return model_id unless model_id.blank?
+        return model_id unless model_id.blank? || model_id.include?('/')
 
         raise MissingModelIdError, "Unable to create a Global ID for " \
           "#{model_name} without a model id."

data/lib/global_id/verifier.rb

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'active_support/message_verifier'
 
 class GlobalID

data/lib/global_id.rb

@@ -1,5 +1,5 @@
-require 'global_id/global_id'
 require 'active_support'
+require 'global_id/global_id'
 
 autoload :SignedGlobalID, 'global_id/signed_global_id'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: globalid
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,7 +59,8 @@ files:
 homepage: http://www.rubyonrails.org
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -75,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: 'Refer to any model with a URI: gid://app/class/id'