happy 0.1.0.pre8 → 0.1.0.pre9

data/happy.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'activesupport', '~> 3.1'
   gem.add_dependency 'rack', '~> 1.4'
-  gem.add_dependency 'happy-helpers', '~> 0.1.0.pre.5'
+  gem.add_dependency 'happy-helpers', '~> 0.1.0.pre6'
   gem.add_dependency 'allowance', '>= 0.1.1'
 
   gem.add_dependency 'happy-cli', '>= 0.1.0.pre1'

data/lib/happy/{context_ext → context}/helpers.rb

@@ -1,7 +1,7 @@
 require 'happy-helpers'
 
 module Happy
-  module ContextExtensions
+  class Context
     module Helpers
       include HappyHelpers::Helpers
 

data/lib/happy/context.rb

@@ -1,9 +1,9 @@
 require 'happy/request'
-require 'happy/context_ext/helpers'
+require 'happy/context/helpers'
 
 module Happy
   class Context
-    include ContextExtensions::Helpers
+    include Helpers
 
     attr_reader   :request, :response, :remaining_path
     attr_accessor :layout, :controller

data/lib/happy/{controller_ext → controller}/actions.rb

@@ -1,5 +1,5 @@
 module Happy
-  module ControllerExtensions
+  class Controller
     module Actions
       def serve!(data, options = {})
         # Don't serve if there are still bits of path remaining.

data/lib/happy/{controller_ext → controller}/rackable.rb

@@ -1,5 +1,5 @@
 module Happy
-  module ControllerExtensions
+  class Controller
     module Rackable
       extend ActiveSupport::Concern
 

data/lib/happy/{controller_ext → controller}/routing.rb

@@ -1,5 +1,5 @@
 module Happy
-  module ControllerExtensions
+  class Controller
     module Routing
       def path_to_regexp(path)
         # Since we want to be compatible with Ruby 1.8.7, we unfortunately can't use named captures like this:

data/lib/happy/controller.rb

@@ -1,12 +1,12 @@
-require 'happy/controller_ext/routing'
-require 'happy/controller_ext/actions'
-require 'happy/controller_ext/rackable'
+require 'happy/controller/routing'
+require 'happy/controller/actions'
+require 'happy/controller/rackable'
 
 module Happy
   class Controller
-    include ControllerExtensions::Routing
-    include ControllerExtensions::Actions
-    include ControllerExtensions::Rackable
+    include Routing
+    include Actions
+    include Rackable
 
     attr_reader :options, :env
 

data/lib/happy/version.rb

@@ -1,3 +1,3 @@
 module Happy
-  VERSION = "0.1.0.pre8"
+  VERSION = "0.1.0.pre9"
 end

data/spec/controller_ext/actions_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Happy
-  describe ControllerExtensions::Actions do
+  describe Controller::Actions do
     subject { Controller.new }
 
     describe '#serve!' do

data/spec/controller_ext/routing_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Happy
-  describe ControllerExtensions::Routing do
+  describe Controller::Routing do
     describe '#path' do
       subject do
         Controller.build do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: happy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre8
+  version: 0.1.0.pre9
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70241489211260 !ruby/object:Gem::Requirement
+  requirement: &70100544312640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70241489211260
+  version_requirements: *70100544312640
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70241489210440 !ruby/object:Gem::Requirement
+  requirement: &70100544261560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70241489210440
+  version_requirements: *70100544261560
 - !ruby/object:Gem::Dependency
   name: happy-helpers
-  requirement: &70241489208840 !ruby/object:Gem::Requirement
+  requirement: &70100544255780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre.5
+        version: 0.1.0.pre6
   type: :runtime
   prerelease: false
-  version_requirements: *70241489208840
+  version_requirements: *70100544255780
 - !ruby/object:Gem::Dependency
   name: allowance
-  requirement: &70241489208260 !ruby/object:Gem::Requirement
+  requirement: &70100544253560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70241489208260
+  version_requirements: *70100544253560
 - !ruby/object:Gem::Dependency
   name: happy-cli
-  requirement: &70241489200800 !ruby/object:Gem::Requirement
+  requirement: &70100544251160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.0.pre1
   type: :runtime
   prerelease: false
-  version_requirements: *70241489200800
+  version_requirements: *70100544251160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70241489199940 !ruby/object:Gem::Requirement
+  requirement: &70100544249920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241489199940
+  version_requirements: *70100544249920
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70241489199080 !ruby/object:Gem::Requirement
+  requirement: &70100544248940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70241489199080
+  version_requirements: *70100544248940
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
-  requirement: &70241489198600 !ruby/object:Gem::Requirement
+  requirement: &70100544247880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241489198600
+  version_requirements: *70100544247880
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70241489198080 !ruby/object:Gem::Requirement
+  requirement: &70100544246800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241489198080
+  version_requirements: *70100544246800
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70241489197660 !ruby/object:Gem::Requirement
+  requirement: &70100544245520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70241489197660
+  version_requirements: *70100544245520
 description: A happy little toolkit for writing web applications.
 email:
 - hendrik@mans.de
@@ -140,11 +140,11 @@ files:
 - happy.gemspec
 - lib/happy.rb
 - lib/happy/context.rb
-- lib/happy/context_ext/helpers.rb
+- lib/happy/context/helpers.rb
 - lib/happy/controller.rb
-- lib/happy/controller_ext/actions.rb
-- lib/happy/controller_ext/rackable.rb
-- lib/happy/controller_ext/routing.rb
+- lib/happy/controller/actions.rb
+- lib/happy/controller/rackable.rb
+- lib/happy/controller/routing.rb
 - lib/happy/ext/permissions.rb
 - lib/happy/ext/resources.rb
 - lib/happy/ext/static.rb