predicated 0.2.1 → 0.2.2

data/lib/predicated/from/callable_object.rb

@@ -5,8 +5,7 @@ require "predicated/from/ruby_code_string"
 module Predicated
   
   require_gem_version("ParseTree", "3.0.5", "parse_tree") if RUBY_VERSION < "1.9"
-  require "predicated/sexp_patch"
-
+  
   class Predicate
 
                                   #hrm
@@ -36,6 +35,44 @@ module Predicated
         ruby_code_string.sub(/^def serializable\n  /, "").sub(/\nend$/, "")
       end
     end
+    
+    #see http://gist.github.com/321038
+    # # Monkey-patch to have Ruby2Ruby#translate with r2r >= 1.2.3, from
+    # # http://seattlerb.rubyforge.org/svn/ruby2ruby/1.2.2/lib/ruby2ruby.rb
+    class ::Ruby2Ruby < ::SexpProcessor
+      def self.translate(klass_or_str, method = nil)
+        sexp = ParseTree.translate(klass_or_str, method)
+        unifier = Unifier.new
+        unifier.processors.each do |p|
+          p.unsupported.delete :cfunc # HACK
+        end
+        sexp = unifier.process(sexp)
+        self.new.process(sexp)
+      end
+      
+      #sconover - 7/2010 - monkey-patch
+      #{1=>2}=={1=>2}
+      #The right side was having its braces cut off because of 
+      #special handling of hashes within arglists within the seattlerb code.
+      #I tried to fork r2r and add a test, but a lot of other tests
+      #broke, and I just dont understand the test in ruby2ruby.
+      #So I'm emailing the author...
+      def process_hash(exp)
+        result = []
+        until exp.empty?
+          lhs = process(exp.shift)
+          rhs = exp.shift
+          t = rhs.first
+          rhs = process rhs
+          rhs = "(#{rhs})" unless [:lit, :str].include? t # TODO: verify better!
 
+          result << "#{lhs} => #{rhs}"
+        end
+
+        return "{ #{result.join(', ')} }"
+      end
+
+    end
+    
   end
 end

data/lib/predicated/from/ruby_code_string.rb

@@ -5,7 +5,6 @@ module Predicated
 
   require_gem_version("ruby_parser", "2.0.4")
   require_gem_version("ruby2ruby", "1.2.4")
-  require "predicated/sexp_patch"
 
   class Predicate
     def self.from_ruby_code_string(ruby_predicate_string, context=binding())

data/lib/predicated/version.rb

@@ -1,3 +1,3 @@
 module Predicated
-  VERSION = "0.2.1" unless defined?(Predicated::VERSION)
+  VERSION = "0.2.2" unless defined?(Predicated::VERSION)
 end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift "#{dir}/../lib"
-$LOAD_PATH.unshift "../wrong/lib"
+$LOAD_PATH.unshift "../wrong/lib" # this assumes that Wrong is checked out as a sibling
+
 require "rubygems"
 require "minitest/spec"
 require "pp"

data/test/test_helper_with_wrong.rb

@@ -2,5 +2,4 @@ require "./test/test_helper"
 
 require "wrong"
 require "wrong/adapters/minitest"
-require "wrong/message/test_context"
-require "wrong/message/string_diff"
+require "wrong/message/string_comparison"

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: predicated
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Steve Conover
+- Alex Chaffee
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -39,7 +39,6 @@ files:
 - lib/predicated/predicate.rb
 - lib/predicated/print.rb
 - lib/predicated/selectable.rb
-- lib/predicated/sexp_patch.rb
 - lib/predicated/simple_templated_predicate.rb
 - lib/predicated/string_utils.rb
 - lib/predicated/to/arel.rb
@@ -90,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 4570885310046635928
       segments: 
       - 0
       version: "0"
@@ -99,7 +98,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/lib/predicated/sexp_patch.rb

@@ -1,39 +0,0 @@
-
-
-#see http://gist.github.com/321038
-# # Monkey-patch to have Ruby2Ruby#translate with r2r >= 1.2.3, from
-# # http://seattlerb.rubyforge.org/svn/ruby2ruby/1.2.2/lib/ruby2ruby.rb
-class ::Ruby2Ruby < ::SexpProcessor
-  def self.translate(klass_or_str, method = nil)
-    sexp = ParseTree.translate(klass_or_str, method)
-    unifier = Unifier.new
-    unifier.processors.each do |p|
-      p.unsupported.delete :cfunc # HACK
-    end
-    sexp = unifier.process(sexp)
-    self.new.process(sexp)
-  end
-
-  #sconover - 7/2010 - monkey-patch
-  #{1=>2}=={1=>2}
-  #The right side was having its braces cut off because of
-  #special handling of hashes within arglists within the seattlerb code.
-  #I tried to fork r2r and add a test, but a lot of other tests
-  #broke, and I just dont understand the test in ruby2ruby.
-  #So I'm emailing the author...
-  def process_hash(exp)
-    result = []
-    until exp.empty?
-      lhs = process(exp.shift)
-      rhs = exp.shift
-      t = rhs.first
-      rhs = process rhs
-      rhs = "(#{rhs})" unless [:lit, :str].include? t # TODO: verify better!
-
-      result << "#{lhs} => #{rhs}"
-    end
-
-    return "{ #{result.join(', ')} }"
-  end
-
-end