drg 0.15.4 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d1cc344f3f40558e3ff0b5b1b4e8cb121b28f33
-  data.tar.gz: 725395f9526ee8371ccd781be7062aab12415342
+  metadata.gz: 63f814a01fc0fbe0162746f51d58f4fd4f761b74
+  data.tar.gz: 51c609488f4b8f9fc82f8e71898da822f71c0f36
 SHA512:
-  metadata.gz: ecd79de1e5d14e24502a38492bd154140c7beebcfbab0210152aa0ea4b47662ba03533c044ba10e6ce65bf5fbc130a4e1091326bd0487cf4f3bd9a11a7f396b5
-  data.tar.gz: d7670cfd5996e9cc0314088d8d09f89b9aeb006173b7f670f3e80361673062b445f5e8401188963fc087d2318170e945ab2dcb5f25bce768971b791920dd54bf
+  metadata.gz: 4f95bdc5018996bcec997689a04b9d42e550007512858b5c895ee0078fe2c92a0bd21af92dcb21a22423eb83cf93f88ad7a8778a0a9427ca20ada802f4634cb4
+  data.tar.gz: 7790f3fc153247b4e3426452ff2d180d8651fdaef949fd1764aa34e5370c0db97a2e592e315380bc069d62d125637d2f9cc25a9976fdd9d8767b97455e6d9cde

data/lib/drg/ruby/assignment.rb

@@ -0,0 +1,25 @@
+module DRG
+  class Ruby
+    class Assignment
+      attr_reader :sexp
+
+      def initialize(sexp)
+        @sexp = sexp
+      end
+
+      def to_s
+        "assigns #{ivar_name}"
+      end
+
+      # @example s(:iasgn, :@duder, s(:if, ...)
+      # @example s(:op_asgn_or, s(:ivar, :@report), ...)
+      def ivar_name
+        if sexp.first == :iasgn
+          sexp[1]
+        elsif sexp.first == :op_asgn_or
+          sexp[1][1]
+        end
+      end
+    end
+  end
+end

data/lib/drg/ruby/func.rb

@@ -2,12 +2,24 @@ class DRG::Ruby::Func < Struct.new(:sexp, :_private)
   alias private? _private
 
   def conditions
-    DRG::Decorators::SexpDecorator.new(sexp).each_sexp_condition.map do |exp|
-      DRG::Ruby::Condition.new(exp)
+    DRG::Decorators::SexpDecorator.new(sexp).each_sexp_condition.map &DRG::Ruby::Condition.method(:new)
+  end
+
+  def assignments
+    nodes = find_assignments(sexp)
+    sexp.find_nodes(:rescue).each do |node|
+      node = node[1] if node[1].first == :block
+      nodes.concat find_assignments(node)
     end
+    nodes.map &DRG::Ruby::Assignment.method(:new)
+  end
+
+  def find_assignments(s_expression)
+    s_expression.find_nodes(:op_asgn_or) + s_expression.find_nodes(:iasgn)
   end
 
   # @note we drop(1) to get rid of :args (which should be the first item in the sexp)
+  # @note called from subclasses
   def map_args(_sexp = sexp, list = [])
     val = _sexp.first
     return list.drop(1) unless val

data/lib/drg/ruby.rb

@@ -8,6 +8,7 @@ module DRG
     autoload :Func, 'drg/ruby/func'
     autoload :ClassFunc, 'drg/ruby/class_func'
     autoload :InstanceFunc, 'drg/ruby/instance_func'
+    autoload :Assignment, 'drg/ruby/assignment'
 
     attr_reader :sexp, :const
 

data/lib/drg/spec.rb

@@ -7,7 +7,7 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
   end
 
   def self.generate(file)
-    spec = DRG::Spec.new(file)
+    spec = new(file)
     return if spec.funcs.empty? # nothing to do
     lines = [%Q(require "spec_helper"), %Q(), %Q(describe #{spec.const} do)]
     if spec.class?
@@ -22,6 +22,9 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
     lines << %Q()
     spec.funcs.reject(&:private?).each do |func|
       lines << %Q(  describe #{spec.quote("#{func.class? ? '.' : '#'}#{func.name}")} do)
+      func.assignments.each do |assignment|
+        lines << %Q(    it #{spec.quote(assignment)} do) << %Q(    end)
+      end
       func.conditions.each do |condition|
         lines.concat spec.collect_contexts(condition, '    ')
       end
@@ -49,7 +52,7 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
   def collect_contexts(condition, indent = '', contexts = [])
     new_indent = indent + (' ' * self.class.default_indent_size)
     contexts << %Q(#{indent}context #{quote(tr(condition.short_statement))} do) << %Q(#{new_indent}before {})
-    unless condition.return_value.empty?
+    if should_print? condition.return_value
       contexts << %Q(#{new_indent}it #{quote(condition.return_value)} do) << %Q(#{new_indent}end)
     end
     if condition.nested_conditions.any?
@@ -58,7 +61,7 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
     contexts << %Q(#{indent}end) << %Q() # /context
     if condition.parts.empty?
       contexts << %Q(#{indent}context #{quote(tr(negate(condition.short_statement)))} do) << %Q(#{new_indent}before {})
-      unless condition.else_return_value.empty?
+      if should_print? condition.else_return_value
         contexts << %Q(#{new_indent}it #{quote(condition.else_return_value)} do) << %Q(#{new_indent}end)
       end
       contexts << %Q(#{indent}end)
@@ -67,7 +70,7 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
       contexts << %Q(#{indent}context #{quote(tr(condition_part.short_statement))} do) << %Q(#{new_indent}before {})
       contexts << %Q(#{new_indent}it #{quote(condition_part.return_value)} do) << %Q(#{new_indent}end)
       contexts << %Q(#{indent}end)
-      unless condition_part.else_return_value.empty?
+      if should_print? condition_part.else_return_value
         contexts << %Q(#{indent}context #{quote(tr(negate(condition_part.short_statement)))} do) << %Q(#{new_indent}before {})
         contexts << %Q(#{new_indent}it #{quote(condition_part.else_return_value)} do) << %Q(#{new_indent}end)
         contexts << %Q(#{indent}end)
@@ -77,6 +80,7 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
   end
 
   def quote(txt)
+    txt = txt.to_s
     txt.strip!
     if txt =~ /"/
       "%Q[#{txt.gsub(/\#\{(.*?)\}/m, '\#{\1}')}]"
@@ -103,4 +107,9 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
     end
     phrase
   end
+
+  # @description reject multiline statements, which means we messed up somewhere else, so let's hide that
+  def should_print?(txt)
+    !txt.empty? and txt !~ /\n/
+  end
 end

data/lib/drg/version.rb

@@ -1,3 +1,3 @@
 module DRG
-  VERSION = '0.15.4'.freeze
+  VERSION = '0.15.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drg
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5
 platform: ruby
 authors:
 - Ryan Buckley
@@ -148,6 +148,7 @@ files:
 - lib/drg/decorators.rb
 - lib/drg/decorators/sexp_decorator.rb
 - lib/drg/ruby.rb
+- lib/drg/ruby/assignment.rb
 - lib/drg/ruby/class_func.rb
 - lib/drg/ruby/condition.rb
 - lib/drg/ruby/const.rb