happy 0.1.0.pre8 → 0.1.0.pre9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. data/happy.gemspec +1 -1
  2. data/lib/happy/{context_ext → context}/helpers.rb +1 -1
  3. data/lib/happy/context.rb +2 -2
  4. data/lib/happy/{controller_ext → controller}/actions.rb +1 -1
  5. data/lib/happy/{controller_ext → controller}/rackable.rb +1 -1
  6. data/lib/happy/{controller_ext → controller}/routing.rb +1 -1
  7. data/lib/happy/controller.rb +6 -6
  8. data/lib/happy/version.rb +1 -1
  9. data/spec/controller_ext/actions_spec.rb +1 -1
  10. data/spec/controller_ext/routing_spec.rb +1 -1
  11. metadata +27 -27
data/happy.gemspec CHANGED
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
17
17
 
18
18
  gem.add_dependency 'activesupport', '~> 3.1'
19
19
  gem.add_dependency 'rack', '~> 1.4'
20
- gem.add_dependency 'happy-helpers', '~> 0.1.0.pre.5'
20
+ gem.add_dependency 'happy-helpers', '~> 0.1.0.pre6'
21
21
  gem.add_dependency 'allowance', '>= 0.1.1'
22
22
 
23
23
  gem.add_dependency 'happy-cli', '>= 0.1.0.pre1'
data/lib/happy/{context_ext → context}/helpers.rb RENAMED
@@ -1,7 +1,7 @@
1
1
  require 'happy-helpers'
2
2
 
3
3
  module Happy
4
- module ContextExtensions
4
+ class Context
5
5
  module Helpers
6
6
  include HappyHelpers::Helpers
7
7
 
data/lib/happy/context.rb CHANGED
@@ -1,9 +1,9 @@
1
1
  require 'happy/request'
2
- require 'happy/context_ext/helpers'
2
+ require 'happy/context/helpers'
3
3
 
4
4
  module Happy
5
5
  class Context
6
- include ContextExtensions::Helpers
6
+ include Helpers
7
7
 
8
8
  attr_reader :request, :response, :remaining_path
9
9
  attr_accessor :layout, :controller
data/lib/happy/{controller_ext → controller}/actions.rb RENAMED
@@ -1,5 +1,5 @@
1
1
  module Happy
2
- module ControllerExtensions
2
+ class Controller
3
3
  module Actions
4
4
  def serve!(data, options = {})
5
5
  # Don't serve if there are still bits of path remaining.
data/lib/happy/{controller_ext → controller}/rackable.rb RENAMED
@@ -1,5 +1,5 @@
1
1
  module Happy
2
- module ControllerExtensions
2
+ class Controller
3
3
  module Rackable
4
4
  extend ActiveSupport::Concern
5
5
 
data/lib/happy/{controller_ext → controller}/routing.rb RENAMED
@@ -1,5 +1,5 @@
1
1
  module Happy
2
- module ControllerExtensions
2
+ class Controller
3
3
  module Routing
4
4
  def path_to_regexp(path)
5
5
  # 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 CHANGED
@@ -1,12 +1,12 @@
1
- require 'happy/controller_ext/routing'
2
- require 'happy/controller_ext/actions'
3
- require 'happy/controller_ext/rackable'
1
+ require 'happy/controller/routing'
2
+ require 'happy/controller/actions'
3
+ require 'happy/controller/rackable'
4
4
 
5
5
  module Happy
6
6
  class Controller
7
- include ControllerExtensions::Routing
8
- include ControllerExtensions::Actions
9
- include ControllerExtensions::Rackable
7
+ include Routing
8
+ include Actions
9
+ include Rackable
10
10
 
11
11
  attr_reader :options, :env
12
12
 
data/lib/happy/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Happy
2
- VERSION = "0.1.0.pre8"
2
+ VERSION = "0.1.0.pre9"
3
3
  end
data/spec/controller_ext/actions_spec.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  module Happy
4
- describe ControllerExtensions::Actions do
4
+ describe Controller::Actions do
5
5
  subject { Controller.new }
6
6
 
7
7
  describe '#serve!' do
data/spec/controller_ext/routing_spec.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require 'spec_helper'
2
2
 
3
3
  module Happy
4
- describe ControllerExtensions::Routing do
4
+ describe Controller::Routing do
5
5
  describe '#path' do
6
6
  subject do
7
7
  Controller.build do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: happy
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0.pre8
4
+ version: 0.1.0.pre9
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-31 00:00:00.000000000 Z
12
+ date: 2012-06-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
16
- requirement: &70241489211260 !ruby/object:Gem::Requirement
16
+ requirement: &70100544312640 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.1'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70241489211260
24
+ version_requirements: *70100544312640
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rack
27
- requirement: &70241489210440 !ruby/object:Gem::Requirement
27
+ requirement: &70100544261560 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,21 +32,21 @@ dependencies:
32
32
  version: '1.4'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70241489210440
35
+ version_requirements: *70100544261560
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: happy-helpers
38
- requirement: &70241489208840 !ruby/object:Gem::Requirement
38
+ requirement: &70100544255780 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
42
42
  - !ruby/object:Gem::Version
43
- version: 0.1.0.pre.5
43
+ version: 0.1.0.pre6
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70241489208840
46
+ version_requirements: *70100544255780
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: allowance
49
- requirement: &70241489208260 !ruby/object:Gem::Requirement
49
+ requirement: &70100544253560 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 0.1.1
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70241489208260
57
+ version_requirements: *70100544253560
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: happy-cli
60
- requirement: &70241489200800 !ruby/object:Gem::Requirement
60
+ requirement: &70100544251160 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 0.1.0.pre1
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70241489200800
68
+ version_requirements: *70100544251160
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
- requirement: &70241489199940 !ruby/object:Gem::Requirement
71
+ requirement: &70100544249920 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70241489199940
79
+ version_requirements: *70100544249920
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rspec
82
- requirement: &70241489199080 !ruby/object:Gem::Requirement
82
+ requirement: &70100544248940 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '2.8'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70241489199080
90
+ version_requirements: *70100544248940
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rspec-html-matchers
93
- requirement: &70241489198600 !ruby/object:Gem::Requirement
93
+ requirement: &70100544247880 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70241489198600
101
+ version_requirements: *70100544247880
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rack-test
104
- requirement: &70241489198080 !ruby/object:Gem::Requirement
104
+ requirement: &70100544246800 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70241489198080
112
+ version_requirements: *70100544246800
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: watchr
115
- requirement: &70241489197660 !ruby/object:Gem::Requirement
115
+ requirement: &70100544245520 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70241489197660
123
+ version_requirements: *70100544245520
124
124
  description: A happy little toolkit for writing web applications.
125
125
  email:
126
126
  - hendrik@mans.de
@@ -140,11 +140,11 @@ files:
140
140
  - happy.gemspec
141
141
  - lib/happy.rb
142
142
  - lib/happy/context.rb
143
- - lib/happy/context_ext/helpers.rb
143
+ - lib/happy/context/helpers.rb
144
144
  - lib/happy/controller.rb
145
- - lib/happy/controller_ext/actions.rb
146
- - lib/happy/controller_ext/rackable.rb
147
- - lib/happy/controller_ext/routing.rb
145
+ - lib/happy/controller/actions.rb
146
+ - lib/happy/controller/rackable.rb
147
+ - lib/happy/controller/routing.rb
148
148
  - lib/happy/ext/permissions.rb
149
149
  - lib/happy/ext/resources.rb
150
150
  - lib/happy/ext/static.rb