konacha 1.1.0 → 1.1.1

data/.gitignore

@@ -18,3 +18,6 @@ test/version_tmp
 tmp
 node_modules
 spec/dummy/log
+vendor/assets/javascripts/mocha.js
+vendor/assets/stylesheets/mocha.css
+vendor/assets/javascripts/chai.js

data/.gitmodules

@@ -0,0 +1,6 @@
+[submodule "chai"]
+	path = chai
+	url = git://github.com/logicalparadox/chai.git
+[submodule "mocha"]
+	path = mocha
+	url = git://github.com/visionmedia/mocha.git

data/History.md

@@ -1,5 +1,9 @@
 # master
 
+# 1.1.1
+
+* 1.8.7 compatibility
+
 # 1.1.0
 
 * Provided the ability to set mocha options via JS

data/README.md

@@ -20,9 +20,11 @@ Photo credit: [FCartegnie](http://commons.wikimedia.org/wiki/File:Konacha.jpg),
 
 Add konacha to the `:test` and `:development` groups in the Gemfile and `bundle install`:
 
-    group :test, :development do
-      gem "konacha"
-    end
+```ruby
+group :test, :development do
+  gem "konacha"
+end
+```
 
 ## Usage
 
@@ -35,28 +37,32 @@ For example, suppose you wanted to test your cool JavaScript `Array#sum` method,
 you placed in `app/assets/javascripts/array_sum.js`. Write the specs in JavaScript in
 the file `spec/javascripts/array_sum_spec.js`:
 
-    //= require array_sum
+```javascript
+//= require array_sum
 
-    describe("Array#sum", function(){
-      it("returns 0 when the Array is empty", function(){
-        [].sum().should.equal(0);
-      });
+describe("Array#sum", function() {
+  it("returns 0 when the Array is empty", function() {
+    [].sum().should.equal(0);
+  });
 
-      it("returns the sum of numeric elements", function(){
-        [1,2,3].sum().should.equal(6);
-      });
-    });
+  it("returns the sum of numeric elements", function() {
+    [1,2,3].sum().should.equal(6);
+  });
+});
+```
 
 Or, if you prefer CoffeeScript, in `spec/javascripts/array_sum_spec.js.coffee`:
 
-    #= require array_sum
+```coffeescript
+#= require array_sum
 
-    describe "Array#sum", ->
-      it "returns 0 when the Array is empty", ->
-        [].sum().should.equal(0)
+describe "Array#sum", ->
+  it "returns 0 when the Array is empty", ->
+    [].sum().should.equal(0)
 
-      it "returns the sum of numeric elements", ->
-        [1,2,3].sum().should.equal(6)
+  it "returns the sum of numeric elements", ->
+    [1,2,3].sum().should.equal(6)
+```
 
 The `konacha:serve` rake task starts a server for your tests. You can go to the root
 page to run all specs (e.g. `http://localhost:3500/`), a sub page to run an individual
@@ -71,12 +77,14 @@ Since Konacha integrates with the asset pipeline, using setup helpers in your sp
 easy. Just create a `spec_helper.js` or `spec_helper.js.coffee` file in `specs/javascripts`
 and require it in your tests:
 
-    //= require spec_helper
-    //= require array_sum
+```javascript
+//= require spec_helper
+//= require array_sum
 
-    describe("Array#sum", function(){
-      ...
-    });
+describe("Array#sum", function() {
+  ...
+});
+```
 
 ## Directives and Asset Bundling
 
@@ -94,10 +102,12 @@ search through a many thousand line application.js bundle to debug a spec failur
 
 Konacha can be configured in an initializer, e.g. `config/initializers/konacha.rb`:
 
-    Konacha.configure do |config|
-      config.spec_dir  = "spec/javascripts"
-      config.driver    = :selenium
-    end if defined?(Konacha)
+```ruby
+Konacha.configure do |config|
+  config.spec_dir  = "spec/javascripts"
+  config.driver    = :selenium
+end if defined?(Konacha)
+```
 
 The `defined?` check is necessary to avoid a dependency on Konacha in the production
 environment.
@@ -114,14 +124,16 @@ You can customize the Mocha options passed into `mocha.setup(..)` by creating a
 named `konacha_config.js` or `konacha_config.js.coffee` in `spec/javascripts` and
 setting properties of `Konacha.mochaOptions`:
 
-    // ignore the following globals during leak detection
-    Konacha.mochaOptions.globals = ['YUI'];
+```javascript
+// ignore the following globals during leak detection
+Konacha.mochaOptions.globals = ['YUI'];
 
-    // or, ignore all leaks
-    Konacha.mochaOptions.ignoreLeaks = true;
+// or, ignore all leaks
+Konacha.mochaOptions.ignoreLeaks = true;
 
-    // set slow test timeout in ms
-    Konacha.mochaOptions.timeout = 5;
+// set slow test timeout in ms
+Konacha.mochaOptions.timeout = 5;
+```
 
 The `ui` and `reporter` Mocha options are set by Konacha and must not be modified.
 
@@ -145,13 +157,15 @@ dependent on each other. Konacha adds a special div to your page with an id of `
 This div is automatically emptied before each example. You should avoid appending markup
 to the page body and instead append it to the `#konacha` div:
 
-    describe "transactions", ->
-      it "should add stuff in one test...", ->
-        $('#konacha').append('<h1 id="added">New Stuff</h1>')
-        $('#konacha h1#added').length.should.equal(1)
+```coffeescript
+describe "transactions", ->
+  it "should add stuff in one test...", ->
+    $('#konacha').append('<h1 id="added">New Stuff</h1>')
+    $('#konacha h1#added').length.should.equal(1)
 
-      it "... should have been removed before the next starts", ->
-        $('#konacha h1#added').length.should.equal(0)
+  it "... should have been removed before the next starts", ->
+    $('#konacha h1#added').length.should.equal(0)
+```
 
 ## Templates / Fixtures
 
@@ -162,22 +176,56 @@ require them in your spec or spec_helper, and render them into the `#konacha` di
 
 For example, in `spec/javascripts/templates/hello.jst.ejs`:
 
-    <h1>Hello Konacha!</h1>
+```html
+<h1>Hello Konacha!</h1>
+```
 
 In `spec_helper.js`:
 
-    //= require_tree ./templates
+```javascript
+//= require_tree ./templates
+```
 
 And your spec:
 
-    //= require spec_helper
+```javascript
+//= require spec_helper
 
-    describe("templating", function(){
-      it("is built in to Sprockets", function(){
-        $('#konacha').html(JST['templates/hello']());
-        $('#konacha h1').text().should.equal('Hello Konacha!');
-      });
-    });
+describe("templating", function() {
+  it("is built in to Sprockets", function() {
+    $('#konacha').html(JST['templates/hello']());
+    $('#konacha h1').text().should.equal('Hello Konacha!');
+  });
+});
+```
+
+## Contributing
+
+```bash
+git clone git://github.com/jfirebaugh/konacha.git
+```
+
+Run `bundle exec rake` to run the test suite.
+
+### Contributing to Mocha and Chai
+
+The Konacha repository includes the
+[Mocha](https://github.com/visionmedia/mocha) and
+[Chai](https://github.com/logicalparadox/chai) repositories as submodules, so
+you can hack on them directly:
+
+```bash
+cd mocha # or: cd chai
+git checkout master
+... hack-hack-hack ...
+bundle exec rake assets # make and cp assets based on your changes
+```
+
+Assuming your app's Gemfile points at your Konacha checkout (`gem 'konacha',
+:path => '~/path/to/konacha'`), your changes to Mocha and Chai are live in
+localhost:3500 when you refresh your browser.
+
+You can send pull requests to Mocha and Chai straight out of your submodules.
 
 ## License
 

data/Rakefile

@@ -3,6 +3,18 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new :spec
+RSpec::Core::RakeTask.new :spec => :assets
+
+desc 'Build and copy Mocha and Chai assets from submodules into vendor/assets'
+task :assets do
+  sh 'git submodule update --init'
+  sh 'cd mocha && make -s'
+  sh 'cd chai && make -s'
+  mkdir_p 'vendor/assets/javascripts'
+  mkdir_p 'vendor/assets/stylesheets'
+  cp 'mocha/mocha.js',  'vendor/assets/javascripts/'
+  cp 'mocha/mocha.css', 'vendor/assets/stylesheets/'
+  cp 'chai/chai.js',    'vendor/assets/javascripts/'
+end
 
 task :default => :spec

data/app/helpers/konacha/specs_helper.rb

@@ -5,7 +5,7 @@ module Konacha
         asset_paths.asset_for(spec.asset_name, "js").to_a
       end.flatten.uniq.map(&:logical_path)
 
-      javascript_include_tag *assets, :body => true, :debug => false
+      javascript_include_tag *(assets << {:body => true, :debug => false})
     end
   end
 end

data/konacha.gemspec

@@ -13,11 +13,14 @@ the asset pipeline and engines.}
   gem.homepage      = "http://github.com/jfirebaugh/konacha"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
+  gem.files         = `git ls-files`.split("\n") + \
+      ['vendor/assets/javascripts/mocha.js',
+       'vendor/assets/stylesheets/mocha.css',
+       'vendor/assets/javascripts/chai.js']
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "konacha"
   gem.require_paths = ["lib"]
-  gem.version       = "1.1.0"
+  gem.version       = "1.1.1"
 
   gem.add_dependency "rails", "~> 3.1"
   gem.add_dependency "capybara"

data/spec/views/specs/specs.html.erb_spec.rb

@@ -2,8 +2,11 @@ require 'spec_helper'
 
 describe "konacha/specs/specs" do
   it "includes konacha JS for given mode" do
+    assign(:specs, [])
     Konacha.should_receive(:mode).any_number_of_times { :runner }
+
     render
+
     rendered.should have_css("script[src='/assets/konacha/runner.js']")
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konacha
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70238910364860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70238910364860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70238910364460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70238910364460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70238910364000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238910364000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70238910363580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238910363580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-firebug
-  requirement: &70238910363080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70238910363080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70238910362660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238910362660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ejs
-  requirement: &70238910362200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238910362200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vendorer
-  requirement: &70238910361780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +133,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238910361780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Konacha is a Rails engine that allows you to test your JavaScript
   with the
 
@@ -118,6 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .gitmodules
 - Gemfile
 - History.md
 - LICENSE
@@ -165,10 +206,10 @@ files:
 - spec/server_spec.rb
 - spec/spec_helper.rb
 - spec/views/specs/specs.html.erb_spec.rb
-- vendor/assets/javascripts/chai.js
+- vendor/images/konacha.jpg
 - vendor/assets/javascripts/mocha.js
 - vendor/assets/stylesheets/mocha.css
-- vendor/images/konacha.jpg
+- vendor/assets/javascripts/chai.js
 homepage: http://github.com/jfirebaugh/konacha
 licenses: []
 post_install_message: 
@@ -189,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Unit-test your Rails JavaScript with the mocha test framework and chai assertion
@@ -222,4 +263,3 @@ test_files:
 - spec/server_spec.rb
 - spec/spec_helper.rb
 - spec/views/specs/specs.html.erb_spec.rb
-has_rdoc: