RubyGems - zucker - Versions diffs - 1 → 2 - Mend

zucker 1 → 2

Files changed (131) hide show

data/CHANGELOG +14 -0
data/Rakefile +14 -4
data/lib/zucker.rb +0 -4
data/lib/zucker/2/D.rb +19 -0
data/lib/zucker/2/aliases.rb +28 -0
data/lib/zucker/2/all.rb +6 -0
data/lib/zucker/2/array.rb +17 -0
data/lib/zucker/2/array2proc.rb +16 -0
data/lib/zucker/2/binding.rb +25 -0
data/lib/zucker/2/blank.rb +26 -0
data/lib/zucker/2/class2proc.rb +10 -0
data/lib/zucker/2/debug.rb +4 -0
data/lib/zucker/2/default.rb +25 -0
data/lib/zucker/2/desc/D.yaml +23 -0
data/lib/zucker/2/desc/aliases.yaml +16 -0
data/lib/zucker/2/desc/array.yaml +14 -0
data/lib/zucker/2/desc/array2proc.yaml +17 -0
data/lib/zucker/2/desc/binding.yaml +10 -0
data/lib/zucker/2/desc/blank.yaml +10 -0
data/lib/zucker/2/desc/class2proc.yaml +12 -0
data/lib/zucker/2/desc/egonil.yaml +17 -0
data/lib/zucker/2/desc/enumerable.yaml +11 -0
data/lib/zucker/2/desc/hash.yaml +14 -0
data/lib/zucker/2/desc/hash2proc.yaml +11 -0
data/lib/zucker/2/desc/info.yaml +12 -0
data/lib/zucker/2/desc/iterate.yaml +17 -0
data/lib/zucker/2/desc/ivars.yaml +20 -0
data/lib/zucker/2/desc/kernel.yaml +13 -0
data/lib/zucker/2/desc/mcopy.yaml +12 -0
data/lib/zucker/2/desc/mm.yaml +12 -0
data/lib/zucker/2/desc/regexp2proc.yaml +13 -0
data/lib/zucker/2/desc/sandbox.yaml +19 -0
data/lib/zucker/2/desc/square_brackets_for.yaml +23 -0
data/lib/zucker/2/desc/string.yaml +13 -0
data/lib/zucker/2/desc/unary.yaml +15 -0
data/lib/zucker/2/desc/union.yaml +11 -0
data/lib/zucker/2/doc/zucker_doc.html +1494 -0
data/lib/zucker/2/doc/zucker_doc.rb +498 -0
data/lib/zucker/2/egonil.rb +14 -0
data/lib/zucker/2/enumerable.rb +12 -0
data/lib/zucker/2/hash.rb +19 -0
data/lib/zucker/2/hash2proc.rb +14 -0
data/lib/zucker/2/info.rb +164 -0
data/lib/zucker/2/iterate.rb +23 -0
data/lib/zucker/2/ivars.rb +26 -0
data/lib/zucker/2/kernel.rb +18 -0
data/lib/zucker/2/mcopy.rb +9 -0
data/lib/zucker/2/mm.rb +31 -0
data/lib/zucker/2/regexp2proc.rb +10 -0
data/lib/zucker/2/sandbox.rb +19 -0
data/lib/zucker/2/spec/D_spec.rb +35 -0
data/lib/zucker/2/spec/aliases_spec.rb +13 -0
data/lib/zucker/2/spec/array2proc_spec.rb +12 -0
data/lib/zucker/2/spec/array_spec.rb +23 -0
data/lib/zucker/2/spec/binding_spec.rb +8 -0
data/lib/zucker/2/spec/blank_spec.rb +20 -0
data/lib/zucker/2/spec/class2proc_spec.rb +9 -0
data/lib/zucker/2/spec/egonil_spec.rb +30 -0
data/lib/zucker/2/spec/enumerable_spec.rb +8 -0
data/lib/zucker/2/spec/hash2proc_spec.rb +12 -0
data/lib/zucker/2/spec/hash_spec.rb +17 -0
data/lib/zucker/2/spec/info_spec.rb +8 -0
data/lib/zucker/2/spec/iterate_spec.rb +54 -0
data/lib/zucker/2/spec/ivars_spec.rb +20 -0
data/lib/zucker/2/spec/kernel_spec.rb +28 -0
data/lib/zucker/2/spec/mcopy_spec.rb +13 -0
data/lib/zucker/2/spec/mm_spec.rb +8 -0
data/lib/zucker/2/spec/regexp2proc_spec.rb +9 -0
data/lib/zucker/2/spec/sandbox_spec.rb +26 -0
data/lib/zucker/2/spec/spec_helper.rb +18 -0
data/lib/zucker/2/spec/square_brackets_for_spec.rb +59 -0
data/lib/zucker/2/spec/string_spec.rb +29 -0
data/lib/zucker/2/spec/unary_spec.rb +26 -0
data/lib/zucker/2/spec/union_spec.rb +15 -0
data/lib/zucker/2/square_brackets_for.rb +20 -0
data/lib/zucker/2/string.rb +25 -0
data/lib/zucker/2/unary.rb +22 -0
data/lib/zucker/2/union.rb +14 -0
data/lib/zucker/all.rb +2 -2
data/lib/zucker/array2proc.rb +7 -1
data/lib/zucker/debug.rb +3 -3
data/lib/zucker/default.rb +1 -1
data/lib/zucker/desc/D.yaml +1 -1
data/lib/zucker/desc/array.yaml +1 -1
data/lib/zucker/desc/array2proc.yaml +5 -1
data/lib/zucker/desc/binding.yaml +2 -2
data/lib/zucker/desc/blank.yaml +1 -3
data/lib/zucker/desc/egonil.yaml +1 -1
data/lib/zucker/desc/enumerable.yaml +1 -1
data/lib/zucker/desc/hash.yaml +4 -2
data/lib/zucker/desc/info.yaml +12 -0
data/lib/zucker/desc/kernel.yaml +2 -2
data/lib/zucker/desc/mm.yaml +3 -3
data/lib/zucker/desc/regexp2proc.yaml +1 -1
data/lib/zucker/desc/sandbox.yaml +6 -1
data/lib/zucker/desc/string.yaml +1 -1
data/lib/zucker/desc/unary.yaml +2 -2
data/lib/zucker/desc/union.yaml +1 -1
data/lib/zucker/doc/zucker_doc.html +441 -233
data/lib/zucker/doc/zucker_doc.rb +32 -27
data/lib/zucker/hash.rb +3 -3
data/lib/zucker/info.rb +164 -0
data/lib/zucker/ivars.rb +1 -1
data/lib/zucker/kernel.rb +2 -4
data/lib/zucker/sandbox.rb +7 -3
data/lib/zucker/spec/D_spec.rb +15 -7
data/lib/zucker/spec/aliases_spec.rb +3 -24
data/lib/zucker/spec/array2proc_spec.rb +5 -1
data/lib/zucker/spec/array_spec.rb +1 -1
data/lib/zucker/spec/binding_spec.rb +4 -2
data/lib/zucker/spec/blank_spec.rb +1 -1
data/lib/zucker/spec/class2proc_spec.rb +1 -1
data/lib/zucker/spec/egonil_spec.rb +1 -1
data/lib/zucker/spec/enumerable_spec.rb +1 -1
data/lib/zucker/spec/hash2proc_spec.rb +1 -1
data/lib/zucker/spec/hash_spec.rb +10 -3
data/lib/zucker/spec/info_spec.rb +8 -0
data/lib/zucker/spec/iterate_spec.rb +1 -1
data/lib/zucker/spec/ivars_spec.rb +1 -1
data/lib/zucker/spec/kernel_spec.rb +1 -7
data/lib/zucker/spec/mcopy_spec.rb +1 -1
data/lib/zucker/spec/mm_spec.rb +4 -2
data/lib/zucker/spec/regexp2proc_spec.rb +1 -1
data/lib/zucker/spec/sandbox_spec.rb +22 -3
data/lib/zucker/spec/spec_helper.rb +18 -0
data/lib/zucker/spec/square_brackets_for_spec.rb +1 -1
data/lib/zucker/spec/string_spec.rb +7 -7
data/lib/zucker/spec/unary_spec.rb +1 -1
data/lib/zucker/spec/union_spec.rb +8 -6
metadata +207 -131
data/lib/zucker/doc/meta.yaml +0 -4

data/lib/zucker/doc/zucker_doc.rb CHANGED

@@ -1,8 +1,12 @@
 # Ruby 1.9, encoding: utf-8
+#  creates the documentation for Zucker
 require 'yaml'
 require 'coderay'
 class ZuckerDoc
+  PACKAGES     = %w|default debug|
+  ORDER        = %w|summary why methods info spec source versions|
   DESCRIPTIONS = {
     'summary'  => 'Summary',
     'why'      => 'Why?',
@@ -13,15 +17,15 @@ class ZuckerDoc
     'versions' => 'Compatibility',
     'authors'  => 'Authors',
   }
-  ORDER   = %w|summary why methods info spec source versions|
   # template vars
-  @version = 1
+  @version = 2
   class << self
-    def generate
+    def generate(path = '../')
+      @path = path
-      cubes = Dir['../desc/*'].inject({}) do |res, cube_file; a|
+      cubes = Dir[ File.join(path, 'desc', '*') ].inject({}) do |res, cube_file; a|
         a = YAML.load_file cube_file
         if a.instance_of? Hash
           res.merge a
@@ -30,13 +34,12 @@ class ZuckerDoc
         end
       end
-      @meta = YAML.load_file 'meta.yaml'
+      output_path = File.join(path, 'doc', 'zucker_doc.html')
-      output = 'zucker_doc.html'
       result = DATA.read
-      cubes_html = cubes.sort.map{ |name, hash|
-        cube name, hash
+      cubes_html = PACKAGES.map{ |pkg_name|
+        package pkg_name, cubes.select{|name, hash| hash['package'] == pkg_name }
       }.join
       # insert cubes
@@ -47,16 +50,28 @@ class ZuckerDoc
       result.gsub! /⇧(.+?)⇧/, '<code>\1</code>'
       # strong
       result.gsub! /●(.+?)●/, '<strong>\1</strong>'
-      # hyper!links
+      # hyper→links
       result.gsub! /→(.+?)→(.+?)→/, '<a href="\2">\1</a>'
-      File.open output, 'w' do |file|
+      File.open output_path, 'w' do |file|
         file.puts result
       end
     end
   protected
+    def package(name, cubes)
+      cube_html = cubes.sort.map{ |name, hash|
+        cube name, hash
+      }.join
+      %{
+      <h2 title="require 'zucker/#{name}'">Cubes[#{name}]</h2>
+        <div class="cubes">
+        #{cube_html}
+        </div> }
+    end
     def cube(name, hash)
       @cube_name = name
       %{ <h3 title="require 'zucker/#{name}'">#{ name }</h3>
@@ -110,17 +125,17 @@ class ZuckerDoc
     end
     def spec(s)
-      source_helper(:spec, '../spec/', '_spec')
+      source_helper(:spec, File.join( @path, 'spec/' ), '_spec')
     end
     def source(s)
-      source_helper(:source, '../')
+      source_helper(:source, @path)
     end
     def source_helper(kind, file_prefix, suffix='')
       %{ <span id="show_#{@cube_name}_#{kind}">(<a href="javascript:show('#{@cube_name}_#{kind}')">show</a>)</span>
          <pre class="source" id="#{@cube_name}_#{kind}">#{
-           get_source_file( file_prefix + @cube_name + suffix + '.rb' )
+           get_source_file( File.join file_prefix, ( @cube_name + suffix + '.rb' ) )
          }</pre> }
     end
@@ -149,7 +164,7 @@ class ZuckerDoc
   end
 end
-ZuckerDoc.generate
+ZuckerDoc.generate *ARGV
 __END__
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
@@ -288,19 +303,12 @@ code, pre{
 .source{
   display:none;
-  border:1px solid #005;
-#  background:#111;
   width:98%;
-#  background-color: #232323;
-#  border: 1px solid black;
-#  font-family: 'Courier New', 'Terminal', monospace;
-#  color: #E6E0DB;
   padding: 3px 5px;
-#  margin-right:1em;
   overflow: auto;
   font-size: 12px;
   background-color: #f8f8f8;
+  border:1px solid #005;
   border: 1px solid silver;
   font-family: 'Courier New', 'Terminal', monospace;
   color: #000;
@@ -454,7 +462,7 @@ table.source td { padding: 2px 4px; vertical-align: top; }
     <h1>Ruby Zucker ..version..</h1>
       <h2>What is it?</h2>
-      <p class="text">Zucker is the German word for sugar (<a href="http://www.forvo.com/word/zucker/">pronunciation</a>). This gem adds syntactical sugar in the form of independent, lightweight scripts that make Ruby even more sweet. Read <a href="http://rbjl.net/32-introducing-ruby-zucker-a-new-syntactical-sugar-gem">this blog post</a> for a little introduction.</p>
+      <p class="text">Zucker is the German word for sugar (<a href="http://www.forvo.com/word/zucker/">pronunciation</a>). It adds syntactical sugar in the form of independent, small scripts that make Ruby even more sweet. Read <a href="http://rbjl.net/32-introducing-ruby-zucker-a-new-syntactical-sugar-gem">this blog post</a> for a little introduction.</p>
       <h2>Install</h2>
       <p class="text">
@@ -475,10 +483,7 @@ table.source td { padding: 2px 4px; vertical-align: top; }
       <p class="text">You can also lock your require to a specific version of Zucker by simply putting the version before the cube name in this way:
       <code>require 'zucker/1/egonil'</code>. Future releases of the gem will include all previous (main) versions, so the behaviour of these directly required cubes will not change (except for critical bugs).</p>
-      <h2 title="require 'zucker/all'">Cubes</h2>
-      <div class="cubes">
-        ....
-      </div>
+       ....
 <br/>
     </div>
   <div id="foot">

data/lib/zucker/hash.rb CHANGED

@@ -1,16 +1,16 @@
 class Hash
   def self.zip(keys,values)
-    Hash[ *[1,2,3].zip( [4,5,6] ).flatten ]
+    Hash[ *keys.zip( values ).flatten ]
   end
   def <<(other)
     case
     when other.is_a?(Hash)
       merge! other
-    when other.respond_to?(:to_splat)
+    when other.is_a?(Enumerable) || other.respond_to?(:to_splat)
       merge! Hash[*other]
     else
-      raise TypeError, 'can only append other Hashs and Enumerables'
+      raise TypeError, 'can only append other Hashs and Enumerables (or Classes that implement to_splat)'
     end
   end
 end

data/lib/zucker/info.rb ADDED

@@ -0,0 +1,164 @@
+module Info
+  class << Info
+    # hash like access
+    def [](what)
+      send what
+    end
+    # TODO: maybe add a descriptions method
+  end
+  module_function
+  # current script file
+  def current_file
+    __FILE__
+  end
+  def current_file_directory
+    File.dirname(__FILE__)
+  end
+  # input
+  def last_input_file
+    $FILENAME
+  end
+  def last_input_line_number
+    $.
+  end
+  def last_input
+    $_
+  end
+  # program
+  def program_name
+    $0
+  end
+  def program_arguments
+    $:
+  end
+  def loaded_programs
+    $"
+  end
+  def program_data
+    ::DATA
+  end
+  def child_program_status
+    $CHILD_STATUS
+  end
+  # system info
+  def environment
+    ::ENV
+  end
+  alias env environment
+  def working_directory
+    Dir.pwd
+  end
+  def platform
+    ::RUBY_PLATFORM
+  end
+  def process_id
+    $$
+  end
+  def load_path
+    $:
+  end
+  # current
+  def current_line
+    __LINE__
+  end
+  def current_method # 1.9
+    __method__
+  end
+  def current_callstack
+    caller
+  end
+  # dealing with strings
+  def gets_separator
+    $/
+  end
+  def join_separator
+    $,
+  end
+  def print_separator
+    $,
+  end
+  def split_separator
+    $;
+  end
+  # misc
+  def security_level
+    $SAFE
+  end
+  def warnings_activated?
+    $VERBOSE
+  end
+  def debug_activated?
+    $DEBUG
+  end
+  def last_exception
+    $!
+  end
+  # defined objects
+  def global_variables
+    global_variables
+  end
+  def global_constants
+    Object.constants
+  end
+  # encoding (1.9)
+  def source_encoding
+    __ENCODING__
+  end
+  def external_encoding
+    Encoding.default_external
+  end
+  def internal_encoding
+    Encoding.default_internal
+  end
+  # ruby version info
+  def ruby_version
+    ::RUBY_VERSION
+  end
+  def ruby_patchlevel
+    ::RUBY_PATCHLEVEL
+  end
+  def ruby_description
+    ::RUBY_DESCRIPTION
+  end
+  def ruby_release_date
+    ::RUBY_RELEASE_DATE
+  end
+end

data/lib/zucker/ivars.rb CHANGED

@@ -1,7 +1,7 @@
 def instance_variables_from(obj, *only)
   iter =
   if    obj.is_a? Binding
-    obj.eval('local_variables').map{|e| [obj.eval(e), e] }
+    obj.eval('local_variables').map{|e| [obj.eval("#{e}"), e] }
   elsif obj.is_a? Hash
     obj.map{|k,v| [v,k] }
   else

data/lib/zucker/kernel.rb CHANGED

@@ -6,10 +6,6 @@ def deactivate_warnings!
   $VERBOSE = false
 end
-def warnings_activated?
-  $VERBOSE
-end
 def library?
   __FILE__ != $PROGRAM_NAME
 end
@@ -18,3 +14,5 @@ def ignore_sigint! # ctrl+c
    Signal.trap *%w|SIGINT IGNORE|
 end
+# J-_-L

data/lib/zucker/sandbox.rb CHANGED

@@ -1,11 +1,15 @@
-def sandbox(rescueblock=nil)
+def sandbox(rescueblock_or_default=nil)
   Thread.start do
     $SAFE = 4
     yield
   end.value
 rescue SecurityError => e
-  if rescueblock
-    rescueblock.call e
+  if !rescueblock_or_default.nil?
+    if rescueblock_or_default.is_a? Proc
+      rescueblock_or_default.call e
+    else
+      rescueblock_or_default
+    end
   else
     raise e
   end

data/lib/zucker/spec/D_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require 'D'
+require 'zucker/D'
 describe 'Object#D' do
@@ -10,18 +10,26 @@ describe 'Object#D' do
     a.each{ |e|
       (e.D).should == e
     }
+    a.each{ |e|
+      (e.D{|value| "This is a: #{value}"}).should == e
+    }
   end
   it "should puts .inspect if no block is given (and not change the object's value)" do
-#    a.each{ |e|
-#      (e.D).should == e
-#    }
+    capture_stdout do
+      a[0].D
+      a[1].D
+      a[6].D
+    end.should == %{1\n"1"\ntrue\n}
   end
   it "should puts the block if it is given (and not change the object's value)" do
-    a.each{ |e|
-      (e.D{|value| "This is a: #{value}"}).should == e
-    }
+    capture_stdout do
+      a[0].D{|value| "This is a: #{value}"}
+      a[1].D{|value| "This is a: #{value}"}
+      a[6].D{|value| "This is a: #{value}"}
+    end.should == %{This is a: 1\nThis is a: 1\nThis is a: true\n}
   end
 end

data/lib/zucker/spec/aliases_spec.rb CHANGED

@@ -1,29 +1,8 @@
-require 'aliases'
+require 'zucker/aliases'
 describe '(aliases)' do
-  it 'should create these aliases [ sorry, no real spec for this one :P ] ' do
-  # alias is_an? is_a?
-  #  module Enumerable
-  #    alias with zip
-  #    alias %    zip
-  #  end
-  #  class Array
-  #    alias ** product
-  #  end
-  #  class Hash
-  #    alias + merge
-  #  end
-  #  class Binding
-  #    #alias [] eval
-  #    def [](expr)
-  #      self.eval "#{expr}"
-  #    end
-  #  end
+  it 'should create these aliases' do
+    # see aliases.rb for aliase list
   end
   it 'should define these constants' do