aerogel-core 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f78add168e5ace6b49d5f75903b43c4f684be0a
-  data.tar.gz: e20f29677e6b3c1325ed319f948198ea0c89872c
+  metadata.gz: 34096608560195b108c8293d58d750ecd2c71e55
+  data.tar.gz: aef77ff72c91c44dcc31773ab1db82898fdf18af
 SHA512:
-  metadata.gz: 9c43359f0b61ea67a960a776474ce4b936c5dec58f3a4b2262a86d31a35089a35b618ad192b602caf694c927ac844487a8c6b682f93a5e3a378574b7c03e73e4
-  data.tar.gz: 2e39951fc23ca1c2d7a2664e6e2c84c40f1e9974b311bcbebbc8c0601cfef59fcdf305c7ba09c1a942ce071f53b1151bc74c41039cf987197d9d07147e5b8d97
+  metadata.gz: 6110c5fd235c225219491bf76f2050fd8a4230870302f246dffcb32aa70e0054ac14efcd380275789060e9789658a777c234393c1795f42282b005028d0ae7e2
+  data.tar.gz: 9a54b53fe15a2d57c841fc056bbaf04168125c606ade574e2a0f333545ce3e605296a3920b9f07c22e4062f29d5b3b1137585e524bebf28702c99172aca872d5

data/aerogel-core.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'aerogel-core/version'
+require 'aerogel/core/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "aerogel-core"

data/app/helpers/assets.rb

@@ -0,0 +1,15 @@
+module Aerogel::Helpers
+
+  # Include styles and javascript tags for assets grouped by scope.
+  #
+  # Intended use is either:
+  #   <%= assets %> # for application assets
+  # or:
+  #   <% assets 'controller/name' %> # for controller specific assets
+  #
+  def assets( filename = :application )
+    (stylesheet_tag filename.to_s) +
+    (javascript_tag filename.to_s)
+  end
+
+end # module Aerogel::Helpers

data/app/helpers/config.rb

@@ -0,0 +1,9 @@
+module Aerogel::Helpers
+
+  # Quick access to config from views and routes
+  #
+  def config
+    settings.config
+  end
+
+end # module Aerogel::Helpers

data/app/helpers/output_buffer.rb

@@ -0,0 +1,26 @@
+module Aerogel::Helpers
+
+  def output_concat( text )
+    if self.respond_to?(:is_haml?) && is_haml?
+      haml_concat(text)
+    elsif !OutputBuffer.buffer.nil? # has_erb_buffer?
+      OutputBuffer.buffer.concat text
+    else # theres no template to concat, return the text directly
+      text
+    end
+  end
+
+  def output_capture( inner_block = nil, &block )
+    inner_block = block if inner_block.nil?
+    if self.respond_to?(:is_haml?) && is_haml? && (block_is_haml?(inner_block) rescue false)
+      # haml
+      capture_haml(nil, &block)
+    elsif OutputBuffer.block_is_erb? block
+      # erb
+      OutputBuffer.capture( &block )
+    else
+      block.call
+    end
+  end
+
+end # module Aerogel::Helpers

data/lib/{aerogel-core.rb → aerogel/core.rb}

@@ -1,8 +1,8 @@
-require 'aerogel-core/version'
-require 'aerogel-core/core'
+require 'aerogel/core/version'
+require 'aerogel/core/core'
 
 # Path to the aerogel gem
-Aerogel.core_path = File.expand_path( File.join( File.dirname(__FILE__), ".." ) )
+Aerogel.core_path = File.expand_path( File.join( File.dirname(__FILE__), "..", ".." ) )
 
 # Default applicaiton path, may be overridden in application's config.ru
 Aerogel.application_path = File.expand_path( Dir.pwd )
@@ -10,4 +10,4 @@ Aerogel.application_path = File.expand_path( Dir.pwd )
 # Core path is registered first
 Aerogel.register_path( Aerogel.core_path )
 
-require "aerogel-core/application"
+require "aerogel/core/application"

data/lib/{aerogel-core → aerogel/core}/application.rb

@@ -1,10 +1,11 @@
 require 'sinatra/base'
 
-require 'aerogel-core/config'
-require 'aerogel-core/helpers'
-require 'aerogel-core/routes'
-require 'aerogel-core/assets'
-require 'aerogel-core/db'
+require 'aerogel/core/config'
+require 'aerogel/core/helpers'
+require 'aerogel/core/routes'
+require 'aerogel/core/assets'
+require 'aerogel/core/db'
+require 'aerogel/core/render'
 
 class Aerogel::Application < Sinatra::Base
 
@@ -28,6 +29,7 @@ private
     register Aerogel::Routes
     register Aerogel::Assets
     register Aerogel::Db
+    register Aerogel::Render
     puts "** Aerogel application configured v#{Aerogel::version}-#{environment}"
   end
 

data/lib/aerogel/core/render.rb

@@ -0,0 +1,13 @@
+require 'aerogel/core/render/output_buffer'
+require 'aerogel/core/render/block_helper'
+
+
+module Aerogel::Render
+
+  # Configures application.
+  #
+  def self.registered(app)
+    app.set :erb, outvar: 'Aerogel::Render::OutputBuffer.buffer'
+  end
+
+end # module Aerogel::Render

data/lib/aerogel/core/render/block_helper.rb

@@ -0,0 +1,46 @@
+#
+# BlockHelper
+# Template level helper.
+# Base class for DSL magic in view helpers.
+#
+
+module Aerogel::Render
+
+class BlockHelper
+
+  # Creates a block helper object.
+  # args will be passed to the block as arguments.
+  #
+  def initialize( *args, &block )
+    @args = args
+    @block = block
+
+    # makes methods and helpers accessible at the self instance scope
+    @self_before_instance_eval = eval "self", @block.binding
+  end
+
+  # Wraps captured content with custom tags or text.
+  # Most of the time, method should be redefined by descendant class.
+  # A good example would be a form helper, that surrounds captured content with <form ..></form> tags.
+  #
+  def wrap( content )
+    content
+  end
+
+  # Renders output to the template or returns it as a string.
+  #
+  def render
+    content = output_capture(@block) do
+      instance_exec( *@args, &@block )
+    end
+    content_wrapped = output_capture() { wrap( content ) }
+    output_concat content_wrapped
+  end
+
+  def method_missing(method, *args, &block)
+    @self_before_instance_eval.send method, *args, &block
+  end
+
+end # class BlockHelper
+
+end # module Aerogel::Render

data/lib/aerogel/core/render/output_buffer.rb

@@ -0,0 +1,66 @@
+# Global rendering buffer.
+# Output capture functionality for ERb and Haml blocks.
+#
+module Aerogel::Render
+module OutputBuffer
+
+  # Returns instance of a string buffer
+  #
+  def self.buffer
+    @buffer
+  end
+
+  # Sets instance of a string buffer
+  #
+  def self.buffer=( text )
+    @buffer = text
+  end
+
+  # Saves current buffer in a stack and creates a new empty one.
+  #
+  def self.push
+    @buffer_stack ||= []
+    @buffer_stack.unshift @buffer
+    @buffer = ''
+  end
+
+  # Returns current buffer contents as a string and restores previous
+  # buffer state from a stack.
+  #
+  def self.pop
+    result = @buffer
+    @buffer = @buffer_stack.shift
+    result
+  end
+
+  # Executes block and captures content rendered into buffer.
+  # If no content is rendered into buffer, returns block yield result as a content.
+  #
+  def self.capture(*args, &block)
+    self.push
+    blk_result = yield *args
+    buf_result = self.pop
+    buf_result.nil? || buf_result.empty? ? blk_result : buf_result
+  end
+
+  # Returns true if block is defined within a ERb template.
+  #
+  def self.block_is_erb?( block )
+    !@buffer.nil? || block && eval('defined? __in_erb_template', block.binding)
+  end
+
+  # Returns true if block is defined within a ERb template.
+  #
+  def self.block_is_haml?( block )
+    block && eval('block_is_haml?(self)', block.binding)
+  end
+
+  # Returns true if block is defined within any template.
+  #
+  def self.block_is_template?( block )
+    block && ( block_is_erb?(block) || block_is_haml?( block ) )
+  end
+
+end # module OutputBuffer
+end # module Aerogel::Render
+

data/lib/aerogel/core/version.rb

@@ -0,0 +1,3 @@
+module Aerogel
+  VERSION = '1.1.0'
+end

data/lib/{aerogel-core → aerogel}/rake.rb

@@ -1,5 +1,5 @@
 require 'sinatra/asset_pipeline/task'
-require 'aerogel-core'
+require 'aerogel/core'
 
 Aerogel::Application.load
 Sinatra::AssetPipeline::Task.define! Aerogel::Application

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aerogel-core
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -177,7 +177,10 @@ files:
 - README.md
 - Rakefile
 - aerogel-core.gemspec
+- app/helpers/assets.rb
+- app/helpers/config.rb
 - app/helpers/core.rb
+- app/helpers/output_buffer.rb
 - app/helpers/render.rb
 - app/routes/core.rb
 - app/routes/static.rb
@@ -191,16 +194,19 @@ files:
 - db/seed/development/.keep
 - db/seed/production/.keep
 - db/seed/seed.template
-- lib/aerogel-core.rb
-- lib/aerogel-core/application.rb
-- lib/aerogel-core/assets.rb
-- lib/aerogel-core/config.rb
-- lib/aerogel-core/core.rb
-- lib/aerogel-core/db.rb
-- lib/aerogel-core/helpers.rb
-- lib/aerogel-core/rake.rb
-- lib/aerogel-core/routes.rb
-- lib/aerogel-core/version.rb
+- lib/aerogel/core.rb
+- lib/aerogel/core/application.rb
+- lib/aerogel/core/assets.rb
+- lib/aerogel/core/config.rb
+- lib/aerogel/core/core.rb
+- lib/aerogel/core/db.rb
+- lib/aerogel/core/helpers.rb
+- lib/aerogel/core/render.rb
+- lib/aerogel/core/render/block_helper.rb
+- lib/aerogel/core/render/output_buffer.rb
+- lib/aerogel/core/routes.rb
+- lib/aerogel/core/version.rb
+- lib/aerogel/rake.rb
 - public/favicon.ico
 - public/humans.txt
 - public/robots.txt.development

data/lib/aerogel-core/version.rb

@@ -1,3 +0,0 @@
-module Aerogel
-  VERSION = '1.0.4'
-end