recordx_sqlite 0.2.5 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 608b01a6d789ee7139213da5a65e9bd1160de9f5
-  data.tar.gz: a58cf47dce501b6cac28b030704832d339f3c867
+SHA256:
+  metadata.gz: 3db5139cd9c0e124459ca4a5f388ae556e6d7e07be90b5f6ed9c0c4e29e45005
+  data.tar.gz: 3d2966b40f159c7a07133ced693673540e0600f3a6da6cb5de8d0db33c6288cf
 SHA512:
-  metadata.gz: b29579a30c0666b295b0c3de86331a4fc5b4f576ead42ac103c516976d565d13109c833110a32d743a528b8cc772844c427bfdc96e819a002ab916794c26b19f
-  data.tar.gz: 4209e323bfe6d09b5f86b0ae09bcec5f1fbdd0ed7f823d4f77a95db7732919487af23775fd333889db21c1a14b6ebe379f38a361b544ac34092f63537dd30e0e
+  metadata.gz: 9509b33e7e585b1103c2fcd60971ac528d403a4c99cb20faab6d91a98b0a8f066ffec030af063e642dcd387841f9619e162d71a74b031b68349af54b711fa1e8
+  data.tar.gz: 20bc3cecc3f045b40db81d7e6b8f3008ec0b21a12418474466f1ed995bf0b37f0499815be62a47c0dd1c1fdf538122b1eb11ce9e1a5769ea44e382cb3b034eb3

data/lib/recordx_sqlite.rb

@@ -4,14 +4,17 @@
 
 require 'sqlite3'
 require 'recordx'
+require 'drb_sqlite'
 
 
 class RecordxSqlite
 
-  def initialize(dbfile, table: '', primary_key: :id, pk: primary_key, 
-                 sql: nil)
-        
-    @db = SQLite3::Database.new dbfile
+  def initialize(dbfile, table: nil, primary_key: :id, pk: primary_key, 
+                 sql: nil, pagesize: 10, debug: false)
+
+    @debug = debug
+    sqlite = dbfile =~ /^sqlite:\/\// ? DRbSQLite : SQLite3::Database    
+    @db = sqlite.new dbfile
 
     @db.results_as_hash = true
     
@@ -26,19 +29,56 @@ class RecordxSqlite
       @primary_key = h[@table].keys.first
       
       create_table(@table, h[@table]) if @db.table_info(@table).empty?
+      
+    else
+      
+      if @db.respond_to? :tables then
+        @table = @db.tables.first
+        @primary_key = @db.fields(@table).first
+      else
+        
+        sql = "SELECT name FROM sqlite_master WHERE type='table';"
+        r = @db.execute(sql)
+        puts 'r: ' + r.inspect if @debug
+        
+        a = r.map {|x| x['name']}
+        puts 'a: ' + a.inspect if @debug
+        
+        sys = a.grep /^sqlite_/
+        @table = (a - sys).first
+        puts '@table: ' + @table.inspect if @debug
+        
+        @primary_key = @db.table_info(@table).map {|x| x['name'].to_sym }.first
+        puts '@primary_key: ' + @primary_key.inspect if @debug
+        
+      end
             
     end
     
-    @sql =  sql || 'select * from ' + @table.to_s
-    
+    @sql =  sql = 'select * from ' + @table.to_s
+    @default_sql = @sql
+    @pagesize = pagesize
     @a = nil
     
+    # create the fhe find_by methods for each fields
+    @db.table_info(@table).each do |cols|
+      #puts 'cols: ' + cols.inspect
+      define_singleton_method ('find_by_' + cols['name']).to_sym do |val|
+        find_by(cols['name'], val)
+      end
+      
+      define_singleton_method ('find_all_by_' + cols['name']).to_sym do |val|
+        find_all_by(cols['name'], val)
+      end      
+    end
+    
   end
 
   # note: when using method all() you will need to call method refresh() 
   # first if a record had recently been added since the recordset was loaded
   #
   def all()    
+    @sql = @default_sql
     query(@sql) unless @a
     @a
   end
@@ -71,15 +111,52 @@ class RecordxSqlite
     
   end
   
+  def find_by(field, val)
+
+    query(@sql) unless @a
+    @a.find {|x| x.method(field).call == val}
+    
+  end
+
+  def find_all_by(field, val)
+
+    query(@sql) unless @a
+    @a.select {|x| x.method(field).call == val}
+    
+  end    
+  
   # returns the 1st n rows
   #
   def first(n=1)
    query(@sql + ' LIMIT ' + n.to_s, cache: false)
   end
-
-  def query(sql=@sql, cache: true)
+  
+  def order(dir=:asc)
+    @sql += " ORDER BY #{@primary_key} #{dir.to_s.upcase}"
+    self
+  end
+  
+  def page(n=1)
     
-    rs = @db.query sql
+    query(@sql + " ORDER BY %s DESC LIMIT %s OFFSET %s" % 
+          [@primary_key, @pagesize, @pagesize*(n-1)], cache: false)
+
+  end
+
+  def query(sql=@sql, cache: true, heading: true)
+        
+    if heading then
+      
+      rs = @db.query sql
+      
+    else
+      
+      @db.results_as_hash = false
+      rs = @db.query(sql).to_a
+      @db.results_as_hash = true
+      
+      return rs 
+    end
     
     a = rs.map do |h| 
       h2 = h.inject({}) {|r, x| k, v = x; r.merge(k.to_sym => v)}
@@ -130,4 +207,4 @@ WHERE #{@primary_key.to_s}='#{id}';"
     
   end  
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recordx_sqlite
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MDcxNjE5MzI1NFoXDTE3MDcxNjE5MzI1NFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMhwmacRvDS0pX630f3U6f/tnOZgD0lcUmwFA2S8n1VS78haGvHWNcORImAk
-  AIsqNGxwyGTWpSdhSbQG2ba5rbWvFLo9uj7ZzcKlLZgVSDqAVrwc2ufRgHtvmXgH
-  Dgq0xfU2YeESpycbPNlUISIWve/0yMsp0mBFnsvKMC61+9DKk0hk7AeuVPdBlGBs
-  sWFfvhRf1cltL51KcXEraYVqzVrkGCzqmeZsLt/cEUPaMGAzmjEpEiJ6V5WJnDvM
-  aYf30rfuscwgzoTnHO38dAeN5YHYeOEuhVO+yg8cCvVaAnu3cy0tf0JUVUkFT3te
-  j+j42gZ3RS54cuQojjB264CAgB8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUpLuRFutxyut9ElCr1CZT8o36oxQwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAHkvcYqht
-  vcvGnJ+CBzNPjOrppZxHtaoN0YuBvyLGy6iIuo5c1AVdAz7Bzal8A8WoYCtCa715
-  k7+ICm2wyrzPjVZgfL/Unw78Dz0SQ8hqqN6vY2mObrULiR+iIK0MoBdORp338UeL
-  laeLmZ3XJvjwdZpEN+DMPe2SI6aTCV1xU7xSLpLGkkuynlbfc4BGaO9fli75W0CR
-  +zidZ8EDF6H4KWua901gnycLrpnglBIl10DWy7lsaDXm5qtKk0dYO5f677JQZVEU
-  pewreBQ0QCPuPbV1FPlyX5N5qsGIMHFIYqUlaykOA8156Y6fbIbqQsLwxaSr8WkD
-  eojajR/fTTvliw==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMjI3MDk0NDA0WhcN
+  MjIwMjI3MDk0NDA0WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCWsEnT
+  HnD/rZuHzcxBKTeeYR1hc0Jfu7WK+Vjc2J2RO2Vc1+GNmNVNKpKJTpLQfgVRRe3p
+  By6GijiR4h9ThjMttAq5T615m77BClaWA6zwKew4VzSa8C2CDPuiDbk+QI0SbISb
+  0UFCtzgH/FpKp9GbqDpTn0EaBR2XcSBrRE5rZu9pqpA9EDc1q8KvKioNmKS+cOlV
+  eDdudbAIvzVnmMXkd9hl8uF8B2IWeh8RF5UHgEWPeObsZBovASQZC6SfeEcbvioL
+  WGFhKkidAy2G+10AXlofdJkMX7iWlMZSkE1oWZ182rTYeIHxKUdAivEbYoHEX13z
+  wJzFFC0oS7ZBc/RfGf1ruDFHqDtN9xc2++ihbC4BYZEe+nF0WMFXNobysgTz6vkD
+  IhtPCkaj1hMHFLJRKIxlk3Zk2X0YUcDoCbyCrsDIvoiaLAMYD4m90s3Dr1vL8nyH
+  Wp188iQC8/wb9NcYHQnf4zjCMKpFKnM/6eBR+1rtARNJww4yDSOzKRdAGXMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUHVeNt0E8
+  EJvAdd8o+KwKLBaZ1DMwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAj65GR5UHe6vDPnTp38ivVIZskSlTCafWvO+oMI1L
+  UO9sLOjS3XDon+VSafMQaWtlf/f0CLHjjImuj/UUMqBU+XxGIQTjw01kCuErBIYH
+  KNPAv7P2Jm7ZOMNubvFTjPE6KvoslFbXEs0FPTf+MjiP/J1F6pHx4rcnxWoQ2qSq
+  uK7Zi8j3bRGDUGdW8c1btU8bUe3XsdfIwYRUvDm3E9fiHThH4Ta3uPLfeN6TCAje
+  qz2w2H+8jTC9zGdKh31dK9GUKneJiJ6EW8G27E9QWlZ0jezMLrjqzekSPGYREJBT
+  45cJ79L4CUPnD+9WR75jGp2G3em8e/4nUlh29GvXOHi5SzpjuqEgLRRHLMG19mrg
+  Uy13/a2YkENgSlY9Q9bZW7jpb1CwVscJ4n+HLVb0fj8HKwsceJzeYf9JXHzJ2ykt
+  14GYRdzYfQotOw5CFtPk6K1OgKW7WoEyiUBKdJanTGfXkAOum4dHWdWD7mm0RXx/
+  VfP9/tWv/9cP4k9V2nUJNEmu
   -----END CERTIFICATE-----
-date: 2017-07-02 00:00:00.000000000 Z
+date: 2021-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -39,40 +43,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: recordx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.4
+- !ruby/object:Gem::Dependency
+  name: drb_sqlite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -100,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: RecordX-SQLite is an object relational mapper primarily designed for updating