datauris 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a65cebd38591b1ea9416cbb69498707019dd6e422c0aacc72b404f546270da
-  data.tar.gz: 559e1dbe5a26c70a872ca242b0e4c93a06b8883a0dbe080a3cd38f560019390f
+  metadata.gz: 7709f8cf824f237c4aed38259191ecb6fd4cf39d3b29664a93ea1ee16902f492
+  data.tar.gz: 8961a0856b232df9c7a5995db91e4f4ae08c072e7d4d655d51ae0be6b8226009
 SHA512:
-  metadata.gz: b60dd18069dee8bcb18b6fbb834964f4a55423fe595c8a8b3cad3f50219c39283920f2b14a4dedf72870eddc0575b555729e5763b3369e43aac809fb61b26ef0
-  data.tar.gz: 6872aa3cc3aeffeaebf0632e6dbc287dec2e17d7d3151bf4fd52ec22a9b93580db2ed61821145fc61b2522345ddbc6828e27279abf523990bc72c58190339921
+  metadata.gz: 85584d023850013b98801c46775c5a43ea76d08eedef815457921684063081a0786517919190c1b9c0b2fbd2d9923773739c0f029338d78d44fcfe88513b9459
+  data.tar.gz: e4a6796902329a3efb962f3733012bbce8b9dd2baf2f315f92b033e41c627630a4ef5c0981368c84526623ed9226bd573e7f079cae6b03c0beb3f0382cdc98d8

data/CHANGELOG.md

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

data/lib/datauris/version.rb

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

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,8 +168,10 @@ module DataUri
     end
 
 
-    ## base64 - force base64 encoding (instead of "automagic")
-    def self.build( data, type=nil, base64: nil )
+    ## 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 )
         uri = "data:"
         uri += type      if type   ## note: allow optional / no type
         
@@ -191,12 +196,16 @@ module DataUri
 
         if base64    
             uri += ";base64," + Base64.strict_encode64( data )
+        elsif utf8 
+            uri += ";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!!!
+            uri += "," +  (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.0
 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