whats_up 1.1.1 → 1.1.2

data/README.md

@@ -15,26 +15,26 @@ Ever asked: "if I have an object, what method can I call on it to get that resul
 See if this suits your console cravings:
 
     > 3.45.what_equals 3
-    3.45.to_i()     == 3
-    3.45.to_int()   == 3
-    3.45.floor()    == 3
-    3.45.round()    == 3
-    3.45.truncate() == 3
+    3.45.to_i     == 3
+    3.45.to_int   == 3
+    3.45.floor    == 3
+    3.45.round    == 3
+    3.45.truncate == 3
     => {:to_i=>3, :to_int=>3, :floor=>3, :round=>3, :truncate=>3}
 
     > 3.45.what_equals 4
-    3.45.ceil() == 4
+    3.45.ceil == 4
     => {:ceil=>4}
 
     > 3.55.what_equals 4
-    3.55.ceil()  == 4
-    3.55.round() == 4
+    3.55.ceil  == 4
+    3.55.round == 4
     => {:ceil=>4, :round=>4}
 
     > 3.45.what_equals /\n/
-    3.45.psych_to_yaml()  == "--- 3.45\n...\n"
-    3.45.to_yaml()        == "--- 3.45\n...\n"
-    3.45.pretty_inspect() == "3.45\n"
+    3.45.psych_to_yaml  == "--- 3.45\n...\n"
+    3.45.to_yaml        == "--- 3.45\n...\n"
+    3.45.pretty_inspect == "3.45\n"
     => {:psych_to_yaml=>"--- 3.45\n...\n", :to_yaml=>"--- 3.45\n...\n", :pretty_inspect=>"3.45\n"}
     
     > 3.what_equals 4, 1
@@ -56,16 +56,16 @@ Note also the addition of helpers like `whats_exactly`, which will only find exa
 `what_matches`, which will match a regular expression:
 
     > 5.whats_exactly 5.0
-    5.to_f() == 5.0
+    5.to_f == 5.0
     => {:to_f=>5.0}
 
     > "hello".what_matches /^\d$/
-    "hello".length()   == 5
-    "hello".size()     == 5
-    "hello".bytesize() == 5
-    "hello".to_i()     == 0
-    "hello".hex()      == 0
-    "hello".oct()      == 0
+    "hello".length   == 5
+    "hello".size     == 5
+    "hello".bytesize == 5
+    "hello".to_i     == 0
+    "hello".hex      == 0
+    "hello".oct      == 0
     => {:length=>5, :size=>5, :bytesize=>5, :to_i=>0, :hex=>0, :oct=>0}
 
 And if you just want to know everything, I've added `what_works_with` that lists the results of all

data/lib/whats_up/version.rb

@@ -1,4 +1,4 @@
 module WhatsUp
   # The current version
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/whats_up.rb

@@ -77,19 +77,20 @@ module WhatsUp
     class << self
       def build_check_lambda(expected_result, opts = {})
         if opts[:force_regex]
-          -> a, b { a === b.to_s }
+          expected_result = Regexp.new(expected_result.to_s) unless expected_result.is_a?(Regexp)
+          -> value { expected_result === value.to_s }
         elsif expected_result.is_a?(Regexp) && !opts[:force_exact]
-          -> a, b { a === b.to_s }
+          -> value { expected_result === value.to_s }
         elsif opts[:force_exact]
-          -> a, b { a.eql?(b) }
+          -> value { expected_result.eql?(value) }
         elsif opts[:show_all]
           if opts[:exclude_blank]
-            -> a, b { !b.nil? && !b.empty? }
+            -> value { !value.nil? && !value.empty? }
           else
-            -> a, b { true }
+            -> value { true }
           end
         else
-          -> a, b { a == b }
+          -> value { expected_result == value }
         end
       end
 
@@ -97,17 +98,12 @@ module WhatsUp
       def find(an_object, expected_result, opts = {}, *args, &block)
         check_result    = build_check_lambda(expected_result, opts)
 
-        if opts[:force_regex] && expected_result.is_a?(String)
-          expected_result = Regexp.new(expected_result)
-        end
-
         # Prevent any writing to the terminal
         stdout, stderr = $stdout, $stderr
         $stdout = $stderr = DummyOut.new
 
-        methods = an_object.methods
-
         # Use only methods with valid arity that aren't blacklisted
+        methods = an_object.methods
         methods.select! { |n| an_object.method(n).arity <= args.size && !@@blacklist.include?(n) }
 
         # Collect all methods equaling the expected result
@@ -115,7 +111,7 @@ module WhatsUp
           begin
             stdout.print ""
             value = an_object.clone.method(name).call(*args, &block)
-            res[name] = value if check_result.call(expected_result, value)
+            res[name] = value if check_result.call(value)
           rescue
           end
           res
@@ -183,8 +179,10 @@ module WhatsUp
         full       = object.inspect
 
         if full.length > max_length
-          left_cutoff  = (max_length - 5) * 2 / 3.0
-          right_cutoff = max_length - 6 - left_cutoff
+          available_length = max_length - 5  # to account for the " ... "
+          left_cutoff      = available_length * 2 / 3.0
+          right_cutoff     = available_length - left_cutoff - 1
+
           "#{full[0..left_cutoff]} ... #{full[-right_cutoff..-1]}"
         else
           full

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whats_up
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors: