jabs 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/examples/config.ru

@@ -1,10 +1,20 @@
 require 'lib/jabs'
 require 'pathname'
+require 'sinatra'
+require 'haml'
+require 'sass'
 
-puts Pathname.new(__FILE__).dirname.expand_path+'src'
-puts "OF"
+class Example < Sinatra::Base
+  set :views, Jabs.root+'../examples/views'
+
+  %w{input_with_default drag_and_drop}.each do |part|
+    get "/#{part}" do
+      haml part.intern
+    end
+  end
+end
+
+use Jabs::Rack::Static, :urls => '/jabs', :root => Pathname.new(__FILE__).dirname.expand_path
+Jabs::Rack.mount(self, '/jquery')
+map("/examples") { run Example.new }
 
-use Jabs::Rack::Static, :urls => '/src', :root => Pathname.new(__FILE__).dirname.expand_path
-run lambda { |env|
-  [200, {'Content-Type'=>'text/html'}, "JABS"]
-}

data/examples/jabs/drag_and_drop.js.jabs

@@ -0,0 +1,23 @@
+:ready
+  $#sortable
+    .sortable 'li'
+
+def sortable parent_selector
+  :dragstart
+    event.target
+      .closest parent_selector
+        .clone
+          .css
+            position: 'absolute'
+          .appendTo document.body
+
+  :drag
+    event.dragProxy
+      .css
+        top: event.pageY
+        left: event.pageX
+
+  :dragend
+    event.dragProxy 
+      .remove
+

data/examples/{src → jabs}/input_with_default.js.jabs

@@ -3,7 +3,7 @@
     :blur
       if @value === ''
         @value = @default_value
-
+    
     :focus
       if @value === @default_value
         @value = ''

data/examples/views/drag_and_drop.haml

@@ -0,0 +1,16 @@
+%script{:src=> "/jabs/drag_and_drop.js.jabs"}
+%style
+  :sass
+    ol, li
+      list-style: number
+    li
+      height: 20px
+      width: 300px
+      margin-bottom: 4px
+      background: black
+      color: white
+%ol#sortable
+  %li One: Lorem ipsum dolor sit amet
+  %li Two: Lorem ipsum dolor sit amet.
+  %li Three: Lorem ipsum dolor sit amet.
+  %li Four: Lorem ipsum dolor sit amet.

data/examples/views/input_with_default.haml

@@ -0,0 +1,3 @@
+%script{:src=> "/jabs/input_with_default.js.jabs"}
+%input{:type=>'text', :default_value => "hello!"}/
+%input{:type=>'text', :default_value => "hello again!"}/

data/examples/views/layout.haml

@@ -0,0 +1,8 @@
+<DOCTYPE html>
+%html
+  %head
+    %title Jabs Example
+    %meta{"http-equiv"=>"content-type", "content"=>"text/html; charset=utf-8"}
+    %script{:src=> "/jquery/jquery.js"}
+  %body= yield
+  

data/lib/jabs.rb

@@ -2,56 +2,19 @@ require 'fold'
 require 'rack'
 require 'johnson'
 require 'pathname'
-puts require Pathname.new(__FILE__).dirname.expand_path+'jabs/middleware'
-
-module Johnson
-  module Nodes
-    attr_accessor :value
-    class FallThrough < Node
-      def initialize(_row, _column, value)
-        @value = value
-      end
-    end
-  end
-
-  module Visitors
-    class EcmaVisitor
-      def visit_SourceElements(o)
-        newline = o.value.length > 0 ? "\n" : ' '
-        (@depth == 0 ? '' : "{#{newline}") +
-          indent {
-            o.value.map { |x|
-              code = x.accept(self)
-              semi = case x
-                     when Nodes::FallThrough
-                      ""
-                     when Nodes::Function, Nodes::While, Nodes::If, Nodes::Try, Nodes::Switch, Nodes::Case, Nodes::Default, Nodes::For, Nodes::ForIn
-                       code =~ /\}\Z/ ? '' : ';'
-                     else
-                       ';'
-                     end
-              "#{indent}#{code}#{semi}"
-            }.join("\n")
-          } +
-          (@depth == 0 ? '' : "#{newline}}")
-      end
-
-      def visit_FallThrough(o)
-        o.value
-      end
-    end
-
-    class SexpVisitor
-      def visit_FallThrough(o)
-        [:fall_through, o.value]
-      end
-    end
-  end
-end
 
 module Jabs
-  include Johnson::Nodes
+  def self.root
+    @root ||= Pathname.new(__FILE__).dirname.expand_path
+  end
+  
+  require root+'jabs/precompiler'
+  require root+'jabs/engine'
+  require root+'jabs/middleware'
   
+  require root+'johnson/ext'
+  include Johnson::Nodes
+
   def self.logger
     @logger ||= begin
       #TODO configurable logging
@@ -62,247 +25,5 @@ module Jabs
       logger
     end
   end
-  
-  class Precompiler < Fold::Precompiler
-    class << self
-      attr_accessor :spot_replacements
-    end
-
-    self.spot_replacements = []
-
-    def self.spot_replace key, &block
-      spot_replacements << block if block_given?
-    end
-
-    attr_reader :sexp, :current_sexp
-
-    def initialize
-      super
-      
-      @ready = false
-      @current_sexp = []
-      @full_sexp = [:source_elements, @current_sexp]
-    end
-
-    folds :Line, // do
-      [:fall_through, (Precompiler.do_spot_replace(text, self) + children.map{|child| child.text}.join(""))]
-    end
-
-    folds :Selector, /^\$/ do
-      call(function(nil, ["$this"], [:source_elements, render_children]), jquery([:string, text]))
-    end
-
-    folds :SubSelector, /^&/ do
-      call(
-        function(nil, ["$this"], [:source_elements, render_children]),
-        call(access([:name, "$this"], [:name, "find"]), [:string, text])
-      )
-    end
-
-    folds :Event, /^:/ do
-      event_bind(text, [:name, "$this"], [:source_elements, [parse("var $this = jQuery(this)")] + render_children])
-    end
-
-    folds :Ready, /^:ready/ do
-      jquery(function(nil,  [], [:source_elements, [call(function(nil, ["$this"], [:source_elements, render_children]), jquery([:name, "window"]))]]))
-    end
-
-    folds :Function, /^fun / do
-      parts = text.split(/ /)
-      name, arg_names = parts.shift, parts.join('').gsub(' ', '').split(',')
-      [:function, name, arg_names, [:source_elements, render_children]]
-    end
-
-    folds :Def, /^def / do
-      parts = text.split(/ /)
-      name, arg_names = parts.shift, parts.join('').gsub(' ', '').split(',')
-      [:assign_expr, 
-        access(access([:name, "jQuery"], [:name, "fn"]), [:name, name]),
-        [:function, nil, arg_names, [:source_elements, [parse("var $this = this")] + render_children]]]
-    end
-
-    if_meta = %q{
-      index = parent.children.index(self)
-      _next =  parent.children.slice index + 1
-      
-      _else = if [Else, ElseIf].include? _next.class
-        _next.render
-      else
-        nil
-      end
-      [:if, parse(Precompiler.do_spot_replace(text)),[:source_elements, render_children], _else]
-    }
-
-    folds :If, /^if / do
-      eval if_meta
-    end
-
-    folds :Unless, /^unless / do
-      [:if, [:not, [:parenthesis, parse(Precompiler.do_spot_replace(text))]], [:source_elements, render_children], nil]
-    end
-
-    folds :Else, /^else/ do
-      [:source_elements, render_children]
-    end
-
-    folds :ElseIf, /^else if/ do
-      eval if_meta
-    end
-
-    folds :DotAccessor, /^\./ do
-      index = parent.children.index(self)
-      _next =  parent.children.slice index + 1
-      _text = _next ? _next.text : ""
-      if children.any?
-        if (_text[/\}\)/])
-          [:fall_through, ("$this."+Precompiler.do_spot_replace(text, self) + children.map{|child| child.text}.join(""))]
-        else
-          call(
-            function(nil, ["$this"], [:source_elements, render_children]),
-            parse(Precompiler.do_spot_replace(".#{text}", self))
-          )
-        end
-      else
-        parse Precompiler.do_spot_replace(".#{text}", self)
-      end
-    end
-
-    spot_replace :DotAccessor do |expression, precompiler|
-      expression.gsub /(^\.([\w]+)|- \.(.+))(.*)/ do |match|
-        "$this#{Precompiler.compile_arguments expression, $1, match, $4}"
-      end
-    end
-
-    spot_replace :AccessUpAndCall do |expression, precompiler|
-      expression.gsub /\.\.(\..*)/ do |match|
-        "$this.prevObject#{Precompiler.do_spot_replace($1)}"
-      end
-    end
-
-    spot_replace :AccessUpUp do |expression, precompiler|
-      expression.
-        gsub(/ \.\.\/|^\.\.\//, "$this.prevObject/").
-        gsub(/\/\.\./, ".prevObject")
-    end    
-    
-    spot_replace :AccessUp do |expression, precompiler|
-      expression.gsub /\.\./ do
-        "$this.prevObject"
-      end
-    end
-
-    spot_replace :AttributeSetter do |expression, precompiler|
-      expression.gsub /@([\w]+)[ ]*=[ ]*(.*)/ do |match|
-        if $2[0] == ?=
-          match
-        else
-          "$this.attr('#{$1}', #{Precompiler.do_spot_replace $2, precompiler})"
-        end
-      end
-    end
     
-    spot_replace :AttributeAccessor do |expression, precompiler|
-      expression.gsub /@([\w]+)/ do
-        "$this.attr('#{$1}')"
-      end
-    end
-
-    spot_replace :DanglingThis do |expression, precompiler|
-      expression.gsub /prevObject\$this/ do
-        "prevObject"
-      end
-    end
-
-    def self.do_spot_replace expression, precompiler=nil
-      spot_replacements.each do |block|
-        expression = block.call(expression, precompiler)
-      end
-      expression
-    end
-
-    def self.compile_arguments expression, call, real, args
-      return real if expression[Regexp.new("^\\#{call}\\(")]
-      arguments = []
-      if args[/^\./]
-        "#{call}()#{do_spot_replace(args).gsub("$this", "")}"
-      else
-        args.split(/\s|,/).each do |arg|
-          arg.gsub!(/:(\w+)/) {%{"#{$1}"}}
-          next if arg[/\s/]
-          next if arg == ""
-          arguments << arg
-        end
-        "#{call}(#{arguments.join(', ')})"
-      end
-    end
-
-    def parse expression
-      self.class.do_spot_replace expression, self
-      Johnson::Parser.parse(expression).value.first
-    end
-
-    def source block=nil
-      source = [:source_elements]
-      source << [block] unless(block.nil? or block.empty?)
-      source
-    end
-
-    def event_bind event, binds_to, function_sexp=nil
-      call(access(binds_to, [:name, "live"]), [:string, event], function(nil,  ["e"], function_sexp))
-    end
-
-    def call *args
-      [:function_call, args]
-    end
-
-    def onready function_sexp=nil
-      event_bind('ready', jquery([:name, "document"]), function_sexp)
-    end
-
-    def access left, right
-      [:dot_accessor, right, left]
-    end
-
-    def function name=nil, args=[], function_sexp=nil
-      [:function, name, args, function_sexp]
-    end
-
-    def jquery *jquery_arg
-      [:function_call, [
-        [:name, 'jQuery'],
-        *jquery_arg
-      ]]
-    end
-
-    def johnsonize(sexp)
-      return sexp if sexp.is_a?(Johnson::Nodes::Node)
-      return sexp if sexp.class.to_s == "String"
-      return [] if sexp === []
-      return nil if sexp === nil
-      unless sexp.first.class.to_s == "Array"
-        if sexp.first.class.to_s == "Symbol"
-          klass = eval("Johnson::Nodes::#{sexp.shift.to_s.camelcase}")
-          klass.new 0,0, *sexp.map{|n|johnsonize(n)}
-        elsif sexp.is_a? Array
-          sexp.map{|n|johnsonize(n)}
-        else
-          sexp
-        end
-      else
-        sexp.map{|n|johnsonize(n)}
-      end
-    end  
-  end
-  
-  class Engine < Fold::Engine
-
-    def render context=nil
-      @p = precompiler_class.new
-      root = Johnson::Nodes::SourceElements.new 0, 0
-      @p.fold(lines).children.each{|c|root << @p.johnsonize(c.render)}
-      root.to_ecma
-    end
-  end
 end
-
-puts Jabs::Engine.new($stdin.read).render if $0 == __FILE__

data/lib/jabs/engine.rb

@@ -0,0 +1,18 @@
+module Jabs
+  class Engine < Fold::Engine
+    def render context=nil
+      @p = precompiler_class.new
+      root = Johnson::Nodes::SourceElements.new 0, 0
+      main = Johnson::Nodes::SourceElements.new 0, 0
+      root << @p.johnsonize(@p.call([:function, nil, [], main]))
+      
+      @p.fold(lines).children.each{|c|main << @p.johnsonize(c.render)}
+      root.to_ecma
+    rescue Fold::FoldFactory::IndentationError => e
+      require 'pp'
+      pp lines
+      puts "______------UP"
+      raise e
+    end
+  end
+end

data/lib/jabs/middleware.rb

@@ -1,6 +1,21 @@
 module Jabs
-  
   module Rack 
+    
+    def self.mount(rack_builder, mount_pount)
+      rack_builder.map(mount_pount) do
+        run (lambda do |env|
+          source = %w{
+            jquery/jquery-1.3.2.js
+            jquery/jquery.event.drag-1.5.js
+            jquery/jquery.event.drop-1.2.js
+            jquery/jquery.focus_and_blur.js
+          }.map{|path| (Jabs.root+path).read }.join("\n")
+          
+          [200, {'Content-Type'=> 'text/javascript'}, source]
+        end)
+      end
+    end
+        
     class Static < ::Rack::Static
       def initialize(app, options={})
         super(app, options)
@@ -11,7 +26,6 @@ module Jabs
     
     class File < ::Rack::File
       def serving
-        @path += ".jabs" unless @path[/\.jabs$/]
         status, headers, body = * super
         return [status, headers, body] unless status == 200
         
@@ -19,7 +33,7 @@ module Jabs
         
         headers['Content-Type'] = 'text/javascript'
         headers['Content-Length'] = jabs.size.to_s
-
+        
         [status, headers, jabs]
       end
     end