collin-fold 0.0.6 → 0.0.8

data/Rakefile.rb

@@ -28,7 +28,7 @@ end
 
 namespace :gem do
   task :version do
-    @version = "0.0.6"
+    @version = "0.0.9"
   end
 
   task :build => :spec do

data/lib/fold.rb

@@ -6,6 +6,8 @@ require 'facets'
 module Fold
   require 'fold/engine'
   require 'fold/abstract_fold'
+  require 'fold/abstract_slice'
   require 'fold/fold_factory'
+  require 'fold/slice_factory'
   require 'fold/precompiler'
 end

data/lib/fold/abstract_fold.rb

@@ -9,8 +9,8 @@ module Fold
         :children => [],
         :tabs => -1
       }.merge(source)
-      
-      attrs[:text].gsub! self.class::Regex, ''
+
+      attrs[:text].gsub! self.class::Regex, '' if self.class.clear_match
       
       super attrs
     end

data/lib/fold/abstract_slice.rb

@@ -0,0 +1,6 @@
+require 'ostruct'
+
+module Fold
+  class AbstractSlice < OpenStruct
+  end
+end

data/lib/fold/fold_factory.rb

@@ -30,6 +30,11 @@ module Fold
   
         fold.metaclass.send :attr_accessor, var.gsub('@', '')
       end
+      that = self
+      fold.meta_def :method_missing do |meth, *args|
+        return that.send(meth, *args) if that.respond_to?(meth)
+        super
+      end
 
       fold
     end
@@ -46,11 +51,12 @@ module Fold
     end
     
     module ClassMethods
-      def folds id, regex=AbstractFold::Regex, &block
+      def folds id, regex=AbstractFold::Regex, clear_match=true, &block
         fold= Class.new(AbstractFold)
         fold.const_set :Regex, regex
         
         fold.send :define_method, :render, &block if block_given?
+        fold.class.send :define_method, :clear_match do; clear_match end
         
         const_set id, fold
         defined_folds << fold

data/lib/fold/precompiler.rb

@@ -1,6 +1,7 @@
 module Fold
   class Precompiler
     include Fold::FoldFactory
+    include Fold::SliceFactory
   
     def fold lines
       last_line= produce
@@ -12,7 +13,7 @@ module Fold
       parent_stack= []
 
       lines.each do |text|
-        line = produce text
+        line = produce process(text)
 
         indent = line.tabs - last_line.tabs
 
@@ -33,7 +34,9 @@ module Fold
           parent_line = parent_stack.last
           parent_line.children << line
         end
-     
+
+        line.parent = parent_line unless parent_line.nil?
+
         last_line= line
       end
       

data/lib/fold/slice_factory.rb

@@ -0,0 +1,65 @@
+require 'ruby2ruby'
+
+module Fold
+  module SliceFactory
+    def self.included klass
+      klass.extend ClassMethods
+    end
+    
+    def process line=''
+      self.class.defined_slices.each do |slice|
+        line.gsub! slice::Regex do |match|
+          text = $1
+          eval(slice::Block.to_ruby).call
+        end
+      end
+      line
+    end
+
+#     def produce 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
+#       that = self
+#       fold.meta_def :method_missing do |meth, *args|
+#         return that.send(meth, *args) if that.respond_to?(meth)
+#         super
+#       end
+# 
+#       fold
+#     end
+    
+    def detect_slice_class line
+      return nil if line.blank?
+      self.class.defined_slices.reverse.detect {|slice| slice::Regex and slice::Regex.match(line)}
+    end
+    
+    module ClassMethods
+      def slices id, regex=AbstractSlice::Regex, &block
+        slice= Class.new(AbstractSlice)
+
+        slice.const_set :Regex, regex
+        slice.const_set :Block, block
+        
+        const_set id, slice
+        defined_slices << slice
+      end
+      
+      def defined_slices
+        @slices||= []
+      end
+    end
+  end
+end

data/rspec/fold/abstract_fold_spec.rb

@@ -12,6 +12,11 @@ describe Fold::AbstractFold, ".initialize" do
     Fold::Precompiler.folds :What, /what/
     Fold::Precompiler::What::Regex.should == /what/
   end
+
+  it "and specifies whether or not to rip the match from the source" do
+    Fold::Precompiler.folds :Whatever, /whatever/, false
+    Fold::Precompiler::Whatever.clear_match.should == false
+  end
 end
 
 describe Fold::AbstractFold, ".render" do
@@ -28,6 +33,12 @@ describe Fold::AbstractFold, ".render" do
     what= Fold::Precompiler::What.new(:text=>'whatever')
     what.render.should== "ever?"
   end
+
+  it "doesn't clear match text if clear_match is false" do
+    Fold::Precompiler.folds :Dirty, /dirty/, false
+    dirty = Fold::Precompiler::Dirty.new(:text=>"dirty bird")
+    dirty.render.should == "dirty bird"
+  end
   
   it "renders children" do
     Fold::Precompiler.folds :Parent, /^parent / do

data/rspec/fold/abstract_slice_spec.rb

@@ -0,0 +1,8 @@
+require "ostruct"
+require 'rspec/fold_spec_helper'
+
+describe Fold::AbstractSlice do
+  it "inherits OpenStruct" do
+    Fold::AbstractSlice.superclass.should == OpenStruct
+  end
+end

data/rspec/fold/fold_factory_spec.rb

@@ -5,6 +5,10 @@ class Included
   def initialize
     @instance_variable = []
   end
+
+  def passed
+    :passed
+  end
 end
 
 describe Fold::FoldFactory do
@@ -47,13 +51,15 @@ describe Fold::FoldFactory, ".produce" do
     @it.produce.instance_variables.should include("@instance_variable")
   end
 
+  it "methods fall through" do
+    @it.produce.passed.should == :passed
+  end
+
   it "and sets up attribute accessors for them" do
     @it.produce.instance_variable.should === []
   end
 end
 
-
-
 #describe Fold::Precompiler::Action::Regex do
 #  it "matches !LINE" do
 #    Fold::Precompiler::Action::Regex.should match("!LINE")

data/rspec/fold/precompiler_spec.rb

@@ -9,6 +9,10 @@ end
 class Confused < Fold::Precompiler
   folds :Line, //
   folds :What, /what/
+
+  slices :Octothorp, /#([\w]+)/ do
+    "octothorpedo:#{text}"
+  end
 end  
 
 describe Fold::Precompiler, ".folds" do
@@ -45,6 +49,22 @@ LINE 7
     }
     @it.fold(en.lines).children.length.should == 3
   end
+
+  it "children can be orphans" do
+    en = Fold::Engine.new "LINE 1"
+    @it.fold(en.lines).parent.should == nil
+  end
+
+  it "lets children know about their parents" do
+    en = Fold::Engine.new %{
+Line 1
+  Line 2
+  Line 3
+}
+  
+    folded = @it.fold(en.lines)
+    folded.children.first.parent.should == folded
+  end
   
   it "barfs on innappropriate indentation" do
     en= Fold::Engine.new %{

data/rspec/fold/slice_factory_spec.rb

@@ -0,0 +1,40 @@
+require 'rspec/fold_spec_helper'
+
+class Included
+  include Fold::FoldFactory
+  include Fold::SliceFactory
+
+  slices :Interpolation, /#\{(.*?)\}/ do
+    text
+  end
+
+  def initialize
+    @instance_variable = []
+  end
+
+  def passed
+    :passed
+  end
+end
+
+describe Fold::SliceFactory do
+  it "inherits module" do
+    Fold::SliceFactory.class.should == Module
+  end
+
+  before(:each) do
+    @it = Included.new
+  end
+
+  it "has list of included slices" do
+    Included.defined_slices.should include(Included::Interpolation)
+  end
+
+  it "generates constant" do
+    Included::Interpolation.should_not be_nil
+  end
+
+  it "replaces items in a string" do
+    @it.process('#{hey} whats #{up}').should == "hey whats up"
+  end
+end

data/rspec/fold_spec_helper.rb

@@ -2,5 +2,6 @@ require 'rubygems'
 __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.6
+  version: 0.0.8
 platform: ruby
 authors: 
 - Collin Miller
@@ -47,6 +47,8 @@ files:
 - lib/fold/abstract_fold.rb
 - lib/fold/fold_factory.rb
 - lib/fold/precompiler.rb
+- lib/fold/slice_factory.rb
+- lib/fold/abstract_slice.rb
 - rspec/fixtures
 - rspec/fixtures/fold
 - rspec/fixtures/fold/fixture.target.fold
@@ -58,6 +60,9 @@ files:
 - rspec/fold/fold_factory_spec.rb
 - rspec/fold/engine_spec.rb
 - rspec/fold/abstract_fold_spec.rb
+- rspec/fold/slice_factory_spec.rb
+- rspec/fold/abstract_slice_spec.rb
+- rspec/fold/precompiler_spec.rb~
 has_rdoc: false
 homepage: http://github.com/collin/fold
 post_install_message: