datauris 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a65cebd38591b1ea9416cbb69498707019dd6e422c0aacc72b404f546270da
-  data.tar.gz: 559e1dbe5a26c70a872ca242b0e4c93a06b8883a0dbe080a3cd38f560019390f
+  metadata.gz: 89ab6159a9beb6750504017159f5d0e0391c78ea965aaea0d705531299bae7b1
+  data.tar.gz: 87bc327d253eb5464e47dbb2ef2d4770da2caacda008aac0ae8c8ad0b8f74483
 SHA512:
-  metadata.gz: b60dd18069dee8bcb18b6fbb834964f4a55423fe595c8a8b3cad3f50219c39283920f2b14a4dedf72870eddc0575b555729e5763b3369e43aac809fb61b26ef0
-  data.tar.gz: 6872aa3cc3aeffeaebf0632e6dbc287dec2e17d7d3151bf4fd52ec22a9b93580db2ed61821145fc61b2522345ddbc6828e27279abf523990bc72c58190339921
+  metadata.gz: bd984682f79f95f7170e023a4f1aa8a048339010e71ee984958c528a7c5bf7a8d6102d90398e636bf27c553cd88f38bae4417708ec6367e7ee713fe84b96620f
+  data.tar.gz: 0ebfd59f4ca9aa3ee881c5a5eab954d4ecd3691594418fc35b1709468d1012ede78139e180b47a700c25f796d8f2e827a1c76734b6aefb236f27e79fc5c0cf8d

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 1.0.1
+### 1.1.1
 ### 0.0.1 / 2023-11-23
 
 * Everything is new. First release

data/lib/datauris/version.rb

@@ -1,7 +1,7 @@
 
 module DataUri
   MAJOR = 1 ## todo: namespace inside version or something - why? why not??
-  MINOR = 0
+  MINOR = 1
   PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/lib/datauris.rb

@@ -8,17 +8,6 @@ require_relative 'datauris/version'     # let version go first
 
 
 module DataUri
-    REGEX_V0 = %r{
-      \Adata:
-      (?<mediatype>
-        (?<type> .+? / .+? )?
-        (?<parameters> (?: ; .+? = .+? )* )
-      )?
-      (?<base64extension>;base64)?
-      ,
-      (?<data>.*)\z
-    }x
-
     ## allow type only - why? why not?
     ## split subtype into [tree prefix] and subtype
     ##  check if type can include dash (-) - why? why not?
@@ -64,7 +53,9 @@ module DataUri
                         )* 
         )
       )?
-      (?<base64extension>;base64)?
+      (?:;
+         (?<extension>base64|utf8)
+       )?
       ,
       (?<data>.*)
       \z
@@ -73,16 +64,21 @@ module DataUri
 
     def self._parse( str ) REGEX.match( str ); end
 
-    def self.parse( str )
+    def self.parse( str, utf8: false )   ## allow force utf8 with utf8: true
         m = _parse( str ) 
   
         if m
           ## 1) return mediatype (mimetype PLUS optional parameters)
           ## 2) return data (base64 decoded or not)
   
+          ## todo/check:
+          ##   add force_encoding( 'UTF-8' ) to returned data (if not base64) - why? why not?
+
           mediatype = m[:mediatype]  
-          data      = if m[:base64extension]   ## assume base64 encoded
+          data      = if m[:extension] && m[:extension] == 'base64'  ## assume base64 encoded
                          Base64.strict_decode64(m[:data])
+                      elsif utf8 || (m[:extension] && m[:extension] == 'utf8')
+                         m[:data]    ## note: no decode; assume "plain" utf8 string  
                       else
                          ## e.g. %20 => space(20)
                          ##  etc.
@@ -100,18 +96,25 @@ module DataUri
     end
 
 
-    def self.valid?( str )
+    def self.valid?( str, utf8: false )
       m = _parse( str )
       if m 
-        if m[:base64extension]   ## assume base64
+        if m[:extension] && m[:extension] == 'base64'   ## assume base64
           begin
             Base64.strict_decode64(m[:data])
             true
           rescue ArgumentError
             false
           end
+        elsif utf8 || (m[:extension] && m[:extension] == 'utf8') 
+           true   ## pass through as is; assume always true (check valid utf8 encoding - why? why not?) 
         else
-          true
+          begin 
+            URI.decode_uri_component(m[:data])            
+            true
+          rescue ArgumentError   ## check if decode errors are argument errors??
+            false
+          end
         end
       else
         false
@@ -165,10 +168,12 @@ module DataUri
     end
 
 
-    ## base64 - force base64 encoding (instead of "automagic")
-    def self.build( data, type=nil, base64: nil )
-        uri = "data:"
-        uri += type      if type   ## note: allow optional / no type
+    ## base64 - force base64 encoding instead of "automagic" (base64: true)
+    ## utf8   - or force utf8 encoding  (utf8: true)
+    ## uri    - or force STOPPING uri encoding (uri: false)
+    def self.build( data, type=nil, base64: nil, utf8: nil, uri: nil )
+        str = "data:"
+        str += type      if type   ## note: allow optional / no type
         
         ## puts "  type: #{type.inspect}, base64: #{base64.inspect}"
 
@@ -190,13 +195,17 @@ module DataUri
         end
 
         if base64    
-            uri += ";base64," + Base64.strict_encode64( data )
+            str += ";base64," + Base64.strict_encode64( data )
+        elsif utf8 
+            str += ";utf8," + data          
         else
             ## use encode_uri_component by default - why? why not?
             ##  space becomes %20
             ##  :     becomes %3A
             ##  ,     becomes %2C  and so on
-            uri += "," + encode_uri( data )
+            ##
+            ## note: use uri: false to turn of uri encode!!!
+            str += "," +  (uri == false ? data : encode_uri( data ))
         end   
     end
       

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datauris
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-25 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc