happy 0.1.0.pre23 → 0.1.0.pre24

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 (4) hide show
  1. data/lib/happy/extras/resources.rb +10 -14
  2. data/lib/happy/extras/scriptable.rb +0 -2
  3. data/lib/happy/version.rb +1 -1
  4. metadata +19 -19
data/lib/happy/extras/resources.rb CHANGED
@@ -1,10 +1,8 @@
1
1
  module Happy
2
2
  module Extras
3
3
  module Resources
4
- module ControllerExtensions
5
- def resource(klass, options = {}, &blk)
6
- run ResourceMounter, options.merge(:class => klass), &blk
7
- end
4
+ def resource(klass, options = {}, &blk)
5
+ run ResourceMounter, options.merge(:class => klass), &blk
8
6
  end
9
7
 
10
8
  class ResourceMounter < Happy::Controller
@@ -95,22 +93,20 @@ module Happy
95
93
  options[:singular_name] ||= options[:class].to_s.tableize.singularize
96
94
  options[:plural_name] ||= options[:class].to_s.tableize.pluralize
97
95
 
98
- path options[:plural_name] do
99
- get('new') { do_new }
96
+ on options[:plural_name] do
97
+ on_get('new') { do_new }
100
98
 
101
- path :id do
102
- get { do_show }
103
- post { do_update }
104
- get('edit') { do_edit }
99
+ on :id do
100
+ on_get { do_show }
101
+ on_post { do_update }
102
+ on_get('edit') { do_edit }
105
103
  end
106
104
 
107
- post { do_create }
108
- get { do_index }
105
+ on_post { do_create }
106
+ on_get { do_index }
109
107
  end
110
108
  end
111
109
  end
112
110
  end
113
111
  end
114
112
  end
115
-
116
- Happy::Controller.send(:include, Happy::Extras::Resources::ControllerExtensions)
data/lib/happy/extras/scriptable.rb CHANGED
@@ -1,5 +1,3 @@
1
- require 'happy/extras/permissions'
2
-
3
1
  module Happy
4
2
  module Extras
5
3
  class Scriptable < Happy::Controller
data/lib/happy/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Happy
2
- VERSION = "0.1.0.pre23"
2
+ VERSION = "0.1.0.pre24"
3
3
  end
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.pre23
4
+ version: 0.1.0.pre24
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-06-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
16
- requirement: &70202609576440 !ruby/object:Gem::Requirement
16
+ requirement: &70283525000640 !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: *70202609576440
24
+ version_requirements: *70283525000640
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rack
27
- requirement: &70202609575940 !ruby/object:Gem::Requirement
27
+ requirement: &70283525000140 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '1.4'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70202609575940
35
+ version_requirements: *70283525000140
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: happy-helpers
38
- requirement: &70202609575480 !ruby/object:Gem::Requirement
38
+ requirement: &70283524999680 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 0.1.0.pre11
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70202609575480
46
+ version_requirements: *70283524999680
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: allowance
49
- requirement: &70202609575020 !ruby/object:Gem::Requirement
49
+ requirement: &70283524999220 !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: *70202609575020
57
+ version_requirements: *70283524999220
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rake
60
- requirement: &70202609574640 !ruby/object:Gem::Requirement
60
+ requirement: &70283524998840 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70202609574640
68
+ version_requirements: *70283524998840
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rspec
71
- requirement: &70202475775160 !ruby/object:Gem::Requirement
71
+ requirement: &70283530471820 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '2.8'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70202475775160
79
+ version_requirements: *70283530471820
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rspec-html-matchers
82
- requirement: &70202475774740 !ruby/object:Gem::Requirement
82
+ requirement: &70283530471400 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70202475774740
90
+ version_requirements: *70283530471400
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rack-test
93
- requirement: &70202475774280 !ruby/object:Gem::Requirement
93
+ requirement: &70283530470940 !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: *70202475774280
101
+ version_requirements: *70283530470940
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: watchr
104
- requirement: &70202475773860 !ruby/object:Gem::Requirement
104
+ requirement: &70283530470520 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70202475773860
112
+ version_requirements: *70283530470520
113
113
  description: A happy little toolkit for writing web applications.
114
114
  email:
115
115
  - hendrik@mans.de