lispy 0.0.2 → 0.0.3

data/Rakefile

@@ -6,5 +6,9 @@ task :default do
 end
 
 task :run_tests do 
-  require 'test/lispy_test'
+  if RUBY_VERSION =~ /^1.9/
+    require_relative 'test/lispy_test' # for fuck's sake.
+  else
+    require 'test/lispy_test'
+  end
 end

data/lib/lispy.rb

@@ -1,26 +1,35 @@
 class Lispy
-  VERSION = '0.0.2'
-  class Builder
-    def _(&block)
-      @output = []
-      @scope = [@output]
-      instance_exec(&block)
-      @output
-    end
+  VERSION = '0.0.3'
 
-    def method_missing(sym, *args, &block)
-      args = (args.length == 1 ? args.first : args)
-      @scope.last << [sym, args]
-      if block
-        @scope.last << []
-        @scope.push(@scope.last.last)
-        instance_exec(&block)
-        @scope.pop
-      end
+  @@methods_to_keep = /^__/, /class/, /instance_/, /method_missing/, /object_id/
+
+  instance_methods.each do |m|
+    undef_method m unless @@methods_to_keep.find { |r| r.match m }
+  end
+
+  def method_missing(sym, *args, &block)
+    args = (args.length == 1 ? args.first : args)
+    @scope.last << [sym, args]
+    if block
+      # there is some simpler recursive way of doing this, will fix it shortly
+      @scope.last.last << []
+      @scope.push(@scope.last.last.last)
+      instance_exec(&block)
+      @scope.pop
     end
   end
 
   def to_data(&block)
-    Builder.new._(&block)
+    _(&block)
+    @output
+  end
+  
+private
+  
+  def _(&block)
+    @output = []
+    @scope = [@output]
+    instance_exec(&block)
+    @output
   end
 end

data/test/lispy_test.rb

@@ -18,14 +18,34 @@ class LispyTest < Test::Unit::TestCase
       end
     end
     
-    expected_output = [[:setup, {:workers=>30, :connections=>1024}],
-                       [:http, {:access_log=>:off}],
-                       [[:server, {:listen=>80}],
-                        [[:location, "/"],
-                         [[:doc_root, "/var/www/website"]],
-                         [:location, "~ .php$"],
-                         [[:fcgi, {:port=>8877}], [:script_root, "/var/www/website"]]]]]
 
-     assert_equal output, expected_output 
+    expected = [[:setup, {:workers=>30, :connections=>1024}],
+                 [:http,
+                  {:access_log=>:off},
+                  [[:server,
+                    {:listen=>80},
+                    [[:location, "/", [[:doc_root, "/var/www/website"]]],
+                     [:location,
+                      "~ .php$",
+                      [[:fcgi, {:port=>8877}], [:script_root, "/var/www/website"]]]]]]]]
+
+     assert_equal expected, output
+  end
+
+  def test_moar_lispy
+    output = Lispy.new.to_data do
+      setup
+      setup do
+        lol
+        lol do
+          hi
+          hi
+        end
+      end
+    end
+
+    expected = [[:setup, []], [:setup, [], [[:lol, []], [:lol, [], [[:hi, []], [:hi, []]]]]]]
+
+    assert_equal expected, output
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ryan Allen