webspec 0.0.1 → 0.1.0

data/lib/webspec.rb

@@ -1,5 +1,8 @@
 require "webspec/version"
 require "webspec/formatter"
+require "webspec/run"
+require "webspec/example_group"
+require "webspec/example"
 require "httparty"
 require "json"
 
@@ -17,10 +20,53 @@ module Webspec
       RSpec.configuration.add_formatter(Webspec::Formatter)
     end
 
-    def report(output_hash)
-      FakeWeb.allow_net_connect = true if defined?(FakeWeb)
-      url = "#{base_url}/projects/#{api_key}/runs.json"
-      post(url, :body => {:run => output_hash})
+    def create_run(run_params = {})
+      allow_net_connect do
+        url = "#{base_url}/projects/#{api_key}/runs.json"
+        response = post(url, :body => {:run => run_params})
+        Webspec::Run.new(response.to_hash)
+      end
+    end
+
+    def update_run(run_id, run_params = {})
+      allow_net_connect do
+        url = "#{base_url}/projects/#{api_key}/runs/#{run_id}.json"
+        response = put(url, :body => {:run => run_params})
+        Webspec::Run.new(response.to_hash)
+      end
+    end
+
+    def create_example_group(example_group_params, run, parent = nil)
+      allow_net_connect do
+        url = "#{base_url}/projects/#{api_key}/runs/#{run.id}/example_groups.json"
+        response = post(url, :body => {
+          :example_group => example_group_params,
+          :parent_id => (parent.id if parent)
+        })
+        Webspec::ExampleGroup.new(response.to_hash.merge(:run => run))
+      end
+    end
+
+    def create_example(example_params, run, parent = nil)
+      allow_net_connect do
+        url = "#{base_url}/projects/#{api_key}/runs/#{run.id}/examples.json"
+        response = post(url, :body => {
+          :example => example_params,
+          :parent_id => (parent.id if parent)
+        })
+        Webspec::Example.new(response.to_hash.merge(:run => run))
+      end
+    end
+
+    def allow_net_connect
+      if defined?(FakeWeb)
+        allow_net_connect = FakeWeb.allow_net_connect
+        FakeWeb.allow_net_connect = true
+        yield
+        FakeWeb.allow_net_connect = allow_net_connect
+      else
+        yield
+      end
     end
   end
 end

data/lib/webspec/example.rb

@@ -0,0 +1,10 @@
+module Webspec
+  class Example
+    attr_accessor :id, :run
+
+    def initialize(params = {})
+      @id = params["_id"]
+      @run = params[:run]
+    end
+  end
+end

data/lib/webspec/example_group.rb

@@ -0,0 +1,20 @@
+module Webspec
+  class ExampleGroup
+    attr_accessor :id, :run, :parent
+
+    def initialize(params = {})
+      @id = params["_id"]
+      @run = params[:run]
+    end
+
+    def create_example_group(example_group)
+      example_group = Webspec.create_example_group(example_group, run, self)
+      example_group.parent = self
+      example_group
+    end
+
+    def create_example(example)
+      Webspec.create_example(example, run, self)
+    end
+  end
+end

data/lib/webspec/formatter.rb

@@ -5,9 +5,9 @@ class Webspec::Formatter < RSpec::Core::Formatters::BaseFormatter
 
   def initialize(output)
     super
-    @output_hash = {:elements => []}
-    @example_group_stack = []
-    @parent_example_group = nil
+    @run = Webspec.create_run
+    @output_hash = {}
+    @example_group = @run
   end
 
   def message(message)
@@ -15,25 +15,13 @@ class Webspec::Formatter < RSpec::Core::Formatters::BaseFormatter
   end
 
   def example_group_started(example_group)
-    @example_group_stack.push(@parent_example_group) if @parent_example_group
-    @parent_example_group = @example_group
-    @example_group = {
-      :type => "example_group",
-      :description => example_group.description,
-      :elements => []
-    }
+    @example_group = @example_group.create_example_group({
+      :description => example_group.description
+    })
   end
 
   def example_group_finished(example_group)
-    return unless @example_group
-    if @parent_example_group
-      @parent_example_group[:elements] << @example_group
-    else
-      @output_hash[:elements] << @example_group
-    end
-
-    @example_group = @parent_example_group
-    @parent_example_group = @example_group_stack.pop
+    @example_group = @example_group.parent
   end
 
   def example_passed(example)
@@ -49,7 +37,8 @@ class Webspec::Formatter < RSpec::Core::Formatters::BaseFormatter
   end
 
   def example_finished(example)
-    @example_group[:elements] << example_metadata(example)
+    puts "example_finished: example_group: #{@example_group}"
+    @example_group.create_example(example_metadata(example))
   end
 
   def dump_summary(duration, example_count, failure_count, pending_count)
@@ -75,7 +64,6 @@ class Webspec::Formatter < RSpec::Core::Formatters::BaseFormatter
 
   def example_metadata(example)
     {
-      :type => "example",
       :description => example.description,
       :full_description => example.full_description,
       :status => example.execution_result[:status],
@@ -107,6 +95,6 @@ class Webspec::Formatter < RSpec::Core::Formatters::BaseFormatter
       :ruby_patchlevel => RUBY_PATCHLEVEL
     }
 
-    Webspec.report(@output_hash)
+    @run.update(@output_hash)
   end
 end

data/lib/webspec/run.rb

@@ -0,0 +1,23 @@
+module Webspec
+  class Run
+    attr_accessor :id
+
+    def initialize(params)
+      @id = params["_id"]
+    end
+
+    def create_example_group(example_group)
+      example_group = Webspec.create_example_group(example_group, self)
+      example_group.parent = self
+      example_group
+    end
+
+    def create_example(example)
+      Webspec.create_example(example, self)
+    end
+
+    def update(params)
+      Webspec.update_run(id, params)
+    end
+  end
+end

data/lib/webspec/version.rb

@@ -1,3 +1,3 @@
 module Webspec
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/webspec_formatter_spec.rb

@@ -3,10 +3,6 @@ require 'spec_helper'
 describe Webspec::Formatter do
   let(:formatter) { Webspec::Formatter.new(nil) }
 
-  it "should initialize empty output hash" do
-    formatter.output_hash.should == {:elements => []}
-  end
-
   it "should add message to output_hash" do
     formatter.message("test message")
     formatter.output_hash[:messages].should == ["test message"]
@@ -25,11 +21,4 @@ describe Webspec::Formatter do
   end
 
   it "should add examples to output hash"
-
-  describe "on close" do
-    it "should report the run to Webspec" do
-      Webspec.should_receive(:report).with(formatter.output_hash)
-      formatter.close
-    end
-  end
 end

data/spec/webspec_spec.rb

@@ -10,13 +10,14 @@ describe Webspec do
     end
   end
 
-  describe "report" do
-    it "should send output_hash to webspec web app" do
+  describe ".create_run" do
+    it "should create new run in webspec web app" do
       Webspec.stub(:api_key => "abc123")
       Webspec.should_receive(:post).
         with("https://webspec.shellyapp.com/projects/abc123/runs.json",
-          {:body => {:run => {:a => :b}}}).and_return(true)
-      Webspec.report({:a => :b})
+          {:body => {:run => {:a => :b}}}).and_return({"_id" => "123"})
+      Webspec::Run.should_receive(:new).with({"_id" => "123"})
+      Webspec.create_run({:a => :b})
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webspec
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -88,7 +88,10 @@ files:
 - README.md
 - Rakefile
 - lib/webspec.rb
+- lib/webspec/example.rb
+- lib/webspec/example_group.rb
 - lib/webspec/formatter.rb
+- lib/webspec/run.rb
 - lib/webspec/version.rb
 - spec/spec_helper.rb
 - spec/webspec_formatter_spec.rb
@@ -108,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 726502925257515232
+      hash: -1030159315617042846
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 726502925257515232
+      hash: -1030159315617042846
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24