datauris 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b17d925dd560274e1e3a4f21e5caa118762e74c1d5b1e4e07777c9456b64f0f
-  data.tar.gz: 34c7263eea9cd31e1bfede00bb4002d303dc59d7870d3bad620a88a7345d292a
+  metadata.gz: d1a65cebd38591b1ea9416cbb69498707019dd6e422c0aacc72b404f546270da
+  data.tar.gz: 559e1dbe5a26c70a872ca242b0e4c93a06b8883a0dbe080a3cd38f560019390f
 SHA512:
-  metadata.gz: 509299375bebbc22eee68c3c3a704030df51c1d555a57ee5ff83435b1b5d6a0cf9de75c49d1551f277e89db01280bb7f15dc2f2ddd42cfa9bf3ef7279cef0ce4
-  data.tar.gz: b0aba84982c23968350395e3aedf91e11bf7f31a20566e1262f715f9638fdcf05b91aa2e575f4189ca0d58318f8702de0d587efbd7262d7a0c466a3b8e1e33e9
+  metadata.gz: b60dd18069dee8bcb18b6fbb834964f4a55423fe595c8a8b3cad3f50219c39283920f2b14a4dedf72870eddc0575b555729e5763b3369e43aac809fb61b26ef0
+  data.tar.gz: 6872aa3cc3aeffeaebf0632e6dbc287dec2e17d7d3151bf4fd52ec22a9b93580db2ed61821145fc61b2522345ddbc6828e27279abf523990bc72c58190339921

data/CHANGELOG.md

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

data/README.md

@@ -1,6 +1,6 @@
 # Data URI Helpers
 
-datauris - helpers to parse (decode) and build (encode) data uris incl. (strict)base64-encoded/decoded images and more
+datauris - helpers to parse (decode) and build (encode) data uris incl. (strict) base64-encoded/decoded images and more
 
 * home  :: [github.com/s6ruby/rubidity](https://github.com/s6ruby/rubidity)
 * bugs  :: [github.com/s6ruby/rubidity/issues](https://github.com/s6ruby/rubidity/issues)
@@ -58,21 +58,21 @@ Let's try and parse the Wikipedia Data URI examples:
 uri = "data:text/vnd-example+xyz;foo=bar;base64,R0lGODdh"
 DataUri.valid?( uri )  
 #=> true
-mediatype, data = DataUri.parse( uri )    ## returns 1) mediatype (+parameters), 2) data
-#=> "text/vnd-example+xyz;foo=bar", "<blob>"
+data, mediatype = DataUri.parse( uri )    ## returns 1) data, 2) mediatype (+parameters)
+#=> "<blob>", "text/vnd-example+xyz;foo=bar"
 
 uri = "data:text/plain;charset=UTF-8;page=21,the%20data:1234,5678"
 DataUri.valid?( uri )  
 #=> true
-mediatype, data = DataUri.parse( uri )    ## returns 1) mediatype (+parameters), 2) data
-#=> "text/plain;charset=UTF-8;page=21", "the data:1234,5678"
+data, mediatype = DataUri.parse( uri )    ## returns 1) data, 2) mediatype (+parameters)
+#=> "the data:1234,5678", "text/plain;charset=UTF-8;page=21"
 
 
 uri = "data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/"
 DataUri.valid?( uri )  
 #=> true
-mediatype, data = DataUri.parse( uri )    ## returns 1) mediatype (+parameters), 2) data
-#=> "image/jpeg", "<blob>"
+data, mediatype = DataUri.parse( uri )    ## returns 1) data, 2) mediatype (+parameters)
+#=> "<blob>", "image/jpeg"
 ```
 
 
@@ -87,7 +87,7 @@ uri = "data:,"
 
 DataUri.valid?( uri )  
 #=> true
-mediatype, data = DataUri.parse( uri )    ## returns 1) mediatype (+parameters), 2) data
+data, mediatype = DataUri.parse( uri )    ## returns 1) data, 2) mediatype (+parameters)
 #=> "", ""
 ```
 
@@ -98,8 +98,8 @@ uri = "data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHV..."
 
 DataUri.valid?( uri )  
 #=> true
-mediatype, data = DataUri.parse( uri )    ## returns 1) mediatype (+parameters), 2) data
-#=> "image/jpeg", "<blob>"
+data, mediatype = DataUri.parse( uri )    ## returns 1) data, 2) mediatype (+parameters)
+#=> "<blob>", "image/jpeg"
 
 ## let's save the jpeg image (blob)
 write_blob( "0.jpeg", data )
@@ -117,8 +117,8 @@ uri = "data:image/png;base64,/9j/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlubwIQAAB..."
 
 DataUri.valid?( uri )  
 #=> true
-mediatype, data = DataUri.parse( uri )    ## returns 1) mediatype (+parameters), 2) data
-#=> "image/png", "<blob>"
+data, mediatype = DataUri.parse( uri )    ## returns 1) data, 2) mediatype (+parameters)
+#=> "<blob>", "image/png"
 
 ## let's save the png image (blob)
 write_blob( "15.png", data )

data/lib/datauris/version.rb

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

data/lib/datauris.rb

@@ -58,7 +58,7 @@ module DataUri
             (?<subtype> [\w.+-]+? )
         )?
         (?<parameters> (?: ; 
-                           [\w.+-]+? 
+                           [\w-]+? 
                               = 
                               .+? 
                         )* 
@@ -89,7 +89,11 @@ module DataUri
                          ## todo/double check - use a different URI decoder - why? why not?
                          URI.decode_uri_component(m[:data])
                       end
-          [mediatype, data]
+
+          ## returns data first!!!
+          ##  and mediatype second (to follow the order in build)
+          ##   - also mediatype is optional -  arguable more intuitive - yes,no?
+          [data, mediatype]
         else
            raise ArgumentError, "invalid datauri - cannot match regex; sorry"
         end
@@ -201,8 +205,8 @@ module DataUri
     ## add alias convenience names - why? why not?
     class << self 
       alias_method :is_valid?,   :valid?
-      alias_method :decode,      :parse
-      alias_method :encode,      :build
+      alias_method :decode,      :parse    ### add decode - why? why not?
+      alias_method :encode,      :build    ### add encode - why? why not?
     end
 end  # module  DataUri
 

metadata

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