pixelart 1.3.7 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 931c4aa26d5a0594b4aec85f532d16e93d3dd505f4d2f9729b24e3fd45c662c4
-  data.tar.gz: 5dc8936fc9a0f76b05cf4209ad69ebeba87f25bd3c0290cad59e961760aa5782
+  metadata.gz: 5a86710643f5a8a481ee79899147c49aa6d7e97b3398c679b15412b5c3ac0565
+  data.tar.gz: 2282693e41bff4de6de43c3742fe9c1a1b5a01a320ed819f326f6c6eee571b46
 SHA512:
-  metadata.gz: 3189094ecb75f30d1ccd52bafc83b6ece3319b0b5c4f769ab02110212b5674adc59a816dc2abfa8be3d9a6a344bd253471677d5802391325b681987eb9d5ece0
-  data.tar.gz: a1e6e2ea6c25ac1ed7f2542ff8039a8ac1b5232001539611a151302959563e623d879e9c6590aa4cc1468d7716eb7ffaa8faeeed9360589570664a94f512aa48
+  metadata.gz: 0b033ac3b7f5cb608c18c8f3a9ccb53d671667b6b1df5d7dd1b7654608dc149bdd13131d19f46fd975c02bea4340dc65cd93fde028499c47468753a1ff1418d1
+  data.tar.gz: 544bbae40dca87fab685997813bba02637d1e7d9d21ff68138ba82a381ad289e5aa02041bc2c488cf6835c6cc1ca7b241a5e888720556031063e6962060f291b

data/CHANGELOG.md

@@ -1,3 +1,4 @@
+### 1.4.0
 ### 0.0.1 / 2021-04-08
 
 * Everything is new. First release

data/Manifest.txt

@@ -13,7 +13,6 @@ lib/pixelart/image.rb
 lib/pixelart/invert.rb
 lib/pixelart/led.rb
 lib/pixelart/misc.rb
-lib/pixelart/orc721/generator.rb
 lib/pixelart/pixelator.rb
 lib/pixelart/sample.rb
 lib/pixelart/silhouette.rb

data/lib/pixelart/base.rb

@@ -1,5 +1,6 @@
 require 'cocos'
 require 'base64'
+require 'strscan'  ## todo/fix: auto-add strscan in cocos - why? why not?
 
 
 ###
@@ -70,9 +71,5 @@ require 'pixelart/convert'
 
 
 
-####
-#  add orc-721 - why? why not?
-require 'pixelart/orc721/generator'
-
 
 puts Pixelart.banner    # say hello

data/lib/pixelart/image.rb

@@ -53,14 +53,42 @@ CHARS = '.@xo^~%*+=:'     ## todo/check: rename to default chars or such? why? w
 ##                  or require user-defined chars to be passed in - why? why not?
 def self.parse( pixels, colors:,
                         background: Color::TRANSPARENT,
-                        chars: CHARS )
+                        chars: CHARS,
+                        width: nil,
+                        height: nil )
   has_keys  = colors.is_a?(Hash)   ## check if passed-in user-defined keys (via hash table)?
 
   colors = parse_colors( colors )
-  pixels = parse_pixels( pixels )
 
-  width  = pixels.reduce(1) {|width,row| row.size > width ? row.size : width }
-  height = pixels.size
+  ## note: for now use strict parser only 
+  ##        if colors with hash map / keys defined
+  ##         will raise error / exit if unknown token found!!!
+  ##   AND  pixels is a single txt / text string to parse (NOT array of string lines) 
+  ##
+  #
+  #  note default for now is:
+  #      1) tokens separated by space if not strict (e.g. has no color keys AND not array of strings)
+  #      2) every char is a token  if array of strings
+  pixels =  if has_keys && pixels.is_a?( String )
+              keys = colors.keys.map { |key| key.to_s }
+              ## todo/fix: - sort by lenght first; 
+              ##           - escape for rx chars!!
+              rx = /#{keys.join('|')}/
+              parse_pixels_strict( rx, pixels )  
+            else
+              parse_pixels( pixels )
+            end 
+
+  ## note: for now only use (require) width for flattened/streamed text input
+  if width   
+     ## always flattern first - why? why not?
+     ##   allow multi-line text inputs - allow/support why? why not?
+     pixels = pixels.flatten.each_slice( width ).to_a
+  else
+    ## find row with max width  
+    width  = pixels.reduce(1) {|width,row| row.size > width ? row.size : width }
+    height = pixels.size
+  end
 
    background = Color.parse( background )   unless background.is_a?( Integer )
 
@@ -320,18 +348,18 @@ def image()        @img; end
 
 ######
 # helpers
-def self.parse_pixels( pixels )
-  if pixels.is_a?( Array )  ## assume array of string (lines)
-      data = []
-      pixels.each do |line|
+def self.parse_pixels( obj )
+  pixels = []
+  if obj.is_a?( Array )  ## assume array of string (lines)
+      lines = obj
+      lines.each do |line|
         ##  convert (string) line into indidual chars
-        data << line.each_char.reduce( [] ) { |mem, c| mem << c; mem }
+        pixels << line.each_char.reduce( [] ) { |mem, c| mem << c; mem }
       end
-      data
   else  ## assume it's a (multi-line) string (with newlines)
         ##  assert and throw ArgumentError if not? - why? why not?
-      data = []
-      pixels.each_line do |line|
+      txt = obj
+      txt.each_line do |line|
         line = line.strip
         next if line.start_with?( '#' ) || line.empty?   ## note: allow comments and empty lines
 
@@ -339,13 +367,41 @@ def self.parse_pixels( pixels )
         ##   to separate pixel codes
         ##  e.g.   o o o o o o o o o o o o dg lg w w lg w lg lg dg dg w w  lg dg o o o o o o o o o o o
         ##    or
-        data << line.split( /[ \t]+/)
+        pixels << line.split( /[ \t]+/ )
      end
-    data
   end
+  pixels
 end
 
 
+def self.parse_pixels_strict( rx, txt )
+    ## must match tokens in regex (rx)  e.g. /0|1|2|3../ or /A|B|C... etc./
+    pixels = []
+
+    txt.each_line do |line|
+       line = line.strip
+       next if line.start_with?( '#' ) || line.empty?   ## note: allow comments and empty lines
+
+       scan = StringScanner.new( line )
+       tokens = []
+       loop do
+         # puts "  pos: #{scan.pos} - size: #{scan.rest.size} - #{scan.rest}"  
+         token = scan.scan( rx )
+         if token.nil?
+          ## todo/fix: raise an exception here
+           puts "!! ERROR - parse error; expected match of #{rx.to_s} but got: #{scan.rest}"
+           exit 1
+         end      
+         tokens << token
+         
+         scan.skip( /[ \t]+/ )    
+         break if scan.eos?
+       end
+       pixels << tokens
+    end
+    pixels
+end
+
 
 def self.parse_colors( colors )
   if colors.is_a?( Array )   ## convenience shortcut

data/lib/pixelart/version.rb

@@ -2,8 +2,8 @@
 module Pixelart
 
   MAJOR = 1
-  MINOR = 3
-  PATCH = 7
+  MINOR = 4
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixelart
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocos
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '4.0'
 description: pixelart - yes, you can! generate your own pixel art images (off-blockchain)
   using any design (in ascii text) in any colors; incl. 2x/4x/8x zoom for bigger sizes
 email: gerald.bauer@gmail.com
@@ -125,7 +125,6 @@ files:
 - lib/pixelart/invert.rb
 - lib/pixelart/led.rb
 - lib/pixelart/misc.rb
-- lib/pixelart/orc721/generator.rb
 - lib/pixelart/pixelator.rb
 - lib/pixelart/sample.rb
 - lib/pixelart/silhouette.rb
@@ -157,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: pixelart - yes, you can! generate your own pixel art images (off-blockchain)

data/lib/pixelart/orc721/generator.rb

@@ -1,51 +0,0 @@
-
-
-module Orc721
-class Generator
-   ###################
-   ## convenience setup helper(s)
-   def self.read( path, width: 24, height: 24 )
-       new( Pixelart::ImageComposite.read( path,
-                                           width: width,
-                                           height: height ))
-   end
-
-
-   def initialize( spritesheet )
-     ### todo: check for composite image type? - why? why not?
-     @spritesheet = spritesheet
-   end
-
-   def _parse( spec )
-     ## for delimiter allow for now:  - why? why not?
-     ##     (multiple) space ( )
-     ##      command or semicolon
-     spec.strip.split( %r{[ ,;/_-]+} ).map {|v| v.to_i(10) }
-   end
-
-   def parse( spec )
-      ## convenience helper
-      ##   parses g spec in various (delimited) formats
-      g = _parse( spec )
-      generate( *g )
-   end
-
-   def generate( *attributes )
-     img = Pixelart::Image.new( width, height )
-     attributes.each do |num|
-       img.compose!( @spritesheet[ num ] )
-     end
-     img
-   end
-   alias_method :g, :generate
-
-   def width()   @spritesheet.tile_width; end
-   def height()  @spritesheet.tile_height; end
-   def count()   @spritesheet.count; end
-end  # class Generator
-end # module Orc721
-
-
-######
-##  add convenience aliases - why? why not?
-ORC721 = Orc721