plock 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05635f98c9cbf4da943f8acdfd4c70513cb8618b
-  data.tar.gz: 3724c5b91bb823f99d1291185790b2cc70b231b7
+  metadata.gz: c762559276fd2fff6c9b8493782c35bb4624ef19
+  data.tar.gz: 7dcdcee27ca47f8227baa023361ac7b05228392c
 SHA512:
-  metadata.gz: c5af6d0f5470c83090a415afb7949f9ec85e2101a828340d234f05405b014fc31ce377caa0d946588210ab80938d1240351262e1779e3a539a9cd3f98ab28a1b
-  data.tar.gz: 7772fa087f96ef42d5e9dfbca83ef2fd213dedea8d53287e4a8de5fb465b9d904699a6020cde1b45cee7e3e2dba117bde4169970b06604bbd28d6664c2596a72
+  metadata.gz: 8455faddd53d074406bf63b072db283b9fb78797b32eb42b85735ebe2f4b23a5698bca05e1822c558b8345c35d2deebaed2c91709f67bfff02ceb7146a344c39
+  data.tar.gz: c8d80609cb4025f5e3864113b7d0e0de37c8a80fc185edb2ad05d576d1f4ae6ed763e73a5c3b7004e8229aaa8471b34e5946c78c685c93bdfcc44888451bf956

data/lib/plock.rb

@@ -21,34 +21,19 @@ module Plock
       [ block.to_source( attached_to: attached, strip_enclosure: true ), result ]
     end
 
-    def print_block_with formatter_method, attached, *args, &block
-      returned = []
-      returned.concat args
-
+    def print_block_with inspect_method, attached, &block
       block_source, block_result = Plock.inspect_block( attached, &block )
-
-      puts self.__send__( formatter_method, block_source, block_result )
-
-      returned << block_result
-      returned.length > 1 ? returned : returned.first
+      puts self.format_with( inspect_method, block_source, block_result )
+      block_result
     end
 
-    def format_with block_source, block_result, inspect_method
+    def format_with inspect_method, block_source, block_result
       result = self.output_format.dup
       result.sub! self::Format::PERCENT_B, block_source
       result.sub! self::Format::PERCENT_R, block_result.__send__( inspect_method )
       return result
     end
 
-    def format block_source, block_result
-      self.format_with block_source, block_result, :inspect
-    end
-
-    if Object.public_method_defined? :pretty_inspect
-      def pretty_format block_source, block_result
-        self.format_with block_source, block_result, :pretty_inspect
-      end
-    end
   end
 
 end
@@ -56,21 +41,23 @@ end
 module Kernel # reopen
   alias p_without_plock p
   def p_with_plock *args, &block
+    returned_by_p = p_without_plock( *args )
     if block_given?
-      Plock.print_block_with :format, :p, *args, &block
+      Plock.print_block_with :inspect, :p, &block
     else
-      p_without_plock( *args )
+      returned_by_p
     end
   end
   alias p p_with_plock
 
   if Kernel.private_method_defined? :pp
     alias pp_without_plock pp
-    def pp_with_plock
+    def pp_with_plock *args, &block
+      returned_by_pp = pp_without_plock( *args )
       if block_given?
-        Plock.print_block_with :pretty_format, :pp, *args, &block
+        Plock.print_block_with :pretty_inspect, :pp, &block
       else
-        pp_without_plock( *args )
+        returned_by_pp
       end
     end
     alias pp pp_with_plock

data/lib/plock/version.rb

@@ -1,3 +1,3 @@
 module Plock
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/plock.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "rb-readline"
 
   spec.add_runtime_dependency "sourcify"
 end

data/spec/plock_spec.rb

@@ -9,14 +9,14 @@ describe Plock do
     end
     it { should eq ['(a + 1)', 2] }
   end
-  describe '.format' do
+  describe '.format_with' do
     context 'when Plock.output_format = "%b #=> %r"' do
       before { described_class.output_format = "%b #=> %r" }
-      subject { described_class.format '(a + 1)', 2 }
+      subject { described_class.format_with :inspect, '(a + 1)', 2 }
       it { should eq '(a + 1) #=> 2' }
       it 'never changes the output_format desructively' do
         described_class.output_format = '%b and %r SHOULD NOT BE CHANGED'
-        described_class.format 'block', 'result'
+        described_class.format_with :inspect, 'block', 'result'
         described_class.output_format.should eq '%b and %r SHOULD NOT BE CHANGED'
       end
     end
@@ -29,18 +29,39 @@ RSpec::Matchers.define :include_when_ignoring_space_difference do|expected|
   end
 end
 
+RSpec::Matchers.define :equals_when_ignoring_space_difference do|expected|
+  match do|actual|
+    expected.gsub( /\s+/, '' ) == actual.gsub( /\s+/, '' )
+  end
+end
+
 describe Kernel do
   describe '#p' do
-    before( :all ) { $stdout = StringIO.new '', 'wb' } # replaces the stdin for testing the output of p
+    before { $stdout = StringIO.new '', 'wb' } # replaces the stdin for testing the output of p
+    after { $stdout = STDOUT } # restore default stdin
+
     context 'when Plock.output_format = "%b #=> %r"' do
       before( :all ) { Plock.output_format = "%b #=> %r" }
       let( :no_percent ){ Plock.output_format.gsub( /%[br]/, '' ) }
+
       subject { p { 1 + 1 } }
+      before { subject }
+
       it { should be 2 }
-      it 'prints out the block and its result onto stdin' do
+      it "prints out the block and the block's result onto stdin" do
         $stdout.string.should include_when_ignoring_space_difference "(1 + 1) #{no_percent} 2"
       end
+
+      context 'given both argument and block' do
+        subject { p( 'one plus one' ) { 1 + 1 } }
+
+        it { should be 2 }
+        it 'prints out its arguments, its block, and the result onto stdin' do
+          $stdout.string.should equals_when_ignoring_space_difference %Q'"one plus one" (1 + 1) #{no_percent} 2'
+        end
+      end
+
     end
-    after( :all ) { $stdout = STDOUT } # restore default stdin
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plock
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yamamoto Yuji
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sourcify
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: '''p { 1 + 1 }` prints "1 + 1 #=> 2". That''s all.'