opal-rspec 0.3.0.beta1 → 0.3.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf962b33837327895dd28ab8b61a3c59d34798d
-  data.tar.gz: 2b9a33708f6a1eb270588daf007e551f7da60125
+  metadata.gz: d5bd79540d6e74c4df7d716c4ca5b8f03cde5a6e
+  data.tar.gz: 723db13931f42a37a78ae3c2aecef9ef6eb17df2
 SHA512:
-  metadata.gz: b8f78171304bf87f6eb090e75a9aa3d094951e8e1fabd030fb391188fc1b44f8eace7c479322f392672091f0de63262e433a958cdbf48aab9ef6ece5c58fc5b6
-  data.tar.gz: ab4c3e4c9934741c1905f7a2dbfc9f2fe76d0945246eb92b48aebe0a51d6a67d0e2d3cbb3331ebdcd529ba1c08d0e054a64f6f3bb3457797ccd31cd09986bf21
+  metadata.gz: 4072ac6a74fe502ca4c83b828934c5f88216d83ede42a03adf3e7cfad083ead45b8f624cb38671cc82912136746a6f8fbdf2475221aaa75d76276b0169ed3b12
+  data.tar.gz: 8256bba226056877123b8a50439d8eca2eeed995b4ba9b8eed3f34954a2bee31f544b9c86bd4ec79af1ca0ed76cdad96e41c5d5adc2f15d2c754ff98dbe2bdc9

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## edge
+
+*   Update Opal dependency for ~> 0.6.0.
+
+*   Remove double-escaping in inline x-strings (from Opal bug fix).
+
+*   Remove opal-sprockets dependency - build tools now part of opal.
+
+*   Replaced browser formatter to use html printer from rspec
+
+## 0.2.1 2013-11-24

data/app/rspec-builder.rb

@@ -38,6 +38,7 @@ require 'rspec/mocks'
 
 # we want access to BaseFormatter
 require 'rspec/core/formatters/base_formatter'
+require 'rspec/core/formatters/html_printer'
 
 # For now, we don't support mocking. This placeholder in rspec-core allows that.
 require 'rspec/core/mocking/with_rspec'

data/config.ru

@@ -1,8 +1,6 @@
 require 'bundler'
 Bundler.require
 
-require 'opal-sprockets'
-
 Opal::Processor.source_map_enabled = false
 
 run Opal::Server.new { |s|

data/lib/opal/rspec/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module RSpec
-    VERSION = '0.3.0.beta1'
+    VERSION = '0.3.0.beta2'
   end
 end

data/opal-rspec.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.require_paths  = ['lib']
 
-  s.add_dependency 'opal', '~> 0.6.0'
+  s.add_dependency 'opal', ['>= 0.6.0', '< 1.0.0']
 
   s.add_development_dependency 'rake'
 end

data/opal/opal/rspec/browser_formatter.rb

@@ -1,18 +1,20 @@
+require 'erb'
+
 module Opal
   module RSpec
     class BrowserFormatter < ::RSpec::Core::Formatters::BaseFormatter
+      include ERB::Util
+
+      CSS_STYLES = ::RSpec::Core::Formatters::HtmlPrinter::GLOBAL_STYLES
 
       def start(example_count)
         super
-
-        @summary_element = Element.new(:p, class_name: 'summary', text: 'Runner...')
-        @groups_element = Element.new(:ul, class_name: 'example_groups')
-
         target = Element.new(`document.body`)
-        target << @summary_element
-        target << @groups_element
+        target << Element.new(:div, html: REPORT_TEMPLATE)
+        @rspec_results = Element.id('rspec-results')
 
-        styles = Element.new(:style, type: 'text/css', css_text: CSS_STYLES)
+        css_text = CSS_STYLES + "\n body { padding: 0; margin: 0 }"
+        styles = Element.new(:style, type: 'text/css', css_text: css_text)
         styles.append_to_head
       end
 
@@ -20,62 +22,74 @@ module Opal
         super
 
         @example_group_failed = false
-        @group_element = Element.new(:li, class_name: 'group passed')
+        parents = example_group.parent_groups.size
 
-        description = Element.new(:span, class_name: 'group_description', text: example_group.description)
-        @group_element << description
+        @rspec_group  = Element.new(:div, class_name: "example_group passed")
+        @rspec_dl     = Element.new(:dl)
+        @rspec_dt     = Element.new(:dt, class_name: "passed", text: example_group.description)
+        @rspec_group << @rspec_dl
+        @rspec_dl << @rspec_dt
 
-        @example_list = Element.new(:ul, class_name: 'examples')
-        @group_element << @example_list
+        @rspec_dl.style 'margin-left', "#{(parents - 2) * 15}px"
 
-        @groups_element << @group_element
+        @rspec_results << @rspec_group
       end
 
       def example_group_finished(example_group)
         super
 
         if @example_group_failed
-          @group_element.class_name = 'group failed'
+          @rspec_group.class_name = "example_group failed"
+          @rspec_dt.class_name = "failed"
+          Element.id('rspec-header').class_name = 'failed'
         end
       end
 
       def example_failed(example)
         super
-
-        @example_group_failed = true
+        duration = sprintf("%0.5f", example.execution_result[:run_time])
 
         error = example.execution_result[:exception]
         error_name = error.class.name.to_s
         output = "#{short_padding}#{error_name}:\n"
         error.message.to_s.split("\n").each { |line| output += "#{long_padding}  #{line}\n" }
 
-        wrapper = Element.new(:li, class_name: 'example failed')
-
-        description = Element.new(:span, class_name: 'example_description', text: example.description)
-        wrapper << description
-
-        exception = Element.new(:pre, class_name: 'exception', text: output)
-        wrapper << exception
+        @example_group_failed = true
 
-        @example_list << wrapper
-        @example_list.style :display, 'list-item'
+        @rspec_dl << Element.new(:dd, class_name: "example failed", html: <<-HTML)
+          <span class="failed_spec_name">#{h example.description}</span>
+          <span class="duration">#{duration}s</span>
+          <div class="failure">
+            <div class="message"><pre>#{h output}</pre></div>
+          </div>
+        HTML
       end
 
       def example_passed(example)
         super
+        duration = sprintf("%0.5f", example.execution_result[:run_time])
 
-        wrapper = Element.new(:li, class_name: 'example passed')
-        description = Element.new(:span, class_name: 'example_description', text: example.description)
-
-        wrapper << description
-        @example_list << wrapper
+        @rspec_dl << Element.new(:dd, class_name: "example passed", html: <<-HTML)
+          <span class="passed_spec_name">#{h example.description}</span>
+          <span class="duration">#{duration}s</span>
+        HTML
       end
 
       def dump_summary(duration, example_count, failure_count, pending_count)
         super
 
-        summary = "\n#{example_count} examples, #{failure_count} failures (time taken: #{duration})"
-        @summary_element.text = summary
+        totals = "#{example_count} examples, #{failure_count} failures"
+        Element.id('totals').html = totals
+
+        duration = "Finished in <strong>#{sprintf("%.5f", duration)} seconds</strong>"
+        Element.id('duration').html = duration
+
+        add_scripts
+      end
+
+      def add_scripts
+        content = ::RSpec::Core::Formatters::HtmlPrinter::GLOBAL_SCRIPTS
+        `window.eval(#{content})`
       end
 
       def short_padding
@@ -89,6 +103,10 @@ module Opal
       class Element
         attr_reader :native
 
+        def self.id(id)
+          new(`document.getElementById(id)`)
+        end
+
         def initialize(el, attrs={})
           if String === el
             @native = `document.createElement(el)`
@@ -141,53 +159,29 @@ module Opal
         end
       end
 
-      CSS_STYLES = <<-EOF
-body {
-  font-size: 14px;
-  font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
-}
-
-pre {
-  font-family: "Bitstream Vera Sans Mono", Monaco, "Lucida Console", monospace;
-  font-size: 12px;
-  color: #444444;
-  white-space: pre;
-  padding: 3px 0px 3px 12px;
-  margin: 0px 0px 8px;
-
-  background: #FAFAFA;
-  -webkit-box-shadow: rgba(0,0,0,0.07) 0 1px 2px inset;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  border: 1px solid #DDDDDD;
-}
-
-ul.example_groups {
-  list-style-type: none;
-}
-
-li.group.passed .group_description {
-  color: #597800;
-  font-weight: bold;
-}
-
-li.group.failed .group_description {
-  color: #FF000E;
-  font-weight: bold;
-}
-
-li.example.passed {
-  color: #597800;
-}
-
-li.example.failed {
-  color: #FF000E;
-}
-
-.examples {
-  list-style-type: none;
-}
+      REPORT_TEMPLATE = <<-EOF
+<div class="rspec-report">
+
+  <div id="rspec-header">
+    <div id="label">
+      <h1>RSpec Code Examples</h1>
+    </div>
+
+    <div id="display-filters">
+      <input id="passed_checkbox"  name="passed_checkbox"  type="checkbox" checked="checked" onchange="apply_filters()" value="1" /> <label for="passed_checkbox">Passed</label>
+      <input id="failed_checkbox"  name="failed_checkbox"  type="checkbox" checked="checked" onchange="apply_filters()" value="2" /> <label for="failed_checkbox">Failed</label>
+      <input id="pending_checkbox" name="pending_checkbox" type="checkbox" checked="checked" onchange="apply_filters()" value="3" /> <label for="pending_checkbox">Pending</label>
+    </div>
+
+    <div id="summary">
+      <p id="totals">&#160;</p>
+      <p id="duration">&#160;</p>
+    </div>
+  </div>
+
+  <div id="rspec-results" class="results">
+  </div>
+</div>
 EOF
     end
   end

data/opal/opal/rspec/text_formatter.rb

@@ -55,11 +55,11 @@ module Opal
       end
 
       def green(str)
-        `console.log('\\033[32m' + str + '\\033[0m')`
+        `console.log('\033[32m' + str + '\033[0m')`
       end
 
       def red(str)
-        `console.log('\\033[31m' + str + '\\033[0m')`
+        `console.log('\033[31m' + str + '\033[0m')`
       end
 
       def short_padding

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: opal-rspec
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta1
+  version: 0.3.0.beta2
 platform: ruby
 authors:
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-01 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -93,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: RSpec for Opal