cup 0.0.6 → 0.0.7

data/lib/cup/builder.rb

@@ -9,15 +9,27 @@ module Cup
 
     def initialize directory
       @directory = directory
-      @before_build_enabled = true
-      @after_build_enabled = true
+
+      @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
     end
 
     def build *params
+
       cupfile.before_build.call
+
       concatenated = concatenate *params
       minified = minify *params
+
       cupfile.after_build.call
+
       {
         :concatenated => concatenated,
         :minified => minified
@@ -71,7 +83,7 @@ module Cup
       options = default_options.merge options
       cli = options[:cli]
 
-      build_directory = "#{directory.path.to_s}/build"
+      build_directory = @build_directory.to_s
       mkdir build_directory unless Dir.exists?(build_directory)
       file = File.open(output_file, 'w')
 

data/lib/cup/command_line.rb

@@ -3,13 +3,12 @@ ENV['RACK_ENV'] ||= File.exists?(File.expand_path('../../../development', __FILE
 require 'thor'
 require 'pathname'
 require 'cup'
-require 'cup/builder'
-require 'cup/directory'
-require 'cup/server/app'
 
 module Cup
+  autoload :Server, 'cup/server/app'
+  
   class CommandLine < Thor
-
+    
     include Thor::Actions
 
     class Helper

data/lib/cup/directory.rb

@@ -1,9 +1,8 @@
 require 'pathname'
-require 'rake'
-require 'cup/cupfile'
 
 module Cup
-
+  autoload :Cupfile, 'cup/cupfile'
+  autoload :FileList, 'rake'
   # Represents the directory that holds a cup
   class Directory
 

data/lib/cup/server/app.rb

@@ -36,12 +36,17 @@ module Cup
       set :views, gem_root_path('views')
       set :public_folder, false #Cup::Directory.current.path.to_s
 
+      def build
+        @build_result = Cup.build
+      end
+
       def view_scope(javascripts_scheme=:debug)
-        @view_scope = ViewScope.new self, javascripts_scheme
+        @view_scope = ViewScope.new self, @build_result, javascripts_scheme
       end
 
       def view (template, options={})
-
+        build
+        
         options = {
           :scope => view_scope(options.delete(:javascripts_scheme) || :debug),
           :layout => true
@@ -59,10 +64,12 @@ module Cup
       end
 
       get '/cup.sass' do
+        content_type 'text/css'
         sass File.read(gem_root_path('views/cup.sass'))
       end
 
       get '/cup.coffee' do
+        content_type 'application/javascript'
         coffee File.read(gem_root_path('views/cup.coffee'))
       end
 
@@ -74,7 +81,7 @@ module Cup
 
         content_type 'text/javascript'
 
-        result = Cup.build[:concatenated]
+        result = build[:concatenated]
         if result[:status] == :ok
           body result[:output]
         else
@@ -86,7 +93,7 @@ module Cup
 
         content_type 'text/javascript'
 
-        result = Cup.build[:minified]
+        result = build[:minified]
         if result[:status] == :ok
           body result[:output]
         else
@@ -130,8 +137,11 @@ module Cup
       end
 
       get '**/*.sass' do
+
         file = File.relative_path(Cup::Directory.current.path, request.path[1..-1])
         return pass unless File.file? file
+
+        content_type 'text/css'
         sass File.read(file)
       end
 

data/lib/cup/server/view_scope.rb

@@ -7,8 +7,9 @@ module Cup
   module Server
     class ViewScope
 
-      def initialize server, javascripts_scheme=nil
+      def initialize server, build_result, javascripts_scheme
         @server = server
+        @build_result = build_result
         @javascripts_scheme = javascripts_scheme
       end
 
@@ -22,10 +23,7 @@ module Cup
 
       def build_result
         #return {:status => :failed, :exception => 'you went wrong'}
-        @build_result ||= begin
-          result = Cup.build
-          result[:concatenated][:status] == :ok ? result[:minified] : result[:concatenated]
-        end
+        @build_result[:concatenated][:status] == :ok ? @build_result[:minified] : @build_result[:concatenated]
       end
 
       def version
@@ -59,7 +57,7 @@ module Cup
       def concatenated
         File.basename Cup.concatenated(:relative => true)
       end
-      
+
       def concatenated_size
         "#{File.exist?(Cup.concatenated) ? File.size(Cup.concatenated) : 0} bytes"
       end
@@ -67,7 +65,7 @@ module Cup
       def minified
         File.basename Cup.minified(:relative => true)
       end
-      
+
       def minified_size
         "#{File.exist?(Cup.minified) ? File.size(Cup.minified) : 0} bytes"
       end

data/lib/cup/version.rb

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

data/lib/cup.rb

@@ -1,9 +1,9 @@
 require 'cup/version'
-require 'cup/directory'
-require 'cup/cupfile'
-require 'cup/builder'
 
 module Cup
+  autoload :Directory, 'cup/directory'
+  autoload :Builder, 'cup/builder'
+  
   class << self
 
     def version *params
@@ -23,27 +23,27 @@ module Cup
     end
 
     def build! *params
-      Cup::Builder.new(directory).build! *params
+      Builder.new(directory).build! *params
     end
 
     def build *params
-      Cup::Builder.new(directory).build *params
+      Builder.new(directory).build *params
     end
     
     def concatenate! *params
-      Cup::Builder.new(directory).concatenate! *params
+      Builder.new(directory).concatenate! *params
     end
 
     def concatenate *params
-      Cup::Builder.new(directory).concatenate *params
+      Builder.new(directory).concatenate *params
     end
     
     def minify! *params
-      Cup::Builder.new(directory).minify! *params
+      Builder.new(directory).minify! *params
     end
 
     def minify *params
-      Cup::Builder.new(directory).minify *params
+      Builder.new(directory).minify *params
     end
 
     def define &block
@@ -51,7 +51,7 @@ module Cup
     end
   private
     def directory
-      @directory ||= Cup::Directory.current
+      @directory ||= Directory.current
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cup
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-16 00:00:00.000000000Z
+date: 2011-10-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152089920 !ruby/object:Gem::Requirement
+  requirement: &2151939960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152089920
+  version_requirements: *2151939960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152056960 !ruby/object:Gem::Requirement
+  requirement: &2151938000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152056960
+  version_requirements: *2151938000
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2152051520 !ruby/object:Gem::Requirement
+  requirement: &2151932160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152051520
+  version_requirements: *2151932160
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2151940820 !ruby/object:Gem::Requirement
+  requirement: &2151929340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151940820
+  version_requirements: *2151929340
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2151931940 !ruby/object:Gem::Requirement
+  requirement: &2151925780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151931940
+  version_requirements: *2151925780
 - !ruby/object:Gem::Dependency
   name: slim
-  requirement: &2151912880 !ruby/object:Gem::Requirement
+  requirement: &2151922360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151912880
+  version_requirements: *2151922360
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2151895180 !ruby/object:Gem::Requirement
+  requirement: &2151906040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151895180
+  version_requirements: *2151906040
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2151883300 !ruby/object:Gem::Requirement
+  requirement: &2151885320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151883300
+  version_requirements: *2151885320
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2151880700 !ruby/object:Gem::Requirement
+  requirement: &2151879660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151880700
+  version_requirements: *2151879660
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2151875000 !ruby/object:Gem::Requirement
+  requirement: &2151864360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -120,10 +120,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2151875000
+  version_requirements: *2151864360
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2151872260 !ruby/object:Gem::Requirement
+  requirement: &2151859040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151872260
+  version_requirements: *2151859040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2151870340 !ruby/object:Gem::Requirement
+  requirement: &2151856060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151870340
+  version_requirements: *2151856060
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151867340 !ruby/object:Gem::Requirement
+  requirement: &2151853820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151867340
+  version_requirements: *2151853820
 - !ruby/object:Gem::Dependency
   name: statemachine
-  requirement: &2151864300 !ruby/object:Gem::Requirement
+  requirement: &2151850200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151864300
+  version_requirements: *2151850200
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2151852720 !ruby/object:Gem::Requirement
+  requirement: &2151846300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151852720
+  version_requirements: *2151846300
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2151846160 !ruby/object:Gem::Requirement
+  requirement: &2151841700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151846160
+  version_requirements: *2151841700
 - !ruby/object:Gem::Dependency
   name: sinatra-reloader
-  requirement: &2151840500 !ruby/object:Gem::Requirement
+  requirement: &2151836120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +197,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151840500
+  version_requirements: *2151836120
 description: 
 email:
 - sjltaylor@gmail.com