konacha 3.2.5 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29db494a3c1e072adcbe33e4332019c65dfb0501
-  data.tar.gz: 4cb3c695c41ef7fa23fdc83597fd977b6e74f948
+  metadata.gz: 8156101061d59bd05a03b424d495add7840d937c
+  data.tar.gz: 42033b36a832484f6af799423b55fe31a8f947f0
 SHA512:
-  metadata.gz: b9a9c8e52fd139ffa4b107072a9db3f910c66ff1e75b063908f5b338ff79df9693cac894b2723ec2c3e274e0da50de3d3b303cd9b48998171028fb9eadb79499
-  data.tar.gz: 96621bc9d25f2f516dbbcdb707ebf939ea6b670b58491d3d37d074dbe20e1153de2e42256a363b2f8429719d8fb0282d374d064d4faf60723e2809099a21c285
+  metadata.gz: 56ed2a6bd7dbaff44fea2718f5d37cfd992f7333b485d5feba5a452bbd772ef1cca438f18c154432139b670105c478ee89e281ded1a113f09590b93dba07b649
+  data.tar.gz: 05c06314f71c147a416b8bb7009e74c6a949f4f7fc99eb8d23f101fd2968944e836e8843c42f624c4a13b19ff405365491889decd002daddd7d4dae9efd546cd

data/History.md

@@ -1,5 +1,9 @@
 # master
 
+# 3.3.0
+
+* Allow multiple spec_dir entries (#187)
+
 # 3.2.5
 
 * Better Rails 4.1 compatibility (#178)

data/konacha.gemspec

@@ -17,7 +17,7 @@ the asset pipeline and engines.}
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "konacha"
   gem.require_paths = ["lib"]
-  gem.version       = "3.2.5"
+  gem.version       = "3.3.0"
   gem.license       = "MIT"
 
   gem.add_dependency "railties", ">= 3.1", "< 5"

data/lib/konacha.rb

@@ -32,17 +32,19 @@ module Konacha
     delegate :port, :spec_dir, :spec_matcher, :application, :driver, :runner_port, :formatters, :to => :config
 
     def spec_root
-      File.join(Rails.root, config.spec_dir)
+      [config.spec_dir].flatten.map {|d| File.join(Rails.root, d)}
     end
 
     def spec_paths
-      Rails.application.assets.each_entry(spec_root).find_all { |pathname|
-        config.spec_matcher === pathname.basename.to_s &&
-        (pathname.extname == '.js' || Tilt[pathname]) &&
-        Rails.application.assets.content_type_of(pathname) == 'application/javascript'
-      }.map { |pathname|
-        pathname.to_s.gsub(File.join(spec_root, ''), '')
-      }.sort
+      spec_root.flat_map do |root|
+        Rails.application.assets.each_entry(root).find_all { |pathname|
+          config.spec_matcher === pathname.basename.to_s &&
+          (pathname.extname == '.js' || Tilt[pathname]) &&
+          Rails.application.assets.content_type_of(pathname) == 'application/javascript'
+        }.map { |pathname|
+          pathname.to_s.gsub(File.join(root, ''), '')
+        }.sort
+      end
     end
   end
 end

data/lib/konacha/engine.rb

@@ -44,7 +44,8 @@ module Konacha
       options.runner_port  ||= nil
       options.formatters   ||= self.class.formatters
 
-      app.config.assets.paths << app.root.join(options.spec_dir).to_s
+      spec_dirs = [options.spec_dir].flatten
+      app.config.assets.paths += spec_dirs.map{|d| app.root.join(d).to_s}
       app.config.assets.raise_runtime_errors = false
     end
   end

data/spec/dummy/app/sections/my_section/my_section.js.coffee

@@ -0,0 +1,2 @@
+window.MySection =
+  number_one: -> 1

data/spec/dummy/app/sections/my_section/my_section_spec.js.coffee

@@ -0,0 +1,6 @@
+#= require ./my_section
+
+describe "MySection", ->
+  describe '#number_one', ->
+    it "returns 1", ->
+      MySection.number_one().should.equal 1

data/spec/konacha_spec.rb

@@ -98,6 +98,31 @@ describe Konacha do
         subject.size.should == 1
       end
     end
+
+    context 'with additional spec directories' do
+      around do |example|
+        begin
+          spec_dir = Konacha.config.spec_dir
+          Konacha.configure {|c| c.spec_dir = ["spec/javascripts", "app/sections"]}
+          example.run
+          Rails.application.config.assets.paths << Rails.root.join("app/sections").to_s
+        ensure
+          Konacha.configure {|c| c.spec_dir = spec_dir}
+
+        end
+      end
+
+      it 'has specs from spec/javascripts' do
+        subject.should include("array_sum_js_spec.js")
+        subject.should include("array_sum_cs_spec.js.coffee")
+      end
+
+      it 'has specs from app/sections' do
+        Konacha.spec_root.should include Rails.root.join("app/sections").to_s
+        subject.should include("my_section/my_section_spec.js.coffee")
+      end
+    end
+
   end
 
   it "can be configured in an initializer" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: konacha
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.3.0
 platform: ruby
 authors:
 - John Firebaugh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -254,6 +254,8 @@ files:
 - spec/controllers/specs_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/javascripts/array_sum.js.coffee
+- spec/dummy/app/sections/my_section/my_section.js.coffee
+- spec/dummy/app/sections/my_section/my_section_spec.js.coffee
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -330,6 +332,8 @@ test_files:
 - spec/controllers/specs_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/javascripts/array_sum.js.coffee
+- spec/dummy/app/sections/my_section/my_section.js.coffee
+- spec/dummy/app/sections/my_section/my_section_spec.js.coffee
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb