RubyGems - markababy - Versions diffs - 1.0.0 → 1.1.0 - Mend

markababy 1.0.0 → 1.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

data/README.txt +8 -0
data/lib/markababy/builder.rb +51 -0
data/lib/markababy/{rails.rb → rails_template_context.rb} +0 -18
data/lib/markababy/rails_template_handler.rb +10 -0
data/lib/markababy/railtie.rb +9 -0
data/lib/markababy.rb +9 -48
data/markababy.gemspec +2 -3
data/spec/markababy_rails_spec.rb +8 -3
data/spec/views/index.html.rb +2 -1
metadata +9 -17

data/README.txt CHANGED Viewed

@@ -21,6 +21,14 @@ Usage is similar to Markaby, and easy to use directly from a Ruby script:
 Use Markababy.capture if you want to capture the output as a string instead
 of printing it to $stdout.
+To use Markababy within a Rails 3 app, first add it to your Gemfile:
+  gem 'markababy'
+Then change the extension on your template files from .erb to .rb, and you
+can start writing your templates in Ruby! Controller instance variables and
+helpers will be available as methods.
 Some differences from Markaby:
 * No auto-stringification

data/lib/markababy/builder.rb ADDED Viewed

@@ -0,0 +1,51 @@
+module Markababy
+  class Builder < BasicObject
+    def initialize(options, &block)
+      @options = options
+      @output = @options[:output]
+      @escape = @options[:escape]
+      @context = @options[:context]
+      instance_eval(&block)
+    end
+    def method_missing(sym, *args, &block)
+      if !@context.nil? && @context.respond_to?(sym)
+        return @context.send(sym, *args, &block)
+      end
+      attributes, content = [], []
+      args.flatten.each do |arg|
+        if arg.respond_to?(:to_hash)
+          arg.to_hash.each { |k, v| attributes << ' %s="%s"' % [@escape[k.to_s], @escape[v.to_s]] }
+        elsif arg.respond_to?(:id2name)
+          attributes << ' %s' % @escape[arg.to_s]
+        elsif arg.respond_to?(:html_safe?) && arg.html_safe?
+          content << arg.to_s
+        else
+          content << @escape[arg.to_s]
+        end
+      end
+      @output << (attributes.empty? ? "<#{sym}>" : "<#{sym}#{attributes.join}>")
+      @output << content.join unless content.empty?
+      instance_eval(&block) unless block.nil?
+      @output << "</#{sym}>" unless content.empty? && block.nil?
+    end
+    def text(content)
+      if content.respond_to?(:html_safe?) && content.html_safe?
+        @output << content.to_s
+      else
+        @output << @escape[content.to_s]
+      end
+    end
+  end
+end

data/lib/markababy/{rails.rb → rails_template_context.rb} RENAMED Viewed

@@ -1,6 +1,3 @@
-require 'markababy'
-require 'action_view'
 module Markababy
   class RailsTemplateContext
     def initialize(controller)
@@ -23,19 +20,4 @@ module Markababy
       end
     end
   end
-  module RailsTemplateHandler
-    def self.call(template)
-      "self.output_buffer = ''\n" +
-      "Markababy.capture(output: self.output_buffer, context: Markababy::RailsTemplateContext.new(self)) do\n" +
-      "#{template.source}\n" +
-      "end\n"
-    end
-    def self.extended(base)
-      base.register_default_template_handler :rb, self
-    end
-  end
-  ActionView::Template.extend RailsTemplateHandler
 end

data/lib/markababy/rails_template_handler.rb ADDED Viewed

@@ -0,0 +1,10 @@
+module Markababy
+  module RailsTemplateHandler
+    def self.call(template)
+      "self.output_buffer = ''\n" +
+      "Markababy.capture(output: self.output_buffer, context: Markababy::RailsTemplateContext.new(self)) do\n" +
+      "#{template.source}\n" +
+      "end\n"
+    end
+  end
+end

data/lib/markababy/railtie.rb ADDED Viewed

@@ -0,0 +1,9 @@
+module Markababy
+  class Railtie < Rails::Railtie
+    initializer 'markababy.action_view' do |app|
+      ActiveSupport.on_load(:action_view) do
+        ActionView::Template.register_default_template_handler :rb, RailsTemplateHandler
+      end
+    end
+  end
+end

data/lib/markababy.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+require 'markababy/builder'
 require 'cgi'
 module Markababy
@@ -10,58 +11,18 @@ module Markababy
     options[:output] = $stdout unless options.has_key?(:output)
-    options[:output] << "<!DOCTYPE html>\n" if options[:doctype]
+    options[:output] << doctype if options[:doctype]
     Builder.new(options, &block)
   end
-  class Builder < BasicObject
-    def initialize(options, &block)
-      @options = options
-      @output = @options[:output]
-      @escape = @options[:escape]
-      @context = @options[:context]
-      instance_eval(&block)
-    end
-    def method_missing(sym, *args, &block)
-      if !@context.nil? && @context.respond_to?(sym)
-        return @context.send(sym, *args, &block)
-      end
-      attributes, content = [], []
-      args.flatten.each do |arg|
-        if arg.respond_to?(:to_hash)
-          arg.to_hash.each { |k, v| attributes << ' %s="%s"' % [@escape[k.to_s], @escape[v.to_s]] }
-        elsif arg.respond_to?(:id2name)
-          attributes << ' %s' % @escape[arg.to_s]
-        elsif arg.respond_to?(:html_safe?) && arg.html_safe?
-          content << arg.to_s
-        else
-          content << @escape[arg.to_s]
-        end
-      end
-      @output << (attributes.empty? ? "<#{sym}>" : "<#{sym}#{attributes.join}>")
-      @output << content.join unless content.empty?
-      instance_eval(&block) unless block.nil?
-      @output << "</#{sym}>" unless content.empty? && block.nil?
-    end
+  def self.doctype
+    @doctype ||= "<!DOCTYPE html>\n".freeze
+  end
-    def text(content)
-      if content.respond_to?(:html_safe?) && content.html_safe?
-        @output << content.to_s
-      else
-        @output << @escape[content.to_s]
-      end
-    end
+  if defined?(Rails)
+    require 'markababy/rails_template_context'
+    require 'markababy/rails_template_handler'
+    require 'markababy/railtie'
   end
 end

data/markababy.gemspec CHANGED Viewed

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'markababy'
-  s.version = '1.0.0'
+  s.version = '1.1.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
   s.email = ['mail@timcraft.com']
@@ -8,7 +8,6 @@ Gem::Specification.new do |s|
   s.description = 'Markaby\'s little sister'
   s.summary = 'See description'
   s.files = Dir.glob('{lib,spec}/**/*') + %w(README.txt Rakefile markababy.gemspec)
-  s.add_development_dependency('activesupport', ['>= 3.0.3'])
-  s.add_development_dependency('actionpack', ['>= 3.0.3'])
+  s.add_development_dependency('rails', ['>= 3.0.3'])
   s.require_path = 'lib'
 end

data/spec/markababy_rails_spec.rb CHANGED Viewed

@@ -1,7 +1,12 @@
 require 'minitest/autorun'
-require 'abstract_controller'
+require 'rails/all'
 require 'markababy'
-require 'markababy/rails'
+class DummyApplication < Rails::Application
+  config.active_support.deprecation = :log
+end
+DummyApplication.initialize!
 class DummyController < AbstractController::Base
   # cf. http://amberbit.com/blog/render-views-partials-outside-controllers-rails-3
@@ -21,7 +26,7 @@ end
 describe DummyController do
   it 'should return the correct markup' do
-    output = '<html><head><title>Controller says hello!</title><p>12,345,678</p></head></html>'
+    output = '<html><head><title>Controller says hello!</title></head><body><p>12,345,678</p></body></html>'
     DummyController.new.index.must_equal output
   end

data/spec/views/index.html.rb CHANGED Viewed

@@ -1,7 +1,8 @@
 html {
   head {
     title message
+  }
+  body {
     p number_with_delimiter(12345678)
   }
 }

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markababy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-10-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &10149360 !ruby/object:Gem::Requirement
+  name: rails
+  requirement: &4155440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,18 +21,7 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *10149360
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: &10149030 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.3
-  type: :development
-  prerelease: false
-  version_requirements: *10149030
+  version_requirements: *4155440
 description: Markaby's little sister
 email:
 - mail@timcraft.com
@@ -40,7 +29,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/markababy/rails.rb
+- lib/markababy/builder.rb
+- lib/markababy/rails_template_context.rb
+- lib/markababy/rails_template_handler.rb
+- lib/markababy/railtie.rb
 - lib/markababy.rb
 - spec/markababy_rails_spec.rb
 - spec/markababy_spec.rb