renee-render 0.2.0 → 0.3.0

data/README.md

@@ -3,7 +3,7 @@
 Rendering templates in Renee should be familiar and intuitive using the `render` command:
 
 ```ruby
-run Renee::Core.new {
+run Renee.core {
  path('blog') do
    get { render! "blogs/index", :haml }
  end

data/lib/{renee-render.rb → renee_render.rb}

@@ -2,10 +2,37 @@ require 'tilt'
 require 'callsite'
 
 # Top-level Renee constant
-class Renee
+module Renee
   # This module is responsible for handling the rendering of templates
   # using Tilt supporting all included template engines.
   module Render
+    def self.included(o)
+      o.extend(ClassMethods)
+    end
+
+    # Class-methods included by this module.
+    module ClassMethods
+      # Gets or sets the views_path for an application.
+      #
+      # @param [String] path The path to the view files.
+      #
+      # @example
+      #  views_path("./views") => nil
+      #  views_path => "./views"
+      #
+      # @api public
+      def views_path(path = nil)
+        path ? @views_path = path : @views_path
+      end
+
+      # Gets or sets the default encoding used.
+      #
+      # @param [String] encoding The encoding to use. e.g. "utf-8"
+      def default_encoding(encoding = nil)
+        encoding ? @encoding = encoding : @encoding
+      end
+    end
+
     ##
     # Exception responsible for when an expected template does not exist.
     #
@@ -75,7 +102,7 @@ class Renee
     #
     def inline(data, engine, options = nil, &block)
       options, engine = engine, nil if engine.is_a?(Hash)
-      call_data = options.delete(:_caller) || Callsite.parse(caller.first)
+      call_data = options && options.delete(:_caller) || Callsite.parse(caller.first)
       render_setup(engine, options, block) do |view_options, views|
         body = data.is_a?(Proc) ? data : Proc.new { data }
         template = Tilt[engine]
@@ -88,10 +115,10 @@ class Renee
     def render_setup(engine, options, block)
       options                    ||= {}
       options[:outvar]           ||= '@_out_buf'
-      options[:default_encoding] ||= settings.default_encoding || options[:encoding] || "utf-8"
+      options[:default_encoding] ||= self.class.default_encoding || options[:encoding] || "utf-8"
 
       locals         = options.delete(:locals) || {}
-      views          = options.delete(:views)  || settings.views_path || "./views"
+      views          = options.delete(:views)  || self.class.views_path || "./views"
       layout         = options.delete(:layout)
       layout_engine  = options.delete(:layout_engine)
       # TODO suppress template errors for layouts?
@@ -140,4 +167,4 @@ class Renee
       @template_cache ||= Tilt::Cache.new
     end
   end
-end
+end

data/lib/renee_render/version.rb

@@ -0,0 +1,8 @@
+require 'renee_core/version'
+
+module Renee
+  module Render
+    # The current version of Renee::Render
+    VERSION = Renee::Core::VERSION
+  end
+end

data/renee-render.gemspec

@@ -1,10 +1,10 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "renee-render/version"
+$:.push File.expand_path("../../renee-core/lib", __FILE__)
+require "renee_core/version"
 
 Gem::Specification.new do |s|
   s.name        = "renee-render"
-  s.version     = Renee::Render::VERSION
+  s.version     = Renee::Core::VERSION
   s.authors     = ["Josh Hull", "Nathan Esquenazi", "Arthur Chiu"]
   s.email       = ["joshbuddy@gmail.com", "nesquena@gmail.com", "mr.arthur.chiu@gmail.com"]
   s.homepage    = "http://reneerb.com"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rack', "~> 1.3.0"
   s.add_runtime_dependency 'tilt', "~> 1.3.3"
   s.add_runtime_dependency 'callsite', '~> 0.0.6'
+  s.add_runtime_dependency 'renee-core', "= #{Renee::Core::VERSION}"
   s.add_development_dependency 'minitest', "~> 2.6.1"
   s.add_development_dependency 'rake'
   s.add_development_dependency 'bundler', "~> 1.0.10"

data/test/test_helper.rb

@@ -1,10 +1,10 @@
-$: << File.expand_path('../../../renee-core/lib', __FILE__)
+$: << File.expand_path('../../../renee_core/lib', __FILE__)
 $: << File.expand_path('../../lib', __FILE__)
-require 'renee-core'
-require 'renee-render'
+require 'renee_core'
+require 'renee_render'
 
 # TODO better registration method (?)
-Renee::Core::Application.send(:include, Renee::Render)
+Renee::Core.send(:include, Renee::Render)
 
 # Load shared test helpers
 require File.expand_path('../../../lib/test_helper', __FILE__)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: renee-render
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Josh Hull
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 Z
+date: 2011-10-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -69,6 +69,22 @@ dependencies:
   name: callsite
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  requirement: *id004
+  type: :runtime
+  prerelease: false
+  name: renee-core
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +95,12 @@ dependencies:
         - 6
         - 1
         version: 2.6.1
-  requirement: *id004
+  requirement: *id005
   type: :development
   prerelease: false
   name: minitest
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,12 +109,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
+  requirement: *id006
   type: :development
   prerelease: false
   name: rake
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,12 +125,12 @@ dependencies:
         - 0
         - 10
         version: 1.0.10
-  requirement: *id006
+  requirement: *id007
   type: :development
   prerelease: false
   name: bundler
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -125,12 +141,12 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
-  requirement: *id007
+  requirement: *id008
   type: :development
   prerelease: false
   name: rack-test
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -141,7 +157,7 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  requirement: *id008
+  requirement: *id009
   type: :development
   prerelease: false
   name: haml
@@ -160,8 +176,8 @@ files:
 - .yardopts
 - README.md
 - Rakefile
-- lib/renee-render.rb
-- lib/renee-render/version.rb
+- lib/renee_render.rb
+- lib/renee_render/version.rb
 - renee-render.gemspec
 - test/render_test.rb
 - test/test_helper.rb

data/lib/renee-render/version.rb

@@ -1,6 +0,0 @@
-class Renee
-  module Render
-    # Current Renee-render version number.
-    VERSION = "0.2.0"
-  end
-end