punks 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c593415e2ffb205d53b0f37c2c39e0248e9bd603727556d19488372512777b6
-  data.tar.gz: e1ea7e9bb6c4d94c2d674d7107b69059f80d5badc97e2cdea2dc69f7d46e5a5e
+  metadata.gz: f0c521c2cbcf4604bebb732f0f09b741a1b535545048995451e04a5326c6a01e
+  data.tar.gz: 4caa12cae6db2396a83d5fdf2b207ed34b9ed9cd2d76ad6e73755bd98219e608
 SHA512:
-  metadata.gz: 4bacfe06d637934b1791287a760ed9e2d17985280ed0af491d6619796c1ae3744f4c12bee3c00b2a6b72d13015bdcd87906e672a1c31f5c0f8b31d5bc19d47af
-  data.tar.gz: 6c9680f7f1e9aeca3913e5d471293f78ee0ca472d7961e267e60cafa8092674f1f349dcd9e63fc48dc4a2e0749153ef41ba498ffe1a5ea53b1da9d8aece59079
+  metadata.gz: 9b753d3425775ed6e5dc69de0b6ca52bc59a1ccb3946ee7a0699ead8e4a03e552d89d21d931bd0f89ed0842df9ad9cf12ed47aec74d6cab3dfce916e72c2384c
+  data.tar.gz: f8e8cb86553017fdb43638fdeb2b248f6169635ecfc33eace2577bf42f4d515d13e79a1b9a9ea07b8393bc4b077cd79ffa3593dc4da2876676dec679d8c36a06

data/README.md

@@ -1,8 +1,8 @@
 The Do-It-Yourself (DIY) [Factory of Modern Originals (FoMO)](https://github.com/pixelartexchange/originals) Presents
 
-# Punks (Pixel Characters / Avatars)
+# Punks, Phunks, Philips, Marilyns & More (Pixel Characters / Avatars)
 
-Yes, you can! Generate your own 24×24 or 32×32 punk (pixel) avatar / character images (off chain) from text attributes (via built-in spritesheet); incl. 2x/4x/8x zoom for bigger sizes and more
+Yes, you can! Generate your own 24×24 (or 32×32) punk, phunk, philip, marilyn & more (pixel) avatar / character images (off chain) from text attributes (via built-in spritesheet); incl. 2x/4x/8x zoom for bigger sizes and more
 
 
 

data/Rakefile

@@ -13,7 +13,7 @@ Hoe.spec 'punks' do
 
   self.version = Pixelart::Module::Punks::VERSION
 
-  self.summary = "punks - generate your own 24×24 or 32×32 punk (pixel) avatar / character images (off chain) from text attributes (via built-in spritesheet); incl. 2x/4x/8x zoom for bigger sizes and more"
+  self.summary = "punks - generate your own 24×24 (or 32×32) punk, phunk, philip, marilyn 'n' more (pixel) avatar / character images (off chain) from text attributes (via built-in spritesheet); incl. 2x/4x/8x zoom for bigger sizes and more"
   self.description = summary
 
   self.urls    = { home: 'https://github.com/cryptopunksnotdead/cryptopunks' }

data/lib/punks/generator.rb

@@ -169,8 +169,6 @@ module Punk
  alias_method :meta, :records
 
 
-
-
  def find_meta( q, gender: nil,
                    size: nil,
                    style: nil )   ## note: gender (m/f) required for attributes!!!
@@ -247,34 +245,55 @@ module Punk
 
 
 
- def to_recs( *values, style: nil )
+ def to_recs( *values, style: nil, patch: nil )
       archetype_name  = values[0]
 
-      ### todo/fix:  check for nil/not found!!!!
-      ## todo/check/fix:  assert meta record returned is archetype NOT attribute!!!!
-      archetype  = find_meta( archetype_name )
-      if archetype.nil?
-        puts "!! ERROR -  archetype >#{archetype}< not found; sorry"
-        exit 1
+      if archetype_name.is_a?( Pixelart::Image )
+         archetype = archetype_name
+      elsif patch && img=patch[ normalize_key(archetype_name) ]
+         archetype = img
+      else ## assume it's a string
+        ### todo/fix:  check for nil/not found!!!!
+        ## todo/check/fix:  assert meta record returned is archetype NOT attribute!!!!
+        archetype  = find_meta( archetype_name )
+        if archetype.nil?
+          puts "!! ERROR -  archetype >#{archetype}< not found; sorry"
+          exit 1
+        end
       end
 
       recs       = [archetype]
 
-      attribute_names  = values[1..-1]
       ## note: attribute lookup requires gender from archetype!!!!
-      attribute_gender = archetype.gender
-      attribute_size   = archetype.size
+      if archetype.is_a?( Pixelart::Image )
+         ### for now assume (support only)
+         ##    large & unisex (u&u) for "inline/patch" archetypes - why? why not?
+         attribute_gender = 'u'
+         attribute_size   = 'l'
+      else
+         attribute_gender = archetype.gender
+         attribute_size   = archetype.size
+      end
 
+      attribute_names  = values[1..-1]
       attribute_names.each do |attribute_name|
-        attribute = find_meta( attribute_name,
-                               gender: attribute_gender,
-                               size:   attribute_size,
-                               style:  style )
-        if attribute.nil?
-           puts "!! ERROR - attribute >#{attribute_name}< for (#{attribute_gender}+#{attribute_size}) not found; sorry"
-           exit 1
-        end
-        recs << attribute
+         ## note: quick hack - allow "inline" raw images for now - why? why not?
+         ##         pass through as-is
+        if attribute_name.is_a?( Pixelart::Image )
+          recs << attribute_name
+        elsif patch && img=patch[ normalize_key(attribute_name) ]
+          recs << img
+        else
+          rec = find_meta( attribute_name,
+                           gender: attribute_gender,
+                           size:   attribute_size,
+                           style:  style )
+          if rec.nil?
+            puts "!! ERROR - attribute >#{attribute_name}< for (#{attribute_gender}+#{attribute_size}) not found; sorry"
+            exit 1
+          end
+          recs << rec
+         end
       end
 
       recs
@@ -283,14 +302,22 @@ module Punk
 
 
 
- def generate_image( *values, style: nil )
+ def generate_image( *values, style: nil, patch: nil )
+   ## check: rename patch to more/extras/foreign or ... - why? why not?
 
-    recs = to_recs( *values, style: style )
+    recs = to_recs( *values, style: style, patch: patch )
 
     punk = @image_class.new( 24, 24 )
 
     recs.each do |rec|
-      punk.compose!( @sheet[ rec.id ] )
+      ## note: quick hack - allow "inline" raw images for now - why? why not?
+      ##         pass through as-is
+      img = if rec.is_a?( Pixelart::Image )
+              rec
+            else
+              @sheet[ rec.id ]
+            end
+      punk.compose!( img )
     end
 
     punk

data/lib/punks/punks.rb

@@ -10,46 +10,48 @@ module Punk
     end
 
 
-    def self.generate( *values, style: nil )
-
-   #####  add style option / hack - why? why not?
-  if style
-    values =  if style.downcase.index( 'natural') && style.downcase.index( '2')
-                 ["#{values[0]} (N2)"] + values[1..-1]
-              elsif style.downcase[0] == 'n'  ## starting with n - always assume natural(s)
-                 ## auto-add (N) for Natural to archetype
-                 ["#{values[0]} (N)"] + values[1..-1]
-              else
-                puts "!! ERROR - unknown punk style #{style}; sorry"
-                exit 1
-              end
-  end
-
-
-###### hack for black&white
-##   auto-add b&w (black&white) to all attribute names e.g.
-##      Eyes   =>  Eyes B&W
-##      Smile  =>  Smile B&W
-##      ....
-
-     archetype_key =  Generator.normalize_key( values[0] )
-     if archetype_key.end_with?( 'bw' ) ||  ## e.g. B&W
-        archetype_key.end_with?( '1bit')    ## e.g. 1-Bit or 1Bit
-
-        values = [values[0]] + values[1..-1].map do |attribute|
-           attribute_key = Generator.normalize_key( attribute )
-           if ['wildhair'].include?( attribute_key )   ## pass through known b&w attributes by "default"
-               attribute
-           elsif attribute_key.index( "black" )
-               attribute ## pass through as-is
-           else
-               "#{attribute} B&W"
-           end
+    def self.generate( *values, style: nil, patch: nil )
+
+     if values[0].is_a?( String )
+       #####  add style option / hack - why? why not?
+       if style
+         values =  if style.downcase.index( 'natural') && style.downcase.index( '2')
+                     ["#{values[0]} (N2)"] + values[1..-1]
+                   elsif style.downcase[0] == 'n'  ## starting with n - always assume natural(s)
+                    ## auto-add (N) for Natural to archetype
+                     ["#{values[0]} (N)"] + values[1..-1]
+                   else
+                     puts "!! ERROR - unknown punk style #{style}; sorry"
+                     exit 1
+                   end
        end
 
-       pp values
-    end
-
+     ###### hack for black&white
+     ##   auto-add b&w (black&white) to all attribute names e.g.
+     ##      Eyes   =>  Eyes B&W
+     ##      Smile  =>  Smile B&W
+     ##      ....
+      archetype_key =  Generator.normalize_key( values[0] )
+       if archetype_key.end_with?( 'bw' ) ||  ## e.g. B&W
+          archetype_key.end_with?( '1bit')    ## e.g. 1-Bit or 1Bit
+
+          values = [values[0]] + values[1..-1].map do |attribute|
+             if attribute.is_a?( Pixelart::Image )
+                attribute
+             else
+                attribute_key = Generator.normalize_key( attribute )
+                if ['wildhair'].include?( attribute_key )   ## pass through known b&w attributes by "default"
+                   attribute
+                elsif attribute_key.index( "black" )
+                   attribute ## pass through as-is
+                else
+                  "#{attribute} B&W"
+                end
+             end
+         end
+
+         pp values
+      end
 
     # note: female mouth by default has "custom" colors (not black)
     #          for every 1/2/3/4 (human) skin tone and for zombie
@@ -68,25 +70,30 @@ module Punk
        archetype_key.index( 'zombiefemale' )
 
       values = [values[0]] + values[1..-1].map do |attribute|
-        attribute_key = Generator.normalize_key( attribute )
-
-        if attribute_key == 'smile' || attribute_key == 'frown'
-          attribute +=   if    archetype_key.index( 'zombiefemale' ) then ' Zombie'
-                         elsif archetype_key.index( 'female1' )      then ' 1'
-                         elsif archetype_key.index( 'female2' )      then ' 2'
-                         elsif archetype_key.index( 'female3' )      then ' 3'
-                         elsif archetype_key.index( 'female4' )      then ' 4'
-                         else
-                           puts "!! ERROR - smile or frown (mouth expression) not supported for archetype:"
-                           pp values
-                           exit 1
-                         end
+        if attribute.is_a?( Pixelart::Image )
+          attribute
+        else
+          attribute_key = Generator.normalize_key( attribute )
+
+          if attribute_key == 'smile' || attribute_key == 'frown'
+             attribute +=   if    archetype_key.index( 'zombiefemale' ) then ' Zombie'
+                            elsif archetype_key.index( 'female1' )      then ' 1'
+                            elsif archetype_key.index( 'female2' )      then ' 2'
+                            elsif archetype_key.index( 'female3' )      then ' 3'
+                            elsif archetype_key.index( 'female4' )      then ' 4'
+                            else
+                              puts "!! ERROR - smile or frown (mouth expression) not supported for archetype:"
+                              pp values
+                              exit 1
+                            end
+           end
+           attribute
         end
-        attribute
       end
     end
+   end
 
-       generator.generate( *values, style: style )
+       generator.generate( *values, style: style, patch: patch )
      end # method Image.generate
   end # class Image
 

data/lib/punks/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punks
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-11 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pixelart
@@ -86,9 +86,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.23'
-description: punks - generate your own 24×24 or 32×32 punk (pixel) avatar / character
-  images (off chain) from text attributes (via built-in spritesheet); incl. 2x/4x/8x
-  zoom for bigger sizes and more
+description: punks - generate your own 24×24 (or 32×32) punk, phunk, philip, marilyn
+  'n' more (pixel) avatar / character images (off chain) from text attributes (via
+  built-in spritesheet); incl. 2x/4x/8x zoom for bigger sizes and more
 email: wwwmake@googlegroups.com
 executables: []
 extensions: []
@@ -138,7 +138,7 @@ requirements: []
 rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: punks - generate your own 24×24 or 32×32 punk (pixel) avatar / character
-  images (off chain) from text attributes (via built-in spritesheet); incl. 2x/4x/8x
-  zoom for bigger sizes and more
+summary: punks - generate your own 24×24 (or 32×32) punk, phunk, philip, marilyn 'n'
+  more (pixel) avatar / character images (off chain) from text attributes (via built-in
+  spritesheet); incl. 2x/4x/8x zoom for bigger sizes and more
 test_files: []