ymdp 0.1.11 → 0.1.12

data/spec/compiler_spec.rb

@@ -7,7 +7,7 @@ YMDP_ENV = "build" unless defined?(YMDP_ENV)
 
 describe "Compiler" do
   before(:each) do
-    Object.send(:remove_const, :CONFIG)
+    Object.send(:remove_const, :CONFIG) if defined?(CONFIG)
     CONFIG = mock('config').as_null_object
     stub_screen_io
     stub_file_io

data/spec/compiler_template_spec.rb

@@ -83,7 +83,8 @@ describe "Template" do
         end
         
         it "should validate" do
-          YMDP::Validator::JSON.should_receive(:validate)
+          @json_validator = mock('json_validator', :validate => true)
+          Epic::Validator::JSON.should_receive(:new).and_return(@json_validator)
           @js_template.validate
         end
       end
@@ -113,6 +114,8 @@ describe "Template" do
     end
     
     it "should build" do
+      @js_template.configuration.compress["embedded_js"] = false
+      
       File.stub!(:read).with("filename.js").and_return("unprocessed")
       
       # process the contents of filename.html.erb through ERB
@@ -120,20 +123,20 @@ describe "Template" do
       @erb = mock('erb', :result => "processed template output")
       ERB.should_receive(:new).with("unprocessed", anything, anything).and_return(@erb)
       
+      Epic::Compressor.stub!(:new).and_return(mock('compressor', :compress => "compressed template output"))
+      
       F.stub!(:save_to_file).with("processed template output")
       
       @js_template.build.should == "processed template output"
     end
     
     it "should compress" do
-      @config.stub!(:compress_embedded_js?).and_return(true)
-      
       # process the contents of filename.html.erb through ERB
       #
       @erb = mock('erb', :result => "processed template output")
       ERB.should_receive(:new).with("unprocessed", anything, anything).and_return(@erb)      
       
-      YMDP::Compressor::JavaScript.stub!(:compress).and_return("compressed template")
+      Epic::Compressor.stub!(:new).and_return(mock('compressor', :compress => "compressed template"))
       File.stub!(:read).with("filename.js").and_return("unprocessed")
       
       F.stub!(:save_to_file)
@@ -210,7 +213,8 @@ describe "Template" do
         @processed_haml = "processed haml"
         stub_haml_class
         
-        YMDP::Validator::HTML.stub!(:validate)
+        @html_validator = mock('html_validator', :validate => true)
+        Epic::Validator::HTML.stub!(:new).and_return(@html_validator)
       end
       
       it "should not build if it's a partial" do

data/spec/default_settings.rb

@@ -1,4 +1,3 @@
-
 def stub_ymdp_configuration
   @content_variables = {
     "version" => 1,

data/ymdp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ymdp}
-  s.version = "0.1.11"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Coleman"]
-  s.date = %q{2010-01-25}
+  s.date = %q{2010-01-30}
   s.description = %q{Framework for developing applications in the Yahoo! Mail Development Platform.}
   s.email = %q{progressions@gmail.com}
   s.extra_rdoc_files = [
@@ -47,19 +47,14 @@ Gem::Specification.new do |s|
      "lib/ymdp/compiler/git_helper.rb",
      "lib/ymdp/compiler/options.rb",
      "lib/ymdp/compiler/template.rb",
-     "lib/ymdp/compressor/compressor.rb",
-     "lib/ymdp/compressor/yuicompressor-2.4.2.jar",
      "lib/ymdp/configuration/config.rb",
      "lib/ymdp/configuration/constants.rb",
      "lib/ymdp/generator/templates/javascript.js",
      "lib/ymdp/generator/templates/stylesheet.css",
      "lib/ymdp/generator/templates/translation.pres",
      "lib/ymdp/generator/templates/view.html.haml",
-     "lib/ymdp/support/file.rb",
      "lib/ymdp/tasks/keys.rake",
      "lib/ymdp/tasks/ymdp.rake",
-     "lib/ymdp/validator/jslint.js",
-     "lib/ymdp/validator/validator.rb",
      "lib/ymdp/view/application.rb",
      "lib/ymdp/view/application_view.rb",
      "lib/ymdp/view/asset_tag_helper.rb",
@@ -68,7 +63,6 @@ Gem::Specification.new do |s|
      "spec/application_view_spec.rb",
      "spec/compiler_spec.rb",
      "spec/compiler_template_spec.rb",
-     "spec/compressor_spec.rb",
      "spec/configuration_spec.rb",
      "spec/default_settings.rb",
      "spec/domains_spec.rb",
@@ -77,7 +71,6 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/stubs.rb",
-     "spec/validator_spec.rb",
      "spec/ymdp_base_spec.rb",
      "spec/ymdp_spec.rb",
      "ymdp.gemspec"
@@ -92,7 +85,6 @@ Gem::Specification.new do |s|
      "spec/application_view_spec.rb",
      "spec/compiler_spec.rb",
      "spec/compiler_template_spec.rb",
-     "spec/compressor_spec.rb",
      "spec/configuration_spec.rb",
      "spec/default_settings.rb",
      "spec/domains_spec.rb",
@@ -100,7 +92,6 @@ Gem::Specification.new do |s|
      "spec/git_helper_spec.rb",
      "spec/spec_helper.rb",
      "spec/stubs.rb",
-     "spec/validator_spec.rb",
      "spec/ymdp_base_spec.rb",
      "spec/ymdp_spec.rb"
   ]
@@ -111,6 +102,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.6"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
@@ -125,9 +117,10 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<ymdp_generator>, [">= 0"])
       s.add_runtime_dependency(%q<ymdt>, [">= 0"])
       s.add_runtime_dependency(%q<yrb>, [">= 0"])
-      s.add_runtime_dependency(%q<w3c_validators>, [">= 0"])
+      s.add_runtime_dependency(%q<epic>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.6"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<haml>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
@@ -142,10 +135,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ymdp_generator>, [">= 0"])
       s.add_dependency(%q<ymdt>, [">= 0"])
       s.add_dependency(%q<yrb>, [">= 0"])
-      s.add_dependency(%q<w3c_validators>, [">= 0"])
+      s.add_dependency(%q<epic>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.6"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<haml>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
@@ -160,7 +154,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ymdp_generator>, [">= 0"])
     s.add_dependency(%q<ymdt>, [">= 0"])
     s.add_dependency(%q<yrb>, [">= 0"])
-    s.add_dependency(%q<w3c_validators>, [">= 0"])
+    s.add_dependency(%q<epic>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ymdp
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors: 
 - Jeff Coleman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -06:00
+date: 2010-01-30 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.6
     version: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: haml
   type: :runtime
@@ -163,7 +173,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: w3c_validators
+  name: epic
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -212,19 +222,14 @@ files:
 - lib/ymdp/compiler/git_helper.rb
 - lib/ymdp/compiler/options.rb
 - lib/ymdp/compiler/template.rb
-- lib/ymdp/compressor/compressor.rb
-- lib/ymdp/compressor/yuicompressor-2.4.2.jar
 - lib/ymdp/configuration/config.rb
 - lib/ymdp/configuration/constants.rb
 - lib/ymdp/generator/templates/javascript.js
 - lib/ymdp/generator/templates/stylesheet.css
 - lib/ymdp/generator/templates/translation.pres
 - lib/ymdp/generator/templates/view.html.haml
-- lib/ymdp/support/file.rb
 - lib/ymdp/tasks/keys.rake
 - lib/ymdp/tasks/ymdp.rake
-- lib/ymdp/validator/jslint.js
-- lib/ymdp/validator/validator.rb
 - lib/ymdp/view/application.rb
 - lib/ymdp/view/application_view.rb
 - lib/ymdp/view/asset_tag_helper.rb
@@ -233,7 +238,6 @@ files:
 - spec/application_view_spec.rb
 - spec/compiler_spec.rb
 - spec/compiler_template_spec.rb
-- spec/compressor_spec.rb
 - spec/configuration_spec.rb
 - spec/default_settings.rb
 - spec/domains_spec.rb
@@ -242,7 +246,6 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/stubs.rb
-- spec/validator_spec.rb
 - spec/ymdp_base_spec.rb
 - spec/ymdp_spec.rb
 - ymdp.gemspec
@@ -279,7 +282,6 @@ test_files:
 - spec/application_view_spec.rb
 - spec/compiler_spec.rb
 - spec/compiler_template_spec.rb
-- spec/compressor_spec.rb
 - spec/configuration_spec.rb
 - spec/default_settings.rb
 - spec/domains_spec.rb
@@ -287,6 +289,5 @@ test_files:
 - spec/git_helper_spec.rb
 - spec/spec_helper.rb
 - spec/stubs.rb
-- spec/validator_spec.rb
 - spec/ymdp_base_spec.rb
 - spec/ymdp_spec.rb

data/lib/ymdp/compressor/compressor.rb

@@ -1,134 +0,0 @@
-require 'rubygems'
-require 'ymdp/base'
-require 'active_support'
-require 'support/file'
-
-module YMDP
-  module Compressor #:nodoc:
-    # Compresses a file using the specified compressor/minifier (currently YUI Compressor 2.4.2).
-    #
-    # === Usage
-    #
-    #   YMDP::Compressor::Base.compress("filename.js", "type" => "js")
-    #
-    #   YMDP::Compressor::Base.compress("filename.css", "type" => "css")
-    #
-    # Outputs the compressed file to <tt>_path_.min.</tt>
-    #
-    # === Options
-    # 
-    #   "type"::              "js" or "css". Identifies the file type.
-    #
-    #   "obfuscate"::         true or false. Change internal variable names within the code.
-    #                         
-    #   "verbose"::           true or false. Output warnings about code quality.
-    #
-    #   "preserve_semi"::     true or false. Preserve unnecessary semicolons.
-    #
-    # TODO: Make it support multiple compressors.
-    #
-    # TODO: Convert it to an object, so you instantiate the Compressor class and then call it
-    # on a file or a string.
-    #
-    # TODO: Get some stringify_keys! action going so you can send in symbols or strings.
-    #
-    class Base < YMDP::Base
-      def self.compress(path, options={})
-        options.stringify_keys!
-        compressed_display_path = display_path(path)
-        compressed_path = "#{path}.min"
-      
-        options["type"] ||= "js"
-        options["type"] = options["type"].to_s
-        
-        # if the compressed_file exists, don't create it again
-        #
-        unless File.exists?(compressed_path)
-          $stdout.print "   #{compressed_display_path}  compressing . . . "
-          compressed = ''
-        
-          # set options and defaults
-          #
-          if options.delete("obfuscate")
-            options["nomunge"] = ""
-          end
-          if options.delete("verbose")
-            options["verbose"] = ""
-          end
-          options["charset"] = "utf-8"
-        
-          if options["type"].to_s == "js" && !options["preserve_semi"]
-            options["preserve-semi"] = ""
-          end
-        
-          # join the options together for appending to the command line
-          #
-          options_string = options.map {|k,v| "--#{k} #{v}"}.join(" ")
-      
-          
-          # call the compressor
-          #
-          
-          compressor_path = File.expand_path("#{File.dirname(__FILE__)}/yuicompressor-2.4.2.jar")
-          raise "#{compressor_path} does not exist" unless File.exists?(compressor_path)
-          
-          command = "java -jar #{compressor_path} #{options_string} #{path} -o #{compressed_path} 2>&1"
-          result = F.execute(command, :return => true)
-        
-          result.split("\n").each do |line|
-            if line =~ /\[ERROR\] (\d+):(\d+):(.*)/
-              line_number = $1.to_i
-              error = "Error at #{compressed_display_path} line #{line_number} character #{$2}: #{$3}"
-              error += F.get_line_from_file(path, line_number)
-        
-              $stdout.puts error
-              g(error)
-            end
-          end
-          
-          if result =~ /ERROR/
-            raise "JavaScript errors in #{compressed_display_path}"
-          else
-            $stdout.puts "OK"
-          end
-        end
-
-        # The compressed file should exist now. If it does, use it. If not, raise an error.
-        #
-        if File.exists?(compressed_path)
-          compressed = File.read(compressed_path)
-        else
-          raise "File does not exist: #{compressed_display_path}"
-        end
-      
-        compressed      
-      end
-    end
-    
-    # Compresses a CSS file using the specified compressor/minifier (currently YUI Compressor 2.4.2).
-    #
-    # === Usage
-    #
-    #   YMDP::Compressor::Stylesheet.compress("filename.css")
-    #
-    class Stylesheet < Base
-      # TODO: Add options hash
-      def self.compress(path)
-        super(path, "type" => "css")
-      end
-    end
-    
-    # Compresses a JavaScript file using the specified compressor/minifier (currently YUI Compressor 2.4.2).
-    #
-    # === Usage
-    #
-    #   YMDP::Compressor::JavaScript.compress("filename.js")
-    #
-    class JavaScript < Base
-      # TODO: Add options hash   
-      def self.compress(filename)
-        super(filename, "type" => "js")
-      end
-    end
-  end
-end

data/lib/ymdp/support/file.rb

@@ -1,63 +0,0 @@
-# Provides a wrapper around common calls that interact with the file system.
-#
-module F
-
-  module_function
-
-  # Concatenates together the contents of all the files in the <tt>source_path</tt> 
-  # into the <tt>destination_path</tt>.
-  #
-  def concat_files(source_path, destination_path)
-    File.open(destination_path, "a") do |output|
-      Dir[source_path].each do |path|
-        output.puts File.read(path)
-      end
-    end
-  end
-
-  # Saves the <tt>output</tt> string to the <tt>destination_path</tt> given.
-  #
-  # Returns <tt>true</tt> if the destination file was newly created, <tt>false</tt> if
-  # it already existed.
-  #
-  def save_to_file(output, destination_path)
-    if File.exists?(destination_path)      
-      false
-    else
-      File.open(destination_path, "w") do |w|
-        w.write(output)
-      end
-      true
-    end
-  end
-
-  # Given a <tt>path</tt> and <tt>line_number</tt>, returns the line and two lines previous
-  #
-  # Used for displaying validation errors.
-  #
-  def get_line_from_file(path, line_number)
-    line_number = line_number.to_i
-    output = "\n"
-    lines = File.readlines(path)
-
-    3.times do |i|
-      line = lines[line_number-(3-i)]
-      output += line if line
-    end
-
-    output += "\n"
-    output
-  end
-
-  # Execute a system command. If the parameter <tt>:return</tt> is true, execute the command
-  # with the backtick (`) command and return the results.  Otherwise, just execute the command
-  # and let the output go to the screen.
-  #
-  def execute(command, params={})
-    if params[:return]
-      `#{command}`
-    else
-      Kernel.system command
-    end
-  end
-end