inline_testing 0.1.0 → 0.1.1

data/Gemfile

@@ -3,6 +3,10 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
+gem "ruby_parser"
+gem "file-tail"
+gem "sourcify"
+
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -1,22 +1,38 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
-    rcov (0.9.9)
-    riot (0.12.3)
-      rr
-    rr (1.0.2)
-
-PLATFORMS
-  x86-mingw32
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
-  rcov
-  riot
+GEM
+  remote: http://rubygems.org/
+  specs:
+    file-tail (1.0.5)
+      spruz (>= 0.1.0)
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    rcov (0.9.9)
+    riot (0.12.3)
+      rr
+    rr (1.0.2)
+    ruby2ruby (1.2.5)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    ruby_parser (2.0.6)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.5)
+    sourcify (0.4.2)
+      file-tail (>= 1.0.5)
+      ruby2ruby (>= 1.2.5)
+      sexp_processor (>= 3.0.5)
+    spruz (0.2.5)
+
+PLATFORMS
+  x86-mingw32
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  file-tail
+  jeweler (~> 1.5.2)
+  rcov
+  riot
+  ruby_parser
+  sourcify

data/README.md

@@ -4,6 +4,10 @@ The name says it all.
 
 Check out `examples/simple.rb`.
 
+## Install
+
+`gem install inline_testing`
+
 ## Contributing to inline_testing
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/Rakefile

@@ -1,4 +1,10 @@
 require 'psych'
+
+# Gay as hell jeweler workaround
+
+require 'psych'
+YAML::ENGINE.yamler = 'psych'
+
 require 'rubygems'
 require 'bundler'
 begin
@@ -34,21 +40,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "inline_testing #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/examples/simple.rb

@@ -1,36 +1,51 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require 'inline_testing'
-InlineTesting.init(__FILE__)
 
 class User
   attr_accessor :name, :email
   def initialize(name, email)
-    @name, @email = name, email
+    @name, @email, @title = name, email, :user
   end
+  def set_as_admin; @title = :admin; end
+  def is_admin?; @title == :admin; end
 end
 
-InlineTesting.start(__LINE__)
-
-my_user = User.new("Ryan", "c00lryguy@gmail.com")
-# some ignored comment
-my_user.name # => "Ryan"
-my_user.email # => "c00lryguy@gmail.com"
-
-InlineTesting.stop(__LINE__)
-InlineTesting.test(binding)
-
-class UserList < Array
-  def create_new(name, email)
-    self << User.new(name, email)
+# All DSLs MUST FOLLOW SPECS. 
+# Don't expect InlineTesting to be able to parse it if you're doing screwy stuff.
+# If you think your "screwy stuff" actually should work,
+# then feel free to open an issue at github.com/c00lryguy/inline_testing/issues
+InlineTesting.test do
+  # This is where locals for test are defined.
+  # Names for messages can be defined either in a second argument or a block.
+  # You can redefine locals at any time if you want.. must have called it at 
+  # least once before calling `test`.
+  locals do
+    user User.new("Ryan", "c00lryguy@gmail.com"), "A User (Ryan)" # Cool but lets set the message automatically...
+    
+    # This overwrites the `user` local
+    user( User.new("Ryan", "c00lryguy@gmail.com") ) { |user| "A User (#{user.name})" }
   end
-end
-
-InlineTesting.start(__LINE__)
-
-users = UserList.new
-users.create_new("James", "jbones1234567@james.org")
-users.create_new("Joe", "joejoejoejoe@four_joes.info")
-users.sort.collect { |u| u.name } # => ["Joe", "James"]
-
-InlineTesting.stop(__LINE__)
-InlineTesting.test(binding)
+  
+  # This is where assertions are made.
+  # We only assert methods that return `true` or `false`
+  # Assertion messages are defined with comments.
+  #
+  # NOTE: Must keep assertions to a single line, this works by parsing each 
+  #       line and running that line within the context of your locals.
+  test do
+    # some ignored comment
+    user.name == "Ryan" # Name is set correctly
+    user.email == "c00lryguy@gmail.com" # Email is set correctly
+    user.name == "Syd Barret" # Will fail =( 
+  end
+  
+  # context "" do
+  #   setup { user.set_as_admin }
+  #   # Can't use comments on one line blocks:
+  #   #   test { user.is_admin? # Test if admin }
+  #   # So you have to do the following:
+  #   test do
+  #     user.is_admin? # Test if admin
+  #   end
+  # end
+end

data/inline_testing.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{inline_testing}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Lewis"]
-  s.date = %q{2011-04-25}
+  s.date = %q{2011-05-06}
   s.description = %q{Test from within your code}
   s.email = %q{c00lryguy@gmail.com}
   s.extra_rdoc_files = [
@@ -25,9 +25,12 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "examples/simple.rb",
-    "inline_testing-0.1.0.gem",
     "inline_testing.gemspec",
     "lib/inline_testing.rb",
+    "lib/inline_testing/comment_parser.rb",
+    "lib/inline_testing/test_environment.rb",
+    "lib/inline_testing/test_environment/context.rb",
+    "lib/inline_testing/test_environment/locals.rb",
     "test/inline_testing_test.rb",
     "test/teststrap.rb"
   ]
@@ -47,17 +50,26 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ruby_parser>, [">= 0"])
+      s.add_runtime_dependency(%q<file-tail>, [">= 0"])
+      s.add_runtime_dependency(%q<sourcify>, [">= 0"])
       s.add_development_dependency(%q<riot>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
+      s.add_dependency(%q<ruby_parser>, [">= 0"])
+      s.add_dependency(%q<file-tail>, [">= 0"])
+      s.add_dependency(%q<sourcify>, [">= 0"])
       s.add_dependency(%q<riot>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
+    s.add_dependency(%q<ruby_parser>, [">= 0"])
+    s.add_dependency(%q<file-tail>, [">= 0"])
+    s.add_dependency(%q<sourcify>, [">= 0"])
     s.add_dependency(%q<riot>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/lib/inline_testing.rb

@@ -1,33 +1,17 @@
 
+require 'pp'
+require 'ap'
+
+require 'meta_tools'
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+module InlineTesting; end
+
+require 'inline_testing/test_environment'
+  
 module InlineTesting
-  def self.init(filename)
-    @filename, @init = filename, true
-  end
-  def self.start(line_number)
-    @start_line_number = line_number
-  end
-  def self.stop(line_number)
-    if @init
-      @data = File.open(@filename).readlines[@start_line_number..line_number]
-      @start_line_number = nil
-    end
-  end
-  private
-  Regex = /^\x20*(.+)\x20*#\x20*=>\x20*(.+)\x20*$/
-  def self.test(binding)
-    puts "+-" * 40
-    if @init && @data
-      @data.find_all { |line| line =~ Regex }.each_with_index do |line, i|
-        code, result = line.match(Regex).captures
-        string_output = {
-          true => "Passed!",
-          false => "Failed!"
-        }
-        # All we need is to be able to eval the `code` within the context of the source file
-        assertion = eval(code, binding) == eval(result)
-        puts "#{i}: " + string_output[assertion]
-      end
-      @data = nil
-    end
+  def self.test(&blk)
+    test_env = TestEnvironment.new(&blk)
   end
 end

data/lib/inline_testing/comment_parser.rb

@@ -0,0 +1,38 @@
+module InlineTesting
+  
+  module CommentParser
+    class << self
+      # @return [Array] an Array of Hash objects.
+      # @example Parse some comments
+      #   cp = CommentParser.parse do
+      #     # ignored
+      #     1 != 2 # One obviously isn't two. # ignored
+      #   end
+      #   
+      #   p cp.first 
+      #   
+      #   outputs:
+      #   
+      #   [
+      #     {
+      #       :code => "1 != 2",
+      #       :comment => "One obviously isn't two."
+      #     }
+      #   ]
+      def parse(&blk)
+        blk.to_raw_source(:strip_enclosure => true).lines.collect { |str|
+          # Delete lines that only consist of comments.... like this one! Irony.
+          str.strip.gsub(/^#.*$/, "")
+        }.delete_if { |str| str.empty? }.collect { |str|
+          str.strip.match(/^\s*([^\s#][^#\n\r]*)(?:#([^#\n\r]*))?/).captures.collect { |str|
+            str.strip if str.respond_to?(:strip) # Try getting it drunk first
+          }
+        }.inject([]) { |result, ary|
+          result << { :code => ary.first, :comment => ary.last }
+          result # Needed? comment this line..
+        }
+      end
+    end
+  end
+  
+end

data/lib/inline_testing/test_environment.rb

@@ -0,0 +1,35 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'test_environment/locals'
+require 'test_environment/context'
+require 'comment_parser'
+
+module InlineTesting
+  
+  class TestEnvironment
+    def initialize(&blk)
+      instance_eval(&blk) if block_given?
+    end
+    
+    def locals(&blk)
+      @locals ||= Locals.new
+      @locals.edit(&blk) if block_given?
+      @locals
+    end
+    
+    def test(&blk)
+      @context ||= Context.new(@locals)
+      @context.update_methods
+      code_comments = CommentParser.parse(&blk)
+      
+      code_comments.each do |code_comment|
+        @context.instance_exec(code_comment[:code]) do |code|
+          p eval(code)
+        end
+      end
+    end
+    
+    def context(&blk); end
+    def call(&blk); end
+  end
+  
+end

data/lib/inline_testing/test_environment/context.rb

@@ -0,0 +1,30 @@
+module InlineTesting
+  class TestEnvironment
+    
+    class Context
+      include MetaTools
+      
+      def initialize(locals_obj)
+        @locals_obj, @delegated_methods = locals_obj, []
+      end
+      
+      def update_methods
+        
+        # TODO..
+        # Remove unused delegated methods
+        # (@locals_obj.locals.keys - @delegated_methods).each do |local|
+        #   @delegated_methods.delete(local)
+        #   metaclass.remove_method(local)
+        # end
+        
+        # Delegate locals methods
+        @locals_obj.locals.keys.each do |local|
+          meta_def(local) { @locals_obj.send(local) } unless metaclass.method_defined?(local)
+          @delegated_methods << local
+        end
+      end
+      
+    end
+    
+  end
+end

data/lib/inline_testing/test_environment/locals.rb

@@ -0,0 +1,53 @@
+require 'sourcify'
+
+module InlineTesting
+  class TestEnvironment
+    
+    class Locals
+      class DSL
+        def self.call(&blk)
+          instance = self.new
+          instance.instance_variable_set(:@result, {})
+          instance.instance_eval(&blk)
+          instance.instance_variable_get(:@result) || {}
+        end
+        
+        # @return [Hash] `local` is the key and it holds another Hash with :obj and :msg.
+        def method_missing(local, *args, &blk)
+          if args.empty?
+            raise(ArgumentError, "No argument given.")
+          elsif args.length == 2 && !blk.nil?
+            raise(ArgumentError, "You can either give one arg and a block or two args, not both.") 
+          end
+          @result[local] = { :obj => args.first }
+          @result[local][:msg] = if args.length == 1
+            blk.call(@result[local][:obj]) if block_given?
+          elsif args.length == 2
+            args.last
+          end
+        end
+      end
+    end
+    
+    class Locals
+      include MetaTools
+      attr_reader :locals
+      
+      def initialize;  @locals = {}; end
+      
+      def edit(&blk)
+        new_locals = DSL.call(&blk)
+        # Check for removed locals.. remove associated methods.. is this ever needed? hmm..
+        (@locals.keys - new_locals.keys).each { |local|  metaclass.remove_method(local) }
+        @locals = new_locals
+        # Add/update methods
+        @locals.each do |local, values|
+          meta_def(local) { @locals[local][:obj] } unless metaclass.method_defined?(local)
+        end
+        
+        self
+      end
+    end
+    
+  end
+end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: inline_testing
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   segments:
   - 0
   - 1
-  - 0
+  - 1
   prerelease: false
 platform: ruby
 authors:
@@ -13,12 +13,51 @@ authors:
 autorequire: !!null 
 bindir: bin
 cert_chain: []
-date: 2011-04-25 00:00:00.000000000 -04:00
+date: 2011-05-06 00:00:00.000000000 -04:00
 default_executable: !!null 
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby_parser
+  requirement: &30716784 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+        segments:
+        - 0
+  type: :runtime
+  prerelease: false
+  version_requirements: *30716784
+- !ruby/object:Gem::Dependency
+  name: file-tail
+  requirement: &30716364 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+        segments:
+        - 0
+  type: :runtime
+  prerelease: false
+  version_requirements: *30716364
+- !ruby/object:Gem::Dependency
+  name: sourcify
+  requirement: &30715932 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+        segments:
+        - 0
+  type: :runtime
+  prerelease: false
+  version_requirements: *30715932
 - !ruby/object:Gem::Dependency
   name: riot
-  requirement: &21995640 !ruby/object:Gem::Requirement
+  requirement: &30715524 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -28,10 +67,10 @@ dependencies:
         - 0
   type: :development
   prerelease: false
-  version_requirements: *21995640
+  version_requirements: *30715524
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21994992 !ruby/object:Gem::Requirement
+  requirement: &30715128 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +82,10 @@ dependencies:
         - 0
   type: :development
   prerelease: false
-  version_requirements: *21994992
+  version_requirements: *30715128
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21994356 !ruby/object:Gem::Requirement
+  requirement: &30714660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -58,10 +97,10 @@ dependencies:
         - 2
   type: :development
   prerelease: false
-  version_requirements: *21994356
+  version_requirements: *30714660
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &21993744 !ruby/object:Gem::Requirement
+  requirement: &30714144 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,7 +110,7 @@ dependencies:
         - 0
   type: :development
   prerelease: false
-  version_requirements: *21993744
+  version_requirements: *30714144
 description: Test from within your code
 email: c00lryguy@gmail.com
 executables: []
@@ -88,9 +127,12 @@ files:
 - Rakefile
 - VERSION
 - examples/simple.rb
-- inline_testing-0.1.0.gem
 - inline_testing.gemspec
 - lib/inline_testing.rb
+- lib/inline_testing/comment_parser.rb
+- lib/inline_testing/test_environment.rb
+- lib/inline_testing/test_environment/context.rb
+- lib/inline_testing/test_environment/locals.rb
 - test/inline_testing_test.rb
 - test/teststrap.rb
 has_rdoc: true
@@ -109,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 702226109
+      hash: -705559789
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: