blocks 3.0.0.rc2 → 3.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4c7897223c480b20fd3787e150b311af20625db
-  data.tar.gz: 4c864e0ee1318de35c64bc27e726b29bb0751d4e
+  metadata.gz: 242d94c843469d6a2d4157e4cc145043c4895a79
+  data.tar.gz: 842fdfde31635095c2792cdffd18289f27a13ad6
 SHA512:
-  metadata.gz: 59d329e7bcfbc630e0e83a66405343ddd6ef3b53a954f38fe8d5b3dba68bca75e3f441e4f8fb248954d22934457f8bc78623ced9fc8058ec429b71f5543fb48a
-  data.tar.gz: 7ba7fed39355412d3c31f3eef190cea23e04fa998b26be04dc50e4c23b82405ccb7477cca75596f13917140f75860aa18f98632e62cd3d06d618421d55e2dcb2
+  metadata.gz: f3369f0bdf67c5c843e86f9970439c3fbff4d9f016720b20cac2a0bcd7c7c982bb3bf93d35b57e22b35f9a4a6ab65de1664af6a05bd70806ef0afb4efb9216e7
+  data.tar.gz: 38fcbef4d4c1c88f786fa168f0bf551f6bcb62e0aa2aae3327a7d5f2295a6b48f43d82bc24a328a9b7f4efef489ceaf2740010ba72803f56b60a04a5faaf9726

data/.rspec

@@ -1,2 +1,4 @@
 --colour
 --backtrace
+--exclude-pattern "spec/features/*_spec.rb"
+--format documentation

data/Gemfile

@@ -2,15 +2,17 @@ source "https://rubygems.org"
 
 gemspec
 
+gem "nokogiri"
+gem "capybara"
 gem "rspec", "~> 3.6.0"
 gem "rails", github: "rails/rails"
-gem 'rack', git: 'git://github.com/rack/rack.git'
+gem 'rack'
 gem "shoulda-matchers", "~> 2.0"
-gem "haml", "~> 5.0.0"
+gem "haml"
 
 # Extra development utilities
-gem 'ruby_dep', '~> 1.3.0'
+gem 'ruby_dep'
 gem 'guard-rspec', '~> 4.7'
 gem "terminal-notifier-guard"
 gem "byebug"
-gem "codeclimate-test-reporter", "~> 1.0.0"
+gem "codeclimate-test-reporter", "~> 1.0.8"

data/blocks.gemspec

@@ -30,7 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "call_with_params"
   spec.add_dependency "rails", ">= 3.0.0"
 
-  spec.add_development_dependency "nokogiri", "1.6.8.1"
-  spec.add_development_dependency "capybara"
   spec.add_development_dependency "simplecov"
 end

data/gemfiles/Gemfile.rails-3-0-stable

@@ -2,6 +2,8 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
+gem "nokogiri", "1.6.8.1"
+gem "capybara"
 gem "rake", "< 11.0"
 gem "public_suffix", "~> 1.4.6"
 gem "mime-types", "< 3.0"

data/gemfiles/Gemfile.rails-3-1-stable

@@ -2,6 +2,8 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
+gem "nokogiri", "1.6.8.1"
+gem "capybara"
 gem "rake", "< 11.0"
 gem "public_suffix", "~> 1.4.6"
 gem "mime-types", "< 3.0"

data/gemfiles/Gemfile.rails-3-2-stable

@@ -2,6 +2,8 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
+gem "nokogiri", "1.6.8.1"
+gem "capybara"
 gem "rake", "< 11.0"
 gem "public_suffix", "~> 1.4.6"
 gem "mime-types", "< 3.0"

data/gemfiles/Gemfile.rails-4-0-stable

@@ -2,6 +2,8 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
+gem "nokogiri", "1.6.8.1"
+gem "capybara"
 gem "rake", "< 11.0"
 gem "public_suffix", "~> 1.4.6"
 gem "mime-types", "< 3.0"

data/gemfiles/Gemfile.rails-4-1-stable

@@ -2,6 +2,8 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
+gem "nokogiri", "1.6.8.1"
+gem "capybara"
 gem "rake", "< 11.0"
 gem "public_suffix", "~> 1.4.6"
 gem "mime-types", "< 3.0"

data/gemfiles/Gemfile.rails-4-2-stable

@@ -2,6 +2,8 @@ source "https://rubygems.org"
 
 gemspec path: ".."
 
+gem "nokogiri", "1.6.8.1"
+gem "capybara"
 gem "rake", "< 11.0"
 gem "public_suffix", "~> 1.4.6"
 gem "mime-types", "< 3.0"

data/gemfiles/Gemfile.rails-5-0-stable

@@ -4,6 +4,8 @@ gemspec path: ".."
 
 # Requires min Ruby version 2.2.2
 
+gem "nokogiri", "1.6.8.1"
+gem "capybara"
 gem "rspec", "~> 3.6.0"
 gem "rails", github: "rails/rails", branch: "5-0-stable"
 gem "shoulda-matchers", "~> 2.0"

data/gemfiles/Gemfile.rails-5-1-stable

@@ -4,6 +4,8 @@ gemspec path: ".."
 
 # Requires min Ruby version 2.2.2
 
+gem "nokogiri", "1.6.8.1"
+gem "capybara"
 gem "rspec", "~> 3.6.0"
 gem "rails", github: "rails/rails", branch: "5-1-stable"
 gem "shoulda-matchers", "~> 2.0"

data/lib/blocks/builders/builder.rb

@@ -30,6 +30,12 @@ module Blocks
     CONTENT_TAG_WRAPPER_BLOCK = :content_tag_wrapper
 
     def initialize(view, options={})
+      if defined?(::Haml) && !view.instance_variables.include?(:@haml_buffer)
+        class << view
+          include Haml::Helpers
+        end
+        view.init_haml_helpers
+      end
       self.view = view
       self.block_definitions = HashWithIndifferentAccess.new do |hash, key|
         hash[key] = BlockDefinition.new(key); hash[key]

data/lib/blocks/renderers/abstract_renderer.rb

@@ -49,7 +49,7 @@ module Blocks
     #  the block would need to be captured in Haml using a Haml buffer.
     #  This workaround accomplishes that.
     def without_haml_interference(&block)
-      if view.instance_variables.include?(:@haml_buffer)
+      if defined?(::Haml) && view.instance_variables.include?(:@haml_buffer)
         haml_buffer = view.instance_variable_get(:@haml_buffer)
         if haml_buffer
           was_active = haml_buffer.active?

data/lib/blocks/renderers/adjacent_blocks_renderer.rb

@@ -5,8 +5,8 @@ module Blocks
       if block
         hooks = block.hooks_for hook
         hooks = hooks.reverse if hook.to_s.index("before") == 0 || hook.to_s.index("prepend") == 0
-        hooks.each do |block_definition|
-          hook_runtime_context = runtime_context.extend_to_block_definition(block_definition)
+        hooks.each do |hook_definition|
+          hook_runtime_context = runtime_context.extend_to_block_definition(hook_definition)
           block_renderer.render(hook_runtime_context)
         end
       end

data/lib/blocks/renderers/nesting_blocks_renderer.rb

@@ -2,12 +2,12 @@ module Blocks
   class NestingBlocksRenderer < AbstractRenderer
     def render(hook, runtime_context, &block)
       block = block_for(runtime_context.block_name)
-      if block
+      hooks = block.try(:hooks_for, hook)
+      if hooks.present?
         content_block = Proc.new { with_output_buffer { yield } }
-        hooks = block.hooks_for(hook)
 
-        renderer = hooks.inject(content_block) do |inner_content, block_definition|
-          hook_runtime_context = runtime_context.extend_to_block_definition(block_definition)
+        renderer = hooks.inject(content_block) do |inner_content, hook_definition|
+          hook_runtime_context = runtime_context.extend_to_block_definition(hook_definition)
           Proc.new {
             with_output_buffer do
               block_renderer.render(inner_content, hook_runtime_context)

data/lib/blocks/renderers/renderer.rb

@@ -1,15 +1,12 @@
 module Blocks
   class Renderer
     attr_accessor :builder
+    delegate :render, to: :block_with_hooks_renderer
 
     def initialize(builder)
       self.builder = builder
     end
 
-    def render(*args, &block)
-      block_with_hooks_renderer.render(*args, &block)
-    end
-
     # TODO: this needs to be handled by a new renderer
     def render_with_overrides(*args, &block)
       options = args.extract_options!

data/lib/blocks/utilities/configurator.rb

@@ -17,7 +17,7 @@ module Blocks
         configure do |config|
           config.builder_class = Builder
           config.renderer_class = Renderer
-          config.lookup_caller_location = true
+          config.lookup_caller_location = false
           config.global_options_set = OptionsSet.new("Global Options")
         end
       end

data/lib/blocks/version.rb

@@ -1,3 +1,3 @@
 module Blocks
-  VERSION = "3.0.0.rc2"
+  VERSION = "3.0.0.rc3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blocks
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc2
+  version: 3.0.0.rc3
 platform: ruby
 authors:
 - Andrew Hunter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: call_with_params
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.8.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.8.1
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement