with_template 0.0.6 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: eb9f1d098920eda664b0e578e87877e8484b34a0
+  data.tar.gz: 8877bee4586e2c50aac7aca15b325a782641a225
+SHA512:
+  metadata.gz: 85f256b61861f7712929b1b168abfd9946ec4d3a1823d93431fd4864fe4f6d0678d159cb312ed60ce55fd8fce124ebef79672e31d642694a7b2b6f64ffac537d
+  data.tar.gz: a2d8e4cd17dd6e334c50090f9bffb9ecfd9bc084479a44640839c5dd67b84e931be094de718d632f3ec9032d474f303e43a1de4e96e3690bdc4ed74a42c9e97a

data/.gitignore

@@ -0,0 +1,50 @@
+# rcov generated
+coverage
+coverage.data
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+Gemfile.lock
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc

data/.ruby-version

@@ -1 +1 @@
-1.9.3
+2.2.0

data/Gemfile

@@ -1,12 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'blocks', '~> 2.6.3'
-gem 'rails', '>= 3.0.0'
-
-group :development do
-  gem 'bundler'
-  gem 'jeweler'
-  gem 'simplecov'
-  gem 'shoulda'
-  gem 'mocha'
-end
+gemspec

data/Gemfile.lock

@@ -1,143 +1,135 @@
+PATH
+  remote: .
+  specs:
+    with_template (0.1.0)
+      blocks (~> 2.7.0)
+      rails (>= 3.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.0.1)
-      actionpack (= 4.0.1)
-      mail (~> 2.5.4)
-    actionpack (4.0.1)
-      activesupport (= 4.0.1)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
+    actionmailer (4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.5)
+      actionview (= 4.2.5)
+      activesupport (= 4.2.5)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    activemodel (4.0.1)
-      activesupport (= 4.0.1)
-      builder (~> 3.1.0)
-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.1)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.1)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    addressable (2.3.5)
-    arel (4.0.1)
-    atomic (1.1.14)
-    blocks (2.6.3)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5)
+      activesupport (= 4.2.5)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
+      globalid (>= 0.3.0)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
+      builder (~> 3.1)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
+      arel (~> 6.0)
+    activesupport (4.2.5)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.3)
+    blocks (2.7.0)
       call_with_params (~> 0.0.2)
       hashie
       rails (>= 3.0.0)
-    builder (3.1.4)
+    builder (3.2.2)
     call_with_params (0.0.2)
       activesupport (>= 3.0.0)
+    concurrent-ruby (1.0.0)
+    docile (1.1.5)
     erubis (2.7.0)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    hike (1.2.3)
-    httpauth (0.2.0)
-    i18n (0.6.5)
-    jeweler (1.8.8)
-      builder
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      github_api (= 0.10.1)
-      highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
-      rake
-      rdoc
-    json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.25)
-    minitest (4.7.5)
-    mocha (0.14.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    hashie (3.4.3)
+    i18n (0.7.0)
+    json (1.8.3)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    metaclass (0.0.4)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    minitest (5.8.3)
+    mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    polyglot (0.3.3)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    nokogiri (1.6.7)
+      mini_portile2 (~> 2.0.0.rc2)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.1)
-      actionmailer (= 4.0.1)
-      actionpack (= 4.0.1)
-      activerecord (= 4.0.1)
-      activesupport (= 4.0.1)
+    rails (4.2.5)
+      actionmailer (= 4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      activemodel (= 4.2.5)
+      activerecord (= 4.2.5)
+      activesupport (= 4.2.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.1)
-      sprockets-rails (~> 2.0.0)
-    railties (4.0.1)
-      actionpack (= 4.0.1)
-      activesupport (= 4.0.1)
+      railties (= 4.2.5)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rdoc (4.0.1)
-      json (~> 1.4)
+    rake (10.4.2)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.5)
-    shoulda-matchers (2.4.0)
+    shoulda-context (1.2.1)
+    shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sprockets (2.10.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    simplecov (0.11.1)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  blocks (~> 2.6.3)
-  bundler
-  jeweler
   mocha
-  rails (>= 3.0.0)
-  shoulda
+  shoulda (~> 3.5.0)
   simplecov
+  with_template!
+
+BUNDLED WITH
+   1.10.6

data/README.rdoc

@@ -1,14 +1,163 @@
 = with_template
 
-Render a template (partial) and easily override any of the components of the template.
+WithTemplate takes the concept of {Blocks}[https://github.com/hunterae/blocks] and adds templating to it. You specify a particular partial to render, and then maintain the ability to control how it renders from outside the template.
+
+This allows you to very easily build reusable UI components. This is best demonstrated through examples.
 
 == Installation
 
 To install, add the following to the Gemfile:
   gem install 'with_template'
 
-== Copyright
+== Note (12/14/15)
+I am in the process of doing a full rewrite of this readme file to include better examples, and better description
+of the features including new features that have not been documented yet.
+
+== Example 1: TableFor
+The {TableFor}[https://github.com/hunterae/table-for] was built by extending WithTemplate. Using a partial that defines a
+series of blocks ({See here}[https://github.com/hunterae/table-for/blob/master/app/views/table_for/_table_for.html.erb]),
+the user of the table builder is passed in a collection of records and specifies exactly which columns to render in the table.
+
+The columns can correspond to fields are the records, methods to be invoked, or the user can specify exactly what should
+be rendered in the column. Additionally, the headers can be overridden, any any component of the table can be replaced
+should the user not like how the table renders. A simple example would be:
+
+  <%= table_for @users, :table_html => {:class => "table table-hover table-bordered"} do |table| %>
+    <% table.column :id, :header => false %>
+    <% table.column :full_name do |user| %>
+      <%= "#{user.first_name} #{user.last_name}" %>
+    <% end %>
+    <% table.footer do %>
+      <div class="pull-right">
+        <%= will_paginate @users %>
+      </div>
+    <% end %>
+  <% end %>
+
+== Example 2: Shared Layouts
+Say you wanted to wanted to create the following three layouts for your application:
+1) a single full-width column
+2) two columns, one that is a fourth of the page, and one that is three fourths of the page.
+3) three columns, each a third of the page
+
+To accomplish this, you may find yourself copying and pasting code between layouts, such as the head tag,
+any meta tags, javascript includes, stylesheet links, navigation bar, the footer, and any components shared across all pages.
+
+Perhaps you typically take this approach, or maybe you render a partial that you pass local variables
+to that are used within the partial to conditionally render output.
+
+I’d like to propose a third solution: use with_template.
+
+With with_template, you specify what template (really just a partial) to render and a block that
+can be used to override definitions within the partial, control what gets rendered and in
+what order, or the block itself can be rendered in the partial.
+
+With the above example, we could define a single partial, something like app/layouts/_shared_layout.html.erb
+(Note: If you aren't familiar with the {Blocks gem}[https://github.com/hunterae/blocks], I highly recommend checking out
+the documentation first):
+
+  <!DOCTYPE html>
+  <html lang="en">
+    <head>
+    <!-- meta tags -->
+      <title>
+        <%= blocks.render :title do %>
+          My App
+        <% end %>
+      </title>
+      <%= csrf_meta_tags %>
+      <%= blocks.render :stylesheets do %>
+        <%= stylesheet_link_tag "application", :media => "all" %>
+      <% end %>
+      <!-- Additional <head> content -->
+    </head>
+    <body>
+      <%= blocks.render_with_partials :navbar %>
+      <div class="main">
+        <div class="container">
+          <div class="row">
+            <div class="col-md-12">
+              <%= bootstrap_flash %>
+            </div>
+            <%= captured_block %>
+          </div>
+        </div>
+      </div>
+      <%= blocks.render :footer do %>
+        <%= render "blocks/footer" %>
+      <% end %>
+      <%= blocks.render :javascripts do %>
+        <%= include_gon %>
+        <%= javascript_include_tag "application" %>
+      <% end %>
+    </body>
+  </html>
+
+Here we've defined a template of code that can be shared amongst all layouts. Where the individual layouts differ, there
+are several hooks that have been added to the template that provide convenient ways of adding code blocks or replacing
+the way others render. In the above code, we call "blocks.render" and "blocks.render_with_partials" in a couple of different
+places. These allow us, from outside the template, to specify code to render before any of those blocks, after any of those
+blocks, or replace any of those blocks. We'll get to that shortly.
+
+Using the above partial, we can now very easily define the 3 layouts defined above:
+
+  <!-- app/views/layout/one_column.html.erb -->
+  <%= with_template("layouts/shared_layout") do %>
+    <div class="col-md-12">
+      <%= yield %>
+    </div>
+  <% end %>
+
+  <!-- app/views/layout/two_columns.html.erb -->
+  <%= with_template("layouts/shared_layout") do %>
+    <%= blocks.render_with_partials :sidebar, :wrap_with => { :tag => :div, :class => "col-md-3 sidebar" } %>
+    <div class="col-md-9">
+      <%= yield %>
+    </div>
+  <% end %>
+
+  <!-- app/views/layout/three_columns.html.erb -->
+  <%= with_template("layouts/shared_layout") do %>
+    <%= blocks.render :column1, :wrap_with => { :tag => :div, :class => "col-md-4" } %>
+    <%= blocks.render :column2, :wrap_with => { :tag => :div, :class => "col-md-4" } %>
+    <%= blocks.render :column3, :wrap_with => { :tag => :div, :class => "col-md-4" } %>
+  <% end %>
+
+Suppose we wanted to add a fourth layout for admins that used roughly the same code as the one column layout,
+but with some additional javascript and stylesheet files included. In the true spirit of DRY, this is
+exceptionally easy to do with WithTemplate:
+
+  <!-- app/views/layout/admin.html.erb -->
+  <% blocks.after :stylesheets do %>
+    <%= stylesheet_link_tag "admin", :media => "all" %>
+  <% end %>
+
+  <% blocks.after :javascripts do %>
+    <%= javascript_include_tag "admin" %>
+  <% end %>
+
+  <% blocks.define :title do %>
+    Admin
+  <% end %>
+
+  <%= render :template => "layouts/one_column" %>
+
+With those lines, we added in the admin javascript files, the admin stylesheets, set the title to "Admin",
+and reused the basic one column layout. What if, instead of rendering the admin stylesheets and javascripts
+after the application stylesheets and javascripts, we wanted to flat out replace the application stylesheets
+and javascripts. Simple enough:
+
+  <!-- app/views/layout/admin.html.erb -->
+  <% blocks.define :stylesheets do %>
+    <%= stylesheet_link_tag "admin", :media => "all" %>
+  <% end %>
+
+  <% blocks.define :javascripts do %>
+    <%= javascript_include_tag "admin" %>
+  <% end %>
 
-Copyright (c) 2013 Andrew Hunter. See LICENSE.txt for
-further details.
+  <% blocks.define :title do %>
+    Admin
+  <% end %>
 
+  <%= render :template => "layouts/one_column" %>

data/Rakefile

@@ -1,29 +1,7 @@
 # encoding: utf-8
 
 require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "with_template"
-  gem.homepage = "http://github.com/hunterae/with_template"
-  gem.license = "MIT"
-  gem.summary = %Q{Render a template (partial) and easily override any of the components of the template}
-  gem.description = %Q{Render a template (partial) and easily override any of the components of the template}
-  gem.email = "hunterae@gmail.com"
-  gem.authors = ["Andrew Hunter"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

data/lib/with_template.rb

@@ -6,4 +6,4 @@ module WithTemplate
   autoload :ViewAdditions, "with_template/view_additions"
 end
 
-ActionView::Base.send :include, WithTemplate::ViewAdditions::ClassMethods
+ActionView::Base.send :include, WithTemplate::ViewAdditions

data/lib/with_template/base.rb

@@ -3,8 +3,8 @@ module WithTemplate
     # Array of Blocks::Container objects, storing the order of blocks as they were queued
     attr_accessor :queued_blocks
 
-    # A Hash of queued_blocks arrays; a new array is started when method_missing is invoked
-    attr_accessor :block_groups
+    # Options that were passed into this instance of WithTemplate for use when merging options with a parent instance
+    attr_accessor :init_options
 
     # Render a partial, treating it as a template, and any code in the block argument will impact how the template renders
     #   <%= WithTemplate::Base.new(self).render_template("shared/wizard") do |blocks| %>
@@ -41,10 +41,12 @@ module WithTemplate
     #   The partial to render as a template
     # [+block+]
     #   An optional block with code that affects how the template renders
-    def render_template(partial, &block)
+    def render_template(partial, variable=nil, &block)
       render_options = global_options.clone
-      render_options[render_options[:variable]] = self
       render_options[:captured_block] = view.capture(self, &block) if block_given?
+      render_options[:options] = render_options
+      variable ||= render_options.delete(:variable) || :template
+      render_options[variable] = self
 
       view.render partial, render_options
     end
@@ -95,30 +97,8 @@ module WithTemplate
 
     def initialize(view, options={})
       self.queued_blocks = []
-      self.block_groups = {}
-      super(view, options.reverse_merge(:variable => :template))
-    end
-
-    # If a method is missing, we'll assume the user is starting a new block group by that missing method name
-    def method_missing(m, *args, &block)
-      options = args.extract_options!
-
-      # If the specified block group has already been defined, it is simply returned here for iteration.
-      #  It will consist of all the blocks used in this block group that have yet to be rendered,
-      #   as the call for their use occurred before the template was rendered (where their definitions likely occurred)
-      return self.block_groups[m] unless self.block_groups[m].nil?
-
-      # Allows for nested block groups, store the current block positions array and start a new one
-      original_queued_blocks = self.queued_blocks
-      self.queued_blocks = []
-      self.block_groups[m] = self.queued_blocks
-
-      # Capture the contents of the block group (this will only capture block definitions and block renders; it will ignore anything else)
-      view.capture(global_options.merge(options), &block) if block_given?
-
-      # restore the original block positions array
-      self.queued_blocks = original_queued_blocks
-      nil
+      self.init_options = options
+      super(view, options)
     end
   end
 end

data/lib/with_template/version.rb

@@ -0,0 +1,3 @@
+module WithTemplate
+  VERSION = "0.1.0"
+end

data/lib/with_template/view_additions.rb

@@ -1,9 +1,31 @@
 module WithTemplate
   module ViewAdditions
-    module ClassMethods
-      def with_template(template, &block)
-        WithTemplate::Base.new(self).render_template(template, &block)
+    def with_template(template, options={}, &block)
+      options = options.with_indifferent_access
+      template_variable = options.delete(:variable) || :template
+      WithTemplate::Base.new(self, options).render_template(template, template_variable, &block)
+    end
+
+    def with_global_template(template, options={}, &block)
+      options = options.with_indifferent_access
+      variable = options.delete(:variable) || :global_template
+      if @global_template.present?
+        @global_template.init_options.reverse_merge!(options)
+        @global_template.global_options.merge!(@global_template.init_options)
+      else
+        @global_template = WithTemplate::Base.new(self, options)
+      end
+      @global_template.render_template(template, variable, &block)
+    end
+
+    def global_template
+      if @global_template.blank?
+        @global_template = WithTemplate::Base.new(self)
+        @global_template.blocks = blocks.blocks
+        @global_template.skipped_blocks = blocks.skipped_blocks
+        @global_template.anonymous_block_number = blocks.anonymous_block_number
       end
+      @global_template
     end
   end
-end
+end

data/test/base_test.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class WithTemplate::BaseTest < Test::Unit::TestCase
+class WithTemplate::BaseTest <  MiniTest::Unit::TestCase
   def setup
     @view = ActionView::Base.new
     @builder = WithTemplate::Base.new(@view)
@@ -28,11 +28,17 @@ class WithTemplate::BaseTest < Test::Unit::TestCase
       @builder.render_template("some_template")
     end
 
-    should "add allow the variable in the partial to be overridden" do
-      builder = WithTemplate::Base.new(@view, :variable => :new_template_variable)
+    should "allow the variable in the partial to be overridden in the options hash" do
+      builder = WithTemplate::Base.new(@view, variable: :new_template_variable)
       @view.expects(:render).with { |template, options| options[:new_template_variable] == builder }
       builder.render_template("some_template")
     end
+
+    should "allow the variable in the partial to be overridden as a parameter" do
+      builder = WithTemplate::Base.new(@view)
+      @view.expects(:render).with { |template, options| options[:new_template_variable] == builder }
+      builder.render_template("some_template", :new_template_variable)
+    end
   end
 
   context "#queue" do
@@ -89,30 +95,4 @@ class WithTemplate::BaseTest < Test::Unit::TestCase
       assert_equal block, container.block
     end
   end
-
-  context "#method_missing" do
-    should "start a new block group if a method is missing" do
-      @builder.some_method
-      queued_blocks = @builder.block_groups[:some_method]
-      assert_equal [], queued_blocks
-    end
-
-    should "add items to a queue when a new block group is started" do
-      @builder.some_method do
-        @builder.queue :myblock1
-        @builder.queue :myblock2
-      end
-      @builder.some_method2 do
-        @builder.queue :myblock3
-      end
-      queued_blocks = @builder.block_groups[:some_method]
-      assert_equal 2, queued_blocks.length
-      assert_equal :myblock1, queued_blocks.first.name
-      assert_equal :myblock2, queued_blocks.second.name
-      queued_blocks = @builder.block_groups[:some_method2]
-      assert_equal 1, queued_blocks.length
-      assert_equal :myblock3, queued_blocks.first.name
-      assert_equal [], @builder.queued_blocks
-    end
-  end
 end

data/test/helper.rb

@@ -1,20 +1,6 @@
 require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'test/unit'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'minitest/autorun'
 require 'shoulda'
-require 'mocha'
-require 'active_support/core_ext'
+require 'mocha/setup'
 require 'blocks'
 require 'with_template'
-
-ActiveSupport::Deprecation.silenced = true

data/test/view_additions_test.rb

@@ -0,0 +1,124 @@
+require 'helper'
+
+class WithTemplate::ViewAdditionsTest <  MiniTest::Unit::TestCase
+  def setup
+    @view = ActionView::Base.new(File.dirname(__FILE__) + '/fixtures')
+    @block = Proc.new {}
+  end
+
+  context "#with_template" do
+    should "instantiate a new WithTemplate::Base instance and render the template with it" do
+      options={ a: 1, b: 2}
+      instance = mock
+      instance.expects(:render_template).with("my_template", :template)
+      WithTemplate::Base.expects(:new).with(@view, options.with_indifferent_access).returns(instance)
+      @view.with_template("my_template", options, &@block)
+    end
+
+    should "allow and extract a variable parameter to be passed in the options hash" do
+      options = { variable: :my_variable, a: 1, b: 2 }
+      instance = mock
+      instance.expects(:render_template).with("my_template", :my_variable)
+      WithTemplate::Base.expects(:new).with(@view, options.with_indifferent_access.except(:variable)).returns(instance)
+      @view.with_template("my_template", options, &@block)
+    end
+
+    should "require only the first parameter to be specified" do
+      @view.with_template("my_template")
+      assert_raises ArgumentError do
+        @view.with_template
+      end
+    end
+  end
+
+  context "#with_global_template" do
+    context "when @global_template is not yet defined in the view" do
+      setup do
+        assert @view.instance_variable_get(:@global_template).nil?
+      end
+
+      should "instantiate a new WithTemplate::Base instance and render the template with it" do
+        options = {a: 1, b: 2}
+        instance = mock
+        instance.expects(:render_template).with("my_template", :global_template)
+        WithTemplate::Base.expects(:new).with(@view, options.with_indifferent_access).returns(instance)
+        @view.with_global_template("my_template", options, &@block)
+      end
+
+      should "allow and extract a variable parameter to be passed in the options hash" do
+        options = { variable: :my_variable, a: 1, b: 2 }
+        instance = mock
+        instance.expects(:render_template).with("my_template", :my_variable)
+        WithTemplate::Base.expects(:new).with(@view, options.with_indifferent_access.except(:variable)).returns(instance)
+        @view.with_global_template("my_template", options, &@block)
+      end
+
+      should "require only the first parameter to be specified" do
+        @view.with_global_template("my_template")
+        assert_raises ArgumentError do
+          @view.with_global_template
+        end
+      end
+    end
+
+    context "when @global_template is already set on the view" do
+      setup do
+        @view.global_template
+        @global_template = @view.instance_variable_get(:@global_template)
+        assert @global_template.present?
+        WithTemplate::Base.expects(:new).never
+      end
+
+      should "use the existing WithTemplate::Base instance and render the template with it" do
+        options={}
+        WithTemplate::Base.any_instance.expects(:render_template).with("my_template", :global_template)
+        @view.with_global_template("my_template", options, &@block)
+      end
+
+      should "allow and extract a variable parameter to be passed in the options hash" do
+        WithTemplate::Base.any_instance.expects(:render_template).with("my_template", :something)
+
+        @view.with_global_template("my_template", variable: :something)
+        assert @view.global_template.global_options[:variable].blank?
+      end
+
+      should "give precedence to the init options set in previous calls to with_global_template" do
+        options_1 = { a: 1, b: 2, d: 3 }
+        options_2 = { a: 4, b: 5, c: 6 }
+        options_3 = { a: 7, b: 8, c: 9, d: 10, e: 11}
+        merged = options_3.merge(options_2.merge(options_1)).with_indifferent_access
+        @view.with_global_template("my_template", options_1) do
+          @view.with_global_template("my_template", options_2) do
+            @view.with_global_template("my_template", options_3)
+          end
+        end
+        assert_equal @global_template.init_options, merged
+        assert_equal @global_template.global_options, @view.blocks.global_options.merge(merged)
+      end
+    end
+  end
+
+  context "#global_template" do
+    should "return a memoized global_template" do
+      assert_same @view.global_template, @view.global_template
+    end
+
+    should "instantiate the global_template from the global blocks instance" do
+      @view.blocks.skip(:some_block)
+      @view.blocks.define(:hello) do
+        "Goodbye"
+      end
+      @view.blocks.define(nil) do
+        "Anonymous block"
+      end
+      gt = @view.global_template
+      assert gt.skipped_blocks.include?(:some_block)
+      assert_equal 1, gt.anonymous_block_number
+      assert gt.blocks.include?(:block_1)
+      assert gt.blocks.include?(:hello)
+      assert_equal "Goodbye", gt.render(:hello)
+      assert_equal "Anonymous block", gt.render(:block_1)
+      assert_equal @view.blocks.global_options, gt.global_options
+    end
+  end
+end

data/with_template.gemspec

@@ -1,73 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = "with_template"
-  s.version = "0.0.6"
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'with_template/version'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andrew Hunter"]
-  s.date = "2013-11-04"
-  s.description = "Render a template (partial) and easily override any of the components of the template"
-  s.email = "hunterae@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".ruby-gemset",
-    ".ruby-version",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/with_template.rb",
-    "lib/with_template/base.rb",
-    "lib/with_template/view_additions.rb",
-    "rails/init.rb",
-    "test/base_test.rb",
-    "test/helper.rb",
-    "with_template.gemspec"
-  ]
-  s.homepage = "http://github.com/hunterae/with_template"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
-  s.summary = "Render a template (partial) and easily override any of the components of the template"
+Gem::Specification.new do |spec|
+  spec.name          = "with_template"
+  spec.version       = WithTemplate::VERSION
+  spec.authors       = ["Andrew Hunter"]
+  spec.email         = ["hunterae@gmail.com"]
+  spec.summary       = %q{Render a template (partial) and easily override any of the components of the template}
+  spec.description   = %q{Render a template (partial) and easily override any of the components of the template}
+  spec.homepage      = "http://github.com/hunterae/with_template"
+  spec.license       = "MIT"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<blocks>, ["~> 2.6.3"])
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-    else
-      s.add_dependency(%q<blocks>, ["~> 2.6.3"])
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<blocks>, ["~> 2.6.3"])
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-  end
-end
+  spec.add_dependency "rails", ">= 3.0.0"
+  spec.add_dependency "blocks", "~> 2.7.0"
 
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "shoulda", "~> 3.5.0"
+  spec.add_development_dependency "mocha"
+end

metadata

@@ -1,180 +1,138 @@
 --- !ruby/object:Gem::Specification
 name: with_template
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Andrew Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: blocks
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
+  name: blocks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.7.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Render a template (partial) and easily override any of the components
   of the template
-email: hunterae@gmail.com
+email:
+- hunterae@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
-- .document
-- .ruby-gemset
-- .ruby-version
+- ".document"
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/with_template.rb
 - lib/with_template/base.rb
+- lib/with_template/version.rb
 - lib/with_template/view_additions.rb
 - rails/init.rb
 - test/base_test.rb
+- test/fixtures/_my_template.html.erb
 - test/helper.rb
+- test/view_additions_test.rb
 - with_template.gemspec
 homepage: http://github.com/hunterae/with_template
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2512220499031150591
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Render a template (partial) and easily override any of the components of
   the template
-test_files: []
+test_files:
+- test/base_test.rb
+- test/fixtures/_my_template.html.erb
+- test/helper.rb
+- test/view_additions_test.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-use_template

data/VERSION

@@ -1 +0,0 @@
-0.0.6