acts_as_markup 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6c12e166ecd865f98ae4537382a9d84fb95435d
-  data.tar.gz: cab43c70c36231d85e515bc18404be9618951349
+  metadata.gz: 3767dcc2b335c8b237088401fbf8224d7bf97bee
+  data.tar.gz: d13496c1a244d5daf3c2bc0d0417670f3c4aa768
 SHA512:
-  metadata.gz: 48e1037dfc0d433f8744208a003470ec9e40eb75c8ca5e5e85d85ebc37b190ec2f04a69ef32ff450ec0b2bb9e2644091252f1d826d4e69a0c5457ab3eef447e9
-  data.tar.gz: b76022b380e4608b2c1e0d5be3518eea8186a7e3232f4c1197e018a40b4e45b0506d04ee66877dafe746ce522b991f730241873b3f9868e83139fcb53db7ee17
+  metadata.gz: dc4ec54b50660d15a82cdb268dacaf7aa79b8be897fed51642c22ba9a2af67853b6c0580dc4396984df18d431c22df501670510e5e48268acc61f17c4b26a262
+  data.tar.gz: fc1e215a75da5da9b2f8dda31abd4d974c71b3535566670164764939128fa5484b73b491c900f15abca3fd76f71a88cd359ca8ca96c0faae4d63883b2cf3e624

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 2.0.2 / 2015-07-21
+* Plain text variable columns always return strings now
+* Refactor how we load markup classes to not load ones we aren't using.
+
+== 2.0.1 / 2014-09-04
+* Stop extending Object and extend string instead.
+
 == 2.0.0 / 2014-09-03
 * Update for latest version of Ruby & Rails
 

data/README.rdoc

@@ -123,16 +123,6 @@ The four options currently supported are:
 
 == INSTALL:
 
-==== Rails 2
-
-<tt>(sudo) gem install acts_as_markup</tt>
- 
-Add "+acts_as_markup+" to your environment.rb:
-
-    config.gem "acts_as_markup"
-    
-==== Rails 3
-
 Simply add "+acts_as_markup+" to your Gemfile:
 
     gem "acts_as_markup"

data/lib/acts_as_markup.rb

@@ -30,8 +30,57 @@ module ActsAsMarkup
   mattr_accessor :markdown_library
 
   # Returns the version string for the library.
-  def self.version
-    VERSION
+  class << self
+    def version
+      VERSION
+    end
+
+    def markup_class(markup_name)
+      load_markup_class(markup_name)
+    end
+    
+    private
+
+    def get_markdown_class
+      if ActsAsMarkup::MARKDOWN_LIBS.keys.include? ActsAsMarkup.markdown_library
+        markdown_library_names = ActsAsMarkup::MARKDOWN_LIBS[ActsAsMarkup.markdown_library]
+        require markdown_library_names[:lib_name]
+        require_extensions(markdown_library_names[:lib_name])
+        return markdown_library_names[:class_name].constantize
+      else
+        raise ActsAsMarkup::UnsportedMarkdownLibrary, "#{ActsAsMarkup.markdown_library} is not currently supported."
+      end
+    end
+    
+    def require_extensions(library)# :nodoc:
+      if ActsAsMarkup::LIBRARY_EXTENSIONS.include? library.to_s
+        require "acts_as_markup/exts/#{library}"
+      end
+    end
+    
+    def require_library_and_get_class(language)
+      case language
+      when :markdown
+        return get_markdown_class
+      when :textile
+        require 'redcloth'
+        return RedCloth
+      when :rdoc
+        require 'rdoc'
+        require_extensions 'rdoc'
+        return RDocText
+      else
+        return String
+      end
+    end
+    
+    def load_markup_class(markup_name)
+      if [:markdown, :textile, :rdoc].include?(markup_name.to_sym)
+        require_library_and_get_class(markup_name.to_sym)
+      else
+        raise ActsAsMarkup::UnsupportedMarkupLanguage, "#{markup_name} is not a currently supported markup language."
+      end
+    end
   end
 
 end

data/lib/acts_as_markup/active_record_extension.rb

@@ -66,12 +66,13 @@ module ActsAsMarkup
       # 
       def acts_as_markup(options)
         options.reverse_merge!(:language_column => :markup_language)
-        markup_class = load_markup_class(options)
-        
+
+        include InstanceMethods
+
         unless options[:language].to_sym == :variable
-          define_markup_columns_reader_methods(markup_class, options)
+          define_markup_columns_reader_methods(options)
         else
-          define_variable_markup_columns_reader_methods(markup_class, options)
+          define_variable_markup_columns_reader_methods(options)
         end
       end
       
@@ -101,93 +102,51 @@ module ActsAsMarkup
         options = columns.extract_options!
         acts_as_markup options.merge(:language => :rdoc, :columns => columns)
       end
-      
-      
+
       private
-        def get_markdown_class
-          if ActsAsMarkup::MARKDOWN_LIBS.keys.include? ActsAsMarkup.markdown_library
-            markdown_library_names = ActsAsMarkup::MARKDOWN_LIBS[ActsAsMarkup.markdown_library]
-            require markdown_library_names[:lib_name]
-            require_extensions(markdown_library_names[:lib_name])
-            return markdown_library_names[:class_name].constantize
-          else
-            raise ActsAsMarkup::UnsportedMarkdownLibrary, "#{ActsAsMarkup.markdown_library} is not currently supported."
-          end
-        end
-        
-        def require_extensions(library)# :nodoc:
-          if ActsAsMarkup::LIBRARY_EXTENSIONS.include? library.to_s
-            require "acts_as_markup/exts/#{library}"
-          end
-        end
-        
-        def require_library_and_get_class(language)
-          case language
-          when :markdown
-            return get_markdown_class
-          when :textile
-            require 'redcloth'
-            return RedCloth
-          when :rdoc
-            require 'rdoc'
-            require_extensions 'rdoc'
-            return RDocText
-          else
-            return String
-          end
-        end
-        
-        def load_markup_class(options)
-          case options[:language].to_sym
-          when :markdown, :textile, :rdoc
-            require_library_and_get_class(options[:language].to_sym)
-          when :variable
-            markup_classes = {}
-            [:textile, :rdoc, :markdown].each do |language|
-              markup_classes[language] = require_library_and_get_class(language)
-            end
-            markup_classes
-          else
-            raise ActsAsMarkup::UnsupportedMarkupLanguage, "#{options[:langauge]} is not a currently supported markup language."
-          end
-        end
+
+      def define_markup_columns_reader_methods(options)
+        markup_options = options["#{options[:language]}_options".to_sym] || []
         
-        def define_markup_columns_reader_methods(markup_class, options)
-          markup_options = options["#{options[:language]}_options".to_sym] || []
-          
-          options[:columns].each do |col|
-            define_method col do
-              if instance_variable_defined?("@#{col}") && !send("#{col}_changed?")
-                  instance_variable_get("@#{col}")
-              else
-                instance_variable_set("@#{col}", markup_class.new(self[col].to_s, *markup_options))
-              end
+        options[:columns].each do |col|
+          define_method col do
+            if instance_variable_defined?("@#{col}") && !send("#{col}_changed?")
+                instance_variable_get("@#{col}")
+            else
+              instance_variable_set("@#{col}", markup_class(options[:language]).new(self[col].to_s, *markup_options))
             end
           end
         end
+      end
 
-        def define_variable_markup_columns_reader_methods(markup_classes, options)
-          options[:columns].each do |col|
-            define_method col do
-              if instance_variable_defined?("@#{col}")
-                unless send("#{col}_changed?") || send("#{options[:language_column]}_changed?")
-                  return instance_variable_get("@#{col}")
-                end
+      def define_variable_markup_columns_reader_methods(options)
+        options[:columns].each do |col|
+          define_method col do
+            if instance_variable_defined?("@#{col}")
+              unless send("#{col}_changed?") || send("#{options[:language_column]}_changed?")
+                return instance_variable_get("@#{col}")
               end
-              instance_variable_set("@#{col}", case send(options[:language_column])
-              when /markdown/i
-                markup_classes[:markdown].new string_for_markup_column(col), *(options[:markdown_options] || [])
-              when /textile/i
-                markup_classes[:textile].new string_for_markup_column(col), *(options[:textile_options] || [])
-              when /rdoc/i
-                markup_classes[:rdoc].new string_for_markup_column(col)
-              else
-                self[col]
-              end)
             end
+            instance_variable_set("@#{col}", case send(options[:language_column])
+            when /markdown/i
+              markup_class(:markdown).new string_for_markup_column(col), *(options[:markdown_options] || [])
+            when /textile/i
+              markup_class(:textile).new string_for_markup_column(col), *(options[:textile_options] || [])
+            when /rdoc/i
+              markup_class(:rdoc).new string_for_markup_column(col)
+            else
+              String(self[col])
+            end)
           end
         end
+      end
       
     end
+
+    module InstanceMethods
+      def markup_class(markup_name)
+        ActsAsMarkup.markup_class(markup_name)
+      end
+    end
   end
 end

data/lib/acts_as_markup/version.rb

@@ -1,3 +1,3 @@
 module ActsAsMarkup
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/test/acts_as_markup_test.rb

@@ -220,7 +220,6 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
 
       teardown do
         @rdoctext, @rdoc_post = nil
-        Post.delete_all
       end
     end
     
@@ -237,12 +236,10 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
       should "return the original string with a `to_s` method call on the column value" do
         assert_equal @plain_text, @plain_text_post.body.to_s
       end
-      
-      # FIXME: why is this failing??? both objects are String, both have EXACTLY the same value when output
-      #        in failure message. assert_equal does not require same object. This is very odd!
-      # should "return the original string with a `to_html` method call on the column value" do
-      #   assert_equal @plain_text, @plain_text_post.body.to_html
-      # end
+
+      should "return the original string with a `to_html` method call on the column value" do
+        assert_equal @plain_text, @plain_text_post.body.to_html
+      end
 
       context "changing value of markup field should return new markup object" do
         setup do
@@ -269,7 +266,6 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
       end
     end
     
-    
     teardown do
       VariablePost.delete_all
     end
@@ -304,6 +300,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
     
     context 'with textile' do
       setup do
+        ActsAsMarkup.markup_class(:textile)
         class ::Post < ActiveRecord::Base
           acts_as_textile :body
         end
@@ -334,6 +331,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
   
     context 'with RDoc' do
       setup do
+        ActsAsMarkup.markup_class(:rdoc)
         class ::Post < ActiveRecord::Base
           acts_as_rdoc :body
         end
@@ -365,6 +363,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
     context 'with RDiscount Markdown' do
       setup do
         ActsAsMarkup.markdown_library = :rdiscount
+        ActsAsMarkup.markup_class(:markdown)
         class ::Post < ActiveRecord::Base
           acts_as_markdown :body
         end
@@ -396,6 +395,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
     context 'with BlueCloth Markdown' do
       setup do
         ActsAsMarkup.markdown_library = :bluecloth
+        ActsAsMarkup.markup_class(:markdown)
         class ::Post < ActiveRecord::Base
           acts_as_markdown :body
         end
@@ -427,6 +427,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
     context 'with Ruby PEG Markdown' do
       setup do
         ActsAsMarkup.markdown_library = :rpeg
+        ActsAsMarkup.markup_class(:markdown)
         class ::Post < ActiveRecord::Base
           acts_as_markdown :body
         end
@@ -446,7 +447,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
       end
       
       should "have a PEGMarkdown object returned for the column value" do
-        assert_kind_of PEGMarkdown, @post.body
+        assert_kind_of ::PEGMarkdown, @post.body
       end
       
       teardown do
@@ -458,6 +459,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
     context 'with Maruku Markdown' do
       setup do
         ActsAsMarkup.markdown_library = :maruku
+        ActsAsMarkup.markup_class(:markdown)
         class ::Post < ActiveRecord::Base
           acts_as_markdown :body
         end
@@ -490,6 +492,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
     context 'with Redcarpet Markdown' do
       setup do
         ActsAsMarkup.markdown_library = :redcarpet
+        ActsAsMarkup.markup_class(:markdown)
         class ::Post < ActiveRecord::Base
           acts_as_markdown :body
         end
@@ -509,7 +512,7 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
       end
       
       should "have a Maruku object returned for the column value" do
-        assert_kind_of RedcarpetText, @post.body
+        assert_kind_of ::RedcarpetText, @post.body
       end
       
       teardown do
@@ -522,20 +525,16 @@ class ActsAsMarkupTest < ActsAsMarkupTestCase
   context 'acts_as_markup with bad language name' do
     should 'raise exception when a non-supported language is passed to acts_as_markup' do
       assert_raise ActsAsMarkup::UnsupportedMarkupLanguage do
-        class ::Post < ActiveRecord::Base
-          acts_as_markup :language => :fake, :columns => [:body]
-        end
+        ActsAsMarkup.markup_class(:fake)
       end
     end
   end
   
   context 'acts_as_markup with bad markdown library' do
     should 'raise exception when a non-supported library is set as the markdown library attribute on ActsAsMarkup' do
+      ActsAsMarkup.markdown_library = :fake
       assert_raise ActsAsMarkup::UnsportedMarkdownLibrary do
-        ActsAsMarkup.markdown_library = :fake
-        class ::Post < ActiveRecord::Base
-          acts_as_markup :language => :markdown, :columns => [:body]
-        end
+        ActsAsMarkup.markup_class(:markdown)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_markup
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Brian Landau
@@ -29,7 +29,7 @@ cert_chain:
   QHjym4e4y/FmXBJjpO/TtRoYd8a5YTCaOsML7M/nb/XrArvE3l5JaNEXkhH/nGs7
   wR9huisTMlESX3ReGKU=
   -----END CERTIFICATE-----
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -278,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Represent ActiveRecord Markdown, Textile, RDoc columns as Markdown, Textile,