cycr 0.0.8 → 0.1.0

data/{README.txt → README.rdoc}

@@ -62,7 +62,7 @@ The you can start 'irb' to see it in action:
   cyc = Cyc::Client.new
 
   # check if Dog generalizes to Animal
-  cyc.genls? :Dog, :Animal # => T
+  cyc.genls? :Dog, :Animal # => true
 
   # check if Animal generalizes to Dog
   cyc.genls? :Animal, :Dog # => nil
@@ -90,15 +90,41 @@ The you can start 'irb' to see it in action:
 
   # What is more, you might even build complex subcalls, such as:
   cyc.genls? :Person, :HomoSapiens # => nil
-  cyc.with_any_mt{|cyc| cyc.genls? :Person, :HomoSapiens} # => T
-
-  # If you want to see the query which is send to Cyc, just turn on the
+  cyc.with_any_mt{|cyc| cyc.genls? :Person, :HomoSapiens} # => true
+
+  # The assertions are parsed, as well as Cyc symbols and variables
+  keys = cyc.key_predicate_rule_index :isa
+  # => [:POS, :NEG]
+  keys[0].class
+  # => Cyc::Symbol
+  cyc.symbolp keys[0]
+  # => true
+
+  keys1 = cyc.key_predicate_rule_index :isa, keys[0]
+  # => [:ComputerRunningMt, :HumanManipulationMt, :BuyingMt, ...
+  keys2 = cyc.key_predicate_rule_index :isa, keys[0], keys1[2]
+  # => [:BACKWARD]
+  rules = cyc.gather_predicate_rule_index :isa, keys[0], keys1[2], keys2[0]
+  # => [[:implies, [:and, [:objectOfPossessionTransfer, :TheBuying, ?OBJ], 
+        [:activityObjectType, :TheSelectingAProduct, ?PREFERED]], 
+        [:isa, ?OBJ, ?PREFERED]] : BuyingMt]
+  cyc.assertion_p rules[0]
+  # => true
+
+  rules[0].formula[1][1][2]
+  # => ?OBJ
+  rules[0].formula[1][1][2].class
+  # => Cyc::Variable
+  # the variable cannot be checked for type, since it won't be bound
+
+
+  # If you want to see the query which is send to Cyc, just turn on
   # debugging:
   cyc.debug = true
   cyc.genls? :Dog, :Anial
   # Send: (genls? #$Dog #$Animal)
   # Recv: 200 T
-  # => "T" 
+  # => true 
 
   # The same way, you can turn it off:
   cyc.debug = false
@@ -108,9 +134,9 @@ The you can start 'irb' to see it in action:
 
 == LICENSE:
  
-(The MIT License)
+(The MIT/X11 License)
 
-Copyright (c) 2008-2010 Aleksander Pohl
+Copyright (c) 2008-2012 Aleksander Pohl
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,7 +1,15 @@
-task :default => [:install]
+task :default => [:test]
 
 $gem_name = "cycr"
 
+desc "Run tests"
+task :test do
+  puts "WARNING: The test have to be run with an available Cyc server"
+  sh "rspec spec/parser.rb"
+  sh "rspec integration/assertion.rb"
+  sh "rspec integration/client.rb"
+end
+
 desc "Build the gem"
 task :build do
   sh "gem build #$gem_name.gemspec"

data/changelog.txt

@@ -1,3 +1,13 @@
+0.1.0
+- Add license info to some files
+- Add tests to Rakefile
+- More specs for the client
+- Parse variables and cyc symbols
+- Move files to cyc dir, improve parenthesis check
+- Better organization of tests (specs/integration separation)
+- T atom interpreted as true value
+0.0.9
+- raises error for raw answer if Cyc reports error
 0.0.8
 - fix documentation for Cyc::Builder
 - removal of legacy code

data/cycr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "cycr"
-  s.version = "0.0.8"
+  s.version = "0.1.0"
   s.date = "#{Time.now.strftime("%Y-%m-%d")}"
   s.summary = "Ruby client for the (Open)Cyc server"
   s.email = "apohllo@o2.pl"
@@ -10,10 +10,9 @@ Gem::Specification.new do |s|
   s.has_rdoc = false
   s.authors = ['Aleksander Pohl']
   s.files = `git ls-files`.split("\n")
-  s.test_files = Dir.glob("spec/**/*")
-  s.rdoc_options = ["--main", "README.txt"]
+  s.test_files = Dir.glob("spec/**/*") + Dir.glob("integration/**/*")
+  s.rdoc_options = ["--main", "README.rdoc"]
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README.txt"]
+  s.extra_rdoc_files = ["README.rdoc"]
   s.add_development_dependency("rspec", [">= 1.2.9"])
 end
-

data/integration/assertion.rb

@@ -0,0 +1,35 @@
+$:.unshift "lib"
+require 'cycr'
+
+describe Cyc::Assertion do
+  before(:all) do
+    @client = Cyc::Client.new()
+    #@client.debug = true
+    @assertion = @client.talk('(gather-predicate-extent-index #$minimizeExtent #$BaseKB)').
+      first
+  end
+
+  after(:all) do
+    @client.close
+  end
+
+  it "should have microtheory assigned" do
+    @assertion.microtheory.should_not == nil
+  end
+
+  it "should have formula assigned" do
+    @assertion.formula.should_not == nil
+  end
+
+  it "should allow to check its direction" do
+    @client.assertion_direction(@assertion).should_not == nil
+  end
+
+  it "should allow to check its truth" do
+    @client.assertion_truth(@assertion).should_not == nil
+  end
+
+  it "should allow to check its strength" do
+    @client.assertion_strength(@assertion).should_not == nil
+  end
+end

data/{spec → integration}/client.rb

@@ -25,12 +25,34 @@ describe Cyc::Client do
     result.should be_a_kind_of String
   end
 
+  it "should raise an error for raw talk if Cyc reported error" do
+    lambda {@client.raw_talk("(aaa)")}.should raise_error(Cyc::CycError)
+  end
+
   it "should allow to talk to server and return parsed answer" do
-    result = @client.talk("(genls \#\$Dog)")
+    result = @client.talk('(genls #$Dog)')
     result.should_not == nil
     result.should respond_to :size
   end
 
+  it "should not allow to send a message with unbalanced parenthesis" do
+    lambda {@client.talk("(")}.should raise_error(Cyc::UnbalancedOpeningParenthesis)
+    lambda {@client.talk("())")}.should raise_error(Cyc::UnbalancedClosingParenthesis)
+  end
+
+  it "should parse results with assertions" do
+    @client.talk('(gather-predicate-extent-index #$minimizeExtent #$BaseKB)').should_not == nil
+  end
+
+  it "should return assertions as results if present in the result" do
+    @client.talk('(gather-predicate-extent-index #$minimizeExtent #$BaseKB)').
+      first.class.should == Cyc::Assertion
+  end
+
+  it "should return results with continuation" do
+    @client.talk('(gather-predicate-extent-index #$minimizeExtent)').size.should > 100
+  end
+
   it "should allow multiple processes to use the client" do
     parent_pid = Process.pid
     if fork

data/lib/cyc/assertion.rb

@@ -0,0 +1,36 @@
+module Cyc
+  # Author:: Aleksander Pohl (mailto:apohllo@o2.pl)
+  # License:: MIT/X11 License
+  #
+  # This class represent the Cyc assertions.
+  class Assertion
+    # The logical formula of the assertion.
+    attr_reader :formula
+
+    # The microtheory the assertion was asserted in.
+    attr_reader :microtheory
+
+    # Initialize the assertion with a +formula+ and a +microtheory+.
+    def initialize(formula,microtheory)
+      @formula = formula
+      @microtheory = microtheory
+    end
+
+    # Returns the string representation of the assertion.
+    def to_s
+      "#{@formula} : #{@microtheory}"
+    end
+
+    # Returns the representation of the assertion understandable by Cyc.
+    def to_cyc(raw=false)
+      "(find-assertion (caar (el-to-hl '#{@formula.to_cyc(true)})) #{@microtheory.to_cyc})"
+    end
+
+    def ==(other)
+      return true if self.object_id == other.object_id
+      return false unless other.respond_to?(:formula)
+      return false unless other.respond_to?(:microtheory)
+      self.formula == other.formula && self.microtheory == other.microtheory
+    end
+  end
+end

data/lib/{cycr → cyc}/builder.rb

@@ -1,7 +1,4 @@
 module Cyc
-  # Author:: Aleksander Pohl (mailto:apohllo@o2.pl)
-  # License:: MIT License
-  #
   # This class is used to capture calls to the Cyc client, to allow
   # nested calls, like
   #

data/lib/{cycr → cyc}/client.rb

@@ -1,8 +1,9 @@
 require 'net/telnet'
+require 'cyc/exception'
 
 module Cyc
   # Author:: Aleksander Pohl (mailto:apohllo@o2.pl)
-  # License:: MIT License
+  # License:: MIT/X11 License
   #
   # This class is the implementation of the Cyc server client.
   class Client
@@ -10,6 +11,7 @@ module Cyc
     # to standard output
     attr_accessor :debug
     attr_reader :host, :port
+
     # Creates new Client.
     def initialize(host="localhost",port="3601",debug=false)
       @debug = debug
@@ -34,7 +36,6 @@ module Cyc
     # If the block is given, the command is guarded by assertion, that
     # it will be performed, even if the connection was reset.
     def connection
-      #puts "#{@pid} #{Process.pid}"
       if @conn.nil? or @pid != Process.pid
         reconnect
       end
@@ -52,6 +53,7 @@ module Cyc
 
     protected :connection, :reconnect
 
+    # Clears the microtheory cache.
     def clear_cache
       @mts_cache = {}
     end
@@ -62,32 +64,58 @@ module Cyc
       @conn = nil
     end
 
-    # Sends message +msg+ directly to the Cyc server and
-    # returns the parsed answer.
+    # Sends message +msg+ to the Cyc server and returns a parsed answer.
     def talk(msg, options={})
       send_message(msg)
       receive_answer(options)
     end
 
-    # Sends message +msg+ directly to the Cyc server and
+    # Sends message +msg+ to the Cyc server and
     # returns the raw answer (i.e. not parsed).
     def raw_talk(msg, options={})
       send_message(msg)
       receive_raw_answer(options)
     end
 
-    # Send the raw message.
-    def send_message(msg)
-      @last_message = msg
-      puts "Send: #{msg}" if @debug
-      connection{|c| c.puts(msg)}
+    # Scans the :message: to find out if the parenthesis are matched.
+    # Raises UnbalancedClosingParenthesis exception if there is not matched closing
+    # parenthesis. The message of the exception contains the string with the
+    # unmatched parenthesis highlighted.
+    # Raises UnbalancedOpeningParenthesis exception if there is not matched opening
+    # parenthesis.
+    def check_parenthesis(message)
+      count = 0
+      position = 0
+      message.scan(/./) do |char|
+        position += 1
+        next if char !~ /\(|\)/
+        count += (char == "(" ?  1 : -1)
+        if count < 0
+          raise UnbalancedClosingParenthesis.
+            new((position > 1 ? message[0..position-2] : "") +
+              "<error>)</error>" + message[position..-1])
+        end
+      end
+      raise UnbalancedOpeningParenthesis.new(count) if count > 0
+    end
+
+    # Sends a raw message to the Cyc server. The user is
+    # responsible for receiving the answer by calling
+    # +receive_answer+ or +receive_raw_answer+.
+    def send_message(message)
+      position = 0
+      check_parenthesis(message)
+      @last_message = message
+      puts "Send: #{message}" if @debug
+      connection{|c| c.puts(message)}
     end
 
+    # Receives and parses an answer for a message from the Cyc server.
     def receive_answer(options={})
       receive_raw_answer do |answer|
         begin
           result = @parser.parse(answer,options[:stack])
-        rescue Parser::ContinueParsing => ex
+        rescue ContinueParsing => ex
           result = ex.stack
           current_result = result
           last_message = @last_message
@@ -97,20 +125,23 @@ module Cyc
             current_result = receive_answer(options) || []
             result.concat(current_result)
           end
+        rescue CycError => ex
+          puts ex.to_s
+          return nil
         end
         return result
       end
     end
 
-    # Receive raw answer from server. If a +block+ is given
-    # the answer is yield to the block, otherwise the naswer is returned.
+    # Receives raw answer from server. If a +block+ is given
+    # the answer is yield to the block, otherwise the answer is returned.
     def receive_raw_answer(options={})
       answer = connection{|c| c.waitfor(/./)}
       puts "Recv: #{answer}" if @debug
       if answer.nil?
-        raise "Unknwon error occured. " +
+        raise CycError.new("Unknwon error occured. " +
           "Check the submitted query in detail:\n" +
-          @last_message
+          @last_message)
       end
       while not answer =~ /\n/ do
         next_answer = connection{|c| c.waitfor(/./)}
@@ -133,16 +164,45 @@ module Cyc
         end
       else
         unless $2.nil?
-          puts $2.sub(/^"/,"").sub(/"$/,"") + "\n" +
-            @last_message
+          raise CycError.new($2.sub(/^"/,"").sub(/"$/,"") + "\n" + @last_message)
         else
-          puts "Unknown error! #{answer}"
+          raise CycError.new("Unknown error! #{answer}")
         end
         nil
       end
     end
 
-
+    # This hook allows for direct call on the Client class, that
+    # are translated into corresponding calls for Cyc server.
+    #
+    # E.g. if users initializes the client and calls some Ruby method
+    #   cyc = Cyc::Client.new
+    #   cyc.genls? :Dog, :Animal
+    #
+    # He/She returns a parsed answer from the server:
+    #   => "T"
+    #
+    # Since dashes are not allowed in Ruby method names they are replaced
+    # with underscores:
+    #
+    #   cyc.min_genls :Dog
+    #
+    # is translated into:
+    #
+    #   (min-genls #$Dog)
+    #
+    # As you see the Ruby symbols are translated into Cyc terms (not Cyc symbols!).
+    #
+    # It is also possible to nest the calls to build more complex functions:
+    #
+    #   cyc.with_any_mt do |cyc|
+    #     cyc.min_genls :Dog
+    #   end
+    #
+    # is translated into:
+    #
+    #   (with-any-mt (min-genls #$Dog))
+    #
     def method_missing(name,*args,&block)
       @builder.reset
       @builder.send(name,*args,&block)

data/lib/{cycr → cyc}/collection.rb

@@ -1,4 +1,8 @@
 module Cyc
+  # Author:: Aleksander Pohl (mailto:apohllo@o2.pl)
+  # License:: MIT/X11 License
+  #
+  # This class is used to represent Cyc collections.
   class Collection
     attr_reader :symbol
 

data/lib/cyc/exception.rb

@@ -0,0 +1,43 @@
+module Cyc
+  # Author:: Aleksander Pohl (mailto:apohllo@o2.pl)
+  # License:: MIT/X11 License
+  #
+  # Base class for exceptions raised by the library.
+  class CycError < RuntimeError
+  end
+
+  # Error raised if the message sent to the server has
+  # more opening parentheses than closing parentheses.
+  class UnbalancedOpeningParenthesis < CycError
+    # The number of unbalanced opening parentheses.
+    attr_reader :count
+
+    # Initialize the exception with the +count+ of unbalanced
+    # opening parentheses.
+    def initialize(count)
+      super("There are #{count} unbalanced opening parentheses")
+      @count = count
+    end
+  end
+
+  # Error raised if the message sent to the server has
+  # more closing parentheses than opening parentheses.
+  class UnbalancedClosingParenthesis < CycError
+  end
+
+  # Exception raised by the parser if there is contents
+  # that cannot be parsed.
+  class ParserError < CycError
+  end
+
+  # Exception raised when there is a continuation sign,
+  # at the end of the parsed message.
+  class ContinueParsing < ParserError
+    attr_reader :stack
+
+    def initialize(stack)
+      @stack = stack
+    end
+  end
+
+end

data/lib/{cycr → cyc}/parser.rb

@@ -1,20 +1,15 @@
 module Cyc
+  # Author:: Aleksander Pohl (mailto:apohllo@o2.pl)
+  # License:: MIT/X11 License
+  #
+  # The class used to parse the answer of the Cyc server.
   class Parser
-    # Exception raised when there is a continuation sign,
-    # at the end of the parsed message.
-    class ContinueParsing < RuntimeError
-      attr_reader :stack
-
-      def initialize(stack)
-        @stack = stack
-      end
-    end
-
     def initialize
       @lexer = SExpressionLexer.new
     end
 
-    # Parses message received from server. +Message+ to parse.
+    # Parses message received from server. Accepts
+    # +message+ to parse and a +stack+ with a partial parse result.
     def parse(message,stack=nil)
       @lexer.scan_str(message)
       stack ||= [[]]
@@ -27,12 +22,18 @@ module Cyc
           top = stack.pop
           stack[-1].push top
         when :atom
-          # FIXME find way to differentiate strings and atoms
-          stack[-1] << token[1]
+          if token[1] == "T"
+            stack[-1] << true
+          else
+            # FIXME find way to differentiate strings and atoms
+            stack[-1] << token[1]
+          end
         when :cyc_symbol
+          stack[-1] << ::Cyc::Symbol.new(token[1][1..-1])
+        when :variable
+          stack[-1] << ::Cyc::Variable.new(token[1][1..-1])
+        when :term
           stack[-1] << token[1][2..-1].to_sym
-        when :symbol
-          stack[-1] << token[1][3..-1].to_sym
         when :string
           stack[-1] << token[1]
         when :open_as
@@ -57,9 +58,7 @@ module Cyc
     rescue ContinueParsing => ex
       raise
     rescue Exception => ex
-      puts "Error occured while parsing message:\n#{message}"
-      puts ex
-      nil
+      raise ParserError.new("Exception #{ex} occurred when parsing message '#{message}'.")
     end
   end
 end

data/lib/{cycr → cyc}/sexpr.rex

@@ -7,8 +7,9 @@ macro
   LINE_TERMINATOR       \r|\n|\r\n
   INPUT_CHARACTER       [^\r\n\"\(\):& ]
   WHITE_SPACE           [\ \t\f\r\n] | \r\n
-  SYMBOL                :[^<>\r\n\"\(\):&\#\ ]+
-  CYC_SYMBOL            \#\$[a-zA-Z0-9:_-]+
+  CYC_SYMBOL            :[^<>\r\n\"\(\):&\?\#\ ]+
+  VARIABLE              \?[^<>\r\n\"\(\):&\?\#\ ]+
+  TERM                  \#\$[a-zA-Z0-9:_-]+
   ATOM                  [^\r\n\"\(\):&\ ]+
   OPEN_PAR              \(
   CLOSE_PAR             \)
@@ -27,13 +28,14 @@ rule
                         {CLOSE_LIST_QUOTE}  { [:close_quote,text] }
                         {DOT}{DOT}{DOT}     { [:continuation] }
                         # keywords 
-                        {OPEN_PAR}			  { [:open_par,text] }
-                        {CLOSE_PAR}			  { [:close_par,text] }
-                        NIL               { [:nil,text] }
+                        {OPEN_PAR}	    { [:open_par,text] }
+                        {CLOSE_PAR}	    { [:close_par,text] }
+                        NIL                 { [:nil,text] }
                         # identifiers 
-                        {SYMBOL}			    { [:symbol,text] }
-                        {CYC_SYMBOL}			{ [:cyc_symbol,text] }
-                        {ATOM}			      { [:atom,text] }
+                        {CYC_SYMBOL}	    { [:cyc_symbol,text] }
+                        {VARIABLE}	    { [:variable,text] }
+                        {TERM}		    { [:term,text] }
+                        {ATOM}		    { [:atom,text] }
                         # literals 
                         {QUOTE}           { state = :STRING; @str = ""; [:in_string] }
                         {ASSERTION_SEP}  { [:assertion_sep]}

data/lib/{cycr → cyc}/sexpr.rex.rb

@@ -73,11 +73,14 @@ class SExpressionLexer
         when (text = ss.scan(/NIL/))
            @rex_tokens.push action { [:nil,text] }
 
-        when (text = ss.scan(/:[^<>\r\n\"\(\):&\#\ ]+/))
-           @rex_tokens.push action { [:symbol,text] }
+        when (text = ss.scan(/:[^<>\r\n\"\(\):&\?\#\ ]+/))
+           @rex_tokens.push action { [:cyc_symbol,text] }
+
+        when (text = ss.scan(/\?[^<>\r\n\"\(\):&\?\#\ ]+/))
+           @rex_tokens.push action { [:variable,text] }
 
         when (text = ss.scan(/\#\$[a-zA-Z0-9:_-]+/))
-           @rex_tokens.push action { [:cyc_symbol,text] }
+           @rex_tokens.push action { [:term,text] }
 
         when (text = ss.scan(/[^\r\n\"\(\):&\ ]+/))
            @rex_tokens.push action { [:atom,text] }

data/lib/cyc/symbol.rb

@@ -0,0 +1,31 @@
+module Cyc
+  # Author:: Aleksander Pohl (mailto:apohllo@o2.pl)
+  # License:: MIT/X11 License
+  #
+  # This class represent the Cyc symbol.
+  class Symbol
+    # The name of the symbol.
+    attr_reader :name
+
+    # Initialize the symbol with its +name+.
+    def initialize(name)
+      @name = name
+    end
+
+    # String representation of the symbol.
+    def to_s
+      self.to_cyc
+    end
+
+    # Representation of the symbol understandable by Cyc.
+    def to_cyc(raw=false)
+      ":#{@name}"
+    end
+
+    # Two symbols are equal if they have the same name.
+    def ==(other)
+      return false if other.class != self.class
+      self.name == other.name
+    end
+  end
+end

data/lib/cyc/variable.rb

@@ -0,0 +1,31 @@
+module Cyc
+  # Author:: Aleksander Pohl (mailto:apohllo@o2.pl)
+  # License:: MIT/X11 License
+  #
+  # This class represent the Cyc variable.
+  class Variable
+    # The name of the variable.
+    attr_reader :name
+
+    # Initialize the variable with its +name+.
+    def initialize(name)
+      @name = name
+    end
+
+    # String representation of the variable.
+    def to_s
+      self.to_cyc
+    end
+
+    # Representation of the variable understandable by Cyc.
+    def to_cyc(raw=false)
+      "?#{@name}"
+    end
+
+    # Two variables are equal if they have the same name.
+    def ==(other)
+      return false if other.class != self.class
+      self.name == other.name
+    end
+  end
+end

data/lib/cycr.rb

@@ -1 +1,10 @@
-Dir.glob(File.join(File.dirname(__FILE__), 'cycr/**.rb')).each { |f| require f }
+require 'cyc/exception'
+require 'cyc/assertion'
+require 'cyc/builder'
+require 'cyc/client'
+require 'cyc/collection'
+require 'cyc/extensions'
+require 'cyc/parser'
+require 'cyc/sexpr.rex'
+require 'cyc/symbol'
+require 'cyc/variable'

data/spec/parser.rb

@@ -0,0 +1,44 @@
+$:.unshift "lib"
+require 'cycr'
+
+describe Cyc::Parser do
+  before(:all) do
+    @parser = Cyc::Parser.new
+  end
+
+  it "should parse an empty list" do
+    @parser.parse('()').should == []
+  end
+
+  it "should parse a Cyc term" do
+    @parser.parse('#$Dog').should == :Dog
+  end
+
+  it "should parse nested lists" do
+    @parser.parse('(())').should == [[]]
+  end
+
+  it "should raise continuation exception if the message contains continuation" do
+    lambda {@parser.parse('(#$Dog ...)')}.should raise_exception(Cyc::ContinueParsing)
+  end
+
+  it "should raise parse error if the message is invalid" do
+    lambda {@parser.parse('(#$Dog ))')}.should raise_exception(Cyc::ParserError)
+  end
+
+  it "should parse an assertion" do
+    @parser.parse('#<AS:(#$equals):#$BaseKB>').should == Cyc::Assertion.new([:equals],:BaseKB)
+  end
+
+  it "should parse a Cyc symbol" do
+    @parser.parse(':BACKWARD').should == Cyc::Symbol.new("BACKWARD")
+  end
+
+  it "should parse a variable" do
+    @parser.parse('?OBJ').should == Cyc::Variable.new("OBJ")
+  end
+
+  it "should parse true value" do
+    @parser.parse('T').should == true
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: cycr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - Aleksander Pohl
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 +02:00
-default_executable: 
+date: 2012-02-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -31,32 +30,35 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.rdoc
 files: 
 - .gitignore
-- README.txt
+- README.rdoc
 - Rakefile
 - changelog.txt
 - cycr.gemspec
+- integration/assertion.rb
+- integration/client.rb
+- lib/cyc/assertion.rb
+- lib/cyc/builder.rb
+- lib/cyc/client.rb
+- lib/cyc/collection.rb
+- lib/cyc/exception.rb
+- lib/cyc/extensions.rb
+- lib/cyc/parser.rb
+- lib/cyc/sexpr.rex
+- lib/cyc/sexpr.rex.rb
+- lib/cyc/symbol.rb
+- lib/cyc/variable.rb
 - lib/cycr.rb
-- lib/cycr/assertion.rb
-- lib/cycr/builder.rb
-- lib/cycr/client.rb
-- lib/cycr/collection.rb
-- lib/cycr/extensions.rb
-- lib/cycr/parser.rb
-- lib/cycr/sexpr.rex
-- lib/cycr/sexpr.rex.rb
-- spec/assertion.rb
-- spec/client.rb
-has_rdoc: true
+- spec/parser.rb
 homepage: http://github.com/apohllo/cycr
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -74,10 +76,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Ruby client for the (Open)Cyc server
 test_files: 
-- spec/client.rb
-- spec/assertion.rb
+- spec/parser.rb
+- integration/client.rb
+- integration/assertion.rb

data/lib/cycr/assertion.rb

@@ -1,14 +0,0 @@
-module Cyc
-  class Assertion
-    attr_reader :formula, :microtheory
-
-    def initialize(formula,microtheory)
-      @formula = formula
-      @microtheory = microtheory
-    end
-
-    def to_s
-      "#{@formula} : #{@microtheory}"
-    end
-  end
-end

data/spec/assertion.rb

@@ -1,36 +0,0 @@
-$:.unshift "lib"
-require 'cycr'
-
-describe Cyc::Assertion do
-  before(:all) do
-    @client = Cyc::Client.new()
-    #@client.debug = true
-  end
-
-  after(:all) do
-    @client.close
-  end
-
-  it "should parse results with assertions" do
-    @client.talk("(gather-predicate-extent-index \#$minimizeExtent \#$BaseKB)").should_not == nil
-  end
-
-  it "should return assertions as results if present in the result" do
-    @client.talk("(gather-predicate-extent-index \#$minimizeExtent \#$BaseKB)").
-      first.class.should == Cyc::Assertion
-  end
-
-  it "should have microtheory assigned" do
-    @client.talk("(gather-predicate-extent-index \#$minimizeExtent \#$BaseKB)").
-      first.microtheory.should_not == nil
-  end
-
-  it "should have formula assigned" do
-    @client.talk("(gather-predicate-extent-index \#$minimizeExtent \#$BaseKB)").
-      first.formula.should_not == nil
-  end
-
-  it "should return many results" do
-    @client.talk("(gather-predicate-extent-index \#$minimizeExtent)").size.should > 100
-  end
-end