blocks 2.8.0 → 3.0.0.rc1

data/lib/blocks/utilities/hash_with_caller.rb

@@ -0,0 +1,73 @@
+module Blocks
+  class HashWithCaller < HashWithIndifferentAccess
+    attr_accessor :callers
+
+    def initialize(*args)
+      self.callers = HashWithIndifferentAccess.new
+      options = args.extract_options!
+      add_options(args.first, options)
+      super &nil
+    end
+
+    def to_s
+      description = []
+
+      description << "{"
+      description << map do |key, value|
+        value_display = case value
+        when Symbol
+          ":#{value}"
+        when String
+          "\"#{value}\""
+        when Proc
+          "Proc"
+        else
+          value
+        end
+        "\"#{key}\" => #{value_display}, # [#{callers[key]}]"
+      end.join(",\n")
+      description << "}"
+      description.join("\n")
+    end
+
+    def add_options(*args)
+      options = args.extract_options!
+
+      caller_id = args.first.to_s.presence || ""
+
+      if !options.is_a?(HashWithCaller) && Blocks.lookup_caller_location?
+        caller_location = caller.detect do |c|
+          !c.include?("/lib/blocks") &&
+          !c.include?("/lib/ruby") &&
+          !c.include?("patch")
+        end.try(:split, ":in").try(:[], 0)
+
+        caller_id += " from #{caller_location}" if caller_location
+      end
+
+      options.each do |key, value|
+        current_value = self[key]
+
+        if options.is_a?(HashWithCaller)
+          setter = options.callers[key]
+        else
+          setter = "set by #{caller_id}"
+        end
+
+        if !self.key?(key)
+          self[key] = value
+          callers[key] = setter
+
+        elsif current_value.is_a?(Hash) && value.is_a?(Hash)
+          self[key] = value.deep_merge(current_value)
+          callers[key] = "#{callers[key]}, #{setter}"
+          # TODO: handle attribute merges here
+        end
+      end
+    end
+
+    def nested_under_indifferent_access
+      self
+    end
+  end
+end

data/lib/blocks/utilities/hash_with_render_strategy.rb

@@ -0,0 +1,47 @@
+module Blocks
+  class HashWithRenderStrategy < HashWithCaller
+    attr_accessor :render_strategy
+
+    RENDER_WITH_PROXY = :with
+    RENDER_WITH_BLOCK = :block
+    RENDER_WITH_PARTIAL = :partial
+
+    RENDERING_STRATEGIES = [RENDER_WITH_PROXY, RENDER_WITH_BLOCK, RENDER_WITH_PARTIAL]
+
+    def initialize_copy(original)
+      super
+      self.callers = original.callers.clone
+      self.render_strategy = nil
+      RENDERING_STRATEGIES.each do |rs|
+        self.delete(rs)
+      end
+    end
+
+    alias_method :dup, :clone
+
+    def reverse_merge(options)
+      self.clone.tap {|cloned| cloned.add_options(options) }
+    end
+
+    def add_options(*args, &block)
+      options = args.extract_options!
+      if !options.is_a?(HashWithIndifferentAccess)
+        options = options.with_indifferent_access
+      end
+      options[:block] = block if block
+      if render_strategy.nil?
+        self.render_strategy = if options.is_a?(HashWithRenderStrategy)
+          options.render_strategy
+        else
+          RENDERING_STRATEGIES.detect {|render_strategy| options[render_strategy].present? }
+        end
+      end
+
+      super(*args, options)
+    end
+
+    def render_strategy_and_item
+      [render_strategy, self[render_strategy]] if render_strategy
+    end
+  end
+end

data/lib/blocks/utilities/options_set.rb

@@ -0,0 +1,95 @@
+module Blocks
+  class OptionsSet < HashWithIndifferentAccess
+    attr_accessor :name
+
+    attr_accessor :runtime_options
+    attr_accessor :standard_options
+    attr_accessor :default_options
+
+    def initialize(*args, &block)
+      options = args.extract_options!
+      self.name = args.first
+      reset
+      add_options options, &block
+      super(&nil)
+    end
+
+    def initialize_copy(original)
+      super
+      control_fields = (
+        RuntimeContext::CONTROL_VARIABLES.keys +
+        RuntimeContext::CONTROL_VARIABLES.values
+      ).flatten.compact
+      self.runtime_options = original.runtime_options.clone.except(*control_fields)
+      self.default_options = original.default_options.clone.except(*control_fields)
+      self.standard_options = original.standard_options.clone.except(*control_fields)
+    end
+
+    def to_s
+      description = []
+      description << "Block Name: #{name}"
+      description << "------------------------------"
+      description << "Runtime Options:"
+      description << runtime_options.to_s
+      description << "------------------------------"
+      description << "Standard Options:"
+      description << standard_options.to_s
+      description << "------------------------------"
+      description << "Default Options:"
+      description << default_options.to_s
+      description.join("\n")
+    end
+
+    def inspect
+      hash = standard_options.to_hash
+      hash[:defaults] = default_options if default_options.present?
+      hash[:runtime] = runtime_options if runtime_options.present?
+      hash
+    end
+
+    def add_options(*args, &block)
+      options = args.extract_options!
+      caller_id = args.first
+
+      runtime, defaults, standard = if options.is_a?(OptionsSet)
+        caller_id ||= options.name
+        [options.runtime_options, options.default_options, options.standard_options]
+      else
+        if !options.is_a?(HashWithIndifferentAccess)
+          options = options.with_indifferent_access
+        end
+        [options.delete(:runtime), options.delete(:defaults), options]
+      end
+
+      caller_id ||= self.name
+
+      runtime_options.add_options caller_id, runtime
+      standard_options.add_options caller_id, standard, &block
+      default_options.add_options caller_id, defaults
+
+      self
+    end
+
+    def reset
+      self.runtime_options = HashWithRenderStrategy.new "#{name} Runtime Options"
+      self.standard_options = HashWithRenderStrategy.new "#{name} Standard Options"
+      self.default_options = HashWithRenderStrategy.new "#{name} Default Options"
+    end
+
+    def current_render_strategy_and_item
+      render_strategies_and_items.compact.first
+    end
+
+    def render_strategies_and_items
+      [
+        runtime_options.render_strategy_and_item,
+        standard_options.render_strategy_and_item,
+        default_options.render_strategy_and_item
+      ]
+    end
+
+    def nested_under_indifferent_access
+      self
+    end
+  end
+end

data/lib/blocks/version.rb

@@ -1,3 +1,3 @@
 module Blocks
-  VERSION = "2.8.0"
+  VERSION = "3.0.0.rc1"
 end

metadata

@@ -1,169 +1,159 @@
 --- !ruby/object:Gem::Specification
 name: blocks
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Andrew Hunter
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: call_with_params
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 3.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8.1
 - !ruby/object:Gem::Dependency
-  name: mocha
+  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: debugger
+  name: simplecov
   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'
-description: Blocks goes beyond blocks and partials
+description: Blocks gives you total control over how your blocks of code render.
 email:
 - hunterae@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Gemfile
-- README.rdoc
+- Guardfile
+- LICENSE.txt
+- README.md
 - Rakefile
+- bin/console
+- bin/setup
 - blocks.gemspec
-- blocks_render_order.graffle
-- blocks_render_order.png
+- gemfiles/Gemfile.rails-3-0-stable
+- gemfiles/Gemfile.rails-3-1-stable
+- gemfiles/Gemfile.rails-3-2-stable
+- gemfiles/Gemfile.rails-4-0-stable
+- gemfiles/Gemfile.rails-4-1-stable
+- gemfiles/Gemfile.rails-4-2-stable
+- gemfiles/Gemfile.rails-5-0-stable
+- gemfiles/Gemfile.rails-5-1-stable
 - lib/blocks.rb
-- lib/blocks/base.rb
-- lib/blocks/container.rb
-- lib/blocks/controller_additions.rb
+- lib/blocks/action_view_extensions/view_extensions.rb
+- lib/blocks/builders/block_definition.rb
+- lib/blocks/builders/builder.rb
+- lib/blocks/builders/hook_definition.rb
+- lib/blocks/experimental/builder_permissions.rb
+- lib/blocks/experimental/invalid_permissions_handler.rb
+- lib/blocks/renderers/abstract_renderer.rb
+- lib/blocks/renderers/adjacent_blocks_renderer.rb
+- lib/blocks/renderers/block_placeholder.rb
+- lib/blocks/renderers/block_renderer.rb
+- lib/blocks/renderers/block_with_hooks_renderer.rb
+- lib/blocks/renderers/collection_renderer.rb
+- lib/blocks/renderers/nesting_blocks_renderer.rb
+- lib/blocks/renderers/partial_renderer.rb
+- lib/blocks/renderers/renderer.rb
+- lib/blocks/renderers/runtime_context.rb
+- lib/blocks/renderers/wrapper_renderer.rb
+- lib/blocks/utilities/configurator.rb
+- lib/blocks/utilities/dynamic_configuration.rb
+- lib/blocks/utilities/hash_with_caller.rb
+- lib/blocks/utilities/hash_with_render_strategy.rb
+- lib/blocks/utilities/options_set.rb
 - lib/blocks/version.rb
-- lib/blocks/view_additions.rb
-- rails/init.rb
-- spec/blocks/base_spec.rb
-- spec/blocks/blocks_spec.rb
-- spec/blocks/view_additions_spec.rb
-- spec/spec_helper.rb
-homepage: http://github.com/hunterae/blocks
+homepage: https://github.com/hunterae/blocks
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: Blocks goes beyond blocks and partials
-test_files:
-- spec/blocks/base_spec.rb
-- spec/blocks/blocks_spec.rb
-- spec/blocks/view_additions_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 
+summary: Blocks gives you total control over how your blocks of code render.
+test_files: []