renee 0.2.0 → 0.3.0

data/lib/renee.rb

@@ -1,6 +1,5 @@
-require 'renee-core'
-require 'renee-render'
-require 'renee/version'
+require 'renee_core'
+require 'renee_render'
 
 # Method for creating new Renee applications.
 # @see http://reneerb.com
@@ -9,23 +8,14 @@ require 'renee/version'
 #       halt "hello renee"
 #     }
 def Renee(&blk)
-  Renee::RichCore.new(&blk)
+  Class.new(Renee::Application).app(&blk)
 end
 
 # Top-level Renee constant.
-class Renee
-  # Analogous to {Renee::Core}, but with all features enabled.
-  # @see http://reneerb.com
-  class RichCore < Renee::Core
-    # Creates a new Renee application.
-    # @yield The application definition.
-    def initialize(&blk)
-      super(Application, &blk)
-    end
-
-    # @private
-    class Application < Renee::Core::Application
-      include Renee::Render
-    end
+module Renee
+  # Main class for a Renee application. This class should be subclasses if you want to define your own Renee
+  # implementations.
+  class Application < Core
+    include Renee::Render
   end
 end

data/lib/renee/version.rb

@@ -1,4 +1,6 @@
-class Renee
-  # Current Renee version number.
-  VERSION = "0.2.0"
+require 'renee_core/version'
+
+module Renee
+  # The current version of Renee
+  VERSION = Renee::Core::VERSION
 end

data/renee.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("../../renee-core/lib", __FILE__)
 require "renee/version"
 
 Gem::Specification.new do |s|
@@ -29,4 +30,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "haml", ">= 2.2.0"
   s.add_development_dependency "json"
   s.add_development_dependency "yard"
+  s.add_development_dependency "shotgun"
 end

data/test/test_helper.rb

@@ -3,8 +3,8 @@ gem 'minitest'
 require 'minitest/autorun'
 gem 'rack-test'
 require 'rack/test'
-$: << File.expand_path('../../../renee-core/lib', __FILE__)
-$: << File.expand_path('../../../renee-render/lib', __FILE__)
+$: << File.expand_path('../../../renee_core/lib', __FILE__)
+$: << File.expand_path('../../../renee_render/lib', __FILE__)
 $: << File.expand_path('../../lib', __FILE__)
 require 'renee'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: renee
 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 
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   requirement: *id001
   type: :runtime
   prerelease: false
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   requirement: *id002
   type: :runtime
   prerelease: false
@@ -157,6 +157,20 @@ dependencies:
   type: :development
   prerelease: false
   name: yard
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id010
+  type: :development
+  prerelease: false
+  name: shotgun
 description: The super-friendly web framework.
 email: 
 - joshbuddy@gmail.com
@@ -181,7 +195,6 @@ files:
 - lib/renee/version.rb
 - renee.gemspec
 - test/blog_test.rb
-- test/rich_core_test.rb
 - test/test_helper.rb
 homepage: http://reneerb.com
 licenses: []
@@ -218,6 +231,5 @@ specification_version: 3
 summary: The super-friendly web framework
 test_files: 
 - test/blog_test.rb
-- test/rich_core_test.rb
 - test/test_helper.rb
 has_rdoc: 

data/test/rich_core_test.rb

@@ -1,11 +0,0 @@
-require File.expand_path('../test_helper', __FILE__)
-
-describe Renee::RichCore do
-  it "should allow the inclusion of arbitrary modules" do
-    r = Renee{
-      respond_to?(:some_method) or raise
-    }.setup { include Module.new { def some_method; end } }
-    r.call(Rack::MockRequest.env_for('/'))
-    assert true
-  end
-end