rbml 0.0.5.9.2 → 0.0.5.9.3

data/Manifest.txt

@@ -25,6 +25,9 @@ lib/procedural.rb
 lib/processor.rb
 lib/rbml.rb
 lib/shell.rb
+lib/cli_tools.rb
+lib/cli_tools/array.rb
+lib/cli_tools/string.rb
 spec/doc_spec.rb
 spec/object_spec.rb
 spec/rbml_spec.rb

data/bin/rbml

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+#$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 $template_dir = File.dirname(ARGV[0]) if ARGV[0]
 
 require File.dirname(__FILE__)+'/../lib/rbml'
-::Rbml::Processor.run(ARGV)
+$script_extention = ARGV.first.gsub(/^.+\./, '')
+::Rbml::Processor.run(ARGV.first)

data/examples/cli/happycli.rbml

@@ -1,16 +1,38 @@
-cli :name=>"happycli", :prompt=>"happy> " do
-  set :unknown_command do
-    cliprint "overwritten unknown command"
+cli :name=>"happycli", :prompt=>"^_^ " do
+  set :unknown_command do |args|
+    puts "unknown command"
   end
   
-  set :help do
-    cliprint "put helpdocs here"
+  set :com do |args|
+    flag(:help => 'h'){
+      puts 'help docs for this command'
+    }
+    flag(:name => 'n'){ |value|
+      puts "the name you gave was #{value}"
+    }
+    key(:test){
+        puts 'good. the test option is running.'
+    }
+    key(:best){ puts 'great. now the best one is.' }
+
+    process args
+
+    # now have access  to remaining arguments as follows:
+    puts "\nremaining individual arguments (after flags): #{remaining_arguments.inspect}"
+    puts "\njoined remaining arguments (after flags): #{remaining_argument}"
+
+    # and also the active keys and flags
+    puts "\nactive options: #{active_options}"
   end
 
-  set :corey_is_awesome do
-    cliprint "corey is awesome"
+  set :clear do
+    system 'clear'
   end
-  
+
+  set :help do
+    puts "put helpdocs here"
+  end
+
   set :quit do
     exit
   end

data/examples/doc/_partial.rbml

@@ -14,5 +14,12 @@ div do
       end
     end
   end
+div :id=>"test" do
+    i "test"
+end
   include "sublist/sublist"
-end
+end
+
+  include "sublist/sublist"
+
+div { i 'what' }

data/examples/doc/test.rbml

@@ -21,3 +21,5 @@ xhtml :doctype => {:type=>:xhtml, :version=>"1.0", :strict=>false} do
     include "partial"
 	end
 end
+
+

data/languages/cli/cli.rb

@@ -1,7 +1,13 @@
+
+require 'cli_tools'
+
 module Rbml
   module Language
     module Cli
       module Cli
+        include CliTools
+        include Flagger
+
         DEFINITION = {"unknown_command" => lambda {puts "unknown command type 'help' for instructions"}}
         
         def set(method, &proc)
@@ -10,24 +16,16 @@ module Rbml
         end
         
         def call(method, *args)
+          clear_arguments
           begin
-            mymethod = DEFINITION.fetch(method)
-            if args.length == 0 && mymethod.arity == -1
-              mymethod.call
-            elsif mymethod.arity.abs == args.length
-              mymethod.call(*args)
-            else
-              puts "bad syntax"
-            end
+            args.empty? ? DEFINITION.fetch(method)[nil] : DEFINITION.fetch(method)[args]
           rescue
-            DEFINITION.fetch("unknown_command").call
+            DEFINITION.fetch("unknown_command")[args]
+          ensure
+            puts "\n"
           end
         end
-        
-        def cliprint(string)
-          string
-        end        
       end
     end
   end
-end
+end

data/languages/doc/base.rb

@@ -2,20 +2,6 @@ module Rbml
   module Language
     module Doc
       module Base
-        def find_partial(str)
-          arr = str.split("/")
-          arr.last[0,0] = "_"
-          find_local_file(arr.join("/") + '.rbml')
-        end
-
-        def find_local_file(filename)
-          find_file($template_dir +'/' + filename)
-        end
-
-        def find_file(filename)
-          __instance_eval__ File.read(filename)
-        end
-        
         def print(doc)
           puts doc
         end

data/languages/doc/xhtml.rb

@@ -3,6 +3,13 @@ require 'redcloth'
 require 'doc/xml'
 require 'rexml/document'
 
+
+module Inclusion
+  def include(file)
+    run_file [$template_dir, file.as_partial].join('/')+'.rbml'
+  end
+end
+
 module Rbml
   module Language
     module Doc
@@ -10,7 +17,7 @@ module Rbml
         include Xml
         ::Kernel.send(:undef_method, :p)
           
-        def tags; %w(body title head p div ul li html a br span)end
+        def tags; %w(body title head p div ul li html a br span h1 h2 h3 h4 h5 h6 strong img i u b pre kbd code cite strong em ins sup sub del table tr td th ol blockquote)end
     
         def stylesheets *sheets
           all_sheets = ''
@@ -38,14 +45,11 @@ module Rbml
         def end_tag *options
           "</html>"
         end
-    
-        def include(str)
-          find_partial(str)
-        end
         
         def format(doc)
           fdoc = REXML::Document.new doc.assemble_doc
           fdoc.write doc.formatted_doc, 1
+          doc.formatted_doc
         end
     
         def textilize(str)      

data/lib/base.rb

@@ -9,9 +9,9 @@ module Rbml
       
     def instance_eval_each(code, &blk)
       $breaker = BlockBreaker.new do |name, args, block|
-         yield @dsl.__send__(name, *args, &block)
-       end
-       $breaker.__instance_eval__ &code
+        yield @dsl.__send__(name, *args, &block)
+      end
+      $breaker.__instance_eval__ &code
     end
   end
 end

data/lib/cli.rb

@@ -2,16 +2,14 @@ module Rbml
   class Cli < Base
     def self.render(language, options, &block)
       d = Cli.new(language)
-      display = lambda do |result|
-          puts "#{result}\n" unless result.nil?
-        end
+      display = lambda { |result| result }
       loop do
         begin
           printf options[:prompt]
-          d.instance_eval_each(block, &display)
+          d.instance_eval_each(block, &display) 
           obj = IO.new(0, "w+")
           args = obj.gets.split
-          d.dsl.__send__("call", *args)
+          d.dsl.__send__("call", *args) unless args.empty?
         rescue Interrupt
           puts "\nExiting #{options[:name]}..."
           break
@@ -19,4 +17,4 @@ module Rbml
       end
     end
   end
-end
+end

data/lib/cli_tools.rb

@@ -0,0 +1,139 @@
+
+class String
+  def flag?; self[0,1]=='-' end
+  def shift; self.slice! 0,1 end
+end
+
+class Array
+  def duplicate; *copy = *self.map{|a|a.dup} end
+end
+
+module CliTools
+  def request_value words=nil
+    printf words+' ' if words
+    $stdin.gets
+  end
+end
+
+module Flagger
+  def clear_arguments
+    @flags ={}
+    @active_keys = {}
+    @active_flags = {}
+    @potential_flags = {}
+    @associated_blocks  = {}
+    @remaining_argument = []
+    @potential_keywords = []
+  end
+
+  def process(args=nil)
+    seperate_arguments_from(args) if args
+    process_command_line_input 
+  end
+  def seperate_arguments_from(args)
+    args = args.duplicate
+    while !args.empty? and not args.first.flag?
+      if @potential_keywords.include?(args.first.to_sym)
+        @active_keys.merge! args.shift.to_sym => nil
+      else
+        @remaining_argument << args.shift
+      end
+    end
+    @flags = args
+  end
+
+  def process_command_line_input &blk
+    flags = parse_flags(@flags)
+    run_flags @active_keys
+    run_flags flags
+  end
+  
+  def trip_flag which, with_value=nil
+    start_flag_checking
+    @active_flags.merge!({which => (with_value || true)})
+  end
+
+  def start_flag_checking
+    @active_flags ||= {}
+  end
+
+  def parse_flags(args)
+    start_flag_checking
+    while not args.empty?
+      flag_set  = args.shift
+      flag_set.shift
+      unless flag_set.flag?
+        while not flag_set.empty?
+          @active_flags.merge!({flag_key_for(flag_set.shift) => (flag_set.empty? && args.first) ? (args.first.flag? or args.shift ) : true})
+        end
+      else
+        flag_set.shift
+        @active_flags.merge!({flag_key_for(flag_set) => (args.first ? (args.first.flag? or args.shift) : true) })
+      end
+    end
+    @active_flags
+  end
+  
+  def flag_key_for(which)
+    return which.to_sym if @potential_flags.member? which.to_sym
+    try = @potential_flags.invert
+    return try[which] if try.member? which
+    return nil
+  end
+
+  def flag option, &blk
+    set_flag  option
+    set_block option, blk
+  end
+  alias key flag
+  
+  def flag_and_key option, &blk
+    flag option, &blk
+    option.each { |k, v| flag k, &blk }
+  end
+  
+  def set_flag(option)
+    if option.respond_to? :merge!
+      @potential_flags.merge! option 
+    else
+      @potential_keywords << option
+    end
+  end
+
+  def set_block(option, blk=nil)
+    @associated_blocks||= {}
+    blk ||= lambda{}
+    tmp = {}
+    if option.kind_of? Symbol
+      tmp[option] = blk
+    else
+      option.each {|key, value| tmp[key] = blk}
+    end
+    @associated_blocks.merge! tmp
+  end
+  
+  def run_flags(options)
+    options.each { |key, value|
+      @associated_blocks[key.to_sym][value] rescue help_docs
+    }
+  end
+
+  def help_docs
+    exit
+  end
+  
+  def active_options
+    flags = @active_flags || {}
+    keys = @active_keys || {}
+    flags.merge keys
+  end
+  def remaining_arguments
+    @remaining_argument||[]
+  end
+  def remaining_argument
+    @remaining_argument.join(' ')
+  end
+
+end
+
+

data/lib/extensions/primitives.rb

@@ -1,3 +1,13 @@
+module Inclusion
+  def run_file(file)
+    __instance_eval__ ::Rbml::Processor.read(file)
+  end
+  
+  def include(file)
+    run_file file+'.rbml'
+  end
+end
+
 module Primitives
   class BlankSlate #:nodoc:
     alias :__instance_eval__ :instance_eval
@@ -15,6 +25,8 @@ module Primitives
   end
   
   class BlockBreaker < BlankSlate #:nodoc:
+    include Inclusion
+
     def initialize(&block)
       if block_given?
         @handler = block
@@ -22,12 +34,11 @@ module Primitives
         raise NoBlockGiven, "Must be a block to break!"
       end
     end
-  
     def method_missing(name, *args, &block)
-      @handler.call(name, args, block)
+      @handler.call(name, args, block) 
     end
   end
 
   class NoBlockGiven < StandardError #:nodoc:
   end
-end
+end

data/lib/extensions/string.rb

@@ -11,4 +11,9 @@ class String
   def camelize
     self[0,1].upcase + self[1, self.length]
   end
-end
+  def as_partial
+    arr = self.split("/")
+    arr.last[0,0] = "_"
+    arr.join("/")
+  end
+end

data/lib/processor.rb

@@ -9,20 +9,37 @@ module Rbml
       ROUTES.fetch(name)
     end
 
-    def spawn(options, &block)
-      require "#{route_for(method_name.to_sym).downcase}/#{method_name}"
-      language = "Language::#{route_for(method_name.to_sym)}::#{method_name.camelize}".to_m
-      Rbml.const_get(route_for(method_name.to_sym)).render(language, options, &block)
-    end
+    def method_name; caller[0][/`([^']*)'/, 1]; end
 
-    ROUTES.each_key do |k|
-      alias_method k, :spawn
+    def spawn(options, *args, &block)
+      language = if args.first.kind_of?(Hash) and args.first[:as_language]
+         args[:as_language]
+      else
+         method_name rescue $script_extention
+      end
+      language = load_language(language)
+      render(method_name, language, options, &block)
     end
 
-    def method_name; caller[0][/`([^']*)'/, 1]; end
+    def render(method_name, language, options, &block)
+      Rbml.const_get(route_for(method_name.to_sym)).render(language, options, &block)
+    end
+    
+    def load_language(language)
+      require "#{route_for(language.to_sym).downcase}/#{language}"
+      "Language::#{route_for(language.to_sym)}::#{language.camelize}".to_m
+    end
+    
+    def self.read(file)
+      File.read(file)
+    end
     
     def self.run(argv)
-      new.instance_eval File.readlines(argv.first).join
+      new.instance_eval File.read(argv)
     end 
+    
+    ROUTES.each_key do |k|
+      alias_method k, :spawn
+    end
   end
 end

data/lib/rbml.rb

@@ -1,8 +1,8 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)) + "/../languages") 
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) 
 
 module Rbml
-  VERSION = '0.0.5.9.2'
+  VERSION = '0.0.5.9.3'
 end
 require 'extensions/kernel'
 require 'extensions/primitives'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rbml
 version: !ruby/object:Gem::Version 
-  version: 0.0.5.9.2
-date: 2007-03-06 00:00:00 -05:00
+  version: 0.0.5.9.3
+date: 2007-05-01 00:00:00 -04:00
 summary: Rbml is a dsl framework for writing other languages in ruby
 require_paths: 
 - lib
@@ -56,6 +56,9 @@ files:
 - lib/processor.rb
 - lib/rbml.rb
 - lib/shell.rb
+- lib/cli_tools.rb
+- lib/cli_tools/array.rb
+- lib/cli_tools/string.rb
 - spec/doc_spec.rb
 - spec/object_spec.rb
 - spec/rbml_spec.rb
@@ -80,5 +83,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.7
+        version: 1.2.0
     version: