ordlite 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f1f6f768a785a0badc768db45c1c8ca831958f983b673fe48990846f3d4260e
-  data.tar.gz: 234d31cabdc7ed109144487792da9f77c39821f935e3d7d91a151b91e817d511
+  metadata.gz: 44ca59e7026e8b717d26f8ae42ed7050d08abd44047dca6de505582253e2f22b
+  data.tar.gz: f2728433967a7d58612e68d0402a3d9c9c9b644e71bdfe6c4aeca2e103cd116f
 SHA512:
-  metadata.gz: 403e1addf0b974af179de293a26c5f1f47da8d0f665da1ca1a44a89cbcfb025a642a04930f49f6df35681527b2cbcaae855f87de4b7ce09e6cd88b4cffab1472
-  data.tar.gz: ab359d39d1dcdf307e8b3239ed61e2f10f8fc6bfc4316c3f9f5554a9fbc2d88b0d1c24f120afcab9b035c675d82d22e0292c6d1202db7219d64f5e8f2c214b54
+  metadata.gz: 6dfd8030275128218b5057c0ed7a585f5a1688acfe894da4183e7e788b26b239565f84ac25bead42cf144d393a1e04ee68c900b918d15b8d4202267d2cad4815
+  data.tar.gz: af1eab5bb9c6e88b698ccd485ef6d8fc08bcd0f2c714faed0ee66d30c834d9ecc2c250c2792285f772a705a33cf5d13fa558965207d6d237b161de6e9c2ff3dc

data/CHANGELOG.md

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

data/lib/ordlite/importer.rb

@@ -125,17 +125,70 @@ def import_csv( path, content: true )
     end  
 end # method import_csv
 
+
 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 )
-   else  ## assume array
-      ids = id_or_ids
-      ids.each do |id|
-         _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
+   else
+      raise ArgumentError, "expected String or Array; got #{id_or_ids.class.name}"
    end
-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?
@@ -149,19 +202,22 @@ def _import( id, content: true )
       Inscribe.create_from_api( data )
    end
 
-   if content
-     ## 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 )
+   _import_content( id )  if content              
+end
 
-        puts "  content-type: #{content.type}"
-        puts "  content-length: #{content.length}"
-     
-        Blob.create( id: id, content: content.data )
-     end
-   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

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,9 +119,10 @@ 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
@@ -129,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,8 +3,8 @@ 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
-  PATCH = 1
+  MINOR = 3
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ordlite
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ordinals