postjob 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb21c1c9b0516371bbc43a2bd7229984ef7577a1
-  data.tar.gz: 761098539e9811bfc9976d5364082030123e646e
+  metadata.gz: b1ab40be9d1e5d2a5dce344ed912d837bf3ae567
+  data.tar.gz: 09ee97d4ce95a137525d8efee7e0f7c24a21cb95
 SHA512:
-  metadata.gz: c23429e34021916aaa70ae98643b6f270c9580b63d68153bb765532bb768125a455ac6ff00a4dd2a6bf78a89c24603440be5334bc59e4e7f75137ee06e41aa73
-  data.tar.gz: f655e34b2746d8202613712ac70db55a094d0d8b9d996a4512ce86c3c8414cb43e8ce9eddd7983dc63966b1a4ccc77b50b70a3993e2ad31a1637b59dc04ec9a7
+  metadata.gz: 2930f208eb34cda94e2570a823f4d32132e6ba58c078a24d0f0803c7bbccf8068b51d3832779a1e1b7eb4c40c0034f1e951970e847bcd1f73806582f3031c735
+  data.tar.gz: 15ee51d44d1341b538808e4cb875a1c98cb518c34e68b355ef678860de8d1737ee20197fe49dd627d84b4b8803b928714df9a73e60b0a0074548cc930db4d1db

data/lib/postjob/cli/ps.rb

@@ -74,7 +74,7 @@ module Postjob::CLI
   def ps_show(id, *ids)
     ids = ([id] + ids).map { |s| Integer(s) }
 
-    jobs = Simple::SQL.records <<~SQL, ids, into: Postjob::Job
+    jobs = Simple::SQL.all <<~SQL, ids, into: Postjob::Job
       SELECT * FROM postjob.postjobs WHERE id = ANY($1)
     SQL
 
@@ -111,7 +111,7 @@ module Postjob::CLI
 
   def print_sql(limit:, query:)
     connect_to_database!
-    records = Simple::SQL.records("#{query} LIMIT $1+1", limit)
+    records = Simple::SQL.all("#{query} LIMIT $1+1", limit, into: Hash)
 
     tp records[0, limit]
     if records.length > limit

data/lib/postjob/queue/search.rb

@@ -6,14 +6,14 @@ end
 module Postjob::Queue::Search
   extend self
 
-  def one(id, filter: {}, into: nil)
+  def one(id, filter: {}, into: Hash)
     query = query(page: 0, per: 1, filter: filter, id: id)
-    Simple::SQL.record(query, into: into)
+    Simple::SQL.ask(query, into: into)
   end
 
-  def all(page: 0, per: 100, filter: {}, into: nil)
+  def all(page: 0, per: 100, filter: {}, into: Hash)
     query = query(page: page, per: per, filter: filter)
-    Simple::SQL.records(query, into: into)
+    Simple::SQL.all(query, into: into)
   end
 
   private

data/lib/postjob/queue.rb

@@ -90,7 +90,7 @@ module Postjob::Queue
 
       Notifications.notify_listeners
 
-      SQL.record "SELECT * FROM #{TABLE_NAME} WHERE id=$1", id, into: Job
+      SQL.ask "SELECT * FROM #{TABLE_NAME} WHERE id=$1", id, into: Job
     end
   end
 
@@ -212,7 +212,7 @@ module Postjob::Queue
   def childjobs(parent)
     expect! parent => Job
 
-    SQL.records <<~SQL, parent.id, into: Job
+    SQL.all <<~SQL, parent.id, into: Job
       SELECT * FROM #{TABLE_NAME}
       WHERE parent_id=$1
       ORDER BY id
@@ -222,7 +222,7 @@ module Postjob::Queue
   def next_unresolved_childjob(parent)
     expect! parent => Job
 
-    SQL.record <<~SQL, parent.id, into: Job
+    SQL.ask <<~SQL, parent.id, into: Job
       SELECT * FROM #{TABLE_NAME}
       WHERE parent_id=$1 AND status NOT IN ('ok', 'failed')
       ORDER BY next_run_at
@@ -235,7 +235,7 @@ module Postjob::Queue
 
     workflow, workflow_method = parse_workflow(workflow)
 
-    job = SQL.record <<~SQL, parent.id, workflow, workflow_method, Encoder.encode(args), into: Job
+    job = SQL.ask <<~SQL, parent.id, workflow, workflow_method, Encoder.encode(args), into: Job
       SELECT * FROM #{TABLE_NAME}
       WHERE parent_id=$1
         AND workflow=$2
@@ -291,7 +291,7 @@ module Postjob::Queue
     SQL
 
     SQL.transaction do
-      job = SQL.record sql, Postjob::Registry.workflows_with_versions, into: Job
+      job = SQL.ask sql, Postjob::Registry.workflows_with_versions, into: Job
       yield job if job
       job
     end
@@ -307,7 +307,7 @@ module Postjob::Queue
   end
 
   def find_job_by_token(token)
-    SQL.record <<~SQL, token, into: Job
+    SQL.ask <<~SQL, token, into: Job
       SELECT postjob.postjobs.* FROM postjob.postjobs
       INNER JOIN postjob.tokens ON postjob.tokens.postjob_id=postjob.postjobs.id
       WHERE postjob.tokens.token=$1

data/spec/support/test_helper.rb

@@ -8,15 +8,15 @@ module TestHelper
   end
 
   def newest_job
-    Simple::SQL.record "SELECT * FROM postjobs ORDER BY id DESC", into: Postjob::Job
+    Simple::SQL.ask "SELECT * FROM postjobs ORDER BY id DESC", into: Postjob::Job
   end
 
   def load_job(id_or_sql, *args)
     case id_or_sql
     when Integer
-      Simple::SQL.record "SELECT * FROM postjobs WHERE id=$1", id_or_sql, into: Postjob::Job
+      Simple::SQL.ask "SELECT * FROM postjobs WHERE id=$1", id_or_sql, into: Postjob::Job
     else
-      Simple::SQL.record id_or_sql, *args, into: Postjob::Job
+      Simple::SQL.ask id_or_sql, *args, into: Postjob::Job
     end
   end
 
@@ -27,7 +27,7 @@ module TestHelper
   def print_sql(sql, *args)
     require "table_print"
 
-    records = Simple::SQL.records(sql, *args)
+    records = Simple::SQL.all(sql, *args)
     tp records
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postjob
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - radiospiel
@@ -120,20 +120,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: simple-cli
   requirement: !ruby/object:Gem::Requirement