shenandoah 0.1.1 → 0.1.2

data/ChangeLog.markdown

@@ -1,3 +1,9 @@
+0.1.2
+=====
+
+* Fix javascript spec template (generated code was not correct)
+* Only generate the spec helper require when spec_helper.js exists
+
 0.1.1
 =====
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 1
+:patch: 2

data/rails_generators/shen_spec/shen_spec_generator.rb

@@ -5,7 +5,6 @@ module Shenandoah
   module Generators
     class ShenSpecGenerator < ::Rails::Generator::NamedBase
       def manifest
-        spec_path = ENV['SHEN_SPEC_PATH'] || Shenandoah::Rails::Locator.new.spec_path.sub(%r{^#{RAILS_ROOT}/}, '')
         record do |m|
           m.directory "#{spec_path}/#{File.dirname(file_path)}"
           m.template 'javascript_spec.js.erb', "#{spec_path}/#{file_path}_spec.js"
@@ -13,6 +12,10 @@ module Shenandoah
         end
       end
 
+      def spec_path
+        ENV['SHEN_SPEC_PATH'] || Shenandoah::Rails::Locator.new.spec_path.sub(%r{^#{RAILS_ROOT}/}, '')
+      end
+
       def file_path
         super.sub /_spec$/, ''
       end
@@ -22,6 +25,10 @@ module Shenandoah
         mod_spec = mods_rev.reverse.collect { |m| m.downcase }.join('.')
         [mod_spec, klass].reject { |p| p == "" }.join '.'
       end
+      
+      def spec_helper?
+        File.exist?("#{destination_root}/#{spec_path}/spec_helper.js")
+      end
     end
   end
 end

data/rails_generators/shen_spec/templates/javascript_spec.js.erb

@@ -1,8 +1,12 @@
+<% if spec_helper? -%>
 require_spec('spec_helper.js');
+<% end -%>
 require_main('<%= file_path %>.js');
 
-describe('<%= javascript_class_name %>', function () {
-  it("needs tests", function () {
-    expect("you").to(include, "some tests");
+Screw.Unit(function () {
+  describe('<%= javascript_class_name %>', function () {
+    it("needs tests", function () {
+      expect("you").to(include, "some tests");
+    });
   });
 });

data/shenandoah.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shenandoah}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rhett Sutphin"]

data/spec/rails_generators/shen_spec_generator_spec.rb

@@ -36,12 +36,9 @@ describe "shen_spec generator" do
       'themes/light/alison' => ['themes/light/alison', 'themes.light.Alison']
     }.each do |input, (expected_filename, expected_classname)|
       describe "for '#{input}'" do
-        before do
-          generate(input)
-        end
-
         describe "the HTML" do
           before do
+            generate(input)
             @html = File.read("#{RAILS_ROOT}/test/javascript/#{expected_filename}.html")
           end
 
@@ -60,19 +57,38 @@ describe "shen_spec generator" do
 
         describe "the JS" do
           before do
-            @js = File.read("#{RAILS_ROOT}/test/javascript/#{expected_filename}_spec.js")
+            @input = input
+            @filename = expected_filename
+          end
+          
+          def js
+            @js ||= begin
+              generate(@input)
+              File.read("#{RAILS_ROOT}/test/javascript/#{@filename}_spec.js")
+            end
+          end
+
+          it "builds a Screw.Unit spec" do
+            js.should =~ %r{Screw.Unit}
+          end
+
+          it "requires the spec_helper if it exists" do
+            FileUtils.mkdir_p "#{RAILS_ROOT}/test/javascript"
+            File.open("#{RAILS_ROOT}/test/javascript/spec_helper.js", 'w') { }
+            js.should =~ %r{require_spec\('spec_helper.js'\);\n}
           end
 
-          it "requires the spec_helper" do
-            @js.should =~ %r{require_spec\('spec_helper.js'\);}
+          it "does not require the spec_helper if it does not" do
+            js.should_not =~ %r{require_spec\('spec_helper.js'\);}
+            js.should =~ %r{^require_main} # ensure no blank line
           end
 
           it "requires the presumed main file" do
-            @js.should =~ %r{require_main\('#{expected_filename}.js'\);}
+            js.should =~ %r{require_main\('#{expected_filename}.js'\);}
           end
 
           it "describes the main file" do
-            @js.should =~ %r{describe\('#{expected_classname}', function \(\) \{}
+            js.should =~ %r{describe\('#{expected_classname}', function \(\) \{}
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shenandoah
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Rhett Sutphin