code_driven_development 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b09b6d5336aaa29537662229c0c204572ee2e81d
-  data.tar.gz: 610a995a3c9012fbd5d6ff374b096793e6fbf259
+  metadata.gz: 546316dbe66b0a333a9dd89b55222bacd74e502b
+  data.tar.gz: 07c3576f12dc0b9667ed79145994e55c5dc344d3
 SHA512:
-  metadata.gz: e83e416be1af608df38ae343b34e7c10dc6775a98f8b3290348eeb4bc4634a83c39beb0aaca10498697ba8761ef89672ff7985f021ee5ee6754b5522af94884d
-  data.tar.gz: 900dd1f8ce764b77eec4126e39d66d5c5d2028696bd24a3cb7d6d7ef749f9d631408639bd0c30bb672413c481c724506398264343bbb7f43907f49bade1c3076
+  metadata.gz: 01bc5e3a0b27dcc595473b5bb8312f538c785c1e33efa341e12b7c85f25514ff83e11eded00b194031f6006298f3df764e8b2b316c59542db03e6b9f154af936
+  data.tar.gz: a023a61a8c1ecd86ae3c5e5e353902b53ce51da33e98af64ca36c759d993d9e2c1baddd6b366e3c8e6123aa1875fe7aeb48c3db98db47ccf6c1cb6ec4fe5029f

data/README.md

@@ -13,9 +13,8 @@ class Bunker < ActiveRecord::Base
   end
 
   def alert_president
-    alert_staff
     SecretService.stand_down
-    President.alert
+    alert_staff || go_crazy
   end
 end
 ```
@@ -23,38 +22,55 @@ end
 And this is what CDD thinks of it:
 
 ``` ruby
-
 describe Bunker do
   it { should validate_secure_of :password }
   it { should validate_protected_of :location }
-
   describe "#alert_staff" do
     let(:obj) { described_class.new }
+    subject { obj.alert_staff }
     before do
       allow(Staff).to receive :alert_all
-      obj.alert_staff
     end
     it "calls Staff.alert_all" do
+      subject
       expect(Staff).to have_received :alert_all
     end
   end
-
   describe "#alert_president" do
     let(:obj) { described_class.new }
+    subject { obj.alert_president }
     before do
-      allow(obj).to receive :alert_staff
       allow(SecretService).to receive :stand_down
-      allow(President).to receive :alert
-      obj.alert_president
-    end
-    it "calls #alert_staff" do
-      expect(obj).to have_received :alert_staff
     end
     it "calls SecretService.stand_down" do
+      subject
       expect(SecretService).to have_received :stand_down
     end
-    it "calls President.alert" do
-      expect(President).to have_received :alert
+    describe "#alert_staff is truthy" do
+      before do
+        allow(obj).to receive(:alert_staff).and_return('alert_staff')
+        allow(obj).to receive(:go_crazy)
+      end
+      it "returns #alert_staff" do
+        expect(subject).to eq 'alert_staff'
+      end
+      it "doesn't call #go_crazy" do
+        subject
+        expect(obj).not_to have_received :go_crazy
+      end
+    end
+    describe "#alert_staff is falsey" do
+      before do
+        allow(obj).to receive(:alert_staff).and_return(false)
+        allow(obj).to receive(:go_crazy).and_return('go_crazy')
+      end
+      it "returns #go_crazy" do
+        expect(subject).to eq 'go_crazy'
+      end
+      it "calls #alert_staff" do
+        subject
+        expect(obj).to have_received :alert_staff
+      end
     end
   end
 end

data/Rakefile

@@ -1 +1,8 @@
+$:.unshift(File.dirname(__FILE__) + '/../../lib')
+
 require "bundler/gem_tasks"
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new
+
+task default: :cucumber

data/code_driven_development.gemspec

@@ -24,4 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "cucumber"
+  spec.add_development_dependency "aruba"
 end

data/features/my_feature.feature

@@ -0,0 +1,113 @@
+Feature: Creates awesome specs
+  Scenario: creating shoulda_matchers
+    Given a file named "my_feature.rb" with:
+      """ruby
+      class Lolcat < ActiveRecord::Base
+        validate :cuteness, presence: true
+      end
+      """
+    When I run `cdd my_feature.rb`
+    Then the exit status should be 0
+    And the output should contain:
+      """ruby
+      describe Lolcat do
+        it { should validate_presence_of :cuteness }
+      end
+      """
+
+  Scenario: instance methods that call constants
+    Given a file named "my_feature.rb" with:
+      """ruby
+      class Lolcat
+        def i_call_things
+          CentralBureaucracy.file_report
+        end
+      end
+      """
+    When I run `cdd my_feature.rb`
+    Then the exit status should be 0
+    And the output should contain:
+      """ruby
+        describe "#i_call_things" do
+          let(:obj) { described_class.new }
+          subject { obj.i_call_things }
+          before do
+            allow(CentralBureaucracy).to receive :file_report
+          end
+          it "calls CentralBureaucracy.file_report" do
+            subject
+            expect(CentralBureaucracy).to have_received :file_report
+          end
+        end
+      """
+
+  Scenario: instance methods that call instance methods
+    Given a file named "my_feature.rb" with:
+      """ruby
+      class Lolcat
+        def i_call_instance_methods
+          meth
+        end
+      end
+      """
+    When I run `cdd my_feature.rb`
+    Then the exit status should be 0
+    And the output should contain:
+      """ruby
+        describe "#i_call_instance_methods" do
+          let(:obj) { described_class.new }
+          subject { obj.i_call_instance_methods }
+          before do
+            allow(obj).to receive :meth
+          end
+          it "calls #meth" do
+            subject
+            expect(obj).to have_received :meth
+          end
+        end
+      """
+
+  Scenario: boolean or
+    Given a file named "my_feature.rb" with:
+      """ruby
+      class Yolounicorn
+        def dilemma
+          should_i_stay || should_i_go
+        end
+      end
+      """
+    When I run `cdd my_feature.rb`
+    Then the exit status should be 0
+    And the output should contain:
+      """ruby
+        describe "#dilemma" do
+          let(:obj) { described_class.new }
+          subject { obj.dilemma }
+          describe "#should_i_stay is truthy" do
+            before do
+              allow(obj).to receive(:should_i_stay).and_return('should_i_stay')
+              allow(obj).to receive(:should_i_go)
+            end
+            it "returns #should_i_stay" do
+              expect(subject).to eq 'should_i_stay'
+            end
+            it "doesn't call #should_i_go" do
+              subject
+              expect(obj).not_to have_received :should_i_go
+            end
+          end
+          describe "#should_i_stay is falsey" do
+            before do
+              allow(obj).to receive(:should_i_stay).and_return(false)
+              allow(obj).to receive(:should_i_go).and_return('should_i_go')
+            end
+            it "returns #should_i_go" do
+              expect(subject).to eq 'should_i_go'
+            end
+            it "calls #should_i_stay" do
+              subject
+              expect(obj).to have_received :should_i_stay
+            end
+          end
+        end
+      """

data/features/support/aruba.rb

@@ -0,0 +1 @@
+require 'aruba/cucumber'

data/lib/code_driven_development/code_driven_development.rb

@@ -25,6 +25,7 @@ module CodeDrivenDevelopment
         Rule::InstanceMethod,
         Rule::ConstantMethodCall,
         Rule::InstanceMethodCall,
+        Rule::BooleanOr,
         default: Rule::Default
       )
     end

data/lib/code_driven_development/indented_output.rb

@@ -18,7 +18,7 @@ module CodeDrivenDevelopment
     private
 
     def current_indentation
-      "\t" * @nesting
+      " " * @nesting * 2
     end
   end
 end

data/lib/code_driven_development/rule/boolean_or.rb

@@ -0,0 +1,61 @@
+module CodeDrivenDevelopment
+  module Rule
+    class BooleanOr < AbstractRule
+      def capable?
+        code.sexp_type == :or &&
+          left.sexp_type == :call &&
+          right.sexp_type == :call
+      end
+
+      def test
+        left_is_true_context = TestComponent::Context.new(%Q("##{left_method_name} is truthy"))
+        right_is_true_context = TestComponent::Context.new(%Q("##{left_method_name} is falsey"))
+
+        left_is_true_context.befores << "allow(obj).to receive(:#{left_method_name}).and_return('#{left_method_name}')"
+        left_is_true_context.befores << "allow(obj).to receive(:#{right_method_name})"
+
+        left_is_true_context << TestComponent::Test.new("returns ##{left_method_name}", [
+          "expect(subject).to eq '#{left_method_name}'"
+        ])
+
+        left_is_true_context << TestComponent::Test.new("doesn't call ##{right_method_name}", [
+          "subject",
+          "expect(obj).not_to have_received :#{right_method_name}"
+        ])
+
+        right_is_true_context.befores << "allow(obj).to receive(:#{left_method_name}).and_return(false)"
+        right_is_true_context.befores << "allow(obj).to receive(:#{right_method_name}).and_return('#{right_method_name}')"
+
+        right_is_true_context << TestComponent::Test.new("returns ##{right_method_name}", [
+          "expect(subject).to eq '#{right_method_name}'"
+        ])
+
+        right_is_true_context << TestComponent::Test.new("calls ##{left_method_name}", [
+          "subject",
+          "expect(obj).to have_received :#{left_method_name}"
+        ])
+
+        test_context << left_is_true_context
+        test_context << right_is_true_context
+      end
+
+      private
+
+      def left
+        code[1]
+      end
+
+      def left_method_name
+        left[2]
+      end
+
+      def right
+        code[2]
+      end
+
+      def right_method_name
+        right[2]
+      end
+    end
+  end
+end

data/lib/code_driven_development/rule/constant_method_call.rb

@@ -9,7 +9,10 @@ module CodeDrivenDevelopment
 
       def test
         test_context.befores << "allow(#{receiver_value}).to receive :#{method_name}"
-        body = ["expect(#{receiver_value}).to have_received :#{method_name}"]
+        body = [
+          "subject",
+          "expect(#{receiver_value}).to have_received :#{method_name}"
+        ]
         test_context << TestComponent::Test.new("calls #{receiver_value}.#{method_name}", body)
       end
 

data/lib/code_driven_development/rule/instance_method.rb

@@ -11,7 +11,7 @@ module CodeDrivenDevelopment
         test_context << new_context
 
         # Do this last so that the method invocation is the last line in the before.
-        new_context.befores << "obj.#{method_name}"
+        new_context.subject = "obj.#{method_name}"
         new_context.lets << TestComponent::Let.new(:obj, "described_class.new")
       end
 

data/lib/code_driven_development/rule/instance_method_call.rb

@@ -9,7 +9,10 @@ module CodeDrivenDevelopment
 
       def test
         test_context.befores << "allow(#{receiver_value}).to receive :#{method_name}"
-        body = ["expect(#{receiver_value}).to have_received :#{method_name}"]
+        body = [
+          "subject",
+          "expect(#{receiver_value}).to have_received :#{method_name}"
+        ]
         test_context << TestComponent::Test.new("calls ##{method_name}", body)
       end
 

data/lib/code_driven_development/test_component/context.rb

@@ -1,24 +1,26 @@
 module CodeDrivenDevelopment
   module TestComponent
     class Context
-      def initialize(description = nil, befores = [], tests = [], lets = [])
-        @description, @befores, @tests, @lets = description, befores, tests, lets
+      def initialize(description = nil, befores = [], tests = [], lets = [], subject = nil)
+        @description, @befores, @tests, @lets, @subject = description, befores, tests, lets, subject
       end
 
       attr_reader :tests, :befores, :lets
-      attr_accessor :description
+      attr_accessor :description, :subject
 
       def << child
         @tests << child
       end
 
       def indented_output io
-        io << ""
         io << "describe #@description do"
         io.indented do
           lets.each do |let|
             let.indented_output(io)
           end
+          if subject
+            io << "subject { #{subject} }"
+          end
           if befores.any?
             io << "before do"
             io.indented do

data/lib/code_driven_development/version.rb

@@ -1,3 +1,3 @@
 module CodeDrivenDevelopment
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/code_driven_development.rb

@@ -15,6 +15,7 @@ require "code_driven_development/rule/set"
 require "code_driven_development/rule/constant_method_call"
 require "code_driven_development/rule/instance_method_call"
 require "code_driven_development/rule/default"
+require "code_driven_development/rule/boolean_or"
 require "code_driven_development/rule/class"
 require "code_driven_development/rule/validation"
 require "code_driven_development/rule/instance_method"

data/samples/president.rb

@@ -7,8 +7,7 @@ class Bunker < ActiveRecord::Base
   end
 
   def alert_president
-    alert_staff
     SecretService.stand_down
-    President.alert
+    alert_staff || go_crazy
   end
 end

data/spec/samples/lone_sample.yaml

@@ -0,0 +1,54 @@
+-
+  title: creates shoulda_matchers
+  input: |
+    class Lolcat < ActiveRecord::Base
+      validate :cuteness, presence: true
+    end
+  output: |
+    describe Lolcat do
+      it { should validate_presence_of :cuteness }
+    end
+-
+  title: instance methods that call constants
+  input: |
+    class Lolcat
+      def i_call_things
+        CentralBureaucracy.file_report
+      end
+    end
+  output: |
+    describe Lolcat do
+      
+      describe "#i_call_things" do
+        let(:obj) { described_class.new }
+        before do
+          allow(CentralBureaucracy).to receive :file_report
+          obj.i_call_things
+        end
+        it "calls CentralBureaucracy.file_report" do
+          expect(CentralBureaucracy).to have_received :file_report
+        end
+      end
+    end
+-
+  title: instance methods that call instance methods
+  input: |
+    class Lolcat
+      def i_call_instance_methods
+        meth
+      end
+    end
+  output: |
+    describe Lolcat do
+      
+      describe "#i_call_instance_methods" do
+        let(:obj) { described_class.new }
+        before do
+          allow(obj).to receive :meth
+          obj.i_call_instance_methods
+        end
+        it "calls #meth" do
+          expect(obj).to have_received :meth
+        end
+      end
+    end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
+require 'yaml'
 require_relative '../lib/code_driven_development'
-require_relative 'support/have_consecutive_lines_matching_matcher'
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_driven_development
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dan Finnie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_parser
@@ -80,6 +80,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Automatically generate stubby tests from your implementation.
 email:
 - dan@danfinnie.com
@@ -96,10 +124,13 @@ files:
 - Rakefile
 - bin/cdd
 - code_driven_development.gemspec
+- features/my_feature.feature
+- features/support/aruba.rb
 - lib/code_driven_development.rb
 - lib/code_driven_development/code_driven_development.rb
 - lib/code_driven_development/indented_output.rb
 - lib/code_driven_development/rule/abstract_rule.rb
+- lib/code_driven_development/rule/boolean_or.rb
 - lib/code_driven_development/rule/class.rb
 - lib/code_driven_development/rule/constant_method_call.rb
 - lib/code_driven_development/rule/default.rb
@@ -114,9 +145,8 @@ files:
 - lib/code_driven_development/test_component/test.rb
 - lib/code_driven_development/version.rb
 - samples/president.rb
-- spec/my_spec.rb
+- spec/samples/lone_sample.yaml
 - spec/spec_helper.rb
-- spec/support/have_consecutive_lines_matching_matcher.rb
 homepage: https://github.com/danfinnie/code-driven-development
 licenses:
 - MIT
@@ -143,6 +173,7 @@ specification_version: 4
 summary: Ever see a test and think, "wow, this test cares a lot about the exact abstract
   syntax tree of the code?" CDD aims to generate tests like that.
 test_files:
-- spec/my_spec.rb
+- features/my_feature.feature
+- features/support/aruba.rb
+- spec/samples/lone_sample.yaml
 - spec/spec_helper.rb
-- spec/support/have_consecutive_lines_matching_matcher.rb

data/spec/my_spec.rb

@@ -1,72 +0,0 @@
-require 'spec_helper'
-
-describe CodeDrivenDevelopment::CodeDrivenDevelopment do
-  before do
-    implementation = <<-EOT
-      class Lolcat < ActiveRecord::Base
-        validate :cuteness, presence: true
-
-        def i_call_things
-          CentralBureaucracy.file_report
-        end
-
-        def i_call_instance_methods
-          meth
-        end
-
-        def weigh_options
-          should_i_stay || should_i_go
-        end
-      end
-    EOT
-
-    @test = CodeDrivenDevelopment::CodeDrivenDevelopment.new(implementation).test_code
-  end
-
-  it "puts the model name in the describe description" do
-    expect(@test).to match /^describe Lolcat do/
-  end
-
-  it "includes shoulda-matchers for simple validations" do
-    expect(@test).to match /^\tit.*should.*validate_presence_of.*:cuteness/
-  end
-
-  it "stubs out method calls to constants" do
-    expect(@test).to have_consecutive_lines_matching [
-      /^\tdescribe.*"#i_call_things"/,
-      /^\t\tbefore/,
-      /^\t\t\tallow.CentralBureaucracy..to.*receive.*:file_report/,
-      /^\t\t\tobj.i_call_things/,
-      /^\t\tit.*calls Central.*do/,
-      /^\t\t\texpect.CentralBureaucracy..to.*have_received.*:file_report/
-    ]
-  end
-
-  it "stubs out instance method calls" do
-    expect(@test).to have_consecutive_lines_matching [
-      /^\tdescribe.*"#i_call_instance_methods"/,
-      /^\t\tlet.:obj.*described_class.new/,
-      /^\t\tbefore/,
-      /^\t\t\tallow.obj..to.*receive.*:meth/,
-      /^\t\t\tobj.i_call_instance_methods/,
-      /^\t\tit.*calls #meth.*do/,
-      /^\t\t\texpect.obj..to.*have_received.*:meth/
-    ]
-  end
-
-  it "handles ORs with aplomb" do
-    expect(@test).to have_consecutive_lines_matching [
-      /^\tdescribe.*"#weigh_options"/,
-      /^\t\tlet.:obj.*described_class.new/,
-      /^\t\tbefore/,
-      /^\t\t\tallow.obj..to.*receive.*:should_i_stay/,
-      /^\t\t\tallow.obj..to.*receive.*:should_i_go/,
-      /^\t\tcontext.*when.*should_i_stay.*truthy/,
-      /^\t\tbefore do/,
-      /^\t\t\t
-      /^\t\t\tobj.weigh_options/,
-      /^\t\tit.*calls #meth.*do/,
-      /^\t\t\texpect.obj..to.*have_received.*:meth/
-    ]
-  end
-end

data/spec/support/have_consecutive_lines_matching_matcher.rb

@@ -1,29 +0,0 @@
-RSpec::Matchers.define :have_consecutive_lines_matching do |*regexen|
-  def compute_match(string, regexen)
-    if regexen.empty?
-      return [true]
-    end
-
-    regex = regexen.shift
-    m = string.match(regex)
-    if m
-      remaining = m.post_match
-      newline_i = remaining.index("\n")+1
-      remaining = remaining[newline_i..-1]
-      compute_match(remaining, regexen)
-    else
-      return [false, regex, string]
-    end
-  end
-
-  match do |actual|
-    compute_match(actual, regexen.flatten).shift
-  end
-
-  failure_message_for_should do |actual|
-    _, failed_regex, failed_string = compute_match(actual, regexen.flatten)
-    "expected #{failed_regex.inspect} to match #{failed_string.inspect}"
-  end
-
-  diffable
-end