join 0.0.3 → 0.0.5

data/bin/{join-compile → join}

@@ -8,13 +8,9 @@ require 'join'
 
 #Get command line args
 args = ARGV.dup.unshift()
-dir = Dir.pwd
 
-if ARGV.empty?
-  STDOUT.puts "You must supply a filename or directory"
-else
-  join = Join::Concatenation.new(dir)
-  modules = join.find_required_modules(args[0])
-  join.concat(modules, args[1], args[0])
-end
+compiler = Join::Compiler.new({:dest => "compiled.js", :compressed => true})
+compiler.join(args)
+
+
 

data/lib/join.rb

@@ -1,20 +1,30 @@
-# Copyright (c) 20011 Owain Lewis. owain@owainlewis.com
+# Copyright (c) Owain Lewis. owain@owainlewis.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
+# Join is an asset packer that joins together multiple files into one, typically for deployment
+# If required, Join will compress JavaScript files with the Google Closure compiler
+
 $:.unshift File.dirname(__FILE__)
 
-require "fileutils"
-require "join/version"
-require 'join/process'
-require 'join/concatenate'
+require 'join/version'
 
 module Join
-
-  class << self
-    def message(m)
-      STDOUT.puts m
-    end
-  end
   
+  ROOT = File.expand_path(File.dirname(__FILE__) + '/')
+  
+  COMPRESS = false
+  
+  autoload :Base, 'join/base'
+  autoload :Compiler, 'join/compiler'
+  autoload :Assets, 'join/asset_processor'
+  autoload :Compressor, 'join/compressor'
+
 end
 
+compiler = Join::Compiler.new({:dest => "compiled", :compressed => true})
+
+compiler.join([
+  'src/1.css', 
+  'src/2.css'
+])
+

data/lib/join/compiler.rb

@@ -0,0 +1,74 @@
+module Join
+ 
+  # Takes multiple files and compiles them into a single file
+  class Compiler
+    
+    attr_reader :options
+    
+    def initialize(opts = {})
+      @dest = opts[:dest] || 'compressed.js'
+      @compressed = opts[:compressed] || false
+      @compressor = Join::Compressor.new
+    end
+    
+    F_TYPES = {
+      :javascript => '.js',
+      :css => '.css'
+    }
+    
+    # Delete or flush the contents of a given file. 
+    def flush!(file)
+      File.open(file, 'w').truncate(0)
+    end
+    
+    # We need this to determine what type of file we are dealing with
+    # before sending the data to the file compressor
+    def get_file_type(ext)
+      F_TYPES.key(ext)
+    end
+    
+    # Open a file and append data to the file. 
+    def append_to(filename, data)
+      begin
+        File.open(filename, 'a') do |f|
+          if @compressed == true
+            ext = get_ext(filename)
+            type = get_file_type(ext)
+            data = @compressor.compress(type, data) 
+          end
+          f.puts data
+        end
+        show_success_message
+      rescue
+        STDOUT.puts "Cannot append to file"
+        exit #Terminate if file can't be found
+      end    
+    end
+    
+    def get_ext(path)
+      File.extname(path)
+    end
+    
+    def show_success_message
+      STDOUT.puts "Successfully joined file for production"
+    end
+
+    def read_file(path)
+      raise "File does not exist" unless File.exists?(path)
+      File.open(path, 'r') do |f|
+        f.read
+      end
+    end
+    
+    # When given an array of files, (e.g [file1.js, file2.js])
+    # join them together and output the result
+    # into the destination set in @options
+    def join(args)
+      flush!(@dest) if File.exists? @dest #Empty file if it already exists
+      result = args.map { |p| read_file(p) }.join("\n")
+      append_to(@dest, result)
+    end
+        
+  end
+ 
+end

data/lib/join/compressor.rb

@@ -0,0 +1,38 @@
+module Join
+  
+  # Files get sent through the asset compressor 
+  # to be minified before deployment
+  
+  class Compressor
+    
+    require 'closure-compiler'
+    
+    class UnknownTypeError < StandardError; end
+
+    def compress(type, data)
+      if type == :javascript
+        compress_javascript(data)
+      elsif type == :css
+        compress_css(data)
+      else
+        throw UnknownTypeError
+      end
+    end
+    
+    def compress_javascript(data)
+      Closure::Compiler.new.compile(data)
+    end
+    
+    def compress_css(data)
+      data.gsub!(/\s+/, " ") #remove space
+      data.gsub(/\s/, '')
+      data.gsub!(/\/\*(.*?)\*\//, "") # remove comments
+      data.gsub!(/\n$/, "") # remove last break
+      data.gsub!(/ \{ /, " {") # trim inside brackets
+      data.gsub!(/; \}/, "}") # trim inside brackets
+      data
+    end
+  
+  end
+  
+end

data/lib/join/version.rb

@@ -1,5 +1,5 @@
 module Join
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end
 
 

data/lib/src/1.css

@@ -0,0 +1,40 @@
+hr {
+  display: block;
+  height: 1px;
+  border: 0;
+  border-top: 1px solid #cccccc;
+  margin: 20px 0 19px 0;
+  padding: 0; }
+
+input, select {
+  vertical-align: middle; }
+
+textarea {
+  overflow: auto; }
+
+.ie6 legend, .ie7 legend {
+  margin-left: -7px; }
+
+input[wtype="radio"] {
+  vertical-align: text-bottom; }
+
+input[type="checkbox"] {
+  vertical-align: bottom; }
+
+.ie7 input[type="checkbox"] {
+  vertical-align: baseline; }
+
+.ie6 input {
+  vertical-align: text-bottom; }
+
+label, input[type="button"], input[type="submit"], input[type="image"], button {
+  cursor: pointer; }
+
+button, input, select, textarea {
+  margin: 0; }
+
+body, h1, h2, h3, h4, h5, h6, p, ul, ol, dl, input, textarea {
+  line-height: 20px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: gray;
+  font-size: 13px; }

data/lib/src/1.js

@@ -0,0 +1,3 @@
+var x = 56;
+
+Object.prototype.join = function(){}

data/lib/src/2.css

@@ -0,0 +1,23 @@
+/* --------------------------------------------------------------
+* Gravity CSS
+* Version 0.1
+* Developed by: Owain Lewis
+* www.owainlewis.com
+* License: MIT
+* http://www.opensource.org/licenses/mit-license.php
+*-------------------------------------------------------------- */
+html, body, div, span, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp,
+small, strong, sub, sup, var, b, i, dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline; }

data/lib/src/2.js

@@ -0,0 +1,6 @@
+(function(){
+	
+	//File number 1
+	
+});
+

data/readme.md

@@ -1,68 +1,25 @@
 #Join
 
-Join is a Ruby gem for concatenating together multiple JavaScript files and libraries ready for deployment. The primary goals are 
-
-+ To provide a pseudo common.js module system for the browser. //= require myfile.js
-+ To reduce the number of script tag calls on websites 
-+ To make combining multiple js files easier.
-
-Each JavaScript module is created with a time stamp and a path to the original source file.
+Join is an asset manager for concatenating together files for deployment.
 
 ##Installation
 
-		gem install join
+	gem install join
 		
 ##Usage
-		
-The basic idea is to have one main.js file that calls in other dependencies via a simple join statement:
 
-		//= require path_to/somefile.js
+	join file1.js file2.js file3.js
+	
+##Calling directly
 
-You can require other files using the Join require statement (//= require filename.js) like this
+You can call the join compiler directly by using the compiler
 
-		//= require cufon.js
-		//= require lightbox.js
-		//= require plugins/jquery.js
-		
-		(function(){
-			//Application code here
-		})();
-					
-Then run the join-files command in the terminal to join together all your files
-
-		join-compile source_file.js output_file.js
-		
-Sample output should be something like this:
+	compiler = Join::Compiler.new({:dest => "compiled.js", :compressed => true})
 
-		/*
-		Compiled with Join at 2011-08-28 23:11:02 +0100
-		from /Users/owainlewis/Projects/Ruby/jointest/app/other.js
-		*/
-
-		Object.keys = function( obj ) {
-		  var array = new Array();
-		  for ( var prop in obj ) {
-		    if ( obj.hasOwnProperty( prop ) ) {
-		      array.push( prop );
-		    }
-		  }
-		  return array;
-		};
-
-		/*
-		Compiled with Join at 2011-08-28 23:11:02 +0100
-		from /Users/owainlewis/Projects/Ruby/jointest/app/main.js
-		*/
-
-		//Main File
-		//= other.js
-
-		Object.defineProperties = function( obj, props ) {
-		  for ( var prop in props ) {
-		    Object.defineProperty( obj, prop, props[prop] );
-		  }
-		};
-		
-## Known issues
+    #Join the following files into compiled.js
 
-There are a few path issues that I still need to address. Also, relative paths are currently required in the require statements ( //= require /app/main.js etc )
+	compiler.join([
+	  'src/1.js', 
+	  'src/2.js'
+	])
+		

data/test/tc_join.rb

@@ -0,0 +1,2 @@
+require 'test/unit'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: join
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,31 +9,32 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-11 00:00:00.000000000Z
+date: 2011-09-18 00:00:00.000000000Z
 dependencies: []
 description: A Ruby library for joining files together. Principally aimed at joining
   JavaScript modules
 email:
 - owain@owainlewis.com
 executables:
-- join-compile
+- join
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
 - Rakefile
-- bin/join-compile
-- index.js
+- bin/join
 - join.gemspec
 - lib/join.rb
-- lib/join/concatenate.rb
-- lib/join/process.rb
+- lib/join/compiler.rb
+- lib/join/compressor.rb
 - lib/join/version.rb
+- lib/src/1.css
+- lib/src/1.js
+- lib/src/2.css
+- lib/src/2.js
 - readme.md
-- test/compiled.js
-- test/include.js
-- test/index.js
+- test/tc_join.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -60,6 +61,4 @@ specification_version: 3
 summary: A Ruby library for joining files together. Principally aimed at joining JavaScript
   modules
 test_files:
-- test/compiled.js
-- test/include.js
-- test/index.js
+- test/tc_join.rb

data/lib/join/concatenate.rb

@@ -1,67 +0,0 @@
-module Join
-  class Concatenation
-  
-    attr_reader :files
-  
-    def initialize(dir)
-      @files = []
-      @dir = dir
-      @process = ::Join::Process.new()
-    end
-    
-    #Return all js files in a directory
-    def find_required_modules(dir)
-        @process.required(read(@dir + handlePrefix(dir)))
-        @process.required_modules()
-    end
-  
-    #If the user omits a / from the path to the js folder we correct it for them
-    def handlePrefix(s)
-      if s.chars.first == '/'
-        s = s
-      else
-        s = '/' + s
-      end
-      s
-    end
-    
-    def exists?(filename)
-      File.exists?(filename)
-    end
-  
-    #Takes an array of files with absolute paths
-    def concat(files, dest, original)
-      File.new(dest,  "w+") if !File.exists?(dest)
-      files.each do |f|
-        file = @dir + handlePrefix(f.fetch(0))
-        puts file
-        processFile(file) if exists?(file)
-      end
-      processFile(@dir + handlePrefix(original))
-      
-      write(@files, dest)
-      ::Join.message("Joined #{@files.length} files to #{@dir + handlePrefix(dest)}")
-    end
-    
-    def processFile(file_name)
-      @files << "/*\nCompiled with Join at #{Time.now}\nfrom #{file_name}\n*/\n\n" + read(file_name) + "\n\n"
-    end
-    
-    protected
-  
-    def read(file_name)
-      file = File.open(file_name, "r")
-      contents = file.read
-      contents
-    end
-  
-    #Write to file
-    def write(content, dest)
-      File.open(dest, 'w') do |file|  
-        file.puts content
-      end
-    end
-
-  end
-  
-end

data/lib/join/process.rb

@@ -1,19 +0,0 @@
-module Join
-  class Process
-    
-    attr_reader :required_modules
-    
-    def initialize
-      @required_modules = []
-    end
-  
-    #Return an array of required modules and files
-    def required(file)
-      expr = /^\/\/= require\s?(.*)$/
-      file.scan(expr) do |m|
-        @required_modules  << m
-      end
-    end
-
-  end
-end

data/test/compiled.js

@@ -1,22 +0,0 @@
-/*
-Compiled with Join at 2011-09-11 18:16:25 +0100
-from /Users/owainlewis/Projects/ruby/Gems/Join/test/include.js
-*/
-
-(function (){
-	
-	/* Include.js */
-		
-}).call(this);
-
-/*
-Compiled with Join at 2011-09-11 18:16:25 +0100
-from /Users/owainlewis/Projects/ruby/Gems/Join/test/index.js
-*/
-
-//= require include.js
-
-
-
-
-

data/test/include.js

@@ -1,5 +0,0 @@
-(function (){
-	
-	/* Include.js */
-		
-}).call(this);

data/test/index.js

@@ -1,4 +0,0 @@
-//= require include.js
-
-
-