collin-fold 0.0.3 → 0.0.5

data/Rakefile.rb

@@ -1,8 +1,12 @@
-__DIR__ = path = File.dirname(__FILE__)
-
 require 'rubygems'
+require 'pathname'
 require 'spec'
 
+__DIR__ = Pathname.new(__FILE__).dirname
+
+
+task :default => 'spec:all'
+
 namespace :spec do
   task :prepare do
     
@@ -18,26 +22,48 @@ namespace :spec do
   end
 end
 
+task :cleanup do 
+  Dir.glob("**/*.*~")+Dir.glob("**/*~").each{|swap|FileUtils.rm(swap, :force => true)}
+end
+
 namespace :gem do
-  task :spec do
-    file = File.new("#{__DIR__}/fold.gemspec", 'w+')
-    file.write %{
+  task :version do
+    @version = "0.0.6"
+  end
+
+  task :build => :spec do
+    load __DIR__ + "fold.gemspec"
+    Gem::Builder.new(@fold_gemspec).build
+  end
+
+  task :install => :build do
+    cmd = "gem install fold -l"
+    system cmd unless system "sudo #{cmd}"
+    FileUtils.rm(__DIR__ + "fold-#{@version}.gem")
+  end
+
+  task :spec => :version do
+    file = File.new(__DIR__ + "fold.gemspec", 'w+')
+    FileUtils.chmod 0755, __DIR__ + "fold.gemspec"
+    spec = %{
 Gem::Specification.new do |s|
   s.name             = "fold"
-  s.version          = "0.0.3"
-  s.platform         = Gem::Platform::RUBY
+  s.date             = "2008-07-21"
+  s.version          = "#{@version}"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.has_rdoc         = false
   s.summary          = "Toolkit for creating whitespace active mini-languages. Inspired by Haml. Feature light."
-  s.description      = s.summary
-  s.author           = "Collin Miller"
+  s.authors          = ["Collin Miller"]
   s.email            = "collintmiller@gmail.com"
   s.homepage         = "http://github.com/collin/fold"
-  s.require_path     = "lib"
   s.files            = %w{#{(%w(README Rakefile.rb) + Dir.glob("{lib,rspec}/**/*")).join(' ')}}
   
   s.add_dependency  "rake"
   s.add_dependency  "rspec"
 end
 }
+
+  @fold_gemspec = eval(spec)
+  file.write(spec)
   end
 end

data/lib/fold/engine.rb

@@ -2,11 +2,6 @@ module Fold
   class Engine
     def initialize source
       @source= source
-      prepare_source
-    end
-    
-    def prepare_source
-      @prepared_source= true
     end
     
     def lines
@@ -14,11 +9,14 @@ module Fold
     end
     
     def render context
-      precompiler.new.fold(lines).children.map{|child| child.render}
+      precompiler = precompiler_class.new
+      precompiler.fold(lines).children.map do |child| 
+        child.render(precompiler)
+      end
     end
     
 #    *** me hard
-    def precompiler
+    def precompiler_class
       @precompiler||= instance_eval "#{self.class.to_s.split(/::/).first}::Precompiler"
     end
   end

data/lib/fold/fold_factory.rb

@@ -14,12 +14,24 @@ module Fold
         :text => line, 
         :tabs => tabs
       }
-    
-      if klass= detect_class(line)
+
+# This all happens because I need to access Precompiler attributes
+# from within AbstractFold render methods
+# Pretty much needs a nice refactor, but don't have the time.
+# PS: thx ruby   
+      fold = if klass= detect_class(line)
         klass.new attrs
       else
         AbstractFold.new attrs.merge(:tabs => -1)
       end
+      
+      instance_variables.each do |var|
+        fold.instance_variable_set var, instance_variable_get(var)
+  
+        fold.metaclass.send :attr_accessor, var.gsub('@', '')
+      end
+
+      fold
     end
     
     def detect_class line

data/lib/fold/precompiler.rb

@@ -5,6 +5,8 @@ module Fold
     def fold lines
       last_line= produce
 
+      return last_line if lines.empty?
+
       parent_line= nil
       
       parent_stack= []
@@ -34,6 +36,7 @@ module Fold
      
         last_line= line
       end
+      
       parent_stack.first
     end
     

data/lib/fold.rb

@@ -1,3 +1,6 @@
+__DIR__ = File.dirname(__FILE__)
+$LOAD_PATH << __DIR__ unless $LOAD_PATH.include?(__DIR__)
+
 require 'facets'
 
 module Fold

data/rspec/fold/engine_spec.rb

@@ -1,32 +1,25 @@
 require 'rspec/fold_spec_helper'
 
 describe Fold::Engine do
+  before(:each) do
+    @fixture = Pathname.new(FoldFixtureRoot)
+    @path= @fixture +"fixture.target.fold"
+    @engine= Fold::Engine.new @path.read  
+
+#     @empty = @fixture + "empty.target.fold"
+#     @empty_engine = Fold::Engine.new @empty.read
+  end
+
   it "inherits Module" do
     Fold::Engine.class.should == Class
   end
 
   describe "#initialize" do
-    before(:each) do
-      @path= "#{FoldFixtureRoot}/fixture.target.fold"
-      @engine= Fold::Engine.new File.read(@path)  
-    end
-  
     it "sets fold content" do
       @engine.instance_variable_get(:@source).should == File.read(@path)
     end
   end
   
-  describe "#prepare_fold" do
-    before(:each) do
-      @path= "#{FoldFixtureRoot}/fixture.target.fold"
-      @engine= Fold::Engine.new File.read(@path)  
-    end
-    
-    it "prepares fold content" do
-      @engine.instance_variable_get(:@prepared_source).should_not be_nil
-    end
-  end
-  
   describe "#lines" do
     it "splits on line breaks" do
       lines= 10

data/rspec/fold/fold_factory_spec.rb

@@ -1,6 +1,11 @@
 require 'rspec/fold_spec_helper'
 
-class Included; include Fold::FoldFactory end
+class Included
+  include Fold::FoldFactory 
+  def initialize
+    @instance_variable = []
+  end
+end
 
 describe Fold::FoldFactory do
   it "inherits module" do
@@ -37,6 +42,14 @@ describe Fold::FoldFactory, ".produce" do
     Included.folds :Location, /^\@/
     @it.produce('@LINE').is_a?(Included::Location).should == true  
   end
+
+  it "passes along instance variables" do
+    @it.produce.instance_variables.should include("@instance_variable")
+  end
+
+  it "and sets up attribute accessors for them" do
+    @it.produce.instance_variable.should === []
+  end
 end
 
 

data/rspec/fold/precompiler_spec.rb

@@ -55,6 +55,10 @@ LINE 1
       @it.fold(en.lines)
     }.should raise_error(Confused::IndentationError)
   end
+
+  it "doesn't choke with empty source" do
+    @it.fold([]).should_not be_nil
+  end
 end
 
 describe Fold::Precompiler, ".step_in?" do

data/rspec/fold_spec_helper.rb

@@ -1,4 +1,6 @@
 require 'rubygems'
-path = File.dirname(__FILE__)
-FoldFixtureRoot= File.expand_path("#{path}/fixtures/fold")
-require "#{path}/../lib/fold"
+__DIR__ = File.dirname(__FILE__)
+$LOAD_PATH << "#{__DIR__}/.." unless $LOAD_PATH.include?("#{__DIR__}/..")
+FoldFixtureRoot= File.expand_path("#{__DIR__}/fixtures/fold")
+require "lib/fold"
+require 'pathname'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: collin-fold
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors: 
 - Collin Miller
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-25 00:00:00 -07:00
+date: 2008-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Toolkit for creating whitespace active mini-languages. Inspired by Haml. Feature light.
+description: 
 email: collintmiller@gmail.com
 executables: []
 
@@ -47,10 +47,10 @@ files:
 - lib/fold/abstract_fold.rb
 - lib/fold/fold_factory.rb
 - lib/fold/precompiler.rb
-- lib/fold/engine.rb~
 - rspec/fixtures
 - rspec/fixtures/fold
 - rspec/fixtures/fold/fixture.target.fold
+- rspec/fixtures/fold/empty.target.fold
 - rspec/fold_spec.rb
 - rspec/fold_spec_helper.rb
 - rspec/fold