ymdp 0.1.11 → 0.1.12

data/Gemfile

@@ -19,6 +19,6 @@ gem "ymdp_generator"
 gem "ymdt"
 gem "yrb"
 gem "idiom"
-gem "w3c_validators"
+gem "epic"
 
 bin_path "vendor/bin"

data/History.txt

@@ -1,3 +1,12 @@
+== 0.1.12 2010-01-30
+  * major enhancements
+    * extracted compressor into <tt>epic</tt> gem
+    * extracted validator into <tt>epic</tt> gem
+  * minor enhancements
+    * raise validation errors inside <tt>application_view</tt> rather than in <tt>epic</tt>
+  * bug fixes
+    * config.yml settings for compression and validation work again
+
 == 0.1.11 2010-01-25
   * minor enhancements
     * changed implementation of configuration object

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/progressions/ymdp"
     gem.authors = ["Jeff Coleman"]
     gem.add_development_dependency "rspec", ">= 1.2.6"
+    gem.add_development_dependency "cucumber", ">= 0"
     gem.add_runtime_dependency "haml", ">= 0"
     gem.add_runtime_dependency "json", ">= 0"
     gem.add_runtime_dependency "hpricot", ">= 0"
@@ -25,7 +26,7 @@ begin
     gem.add_runtime_dependency "ymdp_generator", ">= 0"
     gem.add_runtime_dependency "ymdt", ">= 0"
     gem.add_runtime_dependency "yrb", ">= 0"
-    gem.add_runtime_dependency "w3c_validators", ">= 0"
+    gem.add_runtime_dependency "epic", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -58,6 +59,8 @@ task :spec => [:bundle, :check_dependencies]
 
 task :default => :spec
 
+task :rcov => :bundle
+
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.12

data/features/ymdp.feature

@@ -7,7 +7,7 @@ Feature: Configuration
     Then my "username" setting should be "username"
     And my "password" setting should be "password"
     
-  @wip
+  
   Scenario: Ensure the commit message is in the view
     Given I compile the application with the message "this is my commit message"
     Then I should see "this is my commit message" in "servers/production/views/page"
@@ -49,7 +49,7 @@ Feature: Configuration
     And I compile the application with the message "this should validate"
     Then no exceptions should have been raised
     
-
+  @wip
   Scenario: Build application with invalid JavaScript
     Given the file "app/javascripts/invalid.js" exists with "A = function() { alert('hello'); }"
     And the file "app/views/invalid.html.haml" exists with "= render :javascript => 'invalid'"

data/lib/ymdp.rb

@@ -13,8 +13,7 @@ require 'erb'
 require 'set'
 
 require 'base'
-require 'validator/validator'
 require 'view/tag_helper'
 require 'view/asset_tag_helper'
-require 'support/file'
+require 'f'
 require 'configuration/config'

data/lib/ymdp/compiler/git_helper.rb

@@ -1,4 +1,4 @@
-require 'support/file'
+require 'f'
 require 'grit'
 include Grit
 

data/lib/ymdp/compiler/template.rb

@@ -275,13 +275,17 @@ module YMDP
         #
         def write_template(result)
           result = super(result)
-          
-          if CONFIG.validate_html? && !YMDP::Validator::HTML.validate(destination_path)
+        
+          if configuration.validate["html"]["build"] && !validator.validate(destination_path)
             raise "HTML Validation Errors"
           end
           
           result
         end
+        
+        def validator
+          @validator ||= Epic::Validator::HTML.new
+        end
       end
 
       # Process templates for JavaScript files.
@@ -297,7 +301,7 @@ module YMDP
           filename = @file.split("/").last
           tmp_filename = "#{TMP_PATH}/#{filename}"
           F.save_to_file(result, tmp_filename)
-          result = YMDP::Compressor::JavaScript.compress(tmp_filename) if CONFIG.compress_embedded_js?
+          result = Epic::Compressor.new(tmp_filename).compress if configuration.compress["embedded_js"]
           write_template_without_layout(result)
         end
       end
@@ -365,7 +369,7 @@ module YMDP
         # Validate the JSON file.
         #
         def validate
-          YMDP::Validator::JSON.validate(destination_path)
+          Epic::Validator::JSON.new.validate(destination_path)
         end
   
         private

data/lib/ymdp/configuration/constants.rb

@@ -22,7 +22,10 @@ unless defined?(YMDP_TEST)
     config.content_variables = @content_variables
   end
 
-  YMDP::Validator::JavaScript.configure do |config|
+  Epic::Base.configure do |config|
+    config.base_path = BASE_PATH
+    config.tmp_path = TMP_PATH
+    config.doctype = CONFIG["validate"]["html"]["doctype"]
     config.jslint_settings = @jslint_settings
   end
 end

data/lib/ymdp/tasks/ymdp.rake

@@ -1,4 +1,5 @@
 require 'ymdt'
+require 'epic'
 
 begin
   CATEGORIES = YAML.load_file("./config/categories.yml")["categories"] unless defined?(CATEGORIES)
@@ -113,8 +114,6 @@ desc "Some more help"
 task :help do
   docs = <<-DOCS
       
-#{please_install_rhino}
-
 FOR HELP:
 
   To list reference for all tasks:
@@ -268,7 +267,7 @@ namespace :validate do
   task :javascripts do
     puts "\nValidating external JavaScript assets in #{@application}..."
     Dir["#{BASE_PATH}/servers/#{@application}/assets/javascripts/*.js"].each do |path|
-      YMDP::Validator::JavaScript.validate(path)
+      Epic::Validator::JavaScript.new.validate(path)
     end
   end
 
@@ -278,7 +277,7 @@ namespace :validate do
     Dir["./servers/#{@application}/assets/yrb/*json"].each do |json|
       filename = json.split("/").last
       path = "#{BASE_PATH}/servers/#{@application}/assets/yrb/#{filename}"
-      YMDP::Validator::JSON.validate(path)
+      Epic::Validator::JSON.new.validate(path)
     end    
   end
 
@@ -288,7 +287,7 @@ namespace :validate do
     `rm -rf #{TMP_PATH}`
     Dir.mkdir(TMP_PATH) rescue Errno::EEXIST
     Dir["./servers/#{@application}/views/*"].each do |filename|
-      YMDP::Validator::HTML.validate(filename) if filename =~ /#{@path}/
+      Epic::Validator::HTML.new.validate(filename) if filename =~ /#{@path}/
     end    
   end
 
@@ -495,7 +494,7 @@ def validated_embedded_js(path)
     (doc / "script").each { |js| f.puts js.inner_html + "\n\n" }
   end
 
-  YMDP::Validator::JavaScript.validate(js_fragment_path)
+  Epic::Validator::JavaScript.new.validate(js_fragment_path)
   system "rm #{js_fragment_path}"
 end
 
@@ -657,19 +656,4 @@ def create_directory_from_application(application, path="")
     application_id = SERVERS[application]["application_id"]
     ymdt.get(:application => application, :path => path, :application_id => application_id)
   end  
-end
-
-def please_install_rhino
-  output = <<-DOC
-NOTE: 
-
-You must have Rhino installed in your classpath to validate javascripts, which is required to deploy.  Download Rhino from:
-  
-  http://www.mozilla.org/rhino/download.html
-
-To put Rhino into your Java classpath, run:
-  
-  mkdir -p ~/Library/Java/Extensions/
-  cp rhino****/js.jar ~/Library/Java/Extensions/
-DOC
-end
+end

data/lib/ymdp/view/application_view.rb

@@ -1,12 +1,11 @@
-require 'compressor/compressor'
-require 'validator/validator'
+require 'rubygems'
+require 'epic'
 
 module YMDP
   # Contains all the functions which are available from inside a view file, whether that view
   # is HTML, JavaScript or CSS.
   #
   module ApplicationView
-    include YMDP::Compressor
     
     extend self
     
@@ -270,13 +269,19 @@ module YMDP
       
       validate = F.save_to_file(output, tmp_filename)
 
-      output = YMDP::Compressor::JavaScript.compress(tmp_filename) if CONFIG.compress_embedded_js?
+      output = Epic::Compressor.new(tmp_filename).compress if configuration.compress["embedded_js"]
       
-      YMDP::Validator::JavaScript.validate(tmp_filename) if validate && CONFIG.validate_embedded_js?
+      if validate && configuration.validate["embedded_js"]["build"] && !js_validator.validate(tmp_filename)
+        raise "JavaScript Errors embedded in #{display_path(tmp_filename)}"
+      end
       
       output
     end
     
+    def js_validator
+      @js_validator ||= Epic::Validator::JavaScript.new
+    end
+    
     # Render a CSS partial.
     #
     def render_stylesheet_partial(params)
@@ -307,9 +312,7 @@ module YMDP
       
       validate = F.save_to_file(output, tmp_filename)
 
-      output = YMDP::Compressor::Stylesheet.compress(tmp_filename) if CONFIG.compress_css?
-      
-      # YMDP::Validator::Stylesheet.validate(tmp_filename) if validate && CONFIG.validate_embedded_css?
+      output = Epic::Compressor.new(tmp_filename).compress if configuration.compress["css"]
       
       output
     end
@@ -344,6 +347,6 @@ module YMDP
 
     def initialize(assets_directory)
       @assets_directory = assets_directory
-    end    
+    end  
   end
 end

data/spec/application_view_spec.rb

@@ -1,9 +1,19 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+require 'view/application_view'
+
 describe "ApplicationView" do
   before(:each) do
     @assets_directory = "/om/assets/abcdefg_1"
+
+    @compress = {"obfuscate"=>true, "js_assets"=>true, "css"=>true, "embedded_js"=>true}
+    @validate = {"html"=>{"doctype"=>"HTML 4.0 Transitional", "build"=>true, "deploy"=>true}, "js_assets"=>{"build"=>false, "deploy"=>false}, "json_assets"=>{"build"=>false, "deploy"=>false}, "embedded_js"=>{"build"=>true, "deploy"=>true}}    
+    
     @view = YMDP::View.new(@assets_directory)
+    @configuration = mock('configuration')
+    @configuration.stub!(:compress).and_return(@compress)
+    @configuration.stub!(:validate).and_return(@validate)
+    @view.stub!(:configuration).and_return(@configuration)
     stub_io
   end
   
@@ -180,15 +190,19 @@ describe "ApplicationView" do
     
     describe ":javascript" do
       before(:each) do
-        
-        @config = mock('config', :compress_embedded_js? => false, :validate_embedded_js? => false)
-        reset_constant(:CONFIG, @config)
-    
         @compressed_template = "compressed template"
         @processed_script = "<script type='text/javascript'>\n#{@processed_template}\n</script>"
         @compressed_script = "<script type='text/javascript'>\n#{@compressed_template}\n</script>"
-        YMDP::Compressor::JavaScript.stub!(:compress).and_return(@compressed_template)
-        YMDP::Validator::JavaScript.stub!(:validate)
+        
+        @compressor = mock('compressor')
+        @compressor.stub!(:compress).and_return(@compressed_template)
+        Epic::Compressor.stub!(:new).and_return(@compressor)
+
+        @js_validator = mock('js_validator', :validate => true)
+        Epic::Validator::JavaScript.stub!(:new).and_return(@js_validator)
+        
+        @compress["embedded_js"] = true
+        @validate["embedded_js"]["build"] = true
       end
       
       describe "single" do
@@ -198,50 +212,45 @@ describe "ApplicationView" do
         end
         
         it "should render a compressed partial" do
-          @config.stub!(:compress_embedded_js?).and_return(true)
           @view.render(:javascript => 'application').should == @compressed_script
         end
         
         it "should render an uncompressed partial" do
-          @config.stub!(:compress_embedded_js?).and_return(false)
+          @compress["embedded_js"] = false
           @view.render(:javascript => 'application').should == @processed_script
         end
         
         it "should render compressed without tags" do
-          @config.stub!(:compress_embedded_js?).and_return(true)
           @view.render(:javascript => 'application', :tags => false).should == @compressed_template
         end
         
         it "should render uncompressed without tags" do
-          @config.stub!(:compress_embedded_js?).and_return(false)
+          @compress["embedded_js"] = false
           @view.render(:javascript => 'application', :tags => false).should == @processed_template
         end
         
         it "should validate with config true" do
-          @config.stub!(:validate_embedded_js?).and_return(true)
           F.should_receive(:save_to_file).with(anything, /\/tmp\/application.js/).and_return(true)
-          YMDP::Validator::JavaScript.should_receive(:validate)
           @view.render(:javascript => 'application')
         end
         
         it "should not validate with config false" do
-          @config.stub!(:validate_embedded_js?).and_return(true)
           F.should_receive(:save_to_file).with(anything, /\/tmp\/application.js/).and_return(false)
-          YMDP::Validator::JavaScript.should_not_receive(:validate)
+          Epic::Validator::JavaScript.should_not_receive(:validate)
           @view.render(:javascript => 'application')
         end
         
         it "should not validate if file exists and config true" do
-          @config.stub!(:validate_embedded_js?).and_return(false)
+          @validate["embedded_js"]["build"] = false
           F.should_receive(:save_to_file).with(anything, /\/tmp\/application.js/).and_return(true)
-          YMDP::Validator::JavaScript.should_not_receive(:validate)
+          Epic::Validator::JavaScript.should_not_receive(:validate)
           @view.render(:javascript => 'application')
         end
         
         it "should not validate if file exists and config false" do
-          @config.stub!(:validate_embedded_js?).and_return(false)
+          @validate["embedded_js"]["build"] = false
           F.should_receive(:save_to_file).with(anything, /\/tmp\/application.js/).and_return(true)
-          YMDP::Validator::JavaScript.should_not_receive(:validate)
+          Epic::Validator::JavaScript.should_not_receive(:validate)
           @view.render(:javascript => 'application')
         end
       end
@@ -261,6 +270,7 @@ describe "ApplicationView" do
           File.stub!(:open).with(/sidebar.js$/, anything).and_yield(@sidebar_file)
           
           @view.stub!(:process_template).and_return("application", "sidebar")
+          @compress["embedded_js"] = false
         end
         
         it "should render multiple partials" do
@@ -286,6 +296,7 @@ describe "ApplicationView" do
       
       it "should return blank string if partial can't be found" do
         File.stub!(:exists?).and_return(false)
+        @compressor.should_receive(:compress).and_return("")
         lambda {
           @view.render(:javascript => 'application').should == ""
         }.should_not raise_error
@@ -294,14 +305,15 @@ describe "ApplicationView" do
     
     describe ":stylesheet" do
       before(:each) do
-        @config = mock('config', :compress_css? => false)
-        reset_constant(:CONFIG, @config)
-    
         @compressed_template = "compressed template"
         @processed_script = "<style type='text/css'>\n#{@processed_template}\n</style>"
         @compressed_script = "<style type='text/css'>\n#{@compressed_template}\n</style>"
-        YMDP::Compressor::Stylesheet.stub!(:compress).and_return(@compressed_template)
-        YMDP::Validator::Stylesheet.stub!(:validate).and_return(true)
+        
+        Epic::Compressor.stub!(:new).with("").and_return(mock('compressor', :compress => ""))
+        Epic::Compressor.stub!(:new).with(/.css/).and_return(mock('compressor', :compress => @compressed_template))
+        Epic::Validator::Stylesheet.stub!(:validate).and_return(true)
+        
+        @compress["css"] = true
       end
       
       describe "single" do
@@ -311,22 +323,20 @@ describe "ApplicationView" do
         end
         
         it "should render a compressed partial" do
-          @config.stub!(:compress_css?).and_return(true)
           @view.render(:stylesheet => 'application').should == @compressed_script
         end
         
         it "should render an uncompressed partial" do
-          @config.stub!(:compress_css?).and_return(false)
+          @view.send(:configuration).compress["css"] = false
           @view.render(:stylesheet => 'application').should == @processed_script
         end
         
         it "should render compressed without tags" do
-          @config.stub!(:compress_css?).and_return(true)
           @view.render(:stylesheet => 'application', :tags => false).should == @compressed_template
         end
         
         it "should render uncompressed without tags" do
-          @config.stub!(:compress_css?).and_return(false)
+          @compress["css"] = false
           @view.render(:stylesheet => 'application', :tags => false).should == @processed_template
         end
       end
@@ -345,6 +355,8 @@ describe "ApplicationView" do
           File.stub!(:open).with(/application.css$/, anything).and_yield(@application_file)
           File.stub!(:open).with(/sidebar.css$/, anything).and_yield(@sidebar_file)
           
+          Epic::Compressor.stub!(:new).with(/applicationsidebar.css/).and_return(mock('compressor', :compress => "application\nsidebar"))
+          
           @view.stub!(:process_template).and_return("application", "sidebar")
         end
         
@@ -371,9 +383,10 @@ describe "ApplicationView" do
       
       it "should return blank string if partial can't be found" do
         File.stub!(:exists?).and_return(false)
-        lambda {
+        Epic::Compressor.should_receive(:new).with(/application.css/).and_return(mock('compressor', :compress => ""))
+        # lambda {
           @view.render(:stylesheet => 'application').should == ""
-        }.should_not raise_error
+        # }.should_not raise_error
       end
     end