cup 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cup (0.0.6)
+    cup (0.0.7)
       coffee-script
       rack (= 1.3.3)
       rake

data/README.markdown

@@ -2,6 +2,8 @@
 
 INSERT A PICTURE OF A CUP
 
+`npm install uglify-js`: UglifyJS must be installed
+
 Command lines tools and a web application to help in developing javascript libraries and applications independently of anything else.
 
 
@@ -65,8 +67,6 @@ Sample Cupfile (ruby) with comments:
           'so/can/glob-like/patterns/**/*.js'] # happily, patterns and arrays can be used too.
       end
 
-      uglifier_options :mangle => true # uglifier defaults can be overriden
-
       before_build do
         # whatever you want
       end
@@ -103,7 +103,7 @@ Visual specs help to facilitate the visual verifcation of behaviour which maybe
 
 To create a visual spec, add a slim template in the `spec/visual` directory. Any directory structure within `spec/visual` may be used to organise visual specs as you see fit. An index of available visual specs is available in the browser app.
 
-Each slim template under `spec/visual` is a partial and will be injected into the body of a page with the src, lib and vendor javascript loaded in the order specified by the Cupfile. 
+Each slim template under `spec/visual` is a partial and will be injected into the body of a page with the src, lib and vendor javascript loaded in the order specified by the Cupfile.
 
 
 Note: No style sheets are automatically loaded for visual specs.

data/lib/cup/builder.rb

@@ -60,16 +60,16 @@ module Cup
     end
 
     def concatenate!(options = {})
-      process(options, :concatenated) do |input_file_content|
-        input_file_content
+      process(options, :concatenated) do |input_file|
+        File.read(input_file)
       end
     end
 
     def minify!(options = {})
-      uglifier_options = uglifier_defaults.merge directory.cupfile.uglifier_options
-
-      process(options, :minified) do |input_file_content|
-        Uglifier.compile input_file_content, uglifier_options
+      process(options, :minified) do |input_file|
+        result = `uglifyjs "#{input_file}"`
+        fail "FAILED: uglifyjs '#{input_file}'" unless $?.exitstatus == 0
+        result
       end
     end
 
@@ -85,21 +85,22 @@ module Cup
 
       build_directory = @build_directory.to_s
       mkdir build_directory unless Dir.exists?(build_directory)
-      file = File.open(output_file, 'w')
 
-      file.write(licence_header)
+      buffer = [licence_header, ';']
 
       input_files.each do |input_file|
-        file.write(';')
-        file.write(yield File.read(input_file))
-        file.write(';')
+        buffer << (yield input_file)
+        buffer << ';'
       end
 
-      cli.say("#{relative_output_file}: #{file.pos} bytes written.", :green)
+      buffer = buffer.join
 
-      file.close
+      File.open(output_file, 'w') do |io|
+        io.write buffer
+        cli.say("#{relative_output_file}: #{io.pos} bytes written.", :green)
+      end
 
-      File.read(output_file)
+      buffer
     end
     def cupfile
       directory.cupfile
@@ -114,6 +115,9 @@ module Cup
     def input_files
       directory.javascripts :build_input
     end
+    def uglifier_options
+      uglifier_defaults.merge directory.cupfile.uglifier_options
+    end
     def uglifier_defaults
       {
         :mangle => true, # Mangle variables names

data/lib/cup/cupfile.rb

@@ -3,7 +3,7 @@ module Cup
     class CupfileError < RuntimeError; end
 
     attr_accessor :path
-    attr_reader :path, :validation_errors, :name, :version, :licence, :before_build, :after_build, :uglifier_options
+    attr_reader :path, :validation_errors, :name, :version, :licence, :before_build, :after_build
 
     def initialize path
 
@@ -85,7 +85,7 @@ module Cup
 
       ## DSL members
       ## setters
-      %W{version name licence uglifier_options}.each do |m|
+      %W{version name licence}.each do |m|
         define_method m do |value|
           @cupfile.instance_variable_set "@#{m}", value
         end

data/lib/cup/server/app.rb

@@ -37,7 +37,7 @@ module Cup
       set :public_folder, false #Cup::Directory.current.path.to_s
 
       def build
-        @build_result = Cup.build
+        @build_result ||= Cup.build
       end
 
       def view_scope(javascripts_scheme=:debug)
@@ -46,7 +46,7 @@ module Cup
 
       def view (template, options={})
         build
-        
+
         options = {
           :scope => view_scope(options.delete(:javascripts_scheme) || :debug),
           :layout => true
@@ -106,8 +106,8 @@ module Cup
       end
 
       get '/empty' do
-        redirect '/' if view_scope.build_status == :failed
         view '', :layout => :blank
+        redirect '/' if view_scope.build_status == :failed
       end
 
       get '/spec' do
@@ -127,6 +127,8 @@ module Cup
       end
 
       get '/spec/visual/*' do |visual|
+        build
+
         visual = visuals[visual]
 
         pass if visual.nil? or not File.exist?(visual.full_path)

data/lib/cup/version.rb

@@ -1,3 +1,3 @@
 module Cup
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/spec/cup/builder_spec.rb

@@ -1,164 +1,145 @@
-require 'spec_helper'
-
-describe Cup::Builder do
-
-  let(:directory) {Cup::Directory.current}
-  let(:builder) {Cup::Builder.new(directory)}
-  let(:options){Hash.new}
-  
-  describe '#build' do
-    
-    def build
-      builder.build options
-    end
-    
-    share_examples_for :building do
-      it 'should call the before_build hook before building' do
-        directory.cupfile.before_build.should_receive(:call)
-        build
-      end
-
-      it 'should call the after_build after the build' do
-        directory.cupfile.after_build.should_receive(:call)
-        build
-      end
-      
-      it 'should call the concatentate_variant' do
-        builder.should_receive(concatentate_variant)
-        build
-      end
-      
-      it 'should call the minify_variant' do
-        builder.should_receive(minify_variant)
-        build
-      end
-      
-      it 'should return a Hash with the results of both minification and concatenation' do
-        result = build
-        result[:concatenated].should be_instance_of Hash
-        result[:minified].should be_instance_of Hash
-      end
-    end
-    
-    context 'when suppressing errors' do
-      def build
-        builder.build options
-      end
-      let(:concatentate_variant){:concatenate}
-      let(:minify_variant){:minify}
-    end
-
-    context 'when not suppressing errors' do
-      def build
-        builder.build! options
-      end
-      let(:concatentate_variant){:concatenate!}
-      let(:minify_variant){:minify!}
-    end
-  end
+require 'uglifier'
+require 'cup/noop_shell'
 
-  share_examples_for 'javascript processing' do
+module Cup
+  class Builder
+    include FileUtils
 
-    it 'should create and write an output file by default' do
-      process_scripts!
-      File.should exist(output_file)
-    end
-
-    context 'when a licence file is specified' do
+    attr_reader :directory
 
-      let(:licence){"\n\nLICENSE\nFILE\nCONTENT\n\n\n"}
-      let(:licence_comment) {"/*\n" + licence + "\n*/"}
+    def initialize directory
+      @directory = directory
 
-      before :each do
-        cupfile = directory.cupfile
-        cupfile.stub(:licence).and_return('licence.txt')
-        File.should_receive(:read).with(/.*licence\.txt$/).and_return(licence)
+      @build_directory = @directory.path + 'build'
+      if File.exists? @build_directory
+        if File.file? @build_directory
+          raise "Cannot build, build directory is a file"
+        end
+      else
+        Dir.mkdir @build_directory
       end
 
-      it 'should prepend the licence unaltered to the output' do
-        process_scripts!
-        File.read(output_file).start_with?(licence_comment).should be_true
-      end
+      uglifier_options = uglifier_defaults.merge directory.cupfile.uglifier_options
+      @compiler = Uglifier.new(uglifier_options)
     end
 
-    context 'when not suppressing exceptions' do
+    def build *params
 
-      it 'should throw an exception if something goes wrong' do
-        File.stub(:read).and_raise
+      cupfile.before_build.call
 
-        expect {
-          process_scripts!
-        }.to raise_error
+      concatenated = concatenate *params
+      minified = minify *params
 
-      end
+      cupfile.after_build.call
 
-      it 'should return the output' do
-        process_scripts!.should_not be_nil
-        process_scripts!.length.should_not == 0
-      end
+      {
+        :concatenated => concatenated,
+        :minified => minified
+      }
     end
 
-    context 'when supressing exceptions' do
-
-      context 'and there are errors' do
+    def build! *params
+      cupfile.before_build.call
+      concatenated = concatenate! *params
+      minified = minify! *params
+      cupfile.after_build.call
+      {
+        :concatenated => concatenated,
+        :minified => minified
+      }
+    end
 
-        before :each do
-          builder.stub(:process).and_raise 'and_raise ERROR'
-        end
+    def concatenate *params
+      {:status => :ok, :output => (concatenate! *params)}
+    rescue Exception => e
+      {:status => :failed, :exception => e}
+    end
 
-        it 'should return a Hash with failed status and an exception message' do
-          process_scripts[:status].should == :failed
-          process_scripts[:exception].should_not be_nil
-        end
-      end
+    def minify *params
+      {:status => :ok, :output => (minify! *params)}
+    rescue Exception => e
+      {:status => :failed, :exception => e}
+    end
 
-      context 'and there are no errors' do
-        it 'should return a Hash with ok status output and no exception message' do
-          process_scripts[:status].should == :ok
-          process_scripts[:exception].should be_nil
-          process_scripts[:output].should_not be_nil
-        end
+    def concatenate!(options = {})
+      process(options, :concatenated) do |input_file_content|
+        input_file_content
       end
     end
 
-    context 'when a cli is specified' do
-      it 'should report to the cli' do
-        cli = stub
-        options[:cli] = cli
-        cli.should_receive(:say)
-        process_scripts!
+    def minify!(options = {})
+      process(options, :minified) do |input_file_content|
+       @compiler.compile input_file_content
       end
     end
-  end
 
-  describe 'concatenating' do
+  private
 
-    def process_scripts!
-      builder.concatenate!(options)
-    end
+    def process(options, output_file)
 
-    def process_scripts
-      builder.concatenate(options)
-    end
+      relative_output_file = directory.send output_file, :relative => true
+      output_file = directory.send output_file
 
-    let(:output_file){directory.concatenated}
+      options = default_options.merge options
+      cli = options[:cli]
 
-    it_behaves_like 'javascript processing'
-
-  end
+      build_directory = @build_directory.to_s
+      mkdir build_directory unless Dir.exists?(build_directory)
 
-  describe 'minifying' do
+      buffer = StringIO.new
 
-    def process_scripts!
-      builder.minify!(options)
-    end
+      input_files.each do |input_file|
+        buffer.write(';')
+        buffer.write(File.read(input_file))
+        buffer.write(';')
+      end
 
-    def process_scripts
-      builder.minify(options)
-    end
+      buffer.rewind
+      processed = yield buffer.read
 
-    let(:output_file){directory.minified}
+      file = File.open(output_file, 'w') do |io|
+        io.puts licence_header
+        io.puts ';'
+        io.write processed
+        io.puts ';'
+        cli.say("#{relative_output_file}: #{io.pos} bytes written.", :green)
+      end
 
-    it_behaves_like 'javascript processing'
+      processed
+    end
+    def cupfile
+      directory.cupfile
+    end
+    def default_options
+      { :cli => NoopShell }
+    end
+    def licence_header
+      licence = File.read(directory.cupfile.licence) rescue nil
+      licence.nil? ? '' : "/*\n#{licence}\n*/"
+    end
+    def input_files
+      directory.javascripts :build_input
+    end
+    def uglifier_defaults
+      {
+        :mangle => true, # Mangle variables names
+        :toplevel => false, # Mangle top-level variable names
+        :except => [], # Variable names to be excluded from mangling
+        :max_line_length => 32 * 1024, # Maximum line length
+        :squeeze => true, # Squeeze code resulting in smaller, but less-readable code
+        :seqs => true, # Reduce consecutive statements in blocks into single statement
+        :dead_code => true, # Remove dead code (e.g. after return)
+        :unsafe => false, # Optimizations known to be unsafe in some situations
+        :copyright => true, # Show copyright message
+        :beautify => false, # Output indented code
+        :beautify_options => {
+          :indent_level => 2,
+          :indent_start => 0,
+          :quote_keys => false,
+          :space_colon => 0,
+          :ascii_only => false
+        }
+      }
+    end
   end
-end
+end

data/spec/cup/cupfile_spec.rb

@@ -191,17 +191,6 @@ describe Cup::Cupfile do
     cupfile.after_build.should equal proc
   end
 
-  it 'should allow uglifier options to be specified' do
-
-    uglifier_opts = Hash.new
-
-    Cup::Cupfile::DSL.interpret cupfile do
-      uglifier_options uglifier_opts
-    end
-
-    cupfile.uglifier_options.should equal uglifier_opts
-  end
-
   describe Cup::Cupfile::DSL do
     describe Cup::Cupfile::DSL::JavascriptsDSL do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cup
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000Z
+date: 2011-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2151939960 !ruby/object:Gem::Requirement
+  requirement: &2158458560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151939960
+  version_requirements: *2158458560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151938000 !ruby/object:Gem::Requirement
+  requirement: &2158456920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151938000
+  version_requirements: *2158456920
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2151932160 !ruby/object:Gem::Requirement
+  requirement: &2158453540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151932160
+  version_requirements: *2158453540
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2151929340 !ruby/object:Gem::Requirement
+  requirement: &2158453100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151929340
+  version_requirements: *2158453100
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2151925780 !ruby/object:Gem::Requirement
+  requirement: &2158452540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151925780
+  version_requirements: *2158452540
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &2151922360 !ruby/object:Gem::Requirement
+  requirement: &2158451260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151922360
+  version_requirements: *2158451260
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2151906040 !ruby/object:Gem::Requirement
+  requirement: &2158450240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151906040
+  version_requirements: *2158450240
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2151885320 !ruby/object:Gem::Requirement
+  requirement: &2158449540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151885320
+  version_requirements: *2158449540
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151879660 !ruby/object:Gem::Requirement
+  requirement: &2158449000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151879660
+  version_requirements: *2158449000
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2151864360 !ruby/object:Gem::Requirement
+  requirement: &2158448460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151864360
+  version_requirements: *2158448460
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2151859040 !ruby/object:Gem::Requirement
+  requirement: &2158448040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151859040
+  version_requirements: *2158448040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151856060 !ruby/object:Gem::Requirement
+  requirement: &2158447540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151856060
+  version_requirements: *2158447540
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151853820 !ruby/object:Gem::Requirement
+  requirement: &2158447040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151853820
+  version_requirements: *2158447040
 - !ruby/object:Gem::Dependency
   name: statemachine
-  requirement: &2151850200 !ruby/object:Gem::Requirement
+  requirement: &2158437180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151850200
+  version_requirements: *2158437180
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2151846300 !ruby/object:Gem::Requirement
+  requirement: &2158436500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151846300
+  version_requirements: *2158436500
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2151841700 !ruby/object:Gem::Requirement
+  requirement: &2158435640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151841700
+  version_requirements: *2158435640
 - !ruby/object:Gem::Dependency
   name: sinatra-reloader
-  requirement: &2151836120 !ruby/object:Gem::Requirement
+  requirement: &2158433620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +197,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151836120
+  version_requirements: *2158433620
 description: 
 email:
 - sjltaylor@gmail.com
@@ -286,3 +286,4 @@ test_files:
 - spec/support/javascripts_matchers.rb
 - spec/support/macros.rb
 - spec/support/stub_helpers.rb
+has_rdoc: