Fixes

Author: RogerPodacter

Gemfile

@@ -68,8 +68,6 @@ gem "awesome_print", "~> 1.9"
 
 gem "redis", "~> 5.0"
 
-gem 'facet_rails_common', git: 'https://github.com/0xfacet/facet_rails_common.git'
-
 gem "cbor", "~> 0.5.9"
 
 gem 'rswag-api'

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/0xFacet/eth.rb.git
-  revision: da52c74fe9baecf17177f6b5bfee9f42c1b18970
+  revision: 089128a7703aa5eeafe41d538f05732b29340188
   branch: sync/v0.5.16-nohex
   specs:
     eth (0.5.16)
@@ -14,13 +14,6 @@ GIT
       rbsecp256k1 (~> 6.0)
       scrypt (~> 3.0)
 
-GIT
-  remote: https://github.com/0xfacet/facet_rails_common.git
-  revision: 2d5cf107df9ea12bb7ab59a8b1ce4d38b4de483b
-  specs:
-    facet_rails_common (0.1.0)
-      order_query (~> 0.5.3)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -105,7 +98,7 @@ GEM
     awesome_print (1.9.2)
     base64 (0.2.0)
     benchmark (0.4.1)
-    bigdecimal (3.1.5)
+    bigdecimal (3.2.3)
     bls12-381 (0.3.0)
       h2c (~> 0.2.0)
     bootsnap (1.17.0)
@@ -157,7 +150,7 @@ GEM
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    httpx (1.6.0)
+    httpx (1.6.2)
       http-2 (>= 1.0.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -223,9 +216,6 @@ GEM
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     openssl (3.3.0)
-    order_query (0.5.5)
-      activerecord (>= 5.0, < 8.1)
-      activesupport (>= 5.0, < 8.1)
     ostruct (0.6.3)
     parallel (1.27.0)
     parser (3.2.2.4)
@@ -285,7 +275,7 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
-    rake (13.1.0)
+    rake (13.3.0)
     rbi (0.3.6)
       prism (~> 1.0)
       rbs (>= 3.4.4)
@@ -416,7 +406,6 @@ DEPENDENCIES
   debug
   dotenv-rails (~> 2.8)
   eth!
-  facet_rails_common!
   fastlz (~> 0.1.0)
   httparty (~> 0.22.0)
   jwt (~> 2.8)

app/controllers/application_controller.rb

@@ -1,3 +1,4 @@
 class ApplicationController < ActionController::API
-  include FacetRailsCommon::ApplicationControllerMethods
+  def self.cache_actions_on_block(...)
+  end
 end

app/models/protocol_extractor.rb

@@ -19,20 +19,24 @@ def self.extract(content_uri)
 
     # Try extractors in order of strictness
     # 1. Token protocol (most strict - exact character position matters)
-    # 2. Collections protocol (strict - exact key order required)
-    # 3. Generic protocol (flexible - for all other protocols)
+    # 2. Collections protocol (strict - exact key order required) - gated by ENABLE_COLLECTIONS
+    # 3. Generic protocol (flexible - for all other protocols) - gated by ENABLE_GENERIC_PROTOCOLS
 
     # Try token extractor first (most strict)
     result = try_token_extractor(content_uri)
     return result if result
 
-    # Try collections extractor next
-    result = try_collections_extractor(content_uri)
-    return result if result
+    # Try collections extractor next (if enabled)
+    if ENV['ENABLE_COLLECTIONS'] == 'true'
+      result = try_collections_extractor(content_uri)
+      return result if result
+    end
 
-    # Try generic extractor last (most flexible)
-    # result = try_generic_extractor(content_uri)
-    # return result if result
+    # Try generic extractor last (if enabled)
+    if ENV['ENABLE_GENERIC_PROTOCOLS'] == 'true'
+      result = try_generic_extractor(content_uri)
+      return result if result
+    end
 
     # No protocol could be extracted
     nil

lib/data_uri.rb

@@ -0,0 +1,93 @@
+class DataUri
+  REGEXP = %r{
+    \Adata:
+    (?<mediatype>
+      (?<mimetype> .+? / .+? )?
+      (?<parameters> (?: ; .+? = .+? )* )
+    )?
+    (?<extension>;base64)?
+    ,
+    (?<data>.*)
+  }x.freeze
+
+  attr_reader :uri, :match
+
+  def initialize(uri)
+    match = REGEXP.match(uri)
+    raise ArgumentError, 'invalid data URI' unless match
+
+    @uri = uri
+    @match = match
+
+    validate_base64_content
+  end
+
+  def self.valid?(uri)
+    begin
+      DataUri.new(uri)
+      true
+    rescue ArgumentError
+      false
+    end
+  end
+
+  def self.esip6?(uri)
+    begin
+      parameters = DataUri.new(uri).parameters
+
+      parameters.include?("rule=esip6")
+    rescue ArgumentError
+      false
+    end
+  end
+
+  def validate_base64_content
+    if base64?
+      begin
+        Base64.strict_decode64(data)
+      rescue ArgumentError
+        raise ArgumentError, 'malformed base64 content'
+      end
+    end
+  end
+
+  def mediatype
+    "#{mimetype}#{parameters}"
+  end
+
+  def decoded_data
+    return data unless base64?
+
+    Base64.decode64(data)
+  end
+  
+  def base64?
+    !String(extension).empty?
+  end
+
+  def mimetype
+    if String(match[:mimetype]).empty? || uri.starts_with?("data:,")
+      return 'text/plain'
+    end
+    
+    match[:mimetype]
+  end
+  
+  def data
+    # Special case: if it's "data:," with no mediatype, return everything after comma
+    if uri.start_with?("data:,")
+      return uri[6..-1]  # Everything after "data:,"
+    end
+    match[:data]
+  end
+
+  def parameters
+    return [] if String(match[:mimetype]).empty? && String(match[:parameters]).empty?
+  
+    match[:parameters].split(";").reject(&:empty?)
+  end  
+  
+  def extension
+    match[:extension]
+  end
+end