drg 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69c0e41819c37acab365f77c1c8659c765c5f5be
-  data.tar.gz: d9d5b708748bf54ba0bd88e6d4296f604ef87144
+  metadata.gz: 0d1cc344f3f40558e3ff0b5b1b4e8cb121b28f33
+  data.tar.gz: 725395f9526ee8371ccd781be7062aab12415342
 SHA512:
-  metadata.gz: eeee5b43f72123668474dcc67f19a053587133e8e833d20b7255f1e711faea040d08582b5de88f8b05597d9c9b9f25635a71bc27dbc32cc2532967ba8c1d7830
-  data.tar.gz: 2c028a172eae58d4bdd9d16b8e191680974ce480bc175b7cbc1008d034cce4555cd5a68eb9c281c15a059ff433a037e24b0e88284187f422aa82a51e7e64804d
+  metadata.gz: ecd79de1e5d14e24502a38492bd154140c7beebcfbab0210152aa0ea4b47662ba03533c044ba10e6ce65bf5fbc130a4e1091326bd0487cf4f3bd9a11a7f396b5
+  data.tar.gz: d7670cfd5996e9cc0314088d8d09f89b9aeb006173b7f670f3e80361673062b445f5e8401188963fc087d2318170e945ab2dcb5f25bce768971b791920dd54bf

data/lib/drg/decorators/sexp_decorator.rb

@@ -1,12 +1,19 @@
 class DRG::Decorators::SexpDecorator < DelegateClass(Sexp)
   def each_sexp_condition
     return enum_for(__method__) unless block_given?
+    yielded = []
     each_sexp do |exp|
-      next unless exp.is_a?(Sexp)
       if exp.first == :if
         yield exp
-      elsif nested_sexp = exp.enum_for(:deep_each).find { |s| s.first == :if }
-        yield nested_sexp
+        yielded << exp
+      else
+        nested_sexp = exp.enum_for(:deep_each).select { |s| s.first == :if }
+        nested_sexp.each do |sexp|
+          if yielded.find { |x| x.object_id == sexp.object_id or x.enum_for(:deep_each).find { |xx| xx.object_id == sexp.object_id } }.nil?
+            yield sexp
+            yielded << sexp
+          end
+        end
       end
     end
   end

data/lib/drg/ruby/condition.rb

@@ -2,37 +2,67 @@ require 'ruby2ruby'
 
 class DRG::Ruby::Condition
 
-  attr_reader :statement, :nested_conditions, :sexp
+  module SetComparison
+    def eql?(other)
+      hash == other.hash
+    end
+
+    def hash
+      sexp.object_id
+    end
+  end
+
+  include SetComparison
+
+  attr_reader :statement, :nested_conditions, :sexp, :parts, :unless_found
 
   def initialize(sexp)
     @sexp = sexp
     @statement = Ruby2Ruby.new.process(sexp.deep_clone)
     @nested_conditions = create_nested_conditions
+    @parts = load_parts
   end
 
   def short_statement
-    if @statement =~ /(unless|if)(.+)$/
-      ($1 << $2).strip
-    elsif @statement =~ /(.*?)\s+\?\s+/
-      $1.strip
-    end
+    "#{'unless ' if sexp[2].nil?}#{Ruby2Ruby.new.process(sexp[1].clone!)}"
   end
 
   def return_value
-    edit find_return_value
+    edit Ruby2Ruby.new.process(if_return_value.clone!)
+  end
+
+  def else_return_value
+    edit Ruby2Ruby.new.process(find_else_return_val.clone!)
+  end
+
+  def if_return_value
+    if sexp[2].nil?
+      sexp.last
+    elsif sexp[2].first == :if
+      nil
+    elsif sexp[2].first == :block
+      sexp[2].last
+    elsif sexp[2].first == :rescue
+      sexp[2][1].last
+    else
+      sexp[2]
+    end
   end
 
-  def find_return_value
-    if @statement =~ /\s+\?\s+(.*?)(:|$)/
-      $1.strip
-    elsif @statement[/then\n(.+)\nend/]
-      $1.strip
+  def find_else_return_val
+    if sexp.compact[3].nil?
+      nil
+    elsif sexp[3].first == :block
+      sexp[3].last
+    elsif sexp[3].first == :if
+      nil
     else
-      @statement[/(.*?)(unless|if)/, 1].to_s.strip
+      sexp[3]
     end
   end
 
   def edit(txt)
+    txt = txt.to_s
     txt.sub! /^return\s*/, 'returns '
     txt.sub! /^returns\s*$/, 'returns nil'
     if txt.split(/\s/).length == 1
@@ -44,21 +74,20 @@ class DRG::Ruby::Condition
   end
 
   #
-  # Set related stuff
+  # Private
   #
 
-  def eql?(other)
-    hash == other.hash
-  end
-
-  def hash
-    sexp.object_id
+  # @description handles elsif
+  def load_parts
+    condition_parts = Set.new
+    sexp.each_sexp do |s|
+      if s.first == :if
+        condition_parts << self.class.new(s)
+      end
+    end
+    condition_parts.to_a
   end
 
-  #
-  # Private
-  #
-
   def create_nested_conditions
     nc = Set.new
     s = sexp.drop(1)

data/lib/drg/spec.rb

@@ -12,14 +12,13 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
     lines = [%Q(require "spec_helper"), %Q(), %Q(describe #{spec.const} do)]
     if spec.class?
       spec.initialization_args.each do |arg|
-        lines << %Q(  let(:#{arg}) {})
+        lines << %Q(  let(:#{arg.to_s.sub(/^[&*]/, '')}) {})
       end
       lines << %Q()
       lines << %Q(  subject { described_class.new #{spec.initialization_args.join(', ')} })
     elsif spec.module?
       lines << %Q(  subject { Class.new { include #{spec.const} }.new })
     end
-
     lines << %Q()
     spec.funcs.reject(&:private?).each do |func|
       lines << %Q(  describe #{spec.quote("#{func.class? ? '.' : '#'}#{func.name}")} do)
@@ -48,7 +47,7 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
   end
 
   def collect_contexts(condition, indent = '', contexts = [])
-    new_indent = indent + (' ' *  self.class.default_indent_size)
+    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?
       contexts << %Q(#{new_indent}it #{quote(condition.return_value)} do) << %Q(#{new_indent}end)
@@ -57,15 +56,30 @@ class DRG::Spec < DelegateClass(DRG::Ruby::Const)
       condition.nested_conditions.each { |nc| collect_contexts(nc, new_indent, contexts) }
     end
     contexts << %Q(#{indent}end) << %Q() # /context
-    contexts << %Q(#{indent}context #{quote(tr(negate(condition.short_statement)))} do) << %Q(#{new_indent}before {})
-    contexts << %Q(#{indent}end)
+    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?
+        contexts << %Q(#{new_indent}it #{quote(condition.else_return_value)} do) << %Q(#{new_indent}end)
+      end
+      contexts << %Q(#{indent}end)
+    end
+    condition.parts.each do |condition_part|
+      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?
+        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)
+      end
+    end
     contexts
   end
 
   def quote(txt)
     txt.strip!
     if txt =~ /"/
-      "%Q[#{txt.gsub(/\#\{(.*?)\}/m, '@\1')}]"
+      "%Q[#{txt.gsub(/\#\{(.*?)\}/m, '\#{\1}')}]"
     else
       %Q("#{txt}")
     end

data/lib/drg/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.4
 platform: ruby
 authors:
 - Ryan Buckley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser