blocks 3.0.0.rc4 → 3.0.0.rc5

data/docs/stylesheets/demos/hooks_and_wrappers.scss

@@ -0,0 +1,32 @@
+---
+---
+
+.bg-primary, .bg-warning, .bg-info, .bg-success, .bg-danger {
+  border: 3px solid black;
+  margin: 10px;
+  padding: 5px;
+  font-size: 14px !important;
+  line-height: 20px !important;
+}
+
+#blocks div:not(.bg-primary, .bg-warning, .bg-info, .bg-success, .bg-danger, #actual_block) {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 0;
+  line-height: 0;
+}
+
+#blocks div:not(#actual_block) {
+  font-size: 0;
+  /*border: 0;*/
+  /*margin: 0;*/
+  /*padding: 0;*/
+  /*background-color: white;*/
+  /*line-height: 0;*/
+}
+
+#actual_block {
+  font-size: 14px;
+  /*background-color: inherit;*/
+}

data/docs/stylesheets/print.scss

@@ -0,0 +1,150 @@
+---
+---
+@charset "utf-8";
+@import 'normalize';
+@import 'variables';
+@import 'icon-font';
+@import 'syntax';
+
+/*
+Copyright 2008-2013 Concur Technologies, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may obtain
+a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
+*/
+
+$print-color: #999;
+$print-color-light: #ccc;
+$print-font-size: 12px;
+
+body {
+  @extend %default-font;
+}
+
+.tocify, .toc-footer, .lang-selector, .search, #nav-button {
+  display: none;
+}
+
+.tocify-wrapper>img {
+  margin: 0 auto;
+  display: block;
+}
+
+.content {
+  font-size: 12px;
+
+  pre, code {
+    @extend %code-font;
+    @extend %break-words;
+    border: 1px solid $print-color;
+    border-radius: 5px;
+    font-size: 0.8em;
+  }
+
+  pre {
+    code {
+      border: 0;
+    }
+  }
+
+  pre {
+    padding: 1.3em;
+  }
+
+  code {
+    padding: 0.2em;
+  }
+
+  table {
+    border: 1px solid $print-color;
+    tr {
+      border-bottom: 1px solid $print-color;
+    }
+    td,th {
+      padding: 0.7em;
+    }
+  }
+
+  p {
+    line-height: 1.5;
+  }
+
+  a {
+    text-decoration: none;
+    color: #000;
+  }
+
+  h1 {
+    @extend %header-font;
+    font-size: 2.5em;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
+    margin-top: 1em;
+    margin-bottom: $h1-margin-bottom;
+    border: 2px solid $print-color-light;
+    border-width: 2px 0;
+    text-align: center;
+  }
+
+  h2 {
+    @extend %header-font;
+    font-size: 1.8em;
+    margin-top: 2em;
+    border-top: 2px solid $print-color-light;
+    padding-top: 0.8em;
+  }
+
+  h1+h2, h1+div+h2 {
+    border-top: none;
+    padding-top: 0;
+    margin-top: 0;
+  }
+
+  h3, h4 {
+    @extend %header-font;
+    font-size: 0.8em;
+    margin-top: 1.5em;
+    margin-bottom: 0.8em;
+    text-transform: uppercase;
+  }
+
+  h5, h6 {
+    text-transform: uppercase;
+  }
+
+  aside {
+    padding: 1em;
+    border: 1px solid $print-color-light;
+    border-radius: 5px;
+    margin-top: 1.5em;
+    margin-bottom: 1.5em;
+    line-height: 1.6;
+  }
+
+  aside:before {
+    vertical-align: middle;
+    padding-right: 0.5em;
+    font-size: 14px;
+  }
+
+  aside.notice:before {
+    @extend %icon-info-sign;
+  }
+
+  aside.warning:before {
+    @extend %icon-exclamation-sign;
+  }
+
+  aside.success:before {
+    @extend %icon-ok-sign;
+  }
+}

data/docs/stylesheets/screen.scss

@@ -0,0 +1,10 @@
+---
+---
+@charset "utf-8";
+@import '../_sass/normalize';
+@import '../_sass/variable_overrides';
+@import '../_sass/variables';
+@import '../_sass/icon-font';
+@import '../_sass/syntax';
+@import '../_sass/default_styling';
+@import '../_sass/styling_overrides';

data/lib/blocks/action_view_extensions/view_extensions.rb

@@ -14,6 +14,7 @@ module Blocks
         # builder = builder.clone
         # TODO: figure out what to do here
       else
+        # TODO: options shouldn't have to be passed both here and to the render_with_overrides call below - need it to be just one place
         builder = Blocks.builder_class.new(self, options)
       end
       builder.render_with_overrides(options.merge(partial: partial), &block)

data/lib/blocks/renderers/renderer.rb

@@ -12,6 +12,7 @@ module Blocks
       options = args.extract_options!
       name = args.first
       if name.is_a?(Symbol) || name.is_a?(String)
+        # TODO: block needs to be handled differently so as to provide overrides
         block_with_hooks_renderer.render(*args, options, &block)
       elsif options[:partial]
         partial_renderer.render(options.delete(:partial), options, &block)

data/lib/blocks/renderers/runtime_context.rb

@@ -17,8 +17,7 @@ module Blocks
                   :render_options_set,
                   :block_options_set,
                   :proxy_options_set,
-                  :parent_options_set,
-                  :merged_options_set
+                  :parent_runtime_context
 
     delegate :skip_content, :skip_completely, to: :block_options_set, allow_nil: true
 
@@ -38,16 +37,20 @@ module Blocks
       self.runtime_block = runtime_block
       self.proxy_options_set = OptionsSet.new("Proxy Options Set")
 
-      convert_render_options(runtime_args.extract_options!)
-      identify_block(runtime_args.shift)
+      render_options = runtime_args.extract_options!
+      block_name = runtime_args.shift
+
+      convert_render_options(render_options)
+      identify_block(block_name)
 
       self.runtime_args = runtime_args
       merge_options_and_identify_render_item
       extract_control_options
     end
 
+    # TODO: this method needs to clone without context, i.e. with render_strategy, item, etc
     def extend_to_block_definition(block_definition)
-      RuntimeContext.new(builder, block_definition, parent_options_set: merged_options_set.clone).tap do |rc|
+      RuntimeContext.new(builder, block_definition, parent_runtime_context: self).tap do |rc|
         rc.runtime_args = self.runtime_args
       end
     end
@@ -88,7 +91,7 @@ module Blocks
       if !render_options.is_a?(HashWithIndifferentAccess)
         render_options = render_options.with_indifferent_access
       end
-      self.parent_options_set = render_options.delete(:parent_options_set)
+      self.parent_runtime_context = render_options.delete(:parent_runtime_context)
       self.render_options_set = OptionsSet.new(
         "Render Options",
         defaults: render_options.delete(:defaults),
@@ -133,14 +136,27 @@ module Blocks
 
     def merge_options_and_identify_render_item
       determined_render_item = false
-      all_options_sets = [
-        render_options_set,
-        block_options_set,
-        OptionsSet.new("Runtime Block", block: self.runtime_block),
-        builder_options_set,
-        Blocks.global_options_set,
-        parent_options_set
-      ].compact
+      all_options_sets = if parent_runtime_context
+        [
+          parent_runtime_context.render_options_set.clone,
+          block_options_set,
+          parent_runtime_context.block_options_set.clone,
+          # TODO: figure out how to deal with these - they don't technically belong here
+          parent_runtime_context.proxy_options_set.clone,
+          builder_options_set,
+          Blocks.global_options_set
+        ].compact
+      else
+        [
+          render_options_set,
+          block_options_set,
+          # TODO: consider having the runtime_block be merged into the
+          #  default render options set
+          OptionsSet.new("Runtime Block", block: self.runtime_block),
+          builder_options_set,
+          Blocks.global_options_set
+        ].compact
+      end
 
       options_set_with_render_strategy_index = nil
       all_options_sets.
@@ -159,16 +175,13 @@ module Blocks
         self.render_item = add_proxy_options render_item
       end
 
-      self.merged_options_set = OptionsSet.new("Parent Options Set")
       [:runtime_options, :standard_options, :default_options].each do |option_level|
         all_options_sets.each_with_index do |options_set, index|
           options_for_level = options_set.send(option_level)
-          merged_options_set.send(option_level).add_options(options_for_level)
           add_options options_for_level
 
           if index == options_set_with_render_strategy_index
             options_for_level = proxy_options_set.send(option_level)
-            merged_options_set.send(option_level).add_options(options_for_level)
             add_options options_for_level
           end
         end

data/lib/blocks/utilities/hash_with_render_strategy.rb

@@ -23,6 +23,9 @@ module Blocks
       self.clone.tap {|cloned| cloned.add_options(options) }
     end
 
+    # TODO: need to implement either merge or update to update
+    #  both the hash and the callers hash
+
     def add_options(*args, &block)
       options = args.extract_options!
       if !options.is_a?(HashWithIndifferentAccess)

data/lib/blocks/version.rb

@@ -1,3 +1,3 @@
 module Blocks
-  VERSION = "3.0.0.rc4"
+  VERSION = "3.0.0.rc5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blocks
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc4
+  version: 3.0.0.rc5
 platform: ruby
 authors:
 - Andrew Hunter
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: call_with_params
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
@@ -68,9 +69,76 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- _config.yml
 - bin/console
+- bin/deploy_docs
 - bin/setup
 - blocks.gemspec
+- docs/.gitignore
+- docs/404.html
+- docs/_includes/acknowledgements.md
+- docs/_includes/caller-id.md
+- docs/_includes/configuration.md
+- docs/_includes/custom-builders.md
+- docs/_includes/defining.md
+- docs/_includes/demos/hooks-and-wrappers-output.html
+- docs/_includes/hooks.md
+- docs/_includes/installation.md
+- docs/_includes/introduction.md
+- docs/_includes/option-merging.md
+- docs/_includes/rendering.md
+- docs/_includes/reserved-keywords.md
+- docs/_includes/skipping.md
+- docs/_includes/slate/assets.html
+- docs/_includes/slate/language-tabs.html
+- docs/_includes/templating.md
+- docs/_includes/templating/bootstrap_4_cards.md
+- docs/_includes/use-cases.md
+- docs/_includes/wip.md
+- docs/_includes/wrappers.md
+- docs/_layouts/slate.html
+- docs/_plugins/gem_version.rb
+- docs/_plugins/highlight_with_div.rb
+- docs/_sass/_default_styling.scss
+- docs/_sass/_icon-font.scss
+- docs/_sass/_normalize.scss
+- docs/_sass/_styling_overrides.scss
+- docs/_sass/_syntax.scss
+- docs/_sass/_variable_overrides.scss
+- docs/_sass/_variables.scss
+- docs/assets/javascripts/script.js
+- docs/assets/stylesheets/formChanges.less
+- docs/assets/stylesheets/style.css
+- docs/fonts/slate.eot
+- docs/fonts/slate.svg
+- docs/fonts/slate.ttf
+- docs/fonts/slate.woff
+- docs/fonts/slate.woff2
+- docs/hooks.html
+- docs/hooks_and_wrappers_demo.html
+- docs/images/favicon.ico
+- docs/images/logo.png
+- docs/images/navbar.png
+- docs/images/placeholder.jpg
+- docs/images/render_strategies.png
+- docs/images/templating.png
+- docs/index.md
+- docs/javascripts/all.js
+- docs/javascripts/all_nosearch.js
+- docs/javascripts/app/lang.js
+- docs/javascripts/app/search.js
+- docs/javascripts/app/toc.js
+- docs/javascripts/demos/hooks_and_wrappers.js
+- docs/javascripts/lib/energize.js
+- docs/javascripts/lib/imagesloaded.min.js
+- docs/javascripts/lib/jquery.highlight.js
+- docs/javascripts/lib/jquery.js
+- docs/javascripts/lib/jquery.tocify.js
+- docs/javascripts/lib/jquery_ui.js
+- docs/javascripts/lib/lunr.js
+- docs/stylesheets/demos/hooks_and_wrappers.scss
+- docs/stylesheets/print.scss
+- docs/stylesheets/screen.scss
 - gemfiles/Gemfile.rails-3-0-stable
 - gemfiles/Gemfile.rails-3-1-stable
 - gemfiles/Gemfile.rails-3-2-stable