prolego 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e68ecfffef33a3e01980a8bffefedce792389258
-  data.tar.gz: d41b0a0aaf77597a44423647315e205d756dcf1b
+  metadata.gz: ebac753c6aff0e828b2268518735399d048eb7fd
+  data.tar.gz: f2327f8c1466de231eec9a5780dc646cf6ef7900
 SHA512:
-  metadata.gz: 2c6143b031fab0eb4de7aba11471937e4af570a1f91d922944f502c9b6548052dffab99d0f79fcde3010ec1277e515de4ce9516973677ccb089280514e014a72
-  data.tar.gz: 9d9e38b0634130d0800d88160b25c22b2f818a9fc4af22334cc32b637556128d98bf7abfcb744de56a7acc4a17fada12cafd6fca8eefe4731fb849cf495ab2e1
+  metadata.gz: 6e8b547877eaf35cc86ed3d1eac741bca05544cfb7967b40908b56d906369cd2b327fd8599da0e2b88358525496cb3859cfeff2d4e30180bbe6a8a00f3bd771b
+  data.tar.gz: cce7fab73cad9b1a8d4f9f7fbee4fb1de1d081177da37eebad938b73a6aae01d29b67e7ae4c30544c5207c6e1968d8870c843970effa720ac9221d550e7d977e

data/README.md

@@ -37,12 +37,13 @@ argument list expects an **array**, so if you have arrays within your arguments,
 nest them.
 
 ```ruby
-prolog.command "ce",["BS",["MATH 162","ECE 230"]]
+prolog.command "ce",["BS",[["MATH 162","A"],["CE 160L","A"]]]
 ```
 
 We have a special method called `epilog` to get our formatted output. This
 splits our Prolog output for our application, based on the last command sent
-from the current Prolegomenon object.
+from the current Prolegomenon object. This expects lists to be returned. We are
+using `writeq` to do this, then the gem parses them using the JSON gem.
 
 ```ruby
 prolog.epilog

data/lib/prolego.rb

@@ -1,23 +1,30 @@
 require "prolego/version"
 require "json"
+require "open3"
 
 module Prolego
   class Query
 
-    def initialize filepath
-      @file=filepath
+    attr_reader :status, :whiny, :error
+
+    def initialize(filepath, whiny: false)
+      @file  = filepath
+      @whiny = whiny
     end
 
-    def command predicate,args
-      @output=%x[swipl -q -f '#{@file}' -g '#{parg predicate}(#{parg args}),halt']
+    def command(predicate, args)
+      command = "swipl -qf '#{@file}' -g '#{escape(predicate)}(#{escape(args)}),halt'"
+      @output, @error, status = Open3.capture3(command)
+      @status = status.exitstatus
     end
 
-    def parg arg
-      arg.to_s.gsub /^\[|"|'|\]$/, "[" => "", "]" => "", "'" => "'\"'\"'", "\"" => "'\"'\"'"
+    def escape(arg)
+      arg.to_s.gsub(/^\[|"|'|\]$/, "[" => "", "]" => "", "'" => "'\"'\"'", "\"" => "'\"'\"'")
     end
 
     def epilog
-      JSON.parse @output.gsub("'","\"")
+      fail "Prolog exit status #{@status}. Check errors with query.error" if @status != 0 && whiny
+      JSON.parse @output.gsub("'", "\"") rescue @output
     end
 
   end

data/lib/prolego/version.rb

@@ -1,3 +1,3 @@
 module Prolego
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prolego
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ricardo Piro-Rael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,12 +52,7 @@ files:
 - Rakefile
 - lib/prolego.rb
 - lib/prolego/version.rb
-- prolego-0.0.1.gem
-- prolego-0.0.2.gem
-- prolego-0.0.3.gem
-- prolego-0.0.4.gem
-- prolego-0.0.5.gem
-- prolego-0.0.6.gem
+- prolego-0.0.7.gem
 - prolego.gemspec
 homepage: https://github.com/rickpr/prolegomenon
 licenses:
@@ -79,9 +74,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: This gem interfaces Ruby with Prolog via the shell.
 test_files: []
-has_rdoc: