typedown 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/typedown/section.rb

@@ -6,12 +6,13 @@ module Typedown
       @body = ""
       @sections = []
       if body
-        @body, @sections = sectionize(body) 
+        @body, @sections = sectionize(Shorthand.process(body))
+        puts body
       end
     end
 
     def dummy?
-      (title.strip.empty?) && (!@body || @body.strip.empty?) && subsections.length == 1
+      subsections.length == 1 && (title.strip.empty? || title.tr("!","").strip == subsections[0].title.tr("!","").strip) && (!@body || @body.strip.empty?)
     end
 
     def title

data/lib/typedown/shorthand.rb

@@ -0,0 +1,57 @@
+module Typedown
+
+  class Shorthand
+
+    def self.process body
+      # Find all occurences mathcing the shorthand syntax
+      # 'action/param1[/param2]
+      offset = 0
+      while(match = body[offset..-1].match(/\'\w+[\/\w+]+/)) do
+        m = match[0]
+        res = self.resolve m
+        body.gsub!(m, res) if res
+        offset += match.begin(0) + (res || m).length
+      end
+      body
+    end
+
+
+    private
+
+    def self.resolve m
+      begin
+        params = m.tr("'", "").split("/")
+        action = params.shift
+
+        if self.shorthands[ action.downcase ]
+          self.shorthands[ action.downcase ].resolve action, params
+        else
+          nil
+        end
+      rescue
+        # Something wrong with parameters
+        nil
+      end
+    end
+
+    def self.shorthands
+      @shorthands = {} unless @shorthands
+      @shorthands
+    end
+
+
+    def self.add_shorthand name, obj
+      self.shorthands[ name.downcase ] = obj
+    end
+
+    def initialize name
+      Shorthand.add_shorthand(name, self)
+    end
+
+    def resolve action, params
+      raise "Please subclass and override this method."
+      nil
+    end
+  end
+
+end

data/lib/typedown.rb

@@ -1,6 +1,7 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'typedown/shorthand'
 require 'typedown/section'
 require 'typedown/document'
 

data/test/data/example3.tpd

@@ -0,0 +1,14 @@
+! Heading
+
+//. A lead-in saying what the article is about.
+Some more lead-in. 
+And more.
+
+Some body copy.
+
+!! Subheading
+
+More body copy.
+
+('vg/10036000)
+'amazon/B000JMLFLW

data/test/test_section.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class TestSection < Test::Unit::TestCase
   def setup
-    @doc = File.read("test/data/example.tpd")
+    @doc = File.read("test/data/example3.tpd")
   end
 
   def teardown
@@ -23,7 +23,7 @@ class TestSection < Test::Unit::TestCase
   should "reassemble doc with no exceptions using self.sectionize" do
     assert_nothing_raised do
       s = Typedown::Section.sectionize @doc, "Mail subject"
-      puts "\n\n", s.doc
+      #puts "\n\n", s.doc
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typedown
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - wrimle
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +02:00
+date: 2010-09-04 00:00:00 +02:00
 default_executable: typedown
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,10 +51,12 @@ files:
 - lib/typedown.rb
 - lib/typedown/document.rb
 - lib/typedown/section.rb
+- lib/typedown/shorthand.rb
 - script/console
 - script/destroy
 - script/generate
 - test/data/example.tpd
+- test/data/example3.tpd
 - test/helper.rb
 - test/test_document.rb
 - test/test_section.rb