model_formatting 0.2.3.5 → 0.2.3.6

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = "model_formatting"
-  s.version = "0.2.3.5"
+  s.version = "0.2.3.6"
   s.author = "ENTP"
   s.email = "company@entp.com"
   s.homepage = "http://github.com/entp"

data/lib/model_formatting/instance_methods.rb

@@ -2,12 +2,13 @@ module ModelFormatting
   module InstanceMethods
   protected
     def format_content_with_model_formatting
-      self.class.model_formatting_attributes.each do |original, formatted|
+      model_formatting_attributes.each do |original, formatted|
         text = send(original)
         data = \
           if text.blank?
             ''
           else
+            text.strip!
             options = {:white_list => model_formatting_white_list,
                        :before => model_formatting_before_callback,
                        :after => model_formatting_after_callback}

data/lib/model_formatting.rb

@@ -139,11 +139,11 @@ module ModelFormatting
     parts.each { |p| p.compact! }
   end
 
-  def self.extract_tag(text, *tag_names)
+  def self.extract_regex(text, *regexes)
     # Extract pre blocks
     extractions = {}
-    tag_names.each do |tag_name|
-      text.gsub!(%r{<#{tag_name}[^>]*>.*?</#{tag_name}>}m) do |match|
+    regexes.each do |regex|
+      text.gsub!(regex) do |match|
         md5 = Digest::MD5.hexdigest(match)
         extractions[md5] ||= []
         extractions[md5] << match
@@ -166,6 +166,16 @@ module ModelFormatting
     text
   end
 
+  def self.tag_name_to_regex(name)
+    %r{<#{name}[^>]*>.*?</#{name}>}m
+  end
+
+  def self.extract_tag(text, *tag_names)
+    extract_regex text, *tag_names.map { |n| tag_name_to_regex(n) } do |text|
+      yield text
+    end
+  end
+
   def self.gfm(text)
     extract_tag(text, :pre) do |txt| 
       # prevent foo_bar_baz from ending up with an italic word in the middle

data/test/formatting_test.rb

@@ -49,9 +49,9 @@ module ModelFormatting
 
       it "preserves leading spaces in code blocks" do
         record = Simple.new
-        record.body = "    code\n    more code\n\nnot code\n\n"
+        record.body = "this\n\n    code\n    more code\n\nnot code\n\n"
         record.save
-        record.formatted_body.should == %(<div><pre>\n<code>code\nmore code</code>\n</pre>\n<p>not code</p></div>)
+        record.formatted_body.should == %(<div><p>this</p>\n<pre>\n<code>code\nmore code</code>\n</pre>\n<p>not code</p></div>)
       end
 
       it "converts unicode characters to html entities" do

metadata

@@ -1,145 +1,100 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: model_formatting
-version: !ruby/object:Gem::Version 
-  hash: 89
+version: !ruby/object:Gem::Version
+  version: 0.2.3.6
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  - 5
-  version: 0.2.3.5
 platform: ruby
-authors: 
+authors:
 - ENTP
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-16 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-23 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rdiscount
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70351531284240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 6
-        - 5
+      - !ruby/object:Gem::Version
         version: 1.6.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: actionpack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70351531284240
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &70351531283600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 2
-        - 3
-        - 9
+      - !ruby/object:Gem::Version
         version: 2.3.9
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70351531283600
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70351531282680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 2
-        - 3
-        - 9
+      - !ruby/object:Gem::Version
         version: 2.3.9
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70351531282680
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70351531281480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 2
-        - 3
-        - 9
+      - !ruby/object:Gem::Version
         version: 2.3.9
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: tidy_ffi
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70351531281480
+- !ruby/object:Gem::Dependency
+  name: tidy_ffi
+  requirement: &70351531280900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: jeremymcanally-context
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70351531280900
+- !ruby/object:Gem::Dependency
+  name: jeremymcanally-context
+  requirement: &70351531280100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
-        - 5
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.5.5
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: jeremymcanally-matchy
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70351531280100
+- !ruby/object:Gem::Dependency
+  name: jeremymcanally-matchy
+  requirement: &70351531279540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.1.0
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *70351531279540
 description: 
 email: company@entp.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -154,39 +109,29 @@ files:
 - test/formatting_test.rb
 - test/model_formatting_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/entp
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Automatically format model attributes using rdiscount and Tender/Lighthouse extensions.
+summary: Automatically format model attributes using rdiscount and Tender/Lighthouse
+  extensions.
 test_files: []
-