pink_shirt 0.0.5 → 0.0.6

data/changelog

@@ -1,3 +1,6 @@
+0.0.6
+ - tables are always explicit
+ - vertical-align by symbol
 0.0.5
  - MIT licence.
 0.0.4

data/lib/pink_shirt/attributes.rb

@@ -1,16 +1,16 @@
 class PinkShirt
   # = Attributes
-  # 
+  #
   # the sax parser passes an array of attributes along with each tag
   # attrs = ['href', 'http://www.example.com', 'style', 'background-color: snake;']
   #
   # Textile displays attributes in a certain way
-  # 
+  #
   # = USAGE
-  # 
+  #
   # Attributes.new(attrs).write
   #
-  # 
+  #
   # * colspan=2                 => \2
   # * rowspan=3                 => /3
   # * style='padding-left:1em'  => (
@@ -19,6 +19,9 @@ class PinkShirt
   # * style='text-align:left'   => <
   # * style='text-align:center' => =
   # * style='text-align:justify'=> <>
+  # * style='vertical-align:top'    => ^
+  # * style='vertical-align:center' => -
+  # * style='vertical-align:bottom' => ~
   # * class = 'panthers'        => (panthers)
   # * id = 'banner'             => (#banner)
   # * class='this' id='that'    => (this#that)
@@ -28,13 +31,14 @@ class PinkShirt
   #
   class Attributes
     # @param attrs [Array] formatted [key, value, key, value]
-    # 
+    #
     def initialize(attrs)
       @attrs = attrs
       @attrs_hash  = Hash[attrs]
       @styles_hash = parse_styles
       @nudges  = steal_nudges
       @padding = steal_padding
+      @vertical = steal_vertical
     end
 
     def attrs
@@ -50,19 +54,20 @@ class PinkShirt
       add << colspan
       add << rowspan
       add << nudges
+      add << vertical
       add << padding
       add << klass_and_id
       add << style
       add << lang
       out = add.join
       return nil if out == ""
-      
+
       out
     end
 
     def parse_styles
       return nil unless attrs['style']
-      
+
       rules_list = attrs['style'].split(";").map{|rule|
         rule.split(":")
       }
@@ -96,7 +101,7 @@ class PinkShirt
 
     def steal_padding
       return nil unless attrs['style']
-      
+
       left = case styles.delete('padding-left')
       when '1em'; "(" ;
       when '2em'; "((";
@@ -114,9 +119,20 @@ class PinkShirt
       padding = "#{left}#{right}"
     end
 
+    def steal_vertical
+      return nil unless attrs['style']
+
+      vertical = case styles.delete('vertical-align')
+      when 'top';    "^";
+      when 'middle'; "-";
+      when 'bottom'; "~";
+      end
+      vertical
+    end
+
     def colspan
       return nil unless attrs['colspan']
-      
+
       width = attrs['colspan']
       colspan = ""
       colspan << "\\" #literal backslash
@@ -126,7 +142,7 @@ class PinkShirt
 
     def rowspan
       return nil unless attrs['rowspan']
-      
+
       height = attrs['rowspan']
       colspan = '/' + "#{height}" if height
     end
@@ -139,12 +155,16 @@ class PinkShirt
       @padding
     end
 
+    def vertical
+      @vertical
+    end
+
 
     def klass_and_id
       klass = attrs['class']
       id    = attrs['id']
       return nil unless klass || id
-      
+
       output  = ""
       output += "("
       output += klass if klass
@@ -163,7 +183,7 @@ class PinkShirt
 
     def lang
       return nil unless attrs.include?('lang')
-      
+
       output  = ""
       output += "["
       output += attrs['lang']

data/lib/pink_shirt/sax/tables.rb

@@ -3,9 +3,10 @@ class PinkShirt
     TAGS = %w(table th tr td tbody thead)
 
     def start_table attrs
-      if add_attributes(attrs)
-       @output << "table#{add_attributes(attrs)}.\n" 
-      end
+       @output << "\n"
+      # if add_attributes(attrs)
+       @output << "table#{add_attributes(attrs)}.\n"
+      # end
     end
 
     def end_table
@@ -48,4 +49,4 @@ class PinkShirt
     def end_td
     end
   end
-end
+end

data/lib/pink_shirt/version.rb

@@ -1,3 +1,3 @@
 class PinkShirt
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/basics_spec.rb

@@ -6,7 +6,7 @@ describe 'PinkShirt against redcloth in reality' do
 
 	examples.each do |heading, example|
 		it "#{heading} #{example['desc']}" do
-			html = RedCloth.new(example['textile']).to_html.chomp
+			html     = RedCloth.new(example['textile']).to_html.chomp
 			decoded  = PinkShirt.new(html).to_textile.to_s.chomp.chomp
 			actual   = example['textile']
 			decoded.should == actual
@@ -14,3 +14,17 @@ describe 'PinkShirt against redcloth in reality' do
 	end
 
 end
+
+describe 'PinkShirt against Expectations in reality' do
+
+   examples = YAML::load(File.read('./spec/examples/basics.yaml'))
+      it "Spaces around fonty markup" do
+         example  = examples['Spaces Around fonty Markups']
+         puts example
+         html     = example['html']
+         decoded  = PinkShirt.new(html).to_textile.to_s.chomp.chomp
+         actual   = example['textile']
+         decoded.should == actual
+      end
+
+end

data/spec/examples/basics.yaml

@@ -38,10 +38,10 @@ OL Lists:
 Fonty Markup:
   desc: bold italic and the rest
   textile: |-
-    *b*
+    **b**
     *strong*
     ??cite??
-    _i_
+    __i__
     _em_
     -del-
     +ins+
@@ -50,10 +50,10 @@ Fonty Markup:
     %span%
     @code@
   html: |-
-    <strong>b</strong><br />
+    <b>b</b><br />
     <strong>strong</strong><br />
     <cite>cite</cite><br />
-    <em>i</em><br />
+    <i>i</i><br />
     <em>em</em><br />
     <del>del</del><br />
     <ins>ins</ins><br />
@@ -61,7 +61,12 @@ Fonty Markup:
     <sup>sup</sup><br />
     <span>span</span><br />
     <code>code</code>
-
+Spaces Around fonty Markups:
+  desc: bold italic and the rest need room to breathe
+  textile: |-
+    **b** *strong* ??cite?? __i__ _em_ -del- +ins+ ~sub~ ^sup^ %span% @code@
+  html: |-
+    <b>b</b><strong>strong</strong><cite>cite</cite><i>i</i><em>em</em><del>del</del><ins>ins</ins><sub>sub</sub><sup>sup</sup><span>span</span><code>code</code>
 Nested Lists:
   desc: list nesting is hard
   textile: |-
@@ -109,6 +114,8 @@ Nested Mixed Lists:
 Tables:
   desc: plain Tables
   textile: |-
+
+    table.
     |a|table|row|
     |a|table|row|
   html: |-
@@ -125,9 +132,40 @@ Tables:
       </tr>
     </table>
 
+Tables with vertical alignment:
+  desc: plain Tables
+  textile: |-
+
+    table.
+    |^. a|table|row|
+    |-. a|table|row|
+    |~. a|table|row|
+
+  html: |-
+    <table>
+      <tr>
+        <td style='verical-align:top;'>a</td>
+        <td>table</td>
+        <td>row</td>
+      </tr>
+      <tr>
+        <td style='verical-align:middle;'>a</td>
+        <td>table</td>
+        <td>row</td>
+      </tr>
+      <tr>
+        <td style='verical-align:bottom;'>a</td>
+        <td>table</td>
+        <td>row</td>
+      </tr>
+
+    </table>
+
 Tables With headers:
   desc: a table with a header
   textile: |-
+
+    table.
     |_. a|_. table|_. header|
     |a|table|row|
     |a|table|row|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pink_shirt
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70259168798420 !ruby/object:Gem::Requirement
+  requirement: &70364991723920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259168798420
+  version_requirements: *70364991723920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70259168797920 !ruby/object:Gem::Requirement
+  requirement: &70364991723500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259168797920
+  version_requirements: *70364991723500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70259168797460 !ruby/object:Gem::Requirement
+  requirement: &70364991723080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259168797460
+  version_requirements: *70364991723080
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70259168797000 !ruby/object:Gem::Requirement
+  requirement: &70364991722660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259168797000
+  version_requirements: *70364991722660
 description: Converts Html to Textile, or as some say 'html2textile', it's built on
   nokogiri
 email: