screw_server 0.1.7 → 0.1.8

data/assets/vendor/smoke/spec/su/jquery.print.js

@@ -21,7 +21,7 @@
         'form': ['method', 'action']
       };
       $.each(properties.concat(extra[obj.tagName.toLowerCase()] || []), function() {
-        if (obj[this])
+        if (obj[this]) 
           result.push(' ' + this.replace('className', 'class') + "=" + $.print(obj[this]))
       });
       return "<" + obj.tagName.toLowerCase()
@@ -59,7 +59,7 @@
       '\\': '\\\\'
     };
     var r = /["\\\x00-\x1f\x7f-\x9f]/g;
-
+    
     var str = r.test(value)
       ? '"' + value.replace(r, function (a) {
           var c = character_substitutions[a];
@@ -104,5 +104,5 @@
     else
       return obj.toString().replace(/\n\s*/g, '');
   }
-
+  
 })(jQuery);

data/assets/vendor/smoke/spec/su/screw.behaviors.js

@@ -12,37 +12,37 @@
       parent: function() {
         return $(this).parent('.describes').parent('.describe');
       },
-
+      
       run_befores: function() {
         $(this).fn('parent').fn('run_befores');
         $(this).children('.befores').children('.before').fn('run');
       },
-
+      
       run_afters: function() {
         $(this).fn('parent').fn('run_afters');
         $(this).children('.afters').children('.after').fn('run');
       },
-
+      
       enqueue: function() {
         $(this).children('.its').children('.it').fn('enqueue');
         $(this).children('.describes').children('.describe').fn('enqueue');
       },
-
+      
       selector: function() {
         return $(this).fn('parent').fn('selector')
           + ' > .describes > .describe:eq(' + $(this).parent('.describes').children('.describe').index(this) + ')';
       }
     });
-
+  
     $('body > .describe').fn({
       selector: function() { return 'body > .describe' }
     });
-
+    
     $('.it').fn({
       parent: function() {
         return $(this).parent('.its').parent('.describe');
       },
-
+      
       run: function() {
         try {
           try {
@@ -56,7 +56,7 @@
           $(this).trigger('failed', [e]);
         }
       },
-
+      
       enqueue: function() {
         var self = $(this).trigger('enqueued');
         $(Screw)
@@ -65,17 +65,17 @@
             setTimeout(function() { $(Screw).dequeue() }, 0);
           });
       },
-
+      
       selector: function() {
         return $(this).fn('parent').fn('selector')
           + ' > .its > .it:eq(' + $(this).parent('.its').children('.it').index(this) + ')';
       }
     });
-
+    
     $('.before').fn({
       run: function() { $(this).data('screwunit.run')() }
-    });
-
+    }); 
+  
     $('.after').fn({
       run: function() { $(this).data('screwunit.run')() }
     });

data/assets/vendor/smoke/spec/su/screw.events.js

@@ -1,6 +1,6 @@
 (function($) {
   $(Screw)
-    .bind('loaded', function() {
+    .bind('loaded', function() {    
       $('.describe, .it')
         .click(function() {
           document.location = location.href.split('?')[0] + '?' + $(this).fn('selector');

data/assets/vendor/smoke/spec/su/screw.matchers.js

@@ -1,5 +1,5 @@
 Screw.Matchers = (function($) {
-  return matchers = {
+  return matchers = {	
     expect: function(actual) {
       return {
         to: function(matcher, expected, not) {
@@ -8,13 +8,13 @@ Screw.Matchers = (function($) {
             throw(matcher.failure_message(expected, actual, not));
           }
         },
-
+        
         to_not: function(matcher, expected) {
           this.to(matcher, expected, true);
         }
       }
     },
-
+    
     equal: {
       match: function(expected, actual) {
         if (expected instanceof Array) {
@@ -31,12 +31,12 @@ Screw.Matchers = (function($) {
           return expected == actual;
         }
       },
-
+      
       failure_message: function(expected, actual, not) {
         return 'expected ' + $.print(actual) + (not ? ' to not equal ' : ' to equal ') + $.print(expected);
       }
     },
-
+    
     match: {
       match: function(expected, actual) {
         if (expected.constructor == RegExp)
@@ -44,19 +44,19 @@ Screw.Matchers = (function($) {
         else
           return actual.indexOf(expected) > -1;
       },
-
+      
       failure_message: function(expected, actual, not) {
         return 'expected ' + $.print(actual) + (not ? ' to not match ' : ' to match ') + $.print(expected);
       }
     },
-
+    
     be_empty: {
       match: function(expected, actual) {
         if (actual.length == undefined) throw(actual.toString() + " does not respond to length");
-
+        
         return actual.length == 0;
       },
-
+      
       failure_message: function(expected, actual, not) {
         return 'expected ' + $.print(actual) + (not ? ' to not be empty' : ' to be empty');
       }

data/assets/vendor/smoke/spec/suite.html

@@ -8,7 +8,7 @@
     <script src="su/screw.matchers.js"></script>
     <script src="su/screw.events.js"></script>
     <script src="su/screw.behaviors.js"></script>
-
+		
 		<!-- require smoke -->
     <script src="../lib/smoke.core.js"></script>
     <script src="../lib/smoke.mock.js"></script>

data/bin/screw_server

@@ -8,8 +8,10 @@ if Object.const_defined?("Bundler")
   Kernel.exec(__FILE__)
 end
 
+require File.expand_path("../../bundler_version", __FILE__)
+
 require "rubygems"
-gem "bundler", "= 1.0.21"
+gem "bundler", SCREW_SERVER_BUNDLER_VERSION
 require "bundler"
 ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile.run", __FILE__)
 Bundler.require

data/bundler_version.rb

@@ -0,0 +1 @@
+SCREW_SERVER_BUNDLER_VERSION = "1.1.3"

data/lib/screw_server/app.rb

@@ -142,6 +142,10 @@ module ScrewServer
         }
       end
 
+      def spec_helpers
+        SpecFile.spec_helper_files
+      end
+
       def sample_spec_file
         "\n"+File.read(File.join(VIEW_PATH, "sample_spec.js"))
       end
@@ -159,8 +163,8 @@ module ScrewServer
     private
 
     def file_from_base_dir(base_dir, file)
-      File.expand_path(File.join(base_dir, file)).tap do |result|
-        unless result.start_with?(base_dir)
+      File.expand_path(File.join(base_dir.to_s, file)).tap do |result|
+        unless result.start_with?(base_dir.to_s)
           raise Sinatra::NotFound, "Forbidden Access out of base directory"
         end
       end
@@ -168,17 +172,17 @@ module ScrewServer
 
     def url_for_source_file(filename)
       file = File.expand_path(filename)
-      if file.start_with?(Base.code_base_dir)
-        file[Base.code_base_dir.length..-1]
-      elsif file.start_with?(Base.spec_base_dir)
-        url_for_spec(file[(Base.spec_base_dir.length + 1)..-1])
+      if file.start_with?(Base.code_base_dir.to_s)
+        file[Base.code_base_dir.to_s.length..-1]
+      elsif file.start_with?(Base.spec_base_dir.to_s)
+        url_for_spec(file[(Base.spec_base_dir.to_s.length + 1)..-1])
       else
-        raise "file #{file} cannot be checked by jslint since it it not inside the spec or code path"
+        raise "file #{file} cannot be checked by jslint since it it not inside the spec or code path: #{Base.code_base_dir} or #{Base.spec_base_dir}"
       end
     end
 
     def run_specs(specs)
-      if File.exists?(SpecFile.spec_helper_file)
+      if SpecFile.spec_helper_files.length > 0
         @specs = specs
         haml :run_spec
       else

data/lib/screw_server/base.rb

@@ -2,7 +2,7 @@ module ScrewServer
   module Base
     def self.spec_base_dir=(d)
       raise "expected a directory with javascript specs under #{d}" unless File.exists?(d)
-      @spec_base_dir = d
+      @spec_base_dir = Pathname(d)
     end
 
     def self.spec_base_dir
@@ -11,11 +11,11 @@ module ScrewServer
 
     def self.code_base_dir=(d)
       raise "expected a directory with javascript code under #{d}" unless File.exists?(d)
-      @code_base_dir = d
+      @code_base_dir = Pathname(d)
     end
 
     def self.code_base_dir
       @code_base_dir
     end
   end
-end
+end

data/lib/screw_server/spec_file.rb

@@ -39,7 +39,8 @@ module ScrewServer
     end
 
     def required_scripts
-      required_files_in(SpecFile.spec_helper_file) + required_files_in(filename)
+      SpecFile.spec_helper_files.map { |file| required_files_in(file) }.flatten +
+        required_files_in(filename)
     end
 
     def last_dependency_change
@@ -53,13 +54,15 @@ module ScrewServer
     end
 
     def used_files
-      [filename, SpecFile.spec_helper_file] +
+      [filename] +
+        SpecFile.spec_helper_files +
         used_fixtures.map(&:filename) +
         required_scripts.map {|script| File.join(Base.code_base_dir, script)}
     end
 
-    def self.spec_helper_file
-      File.join(Base.spec_base_dir, "spec_helper.js")
+    def self.spec_helper_files
+      Dir.glob(Base.spec_base_dir + "spec_helper.js") +
+        Dir.glob(Base.spec_base_dir + "support/**/*.js")
     end
 
     protected

data/screw_server.gemspec

@@ -1,17 +1,25 @@
+require File.expand_path("../bundler_version", __FILE__)
+
 Gem::Specification.new do |s|
   s.name = %q{screw_server}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
   s.authors = ["Kristian Hanekamp", "Infopark AG"]
   s.description = %q{Screw Server - easy javascript unit tests}
   s.email = %q{kristian.hanekamp@infopark.de}
   s.files =
     Dir.glob("{lib,assets,views}/**/*") +
-    ["bin/screw_server", "Gemfile.run", "Gemfile.run.lock", "screw_server.gemspec"]
+    [
+      "bin/screw_server",
+      "Gemfile.run",
+      "Gemfile.run.lock",
+      "screw_server.gemspec",
+      "bundler_version.rb"
+    ]
   s.summary = %q{Screw Server}
 
   s.add_dependency("json", "=1.6.5")
   s.add_dependency("haml", "= 3.0.13")
-  s.add_dependency("bundler", "= 1.0.21")
+  s.add_dependency("bundler", SCREW_SERVER_BUNDLER_VERSION)
 
   # sinatra and dependencies
     s.add_dependency("rack", "= 1.1.0")

data/views/run_spec.haml

@@ -9,7 +9,8 @@
     - screw_assets.each do |asset|
       %script{:type => "text/javascript", :src => url_for_screw_asset(asset)}
 
-    %script{:type => "text/javascript", :src => url_for_spec("spec_helper.js")}
+    - spec_helpers.each do |asset|
+      %script{:type => "text/javascript", :src => url_for_source_file(asset)}
 
     %script{:type => "text/javascript"}
       = "fixture_container = #{fixture_html.to_json}"
@@ -28,4 +29,4 @@
 
     - if @include_monitor_code
       %script{:type => "text/javascript"}
-        = monitor_code
+        = monitor_code

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: screw_server
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Kristian Hanekamp
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-21 00:00:00 +01:00
+date: 2012-05-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 21
         segments: 
         - 1
-        - 0
-        - 21
-        version: 1.0.21
+        - 1
+        - 3
+        version: 1.1.3
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -224,6 +224,7 @@ files:
 - Gemfile.run
 - Gemfile.run.lock
 - screw_server.gemspec
+- bundler_version.rb
 has_rdoc: true
 homepage: 
 licenses: []