blocks 2.6.3 → 2.6.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjAzYTVjNjBiN2UxM2JmNWFlYmFiYjMzMGMwM2UxZDc1MDNjYjViNg==
+  data.tar.gz: !binary |-
+    MzAzOWU1NWM1Yzg0M2RlMTAyNDM3NWQwZTYyODdlZDg4NmQ1ZmEwYw==
+SHA512:
+  metadata.gz: !binary |-
+    MDQzZWZkY2YwNDY1M2VlMGY3OWQ5MDdiMWE1Mjg0MzgwZjljNmQzYzFhNTM5
+    NjhhODhiZWY5ZTg0YWU1YjBmYWJhOWU2NzRjZGM1Y2U5Mzc3NWI3MmUzZTVj
+    M2JhYjc3NDg2NTU5N2NkMDVlZGU2YjM0YjY1YTRmY2Q2YWVmNjE=
+  data.tar.gz: !binary |-
+    MWE0MTRjZGM3MDY4NjdkYWQwYjZjYWY1OTY2MWYxMjEwYTNmOGQ1NTJmMzVh
+    NjVmMzA0OTI3MDFiODQwMjE0NWRjMzUxYTFlZjFhZTA0NjU1OTBmNGY1NjE2
+    MGZmYzMwYjk1YjhiZGQyOWY4NDNlZWE1YWJhZTM2YmQwYzM4Mzc=

data/.gitignore

@@ -0,0 +1,7 @@
+*.log
+*.sqlite3
+/pkg/*
+.bundle
+.rvmrc
+Gemfile.lock
+spec/database.yml

data/.ruby-version

@@ -1 +1 @@
-1.9.3
+1.9.3-p484

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+2.6.4 (July 21, 2014)
+* Removed dependence on jeweler for managing gem
+* Small cleanups of the code
+
 2.6.1 (November 4, 2013)
 * Made content_tag_with_block a public method in Blocks::Base so that it can be used in table-for gem.
 

data/Gemfile

@@ -1,17 +1,3 @@
 source "http://rubygems.org"
 
-gem "rails", ">= 3.0.0"
-gem "call_with_params", "~> 0.0.2"
-gem "hashie"
-
-group :development do
-  gem "bundler", "~> 1.3.5"
-  gem "jeweler", "~> 1.6.4"
-  gem "simplecov"
-end
-
-group :test do
-  gem "rspec-rails"
-  gem "mocha"
-  gem "debugger"
-end
+gemspec

data/Rakefile

@@ -1,30 +1,10 @@
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new('spec')
+require 'bundler/gem_tasks'
 
-# If you want to make this the default task
-task :default => :spec
-
-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
+# Default directory to look in is `/specs`
+# Run with `rake spec`
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.rspec_opts = ['--color', '--format', 'nested']
 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 = "blocks"
-  gem.homepage = "http://github.com/hunterae/blocks"
-  gem.license = "MIT"
-  gem.summary = "Blocks is an intricate way of rendering blocks of code and adding several new features that go above and beyond what a simple content_for with yield is capable of doing."
-  gem.description = "Blocks goes beyond blocks and partials"
-  gem.email = "hunterae@gmail.com"
-  gem.authors = ["Andrew Hunter"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+task :default => :spec

data/blocks.gemspec

@@ -1,74 +1,29 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'blocks/version'
 
-Gem::Specification.new do |s|
-  s.name = "blocks"
-  s.version = "2.6.3"
+Gem::Specification.new do |spec|
+  spec.name          = "blocks"
+  spec.version       = Blocks::VERSION
+  spec.authors       = ["Andrew Hunter"]
+  spec.email         = ["hunterae@gmail.com"]
+  spec.summary       = %q{Blocks goes beyond blocks and partials}
+  spec.description   = %q{Blocks goes beyond blocks and partials}
+  spec.homepage      = "http://github.com/hunterae/blocks"
+  spec.license       = "MIT"
 
-  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 = "Blocks goes beyond blocks and partials"
-  s.email = "hunterae@gmail.com"
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".rspec",
-    ".ruby-gemset",
-    ".ruby-version",
-    "CHANGELOG.rdoc",
-    "Gemfile",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "blocks.gemspec",
-    "blocks_render_order.graffle",
-    "blocks_render_order.png",
-    "lib/blocks.rb",
-    "lib/blocks/base.rb",
-    "lib/blocks/container.rb",
-    "lib/blocks/controller_additions.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"
-  ]
-  s.homepage = "http://github.com/hunterae/blocks"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
-  s.summary = "Blocks is an intricate way of rendering blocks of code and adding several new features that go above and beyond what a simple content_for with yield is capable of doing."
+  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 s.respond_to? :specification_version then
-    s.specification_version = 3
+  spec.add_dependency "rails", ">= 3.0.0"
+  spec.add_dependency "call_with_params", "~> 0.0.2"
+  spec.add_dependency "hashie"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<call_with_params>, ["~> 0.0.2"])
-      s.add_runtime_dependency(%q<hashie>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-    else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<call_with_params>, ["~> 0.0.2"])
-      s.add_dependency(%q<hashie>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<call_with_params>, ["~> 0.0.2"])
-    s.add_dependency(%q<hashie>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-  end
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "rspec-rails"
+  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "debugger"
 end
-

data/lib/blocks/base.rb

@@ -22,7 +22,7 @@ module Blocks
     # [+name+]
     #   The name of the block to check
     def defined?(name)
-      !blocks[name.to_sym].nil?
+      !blocks[name].nil?
     end
 
     # Define a block, unless a block by the same name is already defined.
@@ -34,7 +34,7 @@ module Blocks
     # [+name+]
     #   The name of the block being defined (either a string or a symbol or a Proc)
     # [+options+]
-    #   The default options for the block definition. Any or all of these options may be overrideen by
+    #   The default options for the block definition. Any or all of these options may be overridden by
     #   whomever calls "blocks.render" on this block. If :collection => some_array,
     #   Blocks will assume that the first argument is a Proc and define a block for each object in the
     #   collection
@@ -66,12 +66,12 @@ module Blocks
     # [+name+]
     #   The name of the block being defined (either a string or a symbol)
     # [+options+]
-    #   The default options for the block definition. Any or all of these options may be overrideen by
+    #   The default options for the block definition. Any or all of these options may be overridden by
     #   whomever calls "blocks.render" on this block.
     # [+block+]
     #   The block that is to be rendered when "blocks.render" is called for this block.
     def replace(name, options={}, &block)
-      blocks[name.to_sym] = nil
+      blocks[name] = nil
       self.define_block_container(name, options, &block)
       nil
     end
@@ -89,7 +89,7 @@ module Blocks
     # [+name+]
     #   The name of the block to skip rendering for
     def skip(name)
-      blocks[name.to_sym] = nil
+      blocks[name] = nil
       self.define_block_container(name) do
       end
       nil
@@ -412,15 +412,15 @@ module Blocks
       end
     end
 
-    protected
-
     def initialize(view, options={})
       self.view = view
       self.global_options = Blocks.config.merge(options)
-      self.blocks = {}
+      self.blocks = HashWithIndifferentAccess.new
       self.anonymous_block_number = 0
     end
 
+    protected
+
     # Return a unique name for an anonymously defined block (i.e. a block that has not been given a name)
     def anonymous_block_name
       self.anonymous_block_number += 1
@@ -428,8 +428,8 @@ module Blocks
     end
 
     def render_block_with_around_blocks(name_or_container, *args, &block)
-      name = name_or_container.is_a?(Blocks::Container) ? name_or_container.name.to_sym : name_or_container.to_sym
-      around_name = "around_#{name.to_s}".to_sym
+      name = name_or_container.is_a?(Blocks::Container) ? name_or_container.name : name_or_container
+      around_name = "around_#{name}"
 
       around_blocks = blocks[around_name].present? ? blocks[around_name].clone : []
 

data/lib/blocks/version.rb

@@ -0,0 +1,3 @@
+module Blocks
+  VERSION = "2.6.4"
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: blocks
 version: !ruby/object:Gem::Version
-  version: 2.6.3
-  prerelease: 
+  version: 2.6.4
 platform: ruby
 authors:
 - Andrew Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: call_with_params
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,47 +48,55 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: mocha
+  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
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,18 +104,18 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Blocks goes beyond blocks and partials
-email: hunterae@gmail.com
+email:
+- hunterae@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
+- .gitignore
 - .rspec
 - .ruby-gemset
 - .ruby-version
@@ -121,7 +123,6 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
-- VERSION
 - blocks.gemspec
 - blocks_render_order.graffle
 - blocks_render_order.png
@@ -129,6 +130,7 @@ files:
 - lib/blocks/base.rb
 - lib/blocks/container.rb
 - lib/blocks/controller_additions.rb
+- lib/blocks/version.rb
 - lib/blocks/view_additions.rb
 - rails/init.rb
 - spec/blocks/base_spec.rb
@@ -138,31 +140,29 @@ files:
 homepage: http://github.com/hunterae/blocks
 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: 4219206689856184029
 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.2.2
 signing_key: 
-specification_version: 3
-summary: Blocks is an intricate way of rendering blocks of code and adding several
-  new features that go above and beyond what a simple content_for with yield is capable
-  of doing.
-test_files: []
+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

data/VERSION

@@ -1 +0,0 @@
-2.6.3