globalid 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18b15edf85a6adec6677a63e25b88f7e0a603317
-  data.tar.gz: 070999cf1c6910f232e0139d398d635184d285ef
+  metadata.gz: 3de819ff2f02d59893c4a4fd90539488ff7179e9
+  data.tar.gz: e2e16efbcff7df37e004aa3102fb4f0fafa52dfa
 SHA512:
-  metadata.gz: 70412b970cb49cf9b7435616a1e5a7924a7c4dc11c70e5e1fb676e71441721f89d7fe39141c3817d375ccc264ef5d4c8413ea194cf5d5d1db02d0577b6595ba3
-  data.tar.gz: 75b5e5854eb5d330201bf55c49245a2d3d735ab29a74181458a321d6d625813744246ad0c01d6c7e230eb36d91cebc4cb6291e6e297b75c27b5922370d764285
+  metadata.gz: 6c822d9f0ba64363ed40ecea47d85e36bd16a84c4fb171cc547dc510c886143217c58c403a5d8f8c37c259f60c34f631761c50ed005f9d7e9cfc57c3b0098ff8
+  data.tar.gz: 00d2640d7e991dcee6fa4f69ea2d56a1aeae047aa0505864dea88b7f2de9aa4ef0892357c53902a433846750db5899209f1d5cfa7bea6881780da909fed90384

data/lib/global_id/global_id.rb

@@ -11,24 +11,24 @@ class GlobalID
     def create(model, options = {})
       app = options.fetch :app, GlobalID.app
       raise ArgumentError, "An app is required to create a GlobalID. Pass the :app option or set the default GlobalID.app." unless app
-      new URI("gid://#{app}/#{model.class.name}/#{model.id}")
+      new URI("gid://#{app}/#{model.class.name}/#{model.id}"), options
     end
 
     def find(gid, options = {})
       parse(gid).try(:find, options)
     end
 
-    def parse(gid)
-      gid.is_a?(self) ? gid : new(gid)
+    def parse(gid, options = {})
+      gid.is_a?(self) ? gid : new(gid, options)
     rescue URI::Error
-      parse_encoded_gid(gid)
+      parse_encoded_gid(gid, options)
     end
 
-    def parse_encoded_gid(gid)
-      new Base64.urlsafe_decode64(repad_gid(gid)) rescue nil
-    end
-    
     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))
@@ -38,7 +38,7 @@ class GlobalID
 
   attr_reader :uri, :app, :model_name, :model_id
 
-  def initialize(gid)
+  def initialize(gid, options = {})
     extract_uri_components gid
   end
 

data/lib/global_id/railtie.rb

@@ -16,7 +16,11 @@ class GlobalID
       GlobalID.app = app.config.global_id.app
 
       config.after_initialize do
-        app.config.global_id.verifier ||= app.message_verifier(:signed_global_ids)
+        app.config.global_id.verifier ||= begin
+          app.message_verifier(:signed_global_ids)
+        rescue ArgumentError
+          nil
+        end
         SignedGlobalID.verifier = app.config.global_id.verifier
       end
 

data/lib/global_id/signed_global_id.rb

@@ -4,16 +4,40 @@ require 'active_support/message_verifier'
 class SignedGlobalID < GlobalID
   class << self
     attr_accessor :verifier
+
+    def parse(sgid, options = {})
+      if sgid.is_a? self
+        sgid
+      else
+        super verify(sgid, pick_verifier(options))
+      end
+    end
+
+    # Grab the verifier from options and fall back to SignedGlobalID.verifier.
+    # Raise ArgumentError if neither is available.
+    def pick_verifier(options)
+      options.fetch :verifier do
+        verifier || raise(ArgumentError, 'Pass a `verifier:` option with an `ActiveSupport::MessageVerifier` instance, or set a default SignedGlobalID.verifier.')
+      end
+    end
+
+    private
+      def verify(sgid, verifier)
+        verifier.verify(sgid)
+      rescue ActiveSupport::MessageVerifier::InvalidSignature
+        nil
+      end
   end
 
-  def self.parse(sgid)
-    sgid.is_a?(self) ? sgid : super(verifier.verify(sgid))
-  rescue ActiveSupport::MessageVerifier::InvalidSignature
-    nil
+  attr_reader :verifier
+
+  def initialize(gid, options = {})
+    super
+    @verifier = self.class.pick_verifier(options)
   end
 
   def to_s
-    @sgid ||= self.class.verifier.generate(super)
+    @sgid ||= @verifier.generate(super)
   end
   alias to_param to_s
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: globalid
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport