calldata 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3de55f72f5e18b3524ce50f75b2d53ad655b34646a03baf0951680468845e57a
-  data.tar.gz: 4104c954690188e28ae482a8671672d9c0163cb4eebc782eadb617ee2078fb96
+  metadata.gz: c4dd0b6fb62eefef1c10f244cb566a87c6a15847ae6485120bb8eef8c943fa7b
+  data.tar.gz: e8d7ae06405ff382922ae150e085780c14bb94d9a764b9af6e5ab4640ef5b156
 SHA512:
-  metadata.gz: 8279674e4f0cf0ddc2b90ec65e6d1ab61ffaaf68c80a02a528aa6fd469fe85ac32222740904bb7bb272751a168fbaf3f4e16f2475cd84c5e6516925515dbee43
-  data.tar.gz: 5f5e0a9a9bc95053808c8321681a76bbaf7f59e7afb739d4cc4c108ca740d0d691cd0b0c91a8cd135098cc0a148baa6ef7421d6691849c9e2acbdfdae582007b
+  metadata.gz: a0e6b1d1b714f3f9ab48e85a865d4c08102e5f5908ccbe93db2bcde5ebff6d8f5275b538b708187272e6962b5c0ff05a77ba7f8c28dc97df2b199a49185058a3
+  data.tar.gz: ebaf152e85680c18a7f10bfca7cd4a09accb3b72284c5d5af1c7e820dc90d69f4463f9408c08be5254f102a5bfde7a7f948010230f3939ab55795062d30512fe

data/CHANGELOG.md

@@ -1,4 +1,5 @@
-### 0.1.1
+### 1.0.0
+### 0.2.0
 ### 0.0.1 / 2023-11-22
 
 * Everything is new. First release

data/README.md

@@ -3,8 +3,8 @@
 calldata - Calldata.encode / Calldata.decode using utf8_to_hex and hex_to_utf8 helpers and more for inscriptions / inscribes for ethereum & co
 
 
-* home  :: [github.com/s6ruby/rubidity](https://github.com/s6ruby/rubidity)
-* bugs  :: [github.com/s6ruby/rubidity/issues](https://github.com/s6ruby/rubidity/issues)
+* home  :: [github.com/0xCompute/ethscribe](https://github.com/0xCompute/ethscribe)
+* bugs  :: [github.com/0xCompute/ethscribe/issues](https://github.com/0xCompute/ethscribe/issues)
 * gem   :: [rubygems.org/gems/calldata](https://rubygems.org/gems/calldata)
 * rdoc  :: [rubydoc.info/gems/calldata](http://rubydoc.info/gems/calldata)
 
@@ -161,7 +161,9 @@ at the ruby code commons (rubycocos) org.
 
 ## Questions? Comments?
 
-Join us in the [Rubidity (community) discord (chat server)](https://discord.gg/3JRnDUap6y). Yes you can.
+Join us in the [0xCompute discord (chat server)](https://discord.gg/3JRnDUap6y) 
+(or in the more general Ethscription discord). 
+Yes you can.
 Your questions and commentary welcome.
 
 Or post them over at the [Help & Support](https://github.com/geraldb/help) page. Thanks.

data/Rakefile

@@ -8,7 +8,7 @@ Hoe.spec 'calldata' do
   self.summary = "calldata gem - Calldata.encode / Calldata.decode using utf8_to_hex and hex_to_utf8 helpers and more for inscriptions / inscribes for ethereum & co"
   self.description = summary
 
-  self.urls    = { home: 'https://github.com/s6ruby/rubidity' }
+  self.urls    = { home: 'https://github.com/0xCompute/ethscribe' }
 
   self.author  = 'Gerald Bauer'
   self.email   = 'gerald.bauer@gmail.com'
@@ -18,7 +18,7 @@ Hoe.spec 'calldata' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['datauris', '>= 1.0.0'],
+    ['datauris', '>= 1.2.0'],
     ['cocos'],
   ]
 

data/lib/calldata/parser.rb

@@ -17,7 +17,7 @@ class Calldata
    def self.parse_hex( hex )  parse_data( decode( hex )); end
 
    def self.parse_data( utf8 )
-       type, data = DataUri.parse( utf8 )
+       data, type = DataUri.parse( utf8 )  ## note: data, type order switched in datauris 1.0.1+
         
        binary = if type 
                    if type.start_with?( 'image/svg+xml' )

data/lib/calldata/version.rb

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

data/lib/calldata.rb

@@ -14,29 +14,45 @@ require_relative 'calldata/version'    # let version go first
 ## hexdata encode/decode   (hex string NOT binary, utf8-encoded string)
 ##   utf8-to-hex, hex-to-utf8
 
-def utf8_to_hex( utf8 )  ## use bin to hex - why? why not?
-    # str.unpack('U'*str.length).map {|b| b.to_s(16) }.join
-    # str.unpack('H*').first
-    ## note: 0 or 3 must be 00 or 03 with padding!!
-    ##  or use rjust( 2, '0' ) - why? why not?
-    # str.each_byte.map { |b| '%02x' % b }.join
+def utf8_to_hex( utf8 )  ## use bin_to_hex - why? why not?
     utf8.unpack('H*').first
 end
 
 
-def hex_to_utf8( hex )  ## use hex to bin - why? why not?
-    # str.scan(/../).map { |x| x.hex }.pack('c*')
-    ## fix: will NOT work for multi-byte chars
-    ## str.scan(/../).map { |x| x.hex.chr }.join
-
+def hex_to_utf8( hex )  ## use hex_to_bin - why? why not?
     ### cut-off optionial 0x/0X
-    hex = hex[2..-1]   if hex.start_with?( '0x' ) || hex.start_with?( '0X') 
-    
-    ## note:  ethscriptios specifies that \u0000 
+    hex = hex[2..-1]   if hex.start_with?( '0x' ) || hex.start_with?( '0X' ) 
+
+    ## check if force_encoding( 'UTF-8' ) redundant here? 
+    return hex.force_encoding( 'UTF-8' )    if hex.empty?    ## empty string - return as is 
+
+    ## add hexchars check here - why? why not?
+    ##   do NOT allow space, or anything except a-z, A-Z, 0-9
+    raise ArgumentError, "hexstring expected; got #{hex}"   unless /\A[0-9a-fA-F]+\z/.match?( hex )
+  
+
+    ## note:  ethscriptions specifies that \u0000 
     ##             (that is, \x00 - 0 byte) gets deleted/removed (even if valid utf-8)
     ##         reason given:  0 byte in utf-8 messes up postgresql storage!
 
-    [hex].pack('H*').force_encoding( 'UTF-8' ).gsub( "\u0000", '' )
+    ## fix-fix-fix - todo: add support for cleanup / fix corrup utf8 encoding - why? why not?
+    ##   unless utf8_string.valid_encoding?
+    ##     utf8_string = utf8_string.encode('UTF-8', 
+    ##                           invalid: :replace, 
+    ##                           undef: :replace, 
+    ##                           replace: "\uFFFD")
+    ##   end
+    ##    check what's the replace char -> "\uFFFD"         
+
+    # note: about string#delete
+    #   Returns a copy of str with all characters of its arguments deleted. 
+    #   Uses the same rules for building the set of characters as String#count.
+
+    ##
+    ## note: single hexchars get expanded e.g.
+    # ['a'].pack('H*') => "\xA0"
+
+    [hex].pack('H*').force_encoding( 'UTF-8' ).delete( "\u0000" )
 end
 
 
@@ -44,7 +60,6 @@ end
 ##
 ## note: change Calldata to a base class with concrete/subclasses!!
 
-
 class Calldata
    def self.encode( utf8 )
      raise TypeError, "Calldata.encode - String expected; got #{utf8.inspect} : #{utf8.class.name}" unless utf8.is_a?( String )
@@ -54,14 +69,12 @@ class Calldata
    
    def self.decode( hex )
       raise TypeError, "Calldata.decode - String expected; got #{hex.inspect} : #{hex.class.name}"  unless hex.is_a?( String )
-      raise ArgumentError, "Calldata.decode - hexstring expected; got #{hex}"   unless valid_hex?( hex )
       ## todo/check -  add a regex/format check here - why? why not?
       ##  must be string and hexchars only (0x/0X)
       hex_to_utf8( hex )
    end
 
 
-   HEXCHARS_RX = /\A[0-9a-fA-F]{2,}\z/
      
    def self.valid_hex?( hex )  
       ### cut-off optionial 0x/0X
@@ -70,10 +83,10 @@ class Calldata
       ## allow 0x/0X - that is zero? as valid - why? why not?
       return true    if hex.empty?
 
-      match = HEXCHARS_RX.match( hex)
-   
       ## note: a byte requires two hexchars (hexchars must be even!! 2,4,6,8,etc.)
-      match && hex.length.even?
+      ##   enforce this even requirement - why? why not?
+      ##    or turn a into a0 and  0 int 00 and so on - why? why not?
+      /\A[0-9a-fA-F]+\z/.match?( hex )      ## && hex.length.even?
    end
 
  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calldata
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datauris
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: cocos
   requirement: !ruby/object:Gem::Requirement
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 description: calldata gem - Calldata.encode / Calldata.decode using utf8_to_hex and
   hex_to_utf8 helpers and more for inscriptions / inscribes for ethereum & co
 email: gerald.bauer@gmail.com
@@ -89,7 +89,7 @@ files:
 - lib/calldata.rb
 - lib/calldata/parser.rb
 - lib/calldata/version.rb
-homepage: https://github.com/s6ruby/rubidity
+homepage: https://github.com/0xCompute/ethscribe
 licenses:
 - Public Domain
 metadata: {}