@@ -24,11 +24,27 @@ def all_files ].collect{ |f| f + '.js' } end +def license + return <<-LICENSE +/* + * sassijs 0.4.71 - Syntactically Awesome StyleSheets in JavaScript + * + * Copyright (c) 2009 Casey Rosenthal (github.net/clr) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * $Date: #{ Date.today } #{ Time.now } $ + * $Rev: 1 more than last time $ + */ + +LICENSE +end + namespace :javascript do desc "Concatenate the files together." task :join do - all_scripts = '' + all_scripts = license all_files.each do |file| all_scripts << File.read( File.join( 'lib', file ) ) end @@ -43,3 +59,4 @@ namespace :javascript do end + Rakefile @@ -1,7 +1,7 @@ // This file contains various helper methods. -// Sugar functions follow, some of which were ispired by +// Sugar functions follow, some of which were inspired by // [ http://www.crockford.com/javascript/inheritance.html ] Function.prototype.method = function( name, lambda ){ this.prototype[name] = lambda; lib/pepper.js @@ -4,8 +4,10 @@ SassijsTree = function( template ){ this.determineTab(); var rootLine = new SassijsLine( '', this.getTab(), 0 ); this.root = rootLine.determineNode(); + this.variables = {}; this.determineLines(); this.determineNodes(); + this.determineVariables(); } SassijsTree.method( 'getTab', function(){ @@ -33,6 +35,16 @@ SassijsTree.method( 'getTemplateLines', function(){ return this.getTemplate().split( '\n' ); }); +SassijsTree.method( 'getVariable', function( hashName ){ + return this.variables[ hashName ]; +}); + +SassijsTree.method( 'setVariable', function( hashName, newValue ){ + this.variables[ hashName ] = newValue; + return this; +}); + + // The tab is the form of indentation, which can be tabs or spaces, // but not both. SassijsTree.method( 'determineTab', function(){ @@ -102,6 +114,23 @@ SassijsTree.method( 'determineNodes', function(){ } } }); + +// Here we iterate through all of the nodes, and if we find a Node +// of species Variable, we take the value and stick it in the +// tree's hash for reference later. +SassijsTree.method( 'determineVariables', function( node ){ + if( node == null ){ + var node = this.getRoot(); + } + if( node.getSpecies() == 'variable' ){ + this.setVariable( node.getKey(), node.getValue() ); + } + // We will just implement a traditional recursion here. + var childrenToThisNode = node.getChildren(); + for( var i = 0; i < childrenToThisNode.length; i++ ){ + this.determineVariables( childrenToThisNode[ i ] ); + } +}); /* SassijsTreeNodeRule.method( 'getCss', function(){ lib/sassijs/tree.js @@ -109,6 +109,9 @@ SassijsTreeNode.method( 'getCss', function(){ // in a short-hand. When this node is a Rule, it needs to have its // children duplicated and appended to the split Rule in order to be // uncompressed. -SassijsTreeNode.method( 'expandChildren', function(){ - +SassijsTreeNode.method( 'recurse', function( anonymousFunction ){ + anonymousFunction.call( this ); + for( var i = 0; i < this.getChildren().length; i++ ){ + this.getChildren()[ i ].recurse( anonymousFunction ); + } }); lib/sassijs/tree/node.js @@ -6,11 +6,22 @@ SassijsTreeNodeRule = function( line ){ SassijsTreeNodeRule.inherits( SassijsTreeNode ); +/* +I don't think I'll need this function after all. + +'' +// This function has to look at it's children, and if it +// sees a compressed Rule node, it splits that node into +// two, with identical children. SassijsTreeNodeRule.method( 'determineMitosis', function(){ var css = ''; var attributes = []; for( var i = 0; i < this.getChildren().length; i++ ){ - switch( this.getChildren()[ i ].getSpecies() ){ + var child = this.getChildren()[ i ]; + if( ( child.getSpecies() == "" ) && child.getLine().getSyntax().indexOf( ',' ) ){ + var uncompressedRules = child.getLine().getSyntax().split( ',' ); + } + if( )switch( this.getChildren()[ i ].getSpecies() ){ case 'rule': css += this.getLine().getSyntax() + ' ' + this.getChildren()[ i ].getCss(); case 'attribute': @@ -24,7 +35,6 @@ SassijsTreeNodeRule.method( 'determineMitosis', function(){ } }); -/* SassijsTreeNodeRule.method( 'getCss', function(){ var css = ''; var attributes = []; lib/sassijs/tree/rule.js @@ -1,3 +1,13 @@ +/* + * sassijs 0.4.71 - Syntactically Awesome StyleSheets in JavaScript + * + * Copyright (c) 2009 Casey Rosenthal (github.net/clr) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * $Date: 2009-04-25 Sat Apr 25 15:11:12 -0400 2009 $ + * $Rev: 1 more than last time $ + */ // This file contains various helper methods. @@ -112,8 +122,12 @@ Sassijs.method( 'determineTree', function(){ this.tree = new SassijsTree( this.getTemplate() ); }); +Sassijs.method( 'getCss', function(){ + return this.getTree().getRoot().getCss().join( '\n' ); +}); + Sassijs.method( 'getStyleElement', function(){ - return '<style type="text/css"></style>'; + return '<style type="text/css"></style>'; }); Sassijs.method( 'writeToDocument', function(){ @@ -273,6 +287,12 @@ SassijsTreeNode.method( 'getChildren', function(){ return this.children; }); +// It's an odd kind of tree, but we can only traverse out, +// and these poor children will never know their parents. +SassijsTreeNode.method( 'hasChildren', function(){ + return( this.children.length > 0 ); +}); + SassijsTreeNode.method( 'getLine', function(){ return this.line; }); @@ -298,25 +318,10 @@ SassijsTreeNode.method( 'getLastChild', function() { SassijsTreeNode.method( 'getSpecies', function(){ return this.species; }); - -SassijsTreeNode.method( 'toS', function() { - var result = ""; - for( child in this.getChildren() ){ - if( child.isType( AttrNode ) ){ - throw( new SassijError( 'Attributes aren\'t allowed at the root of a document.', child.line ) ); - } else { - // result << "#{child.to_s(1)}" + (@style == :compressed ? '' : "\n") - // need to add a @style indicator at some point - result += child.toS( 1 ); - } - } - // @style == :compressed ? result+"\n" : result[0...-1] - return result; -}); - // This method should be overridden by subclasses to return an error message - // if the given child node is invalid, - // and false or nil otherwise. +// This method should be overridden by subclasses to return an error message +// if the given child node is invalid, +// and false or nil otherwise. SassijsTreeNode.method( 'isInvalidChild', function( child ){ return false; }); @@ -350,7 +355,18 @@ SassijsTreeNode.method( 'getCss', function(){ for( var i = 0; i < ruleChildren.length; i++ ){ prefixRule = this.getLine().getSyntax(); if( prefixRule.length > 0 ){ - ruleChildren[ i ] = prefixRule + " " + ruleChildren[ i ]; + // Sometimes CSS rules are compressed like 'a span, a div' and we + // need to expand those children here and prepend the parent to + // both sub-rules, span and div in the above example. + if( ruleChildren[ i ].indexOf( ',' ) ){ + ruleChildrenParts = ruleChildren[ i ].split( ', ' ); + for( var j = 0; j < ruleChildrenParts.length; j++ ){ + ruleChildrenParts[ j ] = prefixRule + " " + ruleChildrenParts[ j ]; + } + ruleChildren[ i ] = ruleChildrenParts.join( ', ' ); + } else { + ruleChildren[ i ] = prefixRule + " " + ruleChildren[ i ]; + } } } return ruleChildren; @@ -360,6 +376,14 @@ SassijsTreeNode.method( 'getCss', function(){ } }); + +// There are several cases where the children of a node are compressed +// in a short-hand. When this node is a Rule, it needs to have its +// children duplicated and appended to the split Rule in order to be +// uncompressed. +SassijsTreeNode.method( 'expandChildren', function(){ + +}); SassijsTreeNodeAttribute = function( line ){ this.children = []; this.species = 'attribute'; @@ -415,7 +439,23 @@ SassijsTreeNodeAttribute.method( 'getValue', function(){ }); SassijsTreeNodeAttribute.method( 'getCss', function(){ - return this.getKey() + ": " + this.getValue() + ";"; + // If an Attribute node has children, then those children have + // to be Attribute nodes as well, because that means that this + // node is a family definition of attributes, like font-size, + // font-weight, font-style, etc. + if( this.hasChildren() ){ + var attributeChildren = []; + for( var i = 0; i < this.getChildren().length; i++ ){ + var child = this.getChildren()[ i ]; + if( child.getSpecies() != 'attribute' ){ + // Raise error. + } + attributeChildren.push( this.getKey() + "-" + child.getKey() + ": " + child.getValue() + ";" ); + } + return attributeChildren.join( ' ' ); + } else { + return this.getKey() + ": " + this.getValue() + ";"; + } }); SassijsTreeNodeComment = function( line ){ @@ -484,9 +524,8 @@ SassijsTreeNodeRule = function( line ){ }; SassijsTreeNodeRule.inherits( SassijsTreeNode ); -/* -SassijsTreeNodeRule.method( 'getCss', function(){ +SassijsTreeNodeRule.method( 'determineMitosis', function(){ var css = ''; var attributes = []; for( var i = 0; i < this.getChildren().length; i++ ){ @@ -504,6 +543,7 @@ SassijsTreeNodeRule.method( 'getCss', function(){ } }); +/* SassijsTreeNodeRule.method( 'getCss', function(){ var css = ''; var attributes = []; sassijs.js @@ -74,6 +74,33 @@ equals( tree.getCss().join( '\n' ), testResult() ); }); + test( "should get and set variables associated with this tree", function(){ + scriptSassijs = new SassijsFile( '../templates/script.sass', false ); + tree = scriptSassijs.getTree(); + tree.setVariable( 'first', 0 ).setVariable( 'second', 1 ); + equals( tree.getVariable( 'first' ), 0 ); + equals( tree.getVariable( 'second' ), 1 ); + }); + + test( "should find variables and store them in the tree's variable hash", function(){ + scriptSassijs = new SassijsFile( '../templates/script.sass', false ); + tree = scriptSassijs.getTree(); + equals( tree.getVariable( 'width' ), "10em + 20" ); + equals( tree.getVariable( 'color' ), "#00ff98" ); + equals( tree.getVariable( 'main_text' ), "#ffa" ); + equals( tree.getVariable( 'num' ), "10" ); + equals( tree.getVariable( 'dec' ), "10.2" ); + equals( tree.getVariable( 'dec_0' ), "99.0" ); + equals( tree.getVariable( 'neg' ), "-10" ); + equals( tree.getVariable( 'esc' ), "10\"+12\"" ); + equals( tree.getVariable( 'str' ), "Hello!" ); + equals( tree.getVariable( 'qstr' ), "Quo\"ted\"!" ); + equals( tree.getVariable( 'hstr' ), "Hyph-en!" ); + equals( tree.getVariable( 'concat' ), "#{5 + 4} hi there" ); + equals( tree.getVariable( 'percent' ), "11%" ); + equals( tree.getVariable( 'complex' ), "1px/1em" ); + }); + </script> <h1></h1> <h2 id="banner"></h2> test/sassijs/tree.qunit @@ -24,6 +24,7 @@ equals( sassijsNode1.getCss(), '#column.left' ); }); + /* Don't think I need this anymore. test( "SassijTreeNodeRule should split if written in compressed format", function(){ sassijsLine0 = new SassijsLine( ' #container', ' ', 15 ); sassijsNode0 = sassijsLine0.determineNode(); @@ -50,7 +51,6 @@ equals( sassijsNode0.getChildren()[1].getChildren()[0].getLine().getSyntax(), "color: grey" ); }); -/* test( "SassijTreeNodeRule should render subchild rules", function(){ sassijsLine1 = new SassijsLine( ' #column.left', ' ', 15 ); sassijsNode1 = sassijsLine1.determineNode(); test/sassijs/tree/rule.qunit c5fda5a00e6c8bb0aa83eaa4c954ca16c5fcf894 clr clr@port49.com http://github.com/clr/sassijs/commit/95aef99f217a2812e3130b5f87616577fe3879d1 95aef99f217a2812e3130b5f87616577fe3879d1

2009-05-04T20:09:15-07:00

-- variables are now stored in tree, ready for evaluation -- 55d1d1717b0b7cac6e13f35f1068fc8a45b85a61 clr clr@port49.com