fancy 0.8.0 → 0.9.0

data/lib/enumerator.fy

@@ -1,5 +1,13 @@
 class Fancy {
   class Enumerator {
+    class Generator {
+      def initialize: @block
+
+      def each: block {
+        @block call: [block]
+      }
+    }
+
     def initialize: @collection {
       """
       @collection Collection to iterate over.
@@ -141,6 +149,8 @@ class Fancy {
       }
     }
 
+    include: Fancy Enumerable
+
     def chunk: block {
       Generator new: |inner_block| {
         enums = []
@@ -169,17 +179,10 @@ class Fancy {
       } . to_enum
     }
 
-    class Generator {
-      def initialize: @block {}
-
-      def each: block {
-        @block call: [block]
-      }
-    }
-
     def to_a {
       output = []
       each: |element| { output << element }
+      rewind
       output
     }
   }

data/lib/eval.fy

@@ -27,7 +27,6 @@ def Fancy eval: code binding: binding (nil) file: file ("(fancy-eval)") line: li
   cm name=('__fancy_eval__)
 
   script = Rubinius CompiledMethod Script new(cm, file, true)
-  script eval_binding=(binding)
   script eval_source=(code)
 
   cm scope() script=(script)
@@ -39,7 +38,5 @@ def Fancy eval: code binding: binding (nil) file: file ("(fancy-eval)") line: li
     be proc_environment=(binding proc_environment)
   }
 
-  be from_eval!()
-
   be call()
 }

data/lib/fancy_spec.fy

@@ -13,6 +13,8 @@ class FancySpec {
     @spec_tests = []
     @before_blocks = []
     @after_blocks = []
+    @before_all_block = {}
+    @after_all_block = {}
   }
 
   def FancySpec describe: test_obj with: block {
@@ -94,6 +96,22 @@ class FancySpec {
 
   alias_method: 'it:for:when: for: 'it:with:when:
 
+  def before: block {
+    """
+    @block @Block@ to be run before all test cases.
+    """
+
+    @before_all_block = block
+  }
+
+  def after: block {
+    """
+    @block @Block@ to be run after all test cases.
+    """
+
+    @after_all_block = block
+  }
+
   def before_each: block {
     """
     @block @Block@ to be run before each test case.
@@ -116,6 +134,9 @@ class FancySpec {
     """
 
     # "  " ++ @description ++ ": " print
+
+    @before_all_block call
+
     @spec_tests each: |test| {
       @before_blocks each: |b| {
         b call_with_receiver: test
@@ -126,6 +147,8 @@ class FancySpec {
       }
     }
 
+    @after_all_block call
+
     # untested_methods = @test_obj methods select: |m| {
     #   m tests size == 0
     # }
@@ -431,6 +454,10 @@ class Object {
     is == expected
   }
 
+  def is_a: class {
+    is_a?: class . is: true
+  }
+
   def is_not: expected {
     does_not == expected
   }

data/lib/fdoc.fy

@@ -133,7 +133,7 @@ class Fancy FDoc {
       keys each: |i| {
         str << $ to_json: i
         str << ":"
-        str << $ to_json: (obj at: i)
+        str << $ to_json: (obj[i])
       } in_between: { str << ", " }
       str << "}"
       str join
@@ -162,7 +162,7 @@ class Fancy FDoc {
         if: mdoc then: {
           mattr['doc]: $ mdoc format: 'fdoc
           if: (mdoc meta) then: {
-            mattr['arg]: $ mdoc meta at: 'argnames
+            mattr['arg]: $ mdoc meta['argnames]
           }
         }
         if: (exec class() == Rubinius CompiledMethod) then: {
@@ -176,7 +176,7 @@ class Fancy FDoc {
           # right now we only use the first line of code in the body.
           mattr['lines]: $ [exec definition_line, exec last_line]
         }
-        attr[(type ++ "s") intern()] [n]: mattr
+        attr["#{type}s" intern()] [n to_s]: mattr
       }
     }
 
@@ -193,7 +193,7 @@ class Fancy FDoc {
           'doc => doc format: 'fdoc,
           'instance_methods => <[]>,
           'methods => <[]>,
-          'ancestors => cls ancestors() map: |c| { c name() gsub("::", " ") }
+          'ancestors => cls ancestors() map: |c| { (c name || "") gsub("::", " ") }
         ]>
         popuplate_methods: cls on: attr type: 'instance_method known: methods
         popuplate_methods: cls on: attr type: 'method known: methods
@@ -202,14 +202,14 @@ class Fancy FDoc {
 
       methods each: |cm| {
         cls = cm scope() module()
-        cls_name = cls name() gsub("::", " ")
-        cls_attr = map['classes] at: cls_name
+        cls_name = cls name gsub("::", " ")
+        cls_attr = map['classes][cls_name]
 
-        full_name = cls_name ++ "#" ++ (cm name())
+        full_name = "#{cls_name}##{cm name}"
 
         doc = Fancy Documentation for: cm
         attr = <[
-          'args => doc meta at: 'argnames,
+          'args => doc meta['argnames],
           'doc => doc format: 'fdoc
         ]>
 

data/lib/file.fy

@@ -15,6 +15,19 @@ class File {
     File open: filename modes: ['write] with: block
   }
 
+  def File overwrite: filename with: block {
+    """
+    @filename Filename of @File@ to overwrite.
+    @block @Block@ called with a @File@ object to write to (overwriting old contents.
+
+    Opens a @File@ for writing, overwriting old content.
+    """
+
+    File open: filename modes: ['truncate] with: block
+  }
+
+  metaclass alias_method: 'truncate:with: for: 'overwrite:with:
+
   def File append: filename with: block {
     """
     @filename Filename of @File@ to append to.
@@ -37,6 +50,17 @@ class File {
     File open: filename modes: ['read] with: block
   }
 
+  def File readlines: filename {
+    """
+    @filename Filename of @File@ to read lines from.
+    @return @Array@ of lines in @filename.
+
+    Opens & reads a @File@ and returns all of its lines in an @Array@.
+    """
+
+    File read: filename with: @{ readlines }
+  }
+
   def File read_binary: filename with: block {
     """
     @filename Filename of @File@ to read from.
@@ -122,7 +146,7 @@ class File {
           ]>
     """
 
-    File read: filename . eval to_hash_deep
+    File eval: filename . to_hash_deep
   }
 
   def writeln: x {

data/lib/hash.fy

@@ -139,6 +139,21 @@ class Hash {
     o
   }
 
+  def to_object_deep {
+    """
+    Similar to @Hash#to_object@ but converting any nested @Hash@ slots to @Object@s as well.
+    """
+
+    o = dup to_hash_deep to_object
+    o slots each: |s| {
+      val = o get_slot: s
+      match val {
+        case Hash >< Block -> o set_slot: s value: $ val to_object_deep
+      }
+    }
+    o
+  }
+
   def inspect {
     str = "<["
     each: |key val| {
@@ -152,6 +167,10 @@ class Hash {
     str
   }
 
+  def to_s {
+    inspect
+  }
+
   def values_at: keys {
     """
     @keys Collection of keys to get the values for.
@@ -276,4 +295,76 @@ class Hash {
       receiver
     }
   }
+
+  def update_values: block {
+    """
+    @block @Block@ that returns an updated value for each value in @self.
+
+    Example:
+          h = <['name => \"Tom\", 'age => 21 ]>
+          h update_values: @{ * 2}
+          h # => <['name => \”TomTom\”, 'age => 42]>
+    """
+
+    each: |k v| {
+      self[k]: $ block call: [v]
+    }
+  }
+
+  def update_keys: block {
+    """
+    @block @Block@ that returns an updated key for each key in @self.
+
+    Example:
+          h = <['name => \"Tom\", 'age => 21 ]>
+          h update_keys: @{ to_s * 2}
+          h # => <[\"namename\" => \”Tom\”, \"ageage\" => 21]>
+    """
+
+    deletions = []
+    insertions = <[]>
+
+    each: |k v| {
+      new_key = block call: [k]
+      if: (new_key != k) then: {
+        deletions << k
+        insertions[new_key]: v
+      }
+    }
+
+    deletions each: |k| { delete: k }
+    insertions each: |k v| {
+      self[k]: v
+    }
+  }
+
+  def with_updated_values: block {
+    """
+    @block @Block@ that returns an updated value for each value in @self.
+    @return @Hash@ based on self but with updated values via @block.
+    """
+
+    dup update_values: block
+  }
+
+  def with_updated_keys: block {
+    """
+    @block @Block@ that returns an updated key for each key in @self.
+    @return @Hash@ based on self but with updated keys via @block.
+    """
+
+    dup update_keys: block
+  }
+
+  def with_value_for_key: key do: block else: else_block ({}) {
+    """
+    @key Key of value to find in @self.
+    @block @Block@ to be called with value for @key, if found.
+    @else_block @Block@ to be called if @key not found in @self.
+    """
+
+    if: (includes?: key) then: {
+      block call: [at: key]
+    } else: else_block
+  }
 }

data/lib/html.fy

@@ -34,16 +34,20 @@ class HTML {
   def initialize {
     @buf = ""
     @indent = 0
+    @indent_offset = 0
   }
 
-  def initialize: block {
+  def initialize: block indentation: indent_offset (0) {
     initialize
+    @indent_offset = indent_offset
     block call: [self]
   }
 
+  def indentation: @indent_offset
+
   def open_tag: name attrs: attrs (<[]>) indent: indent (true) {
     @buf << "\n"
-    @buf << (" " * @indent)
+    @buf << (" " * (@indent + @indent_offset))
     @indent = @indent + 2
 
     @buf << "<" << name
@@ -60,10 +64,10 @@ class HTML {
     { @indent = @indent - 2 } unless: indent
   }
 
-  def close_tag: name {
-    @buf << "\n"
+  def close_tag: name linebreak: linebreak (true) {
+    { @buf << "\n" } if: linebreak
     @indent = @indent - 2
-    @buf << (" " * @indent)
+    @buf << (" " * (@indent + @indent_offset))
 
     @buf << "</" << name << ">"
   }
@@ -71,9 +75,10 @@ class HTML {
   def html_block: tag body: body attrs: attrs (<[]>) {
     tag = tag from: 0 to: -2
     open_tag: tag attrs: attrs
-    match body first {
-      case Block -> @buf << (body first call: [self])
-      case _ -> @buf << "\n" << (" " * @indent) << (body first)
+    content = body first
+    match content {
+      case Block -> @buf << (content call: [self])
+      case _ -> @buf << "\n" << (" " * (@indent + @indent_offset)) << content
     }
     close_tag: tag
     nil
@@ -91,17 +96,41 @@ class HTML {
   }
 
   def br {
-    @buf << "\n" << (" " * @indent)
+    @buf << "\n" << (" " * (@indent + @indent_offset))
     @buf << "<br/>"
     nil
   }
 
-  def input: attrs {
-    open_tag: "input" attrs: (attrs to_hash) indent: false
+  def script: attrs {
+    open_tag: "script" attrs: (attrs to_hash) indent: true
+    close_tag: "script" linebreak: false
+    nil
+  }
+
+  def textarea: attrs with: content ("") {
+    @buf << "\n" << (" " * (@indent + @indent_offset))
+    @buf << "<textarea "
+    attrs to_hash each: |name val| {
+      @buf << name << "=" << (val to_s inspect)
+    } in_between: {
+      @buf << " "
+    }
+    @buf << ">" << content << "</textarea>"
     nil
   }
 
   def to_s {
     @buf from: 1 to: -1 . to_s
   }
+
+  def self single_tags: single_tags {
+    single_tags each: |t| {
+      define_method: "#{t}:" with: |attrs| {
+        open_tag: t attrs: (attrs to_hash) indent: false
+        nil
+      }
+    }
+  }
+
+  single_tags: ('input, 'link, 'img)
 }

data/lib/integer.fy

@@ -60,6 +60,10 @@ class Integer {
           12345 decimals # => [1, 2, 3, 4, 5]
     """
 
+    if: (self < 0) then: {
+      return negate decimals
+    }
+
     decimals = []
     tmp = self
     while: { tmp >= 10 } do: {

data/lib/main.fy

@@ -7,7 +7,7 @@
 if: (ARGV size == 1) then: {
   ARGV for_options: ["-v", "--version"] do: {
     "Fancy #{Fancy VERSION}" println
-    "(C) 2010, 2011, 2012 Christopher Bertels <chris@fancy-lang.org>" println
+    "(C) 2010, 2011, 2012, 2013 Christopher Bertels <chris@fancy-lang.org>" println
     System exit
   }
 
@@ -42,22 +42,29 @@ ARGV for_option: "-e" do: |eval_string| {
 }
 
 ARGV for_option: "-c" do: {
-  ARGV index: "-c" . if_true: |idx| {
+  if: (ARGV index: "-c") then: |idx| {
     ARGV[[idx + 1, -1]] . tap: |filenames| {
-      filenames each: |filename| {
-        "Compiling " ++ filename println
-        Fancy Compiler compile_file: filename to: nil line: 1 print: false
+      total = filenames size
+      max_width = total decimals size
+      start_time = Time now
+      duration = Time duration: {
+        filenames each_with_index: |filename idx| {
+          *stdout* printf("[%#{max_width}i / %i] Compiling %s\n", idx + 1, total, filename)
+          Fancy Compiler compile_file: filename to: nil line: 1 print: false
+        }
       }
-      files = "file"
-      { files = "files" } if: $ filenames size != 1
-      "Compiled #{filenames size} #{files}." println
+      files = match filenames size {
+        case 1 -> "file"
+        case _ -> "files"
+      }
+      "Compiled #{filenames size} #{files} in #{duration} seconds." println
     }
   }
   System exit
 }
 
 ARGV for_option: "-cv" do: {
-  ARGV index: "-cv" . if_true: |idx| {
+  if: (ARGV index: "-cv") then: |idx| {
     ARGV[[idx + 1, -1]] each: |filename| {
       "Compiling " ++ filename println
       Fancy Compiler compile_file: filename to: nil line: 1 print: true
@@ -92,7 +99,7 @@ ARGV for_option: "list-packages" do: {
 Fancy Package add_to_loadpath
 
 # Load a source file, if any given:
-ARGV first if_true: |file| {
+if: (ARGV first) then: |file| {
   try {
     Fancy CodeLoader load_compiled_file: file
   } catch Fancy Parser ParseError => e {
@@ -100,6 +107,6 @@ ARGV first if_true: |file| {
   }
 }
 
-ARGV empty? if_true: {
+if: (ARGV empty?) then: {
   require: "../bin/ifancy"
 }