jm81-dm-filters 0.2.0 → 0.3.0

data/Rakefile

@@ -4,8 +4,12 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "dm-filters"
-    gem.summary = %Q{TODO}
+    gem.name = "jm81-dm-filters"
+    gem.summary = %Q{Apply text filters to DataMapper properties}
+    gem.description = <<EOF
+This module enables a property in a DataMapper::Resource class to be filtered 
+on save into another property, using per-row and/or per-property filters
+EOF
     gem.email = "jmorgan@morgancreative.net"
     gem.homepage = "http://github.com/jm81/dm-filters"
     gem.authors = ["Jared Morgan"]
@@ -13,7 +17,7 @@ begin
     gem.add_dependency('dm-core', '>= 0.10.0')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/dm-filters.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-filters}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jared Morgan"]
-  s.date = %q{2009-09-19}
+  s.date = %q{2009-10-02}
   s.email = %q{jmorgan@morgancreative.net}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/dm-filters.rb

@@ -11,7 +11,7 @@ require 'extlib'
 # should be defined before to filtered property.
 
 module Filters
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
   
   # A hash, with each entry of the form:
   # Filter name (used in +filters+ property) => 
@@ -20,7 +20,7 @@ module Filters
   # Classes are assumed to respond to +to_html+.
   AVAILABLE_FILTERS = {
     'Smartypants' => [['rubypants', 'RubyPants']],
-    'Markdown' => [['rdiscount', 'RDiscount'], ['bluecloth', 'BlueCloth']],
+    'Markdown' => [['maruku', 'Maruku'], ['rdiscount', 'RDiscount'], ['bluecloth', 'BlueCloth']],
     'Textile' => [['redcloth', 'RedCloth']],
     'BibleML' => [[File.dirname(__FILE__) + '/filters/bible_ml', 'BibleML']],
     'Linebreaker' => [[File.dirname(__FILE__) + '/filters/linebreaker', 'Linebreaker']],

data/lib/filters/bible_ml.rb

@@ -36,10 +36,12 @@ class BibleML
       strip_comments.
       block_quotes.
       inline_quotes.
+      references.
       wikipedia_links.
       to_s
     txt = RubyPants.new(txt).to_html
     txt = RDiscount.new(txt).to_html
+    txt.gsub(/&/, '&') # Get rid of double &amp's
   end
   
   # Convert fg:pp tags to Primary Passage links
@@ -126,6 +128,24 @@ class BibleML
     self
   end
   
+  def references
+    @xml.elements.each("//fg:ref") do | ref_el |
+      label = ''
+      
+      if ref_el.has_elements? || ref_el.has_text? 
+        ref_el.children.each do | child |
+          label << child.to_s
+        end
+      end
+      
+      label = label.empty? ? nil : label.to_s
+      a_tag = reference_a(ref_el.attributes['p'], ref_el.attributes['v'], label)
+      
+      ref_el.parent.replace_child(ref_el, a_tag)
+    end
+    self
+  end
+  
   def wikipedia_links
     @xml.elements.each("//fg:wp") do | wp_el |
       a = REXML::Element.new("a")

data/spec/filters/bible_ml_spec.rb

@@ -68,6 +68,20 @@ describe BibleML do
       "<a href='http://www.biblegateway.com/passage/?search=exodus%205'>Full Chapter</a>"
   end
   
+  it "should convert fg:ref tag without label to link" do
+    BibleML.new('<fg:ref p="Exodus 5:1-5" />').
+    references.
+    to_s.should ==
+      "<a href='http://www.biblegateway.com/passage/?search=exodus%205:1-5'>Exodus 5:1-5</a>"
+  end
+  
+  it "should convert fg:ref tag with label to link" do
+    BibleML.new('<fg:ref p="Exodus 5:1-5">This passage</fg:ref>').
+    references.
+    to_s.should ==
+      "<a href='http://www.biblegateway.com/passage/?search=exodus%205:1-5'>This passage</a>"
+  end
+  
   it "should create link from reference with verses" do
     BibleML.new('').bg_link("Genesis 1:10").should ==
       "http://www.biblegateway.com/passage/?search=genesis%201:10"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jm81-dm-filters
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jared Morgan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-19 00:00:00 -07:00
+date: 2009-10-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.10.0
     version: 
-description: 
+description: |
+  This module enables a property in a DataMapper::Resource class to be filtered 
+  on save into another property, using per-row and/or per-property filters
+
 email: jmorgan@morgancreative.net
 executables: []
 
@@ -61,7 +64,8 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/jm81/dm-filters
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -84,8 +88,8 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: TODO
+specification_version: 3
+summary: Apply text filters to DataMapper properties
 test_files: 
 - spec/dm-filters_spec.rb
 - spec/filters/bible_ml_spec.rb