sourcify 0.4.2 → 0.5.0

data/lib/sourcify/version.rb

@@ -0,0 +1,3 @@
+module Sourcify
+  VERSION = "0.5.0"
+end

data/sourcify.gemspec

@@ -1,185 +1,29 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "sourcify/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{sourcify}
-  s.version = "0.4.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["NgTzeYang"]
-  s.date = %q{2011-02-06}
+  s.name        = "sourcify"
+  s.version     = Sourcify::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["NgTzeYang"]
+  s.email       = ["ngty77@gmail.com"]
+  s.homepage    = "http://github.com/ngty/sourcify"
+  s.summary     = %q{Workarounds before ruby-core officially supports Proc#to_source (& friends)}
   s.description = %q{}
-  s.email = %q{ngty77@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".infinity_test",
-    ".rvmrc",
-    "HISTORY.txt",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/sourcify.rb",
-    "lib/sourcify/proc.rb",
-    "lib/sourcify/proc/methods.rb",
-    "lib/sourcify/proc/methods/source_location.rb",
-    "lib/sourcify/proc/methods/to_sexp.rb",
-    "lib/sourcify/proc/methods/to_source.rb",
-    "lib/sourcify/proc/parser.rb",
-    "lib/sourcify/proc/parser/code_scanner.rb",
-    "lib/sourcify/proc/parser/converter.rb",
-    "lib/sourcify/proc/parser/normalizer.rb",
-    "lib/sourcify/proc/parser/source_code.rb",
-    "lib/sourcify/proc/scanner.rb",
-    "lib/sourcify/proc/scanner.rl",
-    "lib/sourcify/proc/scanner/comment.rb",
-    "lib/sourcify/proc/scanner/counter.rb",
-    "lib/sourcify/proc/scanner/dstring.rb",
-    "lib/sourcify/proc/scanner/extensions.rb",
-    "lib/sourcify/proc/scanner/heredoc.rb",
-    "sourcify.gemspec",
-    "spec/dump_object_space_procs.rb",
-    "spec/proc/19x_extras.rb",
-    "spec/proc/created_on_the_fly_proc_spec.rb",
-    "spec/proc/others_spec.rb",
-    "spec/proc/readme",
-    "spec/proc/spec_helper.rb",
-    "spec/proc/to_sexp_from_multi_blocks_w_specified_attached_to_spec.rb",
-    "spec/proc/to_sexp_variables_spec.rb",
-    "spec/proc/to_sexp_w_specified_strip_enclosure_spec.rb",
-    "spec/proc/to_sexp_within_irb_spec.rb",
-    "spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb",
-    "spec/proc/to_source_from_braced_block_w_nested_hash_spec.rb",
-    "spec/proc/to_source_from_braced_block_wo_nesting_complication_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_begin_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_case_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_class_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_do_end_block_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_for_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_if_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_literal_keyword_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_method_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_module_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_unless_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_until_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_while_spec.rb",
-    "spec/proc/to_source_from_do_end_block_wo_nesting_complication_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_many_matches_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_single_match_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_many_matches_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_no_match_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_single_match_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_many_matches_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_no_match_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_single_match_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_ignore_nested_spec.rb",
-    "spec/proc/to_source_from_multi_do_end_blocks_w_single_match_spec.rb",
-    "spec/proc/to_source_magic_file_var_spec.rb",
-    "spec/proc/to_source_magic_line_var_spec.rb",
-    "spec/proc/to_source_variables_spec.rb",
-    "spec/proc/to_source_w_specified_strip_enclosure_spec.rb",
-    "spec/proc/to_source_within_irb_spec.rb",
-    "spec/proc_scanner/block_comment_spec.rb",
-    "spec/proc_scanner/double_colons_spec.rb",
-    "spec/proc_scanner/double_quote_str_w_interpolation_spec.rb",
-    "spec/proc_scanner/double_quote_str_wo_interpolation_spec.rb",
-    "spec/proc_scanner/heredoc_spec.rb",
-    "spec/proc_scanner/kw_do_alias1_spec.rb",
-    "spec/proc_scanner/kw_do_alias2_spec.rb",
-    "spec/proc_scanner/per_line_comment_spec.rb",
-    "spec/proc_scanner/single_quote_str_spec.rb",
-    "spec/proc_scanner/slash_operator_spec.rb",
-    "spec/proc_scanner/spec_helper.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/ngty/sourcify}
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Workarounds before ruby-core officially supports Proc#to_source (& friends)}
-  s.test_files = [
-    "spec/dump_object_space_procs.rb",
-    "spec/proc/19x_extras.rb",
-    "spec/proc/created_on_the_fly_proc_spec.rb",
-    "spec/proc/others_spec.rb",
-    "spec/proc/spec_helper.rb",
-    "spec/proc/to_sexp_from_multi_blocks_w_specified_attached_to_spec.rb",
-    "spec/proc/to_sexp_variables_spec.rb",
-    "spec/proc/to_sexp_w_specified_strip_enclosure_spec.rb",
-    "spec/proc/to_sexp_within_irb_spec.rb",
-    "spec/proc/to_source_from_braced_block_w_nested_braced_block_spec.rb",
-    "spec/proc/to_source_from_braced_block_w_nested_hash_spec.rb",
-    "spec/proc/to_source_from_braced_block_wo_nesting_complication_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_begin_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_case_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_class_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_do_end_block_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_for_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_if_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_literal_keyword_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_method_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_module_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_unless_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_until_spec.rb",
-    "spec/proc/to_source_from_do_end_block_w_nested_while_spec.rb",
-    "spec/proc/to_source_from_do_end_block_wo_nesting_complication_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_many_matches_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_single_match_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_many_matches_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_no_match_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_and_single_match_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_attached_to_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_many_matches_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_no_match_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_body_matcher_and_single_match_spec.rb",
-    "spec/proc/to_source_from_multi_blocks_w_specified_ignore_nested_spec.rb",
-    "spec/proc/to_source_from_multi_do_end_blocks_w_single_match_spec.rb",
-    "spec/proc/to_source_magic_file_var_spec.rb",
-    "spec/proc/to_source_magic_line_var_spec.rb",
-    "spec/proc/to_source_variables_spec.rb",
-    "spec/proc/to_source_w_specified_strip_enclosure_spec.rb",
-    "spec/proc/to_source_within_irb_spec.rb",
-    "spec/proc_scanner/block_comment_spec.rb",
-    "spec/proc_scanner/double_colons_spec.rb",
-    "spec/proc_scanner/double_quote_str_w_interpolation_spec.rb",
-    "spec/proc_scanner/double_quote_str_wo_interpolation_spec.rb",
-    "spec/proc_scanner/heredoc_spec.rb",
-    "spec/proc_scanner/kw_do_alias1_spec.rb",
-    "spec/proc_scanner/kw_do_alias2_spec.rb",
-    "spec/proc_scanner/per_line_comment_spec.rb",
-    "spec/proc_scanner/single_quote_str_spec.rb",
-    "spec/proc_scanner/slash_operator_spec.rb",
-    "spec/proc_scanner/spec_helper.rb",
-    "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency 'ruby2ruby', '>= 1.2.5'
+  s.add_dependency 'sexp_processor', '>= 3.0.5'
+  s.add_dependency 'ruby_parser', '>= 2.0.5'
+  s.add_dependency 'file-tail', '>= 1.0.5'
+  s.add_development_dependency 'bacon'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<ruby2ruby>, [">= 1.2.5"])
-      s.add_runtime_dependency(%q<sexp_processor>, [">= 3.0.5"])
-      s.add_runtime_dependency(%q<file-tail>, [">= 1.0.5"])
-      s.add_development_dependency(%q<bacon>, [">= 0"])
-    else
-      s.add_dependency(%q<ruby2ruby>, [">= 1.2.5"])
-      s.add_dependency(%q<sexp_processor>, [">= 3.0.5"])
-      s.add_dependency(%q<file-tail>, [">= 1.0.5"])
-      s.add_dependency(%q<bacon>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<ruby2ruby>, [">= 1.2.5"])
-    s.add_dependency(%q<sexp_processor>, [">= 3.0.5"])
-    s.add_dependency(%q<file-tail>, [">= 1.0.5"])
-    s.add_dependency(%q<bacon>, [">= 0"])
-  end
-end
+  # ParseTree (better performance + dynamic goodness, but not supported on java & 1.9.*),
+  # optional for any 1.8.*.
+  #s.add_dependency "ParseTree", ">= 3.0.6"
 
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- spec/*`.split("\n")
+  s.require_paths    = ["lib"]
+end

data/spec/proc/to_raw_source_spec.rb

@@ -0,0 +1,33 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe "Proc#to_raw_source" do
+
+  should 'retain comments' do
+    (
+      lambda do
+        a = 1
+        # i should stay !!
+      end
+    ).should.be having_raw_source(%(
+      proc do
+        a = 1
+        # i should stay !!
+      end
+    ))
+  end
+
+  should 'retain last nil statement' do
+    (
+      lambda do
+        a = 1
+        nil
+      end
+    ).should.be having_raw_source(%(
+      proc do
+        a = 1
+        nil
+      end
+    ))
+  end
+
+end

data/spec/proc/to_raw_source_w_specified_strip_enclosure_spec.rb

@@ -0,0 +1,69 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
+
+describe 'Proc#to_raw_source w specified {:strip_enclosure => ...}' do
+
+  describe '>> w true' do
+
+    options = {:strip_enclosure => true}
+
+    should 'strip enclosing proc wo arg' do
+      (
+        lambda do
+          a = 1
+          # i should stay !!
+        end
+      ).should.be having_raw_source(%(
+          a = 1
+          # i should stay !!
+      ), options)
+    end
+
+    should 'strip enclosing proc w arg' do
+      (
+        lambda do |a|
+          a = 1
+          # i should stay !!
+        end
+      ).should.be having_raw_source(%(
+          a = 1
+          # i should stay !!
+      ), options)
+    end
+
+  end
+
+  describe '>> w false' do
+
+    options = {:strip_enclosure => false}
+
+    should 'not strip enclosing proc wo arg' do
+      (
+        lambda do
+          a = 1
+          # i should stay !!
+        end
+      ).should.be having_raw_source(%(
+        proc do
+          a = 1
+          # i should stay !!
+        end
+      ), options)
+    end
+
+    should 'not strip enclosing proc w arg' do
+      (
+        lambda do |a|
+          a = 1
+          # i should stay !!
+        end
+      ).should.be having_raw_source(%(
+        proc do |a|
+          a = 1
+          # i should stay !!
+        end
+      ), options)
+    end
+
+  end
+
+end

data/spec/run_spec.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo ''
+echo `gem env | grep 'INSTALLATION DIRECTORY' | sed 's/.*\/\(.*\)/\1:/'`
+rm -rf ~/.ruby_inline/*ParseTree*
+bacon spec/**/*_spec.rb

data/spec/spec_helper.rb

@@ -65,6 +65,13 @@ def having_source(expected, opts={}, &matcher)
   end
 end
 
+def having_raw_source(expected, opts={}, &matcher)
+  lambda do |_proc|
+    found = block_given? ? _proc.to_raw_source(&matcher) : _proc.to_raw_source(opts)
+    found == expected.strip
+  end
+end
+
 def having_sexp(expected, opts={}, &matcher)
   lambda do |_proc|
     expected = eval(expected) if expected.is_a?(String)

metadata

@@ -1,102 +1,95 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sourcify
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 2
-  version: 0.4.2
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - NgTzeYang
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-06 00:00:00 +08:00
+date: 2011-05-02 00:00:00.000000000 +08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby2ruby
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19360780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sexp_processor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *19360780
+- !ruby/object:Gem::Dependency
+  name: sexp_processor
+  requirement: &19360280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.5
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: file-tail
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *19360280
+- !ruby/object:Gem::Dependency
+  name: ruby_parser
+  requirement: &19359820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *19359820
+- !ruby/object:Gem::Dependency
+  name: file-tail
+  requirement: &19359360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *19359360
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &19358980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: ""
-email: ngty77@gmail.com
+  prerelease: false
+  version_requirements: *19358980
+description: ''
+email:
+- ngty77@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .document
-- .infinity_test
+- .gitignore
 - .rvmrc
+- Gemfile
 - HISTORY.txt
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/sourcify.rb
+- lib/sourcify/facets.rb
 - lib/sourcify/proc.rb
 - lib/sourcify/proc/methods.rb
 - lib/sourcify/proc/methods/source_location.rb
+- lib/sourcify/proc/methods/to_raw_source.rb
 - lib/sourcify/proc/methods/to_sexp.rb
 - lib/sourcify/proc/methods/to_source.rb
 - lib/sourcify/proc/parser.rb
@@ -111,6 +104,7 @@ files:
 - lib/sourcify/proc/scanner/dstring.rb
 - lib/sourcify/proc/scanner/extensions.rb
 - lib/sourcify/proc/scanner/heredoc.rb
+- lib/sourcify/version.rb
 - sourcify.gemspec
 - spec/dump_object_space_procs.rb
 - spec/proc/19x_extras.rb
@@ -118,6 +112,8 @@ files:
 - spec/proc/others_spec.rb
 - spec/proc/readme
 - spec/proc/spec_helper.rb
+- spec/proc/to_raw_source_spec.rb
+- spec/proc/to_raw_source_w_specified_strip_enclosure_spec.rb
 - spec/proc/to_sexp_from_multi_blocks_w_specified_attached_to_spec.rb
 - spec/proc/to_sexp_variables_spec.rb
 - spec/proc/to_sexp_w_specified_strip_enclosure_spec.rb
@@ -165,47 +161,42 @@ files:
 - spec/proc_scanner/single_quote_str_spec.rb
 - spec/proc_scanner/slash_operator_spec.rb
 - spec/proc_scanner/spec_helper.rb
+- spec/run_spec.sh
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/ngty/sourcify
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 6
-      version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Workarounds before ruby-core officially supports Proc#to_source (& friends)
-test_files: 
+test_files:
 - spec/dump_object_space_procs.rb
 - spec/proc/19x_extras.rb
 - spec/proc/created_on_the_fly_proc_spec.rb
 - spec/proc/others_spec.rb
+- spec/proc/readme
 - spec/proc/spec_helper.rb
+- spec/proc/to_raw_source_spec.rb
+- spec/proc/to_raw_source_w_specified_strip_enclosure_spec.rb
 - spec/proc/to_sexp_from_multi_blocks_w_specified_attached_to_spec.rb
 - spec/proc/to_sexp_variables_spec.rb
 - spec/proc/to_sexp_w_specified_strip_enclosure_spec.rb
@@ -253,4 +244,5 @@ test_files:
 - spec/proc_scanner/single_quote_str_spec.rb
 - spec/proc_scanner/slash_operator_spec.rb
 - spec/proc_scanner/spec_helper.rb
+- spec/run_spec.sh
 - spec/spec_helper.rb