shoulda_runner 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85cb97c8c9697b94f7963507b22fb4123ac9fda3
-  data.tar.gz: 9b6c9b84b4617ad84dee53104853df87fd0e0e9a
+  metadata.gz: 4a238eb33e8bbd09efb385afec8c9316ce4cddbf
+  data.tar.gz: 44e83cd242f17fd8826701ee964cbbc7af8da0fb
 SHA512:
-  metadata.gz: e50ca46a01cb3f9659a61e90225ce8e6e20aef61c604be9db13d8b556507451b6b88efe2d9d0d55177f505a2d3b5fbc38865977ae27fda26bac2b98a1f9a12cb
-  data.tar.gz: 3e7df1ade8cb67de0b6d611cfd050310b59289d02bac55fc2290dca474656cf2b09e2232f2893ded4759426653cab7c2e4cb752bbc4c83864e6bcd3049bac58a
+  metadata.gz: d24161a3d5bbbf2b9b6082f3dd7fbb5592947d71ae2515d411e77600b48c910270302b23bfa66ee00ec16e2130340c5eae355751f449aa37e74919bce77281df
+  data.tar.gz: edabe3365584a35c6a14ec297b2c6d14182af24a31bce458385a8a97bdf001a939cbce5703b203f155fe61ec66d6764ef0750433b37769df2fb5938bb67ced41

data/README.md

@@ -1,15 +1,13 @@
-# ShouldaVim
+# ShouldaRunner
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/shoulda_vim`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+This gem makes it possible to run single test cases when using the `shoulda` gem.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'shoulda_vim'
+gem 'shoulda_runner'
 ```
 
 And then execute:
@@ -18,19 +16,10 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install shoulda_vim
+    $ gem install shoulda_runner
 
 ## Usage
 
+```
 TODO: Write usage instructions here
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/shoulda_vim.
-
+```

data/lib/shoulda_runner/ast_builder.rb

@@ -2,57 +2,81 @@ require 'tree'
 
 module ShouldaRunner
   class AstBuilder
-    attr_reader :ast
+    attr_reader :asts
 
-    def initialize(path)
-      @source = File.read(path)
+    def initialize(source_code)
+      @source = source_code
+      @asts = []
     end
 
     def parse
       stack = []
       each_source_code_line do |line, number|
-        if line =~ /^class\s/
+        if line =~ /^class\s(\S+);\send$/
+          # Do nothing
+        elsif line =~ /^class\s/
           stack = []
-          node = class_node(line)
-          stack.push node
-        elsif line =~ /^context\s/
+          stack.push class_node(line)
+        elsif line =~ /^context\s.+do$/
           stack.push context_node(line)
-        elsif line =~ /^should\s/
+        elsif line =~ /^should\s.+do$/
           stack.push should_node(line, number)
+        elsif line =~ /^def\s/
+          stack.push disposable_node(line)
         elsif line =~ /(do|do\s\|.+\|$)/
           stack.push disposable_node(line)
         elsif line =~ /^end$/
           node = stack.pop
-          node.content[:line_range][:to] = number if node.content[:line_range]
-          parent = stack.pop
-          if parent
-            parent << node unless node.content[:dispose]
+          unless node.nil?
+            node.content[:line_range][:to] = number if node.content[:line_range]
+            parent = stack.pop
+            if parent
+              parent << node unless node.content[:dispose]
+              stack.push parent
+            else
+              @asts << node
+            end
+          end
+        end
+      end
+
+      unless stack.empty?
+        while !stack.empty?
+          node = stack.pop
+          unless stack.empty?
+            parent = stack.pop
+            parent << node
             stack.push parent
-          else
-            @ast = node
           end
         end
+
+        @asts << node
       end
     end
 
     private
 
     def class_node(line)
-      matches = line.match(/^class\s(?<class_name>\w+)\s<\s.+$/)
-      class_name = "#{matches[:class_name]}#test_: "
+      # TODO: This regex may need some love
+      matches = line.match(/^class\s((?<class_name>[^\s<;]+)(\s<\s(?<base_class_name>[^\s;]+))?|<<\s(?<self_name>\S+))/)
+      if !matches[:self_name].nil?
+        class_name = "#{matches[:self_name]}#test_: "
+      else
+        class_name = "#{matches[:class_name]}#test_: "
+      end
 
       Tree::TreeNode.new(class_name, { name: class_name, source_line: line })
     end
 
     def context_node(line)
-      matches = line.match(/^context\s('|")(?<context_text>[\w\s]+)('|")\sdo$/)
+      matches = line.match(/^context\s('|")(?<context_text>.+)('|")\sdo$/)
       context_text = "#{matches[:context_text]} "
 
       Tree::TreeNode.new(context_text, { name: context_text, source_line: line })
     end
 
     def should_node(line, line_number)
-      matches = line.match(/^should\s('|")(?<should_text>[\w\s]+)('|")\sdo$/)
+      matches = line.match(/^should\s('|")(?<should_text>.+)('|")\sdo$/)
       should_text = "should #{matches[:should_text]}. "
 
       Tree::TreeNode.new(should_text, { name: should_text, source_line: line, line_range: { from: line_number } })

data/lib/shoulda_runner/parser.rb

@@ -0,0 +1,52 @@
+require 'shoulda_runner/ast_builder'
+
+module ShouldaRunner
+  class Parser
+    def initialize(test_file_path)
+      @source = File.read(test_file_path)
+    end
+
+    def select_test(linenumber)
+      test_names[linenumber]
+    end
+
+    private
+
+    def test_names
+      @asts ||= build_asts
+      hash = {}
+      @asts.each do |ast|
+        ast.each do |node|
+          if node.children.empty?
+            from = node.content[:line_range][:from]
+            to   = node.content[:line_range][:to]
+            test_name = build_test_name(node)
+
+            from.upto(to) do |line|
+              hash[line] = test_name
+            end
+          end
+        end
+      end
+
+      hash
+    end
+
+    def build_test_name(node)
+      test_name_string = node.content[:name]
+      parent = node.parent
+      while parent != nil
+        test_name_string = "#{parent.content[:name]}#{test_name_string}"
+        parent = parent.parent
+      end
+
+      test_name_string
+    end
+
+    def build_asts
+      ast_builder = AstBuilder.new(@source)
+      ast_builder.parse
+      @asts = ast_builder.asts
+    end
+  end
+end

data/lib/shoulda_runner/version.rb

@@ -1,3 +1,3 @@
 module ShouldaRunner
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/shoulda_runner.rb

@@ -1,51 +1,5 @@
 require 'shoulda_runner/version'
-require 'shoulda_runner/ast_builder'
+require 'shoulda_runner/parser'
 
 module ShouldaRunner
-  class Parser
-    def initialize(test_file_path)
-      @path = test_file_path
-    end
-
-    def select_test(linenumber)
-      test_names[linenumber]
-    end
-
-    private
-
-    def test_names
-      @ast ||= build_ast
-      hash = {}
-      @ast.each do |node|
-        if node.children.empty?
-          from = node.content[:line_range][:from]
-          to   = node.content[:line_range][:to]
-          test_name = build_test_name(node)
-
-          from.upto(to) do |line|
-            hash[line] = test_name
-          end
-        end
-      end
-
-      hash
-    end
-
-    def build_test_name(node)
-      test_name_string = node.content[:name]
-      parent = node.parent
-      while parent != nil
-        test_name_string = "#{parent.content[:name]}#{test_name_string}"
-        parent = parent.parent
-      end
-
-      test_name_string
-    end
-
-    def build_ast
-      ast_builder = AstBuilder.new(@path)
-      ast_builder.parse
-      @ast = ast_builder.ast
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoulda_runner
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Giuseppe Modarelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubytree
@@ -98,6 +98,7 @@ files:
 - Rakefile
 - lib/shoulda_runner.rb
 - lib/shoulda_runner/ast_builder.rb
+- lib/shoulda_runner/parser.rb
 - lib/shoulda_runner/version.rb
 - shoulda_runner.gemspec
 homepage: ''