ordlite 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6051393488775c98fdee4716e6c49b5cd89c6cd404a45f48024a47dea633acfb
-  data.tar.gz: d43e1d73f1b49b27ae35e745eaa8e13be394635d2367233bc6c341fd1aa54933
+  metadata.gz: 44ca59e7026e8b717d26f8ae42ed7050d08abd44047dca6de505582253e2f22b
+  data.tar.gz: f2728433967a7d58612e68d0402a3d9c9c9b644e71bdfe6c4aeca2e103cd116f
 SHA512:
-  metadata.gz: 05e95871ce3a85dd31557e38a4247d5cd38e25406e2ac535a1254e6952e68b8054e8c1a06378b4620ce8168c67d1e4cb7eac50305da9e7e59e2f10152a4aa971
-  data.tar.gz: 3fe7780c583d525dd60170f4ec0e996f430722d53899e3edb321d9af67425024c262a253e1cf718ab0b7316f9fbb3ae0a6903b3a82debf3860511a167872a1ab
+  metadata.gz: 6dfd8030275128218b5057c0ed7a585f5a1688acfe894da4183e7e788b26b239565f84ac25bead42cf144d393a1e04ee68c900b918d15b8d4202267d2cad4815
+  data.tar.gz: af1eab5bb9c6e88b698ccd485ef6d8fc08bcd0f2c714faed0ee66d30c834d9ecc2c250c2792285f772a705a33cf5d13fa558965207d6d237b161de6e9c2ff3dc

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### 0.2.0 / 2023-07-28
+### 0.3.0
 ### 0.0.1 / 2023-07-01
 
 * Everything is new. First release

data/Manifest.txt

@@ -5,6 +5,7 @@ Rakefile
 lib/ordlite.rb
 lib/ordlite/base.rb
 lib/ordlite/cache.rb
+lib/ordlite/factory.rb
 lib/ordlite/importer.rb
 lib/ordlite/models/blob.rb
 lib/ordlite/models/collection.rb

data/README.md

@@ -13,7 +13,7 @@ ordlite - ordinals inscription (on bitcoin & co) database let's you query via sq
 
 ##  SQL Database Model
 
-Inscribes •  Blobs • Collections • Generatives
+Inscribes • Blobs • Collections • Factories • Generatives
 
 
 Table Inscribes
@@ -63,6 +63,7 @@ puts
 puts "  #{Inscribe.count} inscribe(s)"
 puts "  #{Blob.count} blob(s)"
 puts "  #{Collection.count} collection(s)"
+puts "  #{Factory.count} factories"
 puts "  #{Generative.count} generative(s)"
 
 #=>  0 inscribe(s)
@@ -74,68 +75,134 @@ puts "  #{Generative.count} generative(s)"
 
 
 
-### Example No 1 - Query Ordgen Deploy / Mint Inscriptions
+### Example No 1 - Auto-Add (Via Ordinals.com) First Thousand Inscriptions (Sub 1k)
 
 ``` ruby
 require 'ordlite'
 
 
-OrdDb.connect( adapter:  'sqlite3',
-               database: './ord.db' )
+OrdDb.open( './ord.db' )
 
 
-####################
-## query for deploy candidates
-##
-##  e.g. sql where clause like
-##     content LIKE '%deploy%' 
-##       AND (   content LIKE '%orc-721%' 
-##            OR content LIKE '%og%')
-## 
+1000.times do |num|   # auto-add inscription 0-999
+   OrdDb.import( num )
+end
+
+puts
+puts "  #{Inscribe.count} inscribe(s)"
+puts "  #{Blob.count} blob(s)"
+#=>   1000 inscribe(s)
+#=>   1000 blob(s)
+```
 
-deploys = Inscribe.deploys
-puts "   #{deploys.size} deploy candidate(s)"
+Let's query for the ten biggest (by bytes) inscriptions 
+(and pretty print the result):
 
-deploys.each_with_index do |rec,i|
-    puts "==> deploy #{i} - num #{rec.num} - #{rec.bytes} bytes - #{rec.date}"
-    puts rec.content 
+```ruby
+Inscribe.biggest.limit(10).each do |rec|
+    print "#{number_to_human_size(rec.bytes)} (#{rec.bytes} bytes) - "
+    print "Inscribe №#{rec.num} (#{rec.content_type}) - "
+    print "#{rec.date} - #{rec.fee} fee in sats"
+    print "\n"
 end
+```
 
+resulting in:
 
-punks_deploys = Inscribe.deploys_by( slug: 'diypunks')
-puts "   #{punks_deploys.size} deploy candidate(s)"
+```
+3.73 MB (3915537 bytes) - Inscribe №652 (image/jpeg) - 2023-02-01 20:38:33 - 0 fee in sats
+385 KB (394718 bytes) - Inscribe №978 (application/epub+zip) - 2023-02-02 06:46:04 - 109325 fee in sats
+385 KB (394479 bytes) - Inscribe №546 (image/gif) - 2023-02-01 10:41:50 - 1489860 fee in sats
+385 KB (394440 bytes) - Inscribe №833 (image/png) - 2023-02-02 01:13:51 - 99314 fee in sats
+381 KB (389858 bytes) - Inscribe №388 (image/jpeg) - 2023-01-31 14:01:38 - 981620 fee in sats
+379 KB (388417 bytes) - Inscribe №291 (image/gif) - 2023-01-30 17:58:54 - 586794 fee in sats
+378 KB (386858 bytes) - Inscribe №857 (image/png) - 2023-02-02 01:17:54 - 97407 fee in sats
+374 KB (383322 bytes) - Inscribe №538 (image/jpeg) - 2023-02-01 10:20:28 - 96519 fee in sats
+367 KB (375414 bytes) - Inscribe №378 (image/gif) - 2023-01-31 09:47:55 - 945300 fee in sats
+365 KB (373504 bytes) - Inscribe №288 (image/jpeg) - 2023-01-30 16:51:46 - 94050 fee in sats
+```
 
 
+Let's query for all inscriptions grouped by date (day) and dump the results:
 
-#######################
-## query for mint candidates
-##
-##  e.g. sql where clause like
-##     content LIKE '%mint%' 
-##       AND (   content LIKE '%orc-721%' 
-##            OR content LIKE '%og%')
+```ruby
+pp Inscribe.counts_by_date   ## or count_by_day
+```
 
-mints = Inscribe.mints
-puts "   #{mints.size} mint candidate(s)"
+resulting in:
 
-## print last hundred mint candidates
-mints[-100,100].each_with_index do |rec,i|
-    puts "==> mint #{i} - num #{rec.num} - #{rec.bytes} bytes - #{rec.date}"
-    puts rec.content 
-end
+```
+{"2022-12-14" => 1,
+ "2022-12-17" => 1,
+ "2022-12-19" => 1,
+ "2023-01-05" => 1,
+ "2023-01-10" => 1,
+ "2023-01-12" => 1,
+ "2023-01-13" => 2,
+ "2023-01-15" => 1,
+ "2023-01-16" => 1,
+ "2023-01-19" => 5,
+ "2023-01-20" => 3,
+ "2023-01-21" => 5,
+ "2023-01-22" => 34,
+ "2023-01-23" => 23,
+ "2023-01-24" => 4,
+ "2023-01-25" => 9,
+ "2023-01-26" => 12,
+ "2023-01-27" => 19,
+ "2023-01-28" => 16,
+ "2023-01-29" => 128,
+ "2023-01-30" => 82,
+ "2023-01-31" => 98,
+ "2023-02-01" => 220,
+ "2023-02-02" => 332}
+```
 
+Let's query for all inscriptions grouped by month and dump the results:
+
+```ruby
+pp Inscribe.counts_by_month
+```
+
+resulting in:
+
+```
+{"2022-12" => 3, 
+ "2023-01" => 445, 
+ "2023-02" => 552}
+```
 
-phunks_mints = Inscribe.mints_by( slug: 'diyphunks')
-puts "   #{phunks_mints.size} mint candidate(s)"
 
+Let's query for all content types and group by count (descending) and dump the results:
 
-puts "   #{deploys.size} deploy candidate(s)"
-puts "   #{mints.size} mint candidate(s)"
 
-#=> 123 deploy candidate(s)
-#=> 7453 mint candidate(s)
+```ruby
+pp Inscribe.counts_by_content_type
 ```
 
+resulting in:
+
+```
+{"image/png" => 475,
+ "image/jpeg" => 188,
+ "image/webp" => 117,
+ "text/plain;charset=utf-8" => 112,
+ "image/svg+xml" => 62,
+ "text/html;charset=utf-8" => 18,
+ "image/gif" => 11,
+ "audio/mpeg" => 6,
+ "application/pdf" => 2,
+ "image/avif" => 2,
+ "video/webm" => 2,
+ "application/epub+zip" => 1,
+ "application/pgp-signature" => 1,
+ "audio/midi" => 1,
+ "audio/mod" => 1,
+ "video/mp4" => 1}
+```
+
+and so on.
+
 
 
 
@@ -150,13 +217,10 @@ into an (sql) database e.g. `ord.db`:
 ``` ruby
 require 'ordlite'
 
-OrdDb.connect( adapter:  'sqlite3',
-               database: './ord.db' )
-
-OrdDb.create_all     # build table schema
+OrdDb.open( './ord.db' )
 
 cache_dir = './ordinals.cache/inscription'
-cache =  OrdDb::Cache.new( cache_dir )
+cache = Ordinals::Cache.new( cache_dir )
 cache.import_all
 
 

data/Rakefile

@@ -27,6 +27,7 @@ Hoe.spec 'ordlite' do
     ['props'],
     ['props-activerecord'],
     ['sqlite3'],
+    ['pixelart'],   ## required for factory (ordgen/orc-721) support for now
   ]
 
   self.licenses = ['Public Domain']

data/lib/ordlite/base.rb

@@ -134,5 +134,13 @@ module OrdDb
 end  # module OrdDb
 
 
+
+####
+# add factory (ordgen/orc-721) support here for now - why? why not?
+require 'pixelart'
+require_relative 'factory'
+
+
+
 # say hello
 puts Ordlite.banner     ## if defined?($RUBYCOCOS_DEBUG) && $RUBCOCOS_DEBUG

data/lib/ordlite/factory.rb

@@ -0,0 +1,132 @@
+
+
+class FactorySpritesheet    ## check - rename to catalog or atlas NOT spritesheet - why? why not?
+  def self.read_inscribes( *inscribes, width:, 
+                                       height: )
+     ## map inscribes to images                                  
+     images = inscribes.map {|inscribe| Pixelart::Image.blob( inscribe.content ) }
+     ## puts "  #{images.size} image(s)"
+
+     new( *images, width: width,
+                   height: height)                                
+  end
+
+  def initialize( *images, width:, 
+                           height: )
+     @tile_width  = width
+     @tile_height = height
+     @tiles = []
+     images.each {|img| add(img) }
+  end
+
+  def count() @tiles.size; end
+  alias_method :size,       :count 
+  alias_method :tile_count, :count   ## add tile_count - why? why not?
+  def tile_width() @tile_width; end     ## use width  - why? why not?
+  def tile_height() @tile_height; end   ## use height - why? why not?
+
+  def tile( index )  @tiles[ index ]; end
+  alias_method :[], :tile  
+
+  def add_inscribe( inscribe ) _add( Pixelart::Image.blob( inscribe.content )); end
+  def add( img )
+    ## 1:1 tile; use as is
+    if img.width == @tile_width && img.height == @tile_height
+        @tiles << img 
+    else  ## assume spritesheet??
+      ## wrap into composite image
+      composite = Pixelart::ImageComposite.new( img.image, width:  @tile_width,
+                                                           height: @tile_height )
+      cols  = img.width  / composite.tile_width
+      rows  = img.height / composite.tile_height                                           
+      puts "     #{composite.count} tile(s) in #{cols}x#{rows} grid"
+      composite.each {|tile| @tiles << tile }
+     end
+  end
+  alias_method :<<, :add
+end  ## class Spritesheet
+
+
+class FactoryGenerator
+  ###################
+  ## convenience setup helper(s)
+  def self.read_inscribes( *inscribes, width:, 
+                                       height: )                                         
+        new( FactorySpritesheet.read_inscribes( *inscribes,
+                                                   width: width,
+                                                   height: height ))
+  end
+ 
+  def initialize( spritesheet )
+    @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 FactoryGenerator
+ 
+
+
+module OrdDb
+module Model
+  
+class Factory
+
+## use id/slug to cache generators / spritesheets - why? why not?
+def self.generators
+    @generators ||= {}
+end
+
+def generator
+    generators = self.class.generators
+    if generators.has_key?( id )
+        generators[ id ]
+    else
+        ## auto-add generator on first-time/hit/demand
+        width, height = _parse_dimension( dim )
+        inscribes = layers.to_a  ## get layer inscribe records
+        generator = FactoryGenerator.read_inscribes( *inscribes,
+                                                     width: width,
+                                                     height: height )
+        generators[ id ] = generator
+        generator                         
+    end
+end
+
+def generate( *attributes )  ## add g shortcut alias - why? why not?
+    generator.generate( *attributes )
+end
+
+
+## e.g. convert dimension (width x height) "24x24" or "24 x 24" to  [24,24]
+def _parse_dimension( str )
+    str.split( /x/i ).map { |str| str.strip.to_i(10) }
+end
+
+end  # class Factory
+end  # module Model
+end  # module OrdDb

data/lib/ordlite/importer.rb

@@ -1,8 +1,82 @@
+module OrdDb
 
+class Importer
+   Inscribe   =  Model::Inscribe
+   Blob       =  Model::Blob
+   Collection =  Model::Collection 
 
-module OrdDb
 
-def self.import_collection( path, content: true )
+
+def import_collection_csv( path,
+                                name:,
+                                content: true )
+## or use
+##  import_collection( format: 'csv') - why? why not?
+   recs = read_csv( path )
+   puts "  #{recs.size} inscribe id(s)"
+
+   col = Collection.find_by( name: name )
+   if col && col.items.count > 0
+     puts "!! WARN - collection already in db; delete first to reimport"
+     return     
+   elsif col
+     ## do nothing; (re)use collection record; add items
+   else
+     col = Collection.create(
+            name:  name
+            ## max:   recs.size   ## auto-add max - why? why not?
+          )
+   end
+
+ recs.each_with_index do |rec,i|
+    id   = rec['id']
+    name = rec['name'] || rec['title']
+    puts "==> #{i+1}/#{recs.size} >#{name}< @ #{id}..."
+
+    col.items.create( pos: i,
+                      inscribe_id: id,
+                      name: name )
+
+    _import( id, content: content )
+ end
+end
+
+
+def import_collection_inscriptions( path, 
+                                         name:, 
+                                         content: true )
+   recs = read_json( path )
+   puts "  #{recs.size} inscribe id(s)"
+
+   col = Collection.find_by( name: name )
+   if col && col.items.count > 0
+     puts "!! WARN - collection already in db; delete first to reimport"
+     return     
+   elsif col
+      ## do nothing; (re)use collection record; add items
+   else
+     col = Model::Collection.create(
+        name:  name  
+        ## max:   recs.size   ## auto-add max - why? why not?
+      )
+   end
+
+   recs.each_with_index do |rec,i|
+      id   = rec['id']
+      meta = rec['meta']
+      name = meta['name']
+      puts "==> #{i+1}/#{recs.size} >#{name}< @ #{id}..."
+ 
+      col.items.create( pos: i,
+                        inscribe_id: id,
+                        name: name )
+
+     _import( id, content: content ) 
+   end
+end
+
+
+def import_collection( path, content: true )
    data = read_json( path )
 
    meta =  data['collection']
@@ -10,13 +84,13 @@ def self.import_collection( path, content: true )
 
    name = meta['name']
 
-   col = Model::Collection.find_by( name: name )
+   col = Collection.find_by( name: name )
    if col
      puts "!! WARN - collection already in db; delete first to reimport"
      return     
    end
    
-   col = Model::Collection.create(
+   col = Collection.create(
       name:  name,
       desc:  meta['description'],
       max:   meta['max_supply']
@@ -33,35 +107,12 @@ def self.import_collection( path, content: true )
                         inscribe_id: id,
                         name: name )
 
-     ## check if inscription / inscribe is already in db?
-     inscribe = Model::Inscribe.find_by( id: id )
-     if inscribe  ## already in db; dump record
-       ## pp inscribe
-     else         ## fetch via ordinals.com api and update db
-        data = Ordinals.inscription( id )
-        pp data
-        Model::Inscribe.create_from_api( data )
-        sleep( 1 )   ## delay in seconds (before next request) 
-     end
-
-     if content
-       ## check if (content) blob is already in db?
-       blob = Model::Blob.find_by( id: id )
-       if blob    ## already in db; do nothing
-       else       ## fetch via ordinals.com api and update db
-          content = Ordinals.content( id )
-          puts "  content-type: #{content.type}"
-          puts "  content-length: #{content.length}"
-       
-          Model::Blob.create( id: id, content: content.data )
-          sleep( 1 )   ## delay in seconds (before next request) 
-       end
-     end              
+     _import( id, content: content )
    end
 end
 
 
-def self.import_csv( path, content: true )
+def import_csv( path, content: true )
     recs = read_csv( path )
     puts "  #{recs.size} inscribe id(s)"
     #=>  1000 inscribe id(s) 
@@ -70,30 +121,154 @@ def self.import_csv( path, content: true )
       id = rec['id']
       puts "==> #{i+1}/#{rec.size} @ #{id}..."
     
-      ## check if inscription / inscribe is already in db?
-      inscribe = Model::Inscribe.find_by( id: id )
-      if inscribe  ## already in db; dump record
-        ## pp inscribe
-      else         ## fetch via ordinals.com api and update db
-         data = Ordinals.inscription( id )
-         pp data
-         Model::Inscribe.create_from_api( data )
-         sleep( 1 )   ## delay in seconds (before next request) 
-      end
+      _import( id, content: content )
+    end  
+end # method import_csv
 
-      if content
-        ## check if (content) blob is already in db?
-        blob = Model::Blob.find_by( id: id )
-        if blob    ## already in db; do nothing
-        else       ## fetch via ordinals.com api and update db
-           content = Ordinals.content( id )
-           puts "  content-type: #{content.type}"
-           puts "  content-length: #{content.length}"
-        
-           Model::Blob.create( id: id, content: content.data )
-           sleep( 1 )   ## delay in seconds (before next request) 
-        end
+
+def import( id_or_ids, content: true )
+   ## note: support (integer) numbers too (e.g. 0/1/2, etc.)
+   if id_or_ids.is_a?( String )
+      id = id_or_ids
+     _import( id, content: content )
+   elsif id_or_ids.is_a?( Integer )  
+      num = id_or_ids
+     _import_by_num( num, content: content )
+   elsif id_or_ids.is_a?( Array )
+      if id_or_ids.empty?   ## id_or_ids.size == 0
+         ## do nothing; empty array
+      else
+         first = id_or_ids[0]
+         if first.is_a?( String ) 
+           ids = id_or_ids
+           ids.each do |id|
+             _import( id, content: content )
+           end
+         elsif first.is_a?( Integer ) 
+            nums = id_or_ids
+            nums.each do |num|
+              _import_by_num( num, content: content )
+            end 
+         elsif first.is_a?( Hash ) && first.has_key?( 'id' ) 
+           ## try to get ids with records
+           recs = id_or_ids
+           ids = recs.map {|rec| rec['id'] }
+           ids.each do |id|
+             _import( id, content: content )
+           end
+         elsif first.is_a?( Hash ) && first.has_key?( 'num' ) 
+            ## try to get nums with records
+            recs = id_or_ids
+            nums = recs.map {|rec| rec['num'] }
+            nums.each do |num|
+               ## note: support numbers as strings too
+               num = num.to_i(10)  if num.is_a?( String )
+              _import_by_num( num, content: content )
+            end
+          else
+           raise ArgumentError, "expected Array of String|Integer or Hash (with keys id|num); got #{first.class.name}"
+         end
       end
-    end  
-end # method self.import_csv
+   else
+      raise ArgumentError, "expected String or Array; got #{id_or_ids.class.name}"
+   end
+end  # method import
+
+
+def _import_content( id )
+     ## check if (content) blob is already in db?
+     blob = Blob.find_by( id: id )
+     if blob    ## already in db; do nothing
+     else       ## fetch via ordinals.com api and update db
+        content = Ordinals.content( id )
+
+        puts "  content-type: #{content.type}"
+        puts "  content-length: #{content.length}"
+     
+        Blob.create( id: id, content: content.data )
+     end
+end
+
+
+def _import( id, content: true )
+   ## check if inscription / inscribe is already in db?
+   inscribe = Inscribe.find_by( id: id )
+   if inscribe  ## already in db; dump record
+     ## pp inscribe
+   else         ## fetch via ordinals.com api and update db
+      data = Ordinals.inscription( id )
+
+      pp data
+      Inscribe.create_from_api( data )
+   end
+
+   _import_content( id )  if content              
+end
+
+def _import_by_num( num, content: true )
+   ## check if inscription / inscribe is already in db?
+   inscribe = Inscribe.find_by( num: num )
+   if inscribe  ## already in db; dump record
+     ## pp inscribe
+   else         ## fetch via ordinals.com api and update db
+      data = Ordinals.inscription( num )
+
+      pp data
+      inscribe = Inscribe.create_from_api( data )
+   end
+
+   _import_content( inscribe.id )   if content              
+end
+
+end  # class Importer
+
+
+
+###
+## convenience helpers
+
+def self.importer   ## "default" importer
+   @importer ||= Importer.new 
+end
+
+def self.import( id_or_ids, content: true )
+   importer.import( id_or_ids, content: content )
+end
+
+
+def self.import_csv( path, content: true )
+   importer.import_csv( path, content: content )
+end
+
+
+def self.import_collection( path, content: true )
+   importer.import_collection( path, content: content )
+end
+
+def self.import_collection_inscriptions( path, 
+          name:, 
+          content: true )
+   importer.import_collection_inscriptions( path, 
+          name: name, 
+          content: content )
+end
+
+def self.import_collection_csv( path,
+          name:,
+          content: true )
+    importer.import_collection_csv( path,
+           name: name,
+           content: content )
+end
+
+
+module Model 
+class Inscribe
+   def self.import( id_or_ids, content: true )
+       OrdDb.importer.import( id_or_ids, content: content )
+   end
+end  # class Inscribe
+end # module Model 
+
+
 end  # module OrdDb

data/lib/ordlite/models/collection.rb

@@ -2,7 +2,11 @@ module OrdDb
     module Model
   
   class Collection < ActiveRecord::Base    
-    has_many :items, -> { order('pos') }
+    has_many :items   
+    ##  -> { order('pos') }
+    ##   note: default_scope (order)
+    ##      will break all count queries and more
+    ##      thus - no "magic" - always sort if pos order required!!!
     has_many :inscribes, :through => :items                    
   end  # class Collection
   

data/lib/ordlite/models/factory.rb

@@ -7,7 +7,12 @@ module OrdDb
 
     belongs_to :inscribe
     
-    has_many :inscriberefs, -> { order('pos') }  ## join table (use habtm - why? why not?)
+    has_many :inscriberefs  ## join table (use habtm - why? why not?)
+    ##  -> { order('pos') }
+    ##   note: default_scope (order)
+    ##      will break all count queries and more
+    ##      thus - no "magic" - always sort if pos order required!!!
+   
     has_many :layers, :through => :inscriberefs,  
                       :source => :inscribe  
 

data/lib/ordlite/models/inscribe.rb

@@ -18,6 +18,68 @@ module OrdDb
 
     ################################
     ### scope like helpers
+    def self.png() where( content_type: 'image/png' ); end
+    def self.gif() where( content_type: 'image/gif' ); end
+    def self.jpg() where( content_type: 'image/jpeg' ); end
+    def self.webp() where( content_type: 'image/webp' ); end
+    def self.svg()  where( content_type: 'image/svg+xml' ); end
+    def self.avif() where( content_type: 'image/avif' ); end
+
+    class << self
+       alias_method :jpeg, :jpg
+    end     
+
+    def self.image  
+         ## change to/or add alias e.g. image/images - why? why not
+        where( content_type: [
+            'image/png',
+            'image/jpeg',
+            'image/gif',
+            'image/webp',
+            'image/svg+xml',
+            'image/avif',
+            ])
+    end
+
+    def self.html
+        where( content_type: [
+           'text/html;charset=utf-8',
+           'text/html',
+          ])
+    end
+
+    def self.js
+        where( content_type: [
+           'text/javascript',
+           'application/javascript',
+          ])
+    end
+
+     class << self
+        alias_method :javascript, :js
+     end     
+ 
+    def self.text
+        ## change to/or add alias e.g. text/texts - why? why not
+        ## include html or svg in text-only inscription - why? why not?
+        ##  include markdown in text-only inscription - why? why not?
+        ##   make content_type lower case with lower() - why? why not?
+        where( content_type: [
+                  'text/plain',
+                  'text/plain;charset=utf-8',
+                  'text/plain;charset=us-ascii',
+                  'application/json',
+             ])
+    end
+        
+    def self.search( q )   ## "full-text" search helper
+        ##  rename to text_search - why? why not?        
+        ## auto-sort by num - why? why not?
+        joins(:blob).text.where( "content LIKE '%#{q}%'" ).order('num')
+    end
+    
+    
+
     def self.deploys 
       where_clause =<<SQL 
 content LIKE '%deploy%' 
@@ -25,7 +87,7 @@ AND (   content LIKE '%orc-721%'
      OR content LIKE '%og%')
 SQL
 
-       joins(:blob).where( where_clause ).order( 'num' )
+       joins(:blob).text.where( where_clause ).order( 'num' )
     end
 
     def self.deploys_by( slug: )
@@ -36,7 +98,7 @@ AND (   content LIKE '%orc-721%'
 AND content LIKE '%#{slug}%'     
 SQL
 
-      joins(:blob).where( where_clause ).order( 'num' )
+      joins(:blob).text.where( where_clause ).order( 'num' )
     end
 
     def self.mints 
@@ -46,7 +108,7 @@ AND (   content LIKE '%orc-721%'
      OR content LIKE '%og%')
 SQL
 
-       joins(:blob).where( where_clause ).order( 'num' )
+       joins(:blob).text.where( where_clause ).order( 'num' )
     end
 
     def self.mints_by( slug: ) 
@@ -57,38 +119,50 @@ AND (   content LIKE '%orc-721%'
 AND content LIKE '%#{slug}%'     
 SQL
 
-       joins(:blob).where( where_clause ).order( 'num' )
+       joins(:blob).text.where( where_clause ).order( 'num' )
     end
 
+    
    def self.sub1k()  where( 'num < 1000' ); end
    def self.sub2k()  where( 'num < 2000' ); end
    def self.sub10k()  where( 'num < 10000' ); end
    def self.sub20k()  where( 'num < 20000' ); end
    def self.sub100k()  where( 'num < 100000' ); end
    def self.sub1m()  where( 'num < 1000000' ); end
+   def self.sub2m()  where( 'num < 2000000' ); end
+   def self.sub10m()  where( 'num < 10000000' ); end
+   def self.sub20m()  where( 'num < 20000000' ); end
+   def self.sub21m()  where( 'num < 21000000' ); end
  
 
    def self.largest
       order( 'bytes DESC' )
    end
 
+   def self.address_counts
+       group( 'address' )
+        .order( Arel.sql( 'COUNT(*) DESC')).count
+   end 
+
    def self.block_counts
-      group( 'block' ).count
+       group( 'block' )
+        .order( 'block').count
    end 
    
    def self.block_with_timestamp_counts
-      group( Arel.sql( "block || ' @ ' || date" )).count
+       group( Arel.sql( "block || ' @ ' || date" ))
+        .order( Arel.sql( "block || ' @ ' || date" ) ).count
    end
 
    def self.content_type_counts
-      group( 'content_type' )
+       group( 'content_type' )
        .order( Arel.sql( 'COUNT(*) DESC, content_type')).count
    end
 
 
    def self.date_counts
        ## note: strftime is SQLite specific/only!!!
-       group( Arel.sql("strftime('%Y-%m-%d', date)"))
+      group( Arel.sql("strftime('%Y-%m-%d', date)"))
         .order( Arel.sql("strftime('%Y-%m-%d', date)")).count
    end
 
@@ -100,13 +174,14 @@ SQL
 
    def self.hour_counts
       ## note: strftime is SQLite specific/only!!!
-      group( Arel.sql("strftime('%Y-%m-%d %Hh', date)"))
+       group( Arel.sql("strftime('%Y-%m-%d %Hh', date)"))
        .order( Arel.sql("strftime('%Y-%m-%d %Hh', date)")).count
    end
 
 
    class << self
       alias_method :biggest, :largest
+      alias_method :counts_by_address,      :address_counts
       alias_method :counts_by_content_type, :content_type_counts
       alias_method :counts_by_date,         :date_counts
       alias_method :counts_by_day,          :date_counts
@@ -117,23 +192,12 @@ SQL
    end
 
 
-   def self.text
-      ## note: for now include:
-      ##   - text/plain (all variants)
-      ##   - text/json (all variants)
-      ##   - text/markdown
-      where( content_type: 
-               ['text/plain',
-                'text/plain;charset=utf-8',
-                'text/markdown',
-                'application/json',
-               ]
-           )
-   end
-   def self.png() where( content_type: 'image/png' ); end
+
 
 ###
 ## add support for ordinals.com api txt (headers format) 
+##
+## todo/fix: move to importer!!! - why? why not?
 
 
    def self.create_from_api( data ) create( _parse_api( data )); end

data/lib/ordlite/schema.rb

@@ -56,6 +56,7 @@ create_table :inscribes, :id => :string do |t|
 
     ## "timestamp": "2023-06-01 05:00:57 UTC"
     ##   or use date_utc ???
+    ##   or change to t.integer AND timestamp  or time or epoch(time) - why? why not?
     t.datetime :date, null: false
 
     ##
@@ -99,8 +100,8 @@ create_table :blobs, :id => :string do |t|
     ## t.string   :id,  null: false, index: { unique: true, name: 'blob_uuids' }
  
     t.binary     :content,   null: false
-    t.string     :sha256   ## sha256 hash
-    t.string     :md5      ## md5 hash - add why? why not?  
+    t.string     :sha256   ## sha256 hash as hexstring
+    t.string     :md5      ## md5 hash as hexstring - add why? why not?  
 
   ## timestamp last
   t.timestamps
@@ -193,23 +194,5 @@ end # block Schema.define
 
 end # method up
 end # class CreateDb
-
-###
-#  migrations helpers
-class AddGeneratives
-
-def up  
-  ActiveRecord::Schema.define do
-    create_table :generatives, :id => :string do |t|
-      t.string  :factory_id, null: false
-      t.string  :g,          null: false  ##  use space separated numbers - why? why not?    
-      t.binary  :content    ### optional for now - why? why not?
-     
-      ## timestamp last
-      t.timestamps
-    end
-  end # block Schema.define
-end # method up
-end # class AddGeneratives
   
 end # module OrdDb

data/lib/ordlite/version.rb

@@ -3,7 +3,7 @@ module Ordlite
 
   # sync version w/ sport.db n friends - why? why not?
   MAJOR = 0 ## todo: namespace inside version or something - why? why not??
-  MINOR = 2
+  MINOR = 3
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ordlite
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ordinals
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pixelart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +187,7 @@ files:
 - lib/ordlite.rb
 - lib/ordlite/base.rb
 - lib/ordlite/cache.rb
+- lib/ordlite/factory.rb
 - lib/ordlite/importer.rb
 - lib/ordlite/models/blob.rb
 - lib/ordlite/models/collection.rb