vraptor-scaffold 1.1.0.pre → 1.1.0

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 (14) hide show
  1. data/Gemfile.lock +2 -9
  2. data/History.txt +9 -6
  3. data/lib/vraptor-scaffold/configuration.rb +9 -9
  4. data/lib/vraptor-scaffold/generators/app_generator/templates/freemarker/main.ftl +2 -1
  5. data/lib/vraptor-scaffold/generators/app_generator/templates/jsp/main.jsp +1 -0
  6. data/lib/vraptor-scaffold/generators/app_generator/templates/webapp/javascripts/application.js +0 -0
  7. data/lib/vraptor-scaffold/generators/app_generator/templates/webapp/stylesheets/common.css +0 -3
  8. data/lib/vraptor-scaffold/generators/app_generator/templates/webapp/stylesheets/stylesheets.css +0 -1
  9. data/lib/vraptor-scaffold/version.rb +1 -1
  10. data/spec/vraptor-scaffold/generators/app_generator/app_generator_spec.rb +18 -0
  11. data/vraptor-scaffold.gemspec +3 -4
  12. metadata +29 -88
  13. data/.document +0 -4
  14. data/lib/vraptor-scaffold/generators/app_generator/templates/webapp/stylesheets/reset.css +0 -47
data/Gemfile.lock CHANGED
@@ -1,8 +1,9 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- vraptor-scaffold (0.0.1)
4
+ vraptor-scaffold (1.1.0)
5
5
  activesupport (= 3.0.1)
6
+ rake (= 0.8.7)
6
7
  thor (= 0.14.6)
7
8
 
8
9
  GEM
@@ -10,16 +11,9 @@ GEM
10
11
  specs:
11
12
  ZenTest (4.4.0)
12
13
  activesupport (3.0.1)
13
- columnize (0.3.2)
14
- linecache (0.43)
15
14
  rake (0.8.7)
16
15
  rcov (0.9.9)
17
16
  rspec (1.3.1)
18
- ruby-debug (0.10.4)
19
- columnize (>= 0.1)
20
- ruby-debug-base (~> 0.10.4.0)
21
- ruby-debug-base (0.10.4)
22
- linecache (>= 0.3)
23
17
  thor (0.14.6)
24
18
 
25
19
  PLATFORMS
@@ -31,6 +25,5 @@ DEPENDENCIES
31
25
  rake (= 0.8.7)
32
26
  rcov (= 0.9.9)
33
27
  rspec (= 1.3.1)
34
- ruby-debug
35
28
  thor (= 0.14.6)
36
29
  vraptor-scaffold!
data/History.txt CHANGED
@@ -1,19 +1,22 @@
1
- === 1.1.0 / 2011-??-??
1
+ === 1.1.0 / 2011-03-02
2
2
 
3
3
  == New Features
4
4
  * JPA 2 support using hibernate 3.6.1.Final. (Issue 13)
5
5
  * ant task to minify js and css. (Issue 27)
6
6
  * created prelude to automatic import taglibs in jsp.
7
- * added css reset to reduce browsers inconsistencies.
8
7
 
9
8
  == Improvements
10
9
  * updated hibernate validator to 4.1.0.Final.
11
- * changed html DTD to XHTML.
12
- * declared css encoding.
13
- * better repository and controller encapsulation.
14
- * added head with title tag for sitemesh capture it in jsp views.
15
10
  * updated vraptor to 3.3.1.
16
11
  * updated jquery to 1.5.1.
12
+ * added head with title tag for sitemesh capture it in jsp views.
13
+ * changed html DTD to XHTML.
14
+ * declared css encoding (UTF-8).
15
+ * created application.js.
16
+ * better repository and controller encapsulation.
17
+ * better controller template.
18
+ * specified the exact location of SuppressWarnings, like Clean Code technique.
19
+ * changed jeweler to bundler. (Issue 26)
17
20
 
18
21
  === 1.0.0 / 2011-02-04
19
22
 
data/lib/vraptor-scaffold/configuration.rb CHANGED
@@ -1,11 +1,11 @@
1
1
  class Configuration
2
- MAIN_SRC="src/main/java"
3
- MAIN_RESOURCES="src/main/resources"
4
- TEST_SRC="src/test/java"
5
- TEST_RESOURCES="src/test/resources"
6
- WEB_APP="src/main/webapp"
7
- WEB_INF="#{WEB_APP}/WEB-INF"
8
- META_INF="#{WEB_APP}/META-INF"
2
+ MAIN_SRC = "src/main/java"
3
+ MAIN_RESOURCES = "src/main/resources"
4
+ TEST_SRC = "src/test/java"
5
+ TEST_RESOURCES = "src/test/resources"
6
+ WEB_APP = "src/main/webapp"
7
+ WEB_INF = "#{WEB_APP}/WEB-INF"
8
+ META_INF = "#{WEB_APP}/META-INF"
9
9
  FILENAME = "#{META_INF}/vraptor-scaffold.properties"
10
10
 
11
11
  def self.config
@@ -22,10 +22,10 @@ class Configuration
22
22
 
23
23
  def self.main_class_path *path
24
24
  File.join MAIN_SRC, package.gsub(".", File::Separator), path
25
- end
25
+ end
26
26
 
27
27
  def self.test_class_path *path
28
28
  File.join TEST_SRC, package.gsub(".", File::Separator), path
29
- end
29
+ end
30
30
 
31
31
  end
data/lib/vraptor-scaffold/generators/app_generator/templates/freemarker/main.ftl CHANGED
@@ -2,7 +2,7 @@
2
2
  <html>
3
3
  <head>
4
4
  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
5
- <@html.css "scaffold"/>
5
+ <@html.css "stylesheets"/>
6
6
  <title>Vraptor Scaffold</title>
7
7
  ${head}
8
8
  </head>
@@ -10,5 +10,6 @@
10
10
  <body>
11
11
  ${body}
12
12
  <@html.js "jquery.min"/>
13
+ <@html.js "application"/>
13
14
  </body>
14
15
  </html>
data/lib/vraptor-scaffold/generators/app_generator/templates/jsp/main.jsp CHANGED
@@ -12,5 +12,6 @@
12
12
  <body>
13
13
  <decorator:body/>
14
14
  <script type="text/javascript" src="${pageContext.request.contextPath}/javascripts/jquery.min.js"/></script>
15
+ <script type="text/javascript" src="${pageContext.request.contextPath}/javascripts/application.js"/></script>
15
16
  </body>
16
17
  </html>
data/lib/vraptor-scaffold/generators/app_generator/templates/webapp/stylesheets/stylesheets.css CHANGED
@@ -1,5 +1,4 @@
1
1
  @CHARSET "UTF-8";
2
2
 
3
- @IMPORT url("reset.css");
4
3
  @IMPORT url("common.css");
5
4
  @IMPORT url("scaffold.css");
data/lib/vraptor-scaffold/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module VraptorScaffold
2
- VERSION = "1.1.0.pre"
2
+ VERSION = "1.1.0"
3
3
  end
data/spec/vraptor-scaffold/generators/app_generator/app_generator_spec.rb CHANGED
@@ -128,12 +128,30 @@ describe AppGenerator do
128
128
  exists_and_identical?(source, destination)
129
129
  end
130
130
 
131
+ it "should create common css" do
132
+ source = "#{AppGenerator.source_root}/webapp/stylesheets/common.css"
133
+ destination = "#{@webapp}/stylesheets/common.css"
134
+ exists_and_identical?(source, destination)
135
+ end
136
+
137
+ it "should create stylesheets css" do
138
+ source = "#{AppGenerator.source_root}/webapp/stylesheets/stylesheets.css"
139
+ destination = "#{@webapp}/stylesheets/stylesheets.css"
140
+ exists_and_identical?(source, destination)
141
+ end
142
+
131
143
  it "should create jquery js" do
132
144
  source = "#{AppGenerator.source_root}/webapp/javascripts/jquery.min.js"
133
145
  destination = "#{@webapp}/javascripts/jquery.min.js"
134
146
  exists_and_identical?(source, destination)
135
147
  end
136
148
 
149
+ it "should create application js" do
150
+ source = "#{AppGenerator.source_root}/webapp/javascripts/application.js"
151
+ destination = "#{@webapp}/javascripts/application.js"
152
+ exists_and_identical?(source, destination)
153
+ end
154
+
137
155
  it "should create images folder" do
138
156
  File.exist?("#{@webapp}/images").should be_true
139
157
  end
data/vraptor-scaffold.gemspec CHANGED
@@ -15,15 +15,14 @@ Gem::Specification.new do |s|
15
15
 
16
16
  s.add_dependency('thor', '0.14.6')
17
17
  s.add_dependency('activesupport', "3.0.1")
18
-
18
+ s.add_dependency('rake', '0.8.7')
19
+
19
20
  s.add_development_dependency('rspec', '1.3.1')
20
21
  s.add_development_dependency('ZenTest', '4.4.0')
21
22
  s.add_development_dependency('rcov', '0.9.9')
22
- s.add_development_dependency('ruby-debug')
23
- s.add_development_dependency('rake', '0.8.7')
24
23
 
25
24
  s.files = `git ls-files`.split("\n")
26
- s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
25
+ s.test_files = `git ls-files -- {spec}/*`.split("\n")
27
26
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
28
27
  s.require_paths = ["lib"]
29
28
  end
metadata CHANGED
@@ -1,14 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vraptor-scaffold
3
3
  version: !ruby/object:Gem::Version
4
- hash: 961915996
5
- prerelease: true
4
+ prerelease: false
6
5
  segments:
7
6
  - 1
8
7
  - 1
9
8
  - 0
10
- - pre
11
- version: 1.1.0.pre
9
+ version: 1.1.0
12
10
  platform: ruby
13
11
  authors:
14
12
  - Rodolfo Liviero
@@ -16,7 +14,7 @@ autorequire:
16
14
  bindir: bin
17
15
  cert_chain: []
18
16
 
19
- date: 2011-02-27 00:00:00 -03:00
17
+ date: 2011-03-02 00:00:00 -03:00
20
18
  default_executable:
21
19
  dependencies:
22
20
  - !ruby/object:Gem::Dependency
@@ -27,7 +25,6 @@ dependencies:
27
25
  requirements:
28
26
  - - "="
29
27
  - !ruby/object:Gem::Version
30
- hash: 43
31
28
  segments:
32
29
  - 0
33
30
  - 14
@@ -43,7 +40,6 @@ dependencies:
43
40
  requirements:
44
41
  - - "="
45
42
  - !ruby/object:Gem::Version
46
- hash: 5
47
43
  segments:
48
44
  - 3
49
45
  - 0
@@ -52,83 +48,65 @@ dependencies:
52
48
  type: :runtime
53
49
  version_requirements: *id002
54
50
  - !ruby/object:Gem::Dependency
55
- name: rspec
51
+ name: rake
56
52
  prerelease: false
57
53
  requirement: &id003 !ruby/object:Gem::Requirement
58
54
  none: false
59
55
  requirements:
60
56
  - - "="
61
57
  - !ruby/object:Gem::Version
62
- hash: 25
63
58
  segments:
64
- - 1
65
- - 3
66
- - 1
67
- version: 1.3.1
68
- type: :development
59
+ - 0
60
+ - 8
61
+ - 7
62
+ version: 0.8.7
63
+ type: :runtime
69
64
  version_requirements: *id003
70
65
  - !ruby/object:Gem::Dependency
71
- name: ZenTest
66
+ name: rspec
72
67
  prerelease: false
73
68
  requirement: &id004 !ruby/object:Gem::Requirement
74
69
  none: false
75
70
  requirements:
76
71
  - - "="
77
72
  - !ruby/object:Gem::Version
78
- hash: 47
79
73
  segments:
80
- - 4
81
- - 4
82
- - 0
83
- version: 4.4.0
74
+ - 1
75
+ - 3
76
+ - 1
77
+ version: 1.3.1
84
78
  type: :development
85
79
  version_requirements: *id004
86
80
  - !ruby/object:Gem::Dependency
87
- name: rcov
81
+ name: ZenTest
88
82
  prerelease: false
89
83
  requirement: &id005 !ruby/object:Gem::Requirement
90
84
  none: false
91
85
  requirements:
92
86
  - - "="
93
87
  - !ruby/object:Gem::Version
94
- hash: 41
95
88
  segments:
89
+ - 4
90
+ - 4
96
91
  - 0
97
- - 9
98
- - 9
99
- version: 0.9.9
92
+ version: 4.4.0
100
93
  type: :development
101
94
  version_requirements: *id005
102
95
  - !ruby/object:Gem::Dependency
103
- name: ruby-debug
96
+ name: rcov
104
97
  prerelease: false
105
98
  requirement: &id006 !ruby/object:Gem::Requirement
106
- none: false
107
- requirements:
108
- - - ">="
109
- - !ruby/object:Gem::Version
110
- hash: 3
111
- segments:
112
- - 0
113
- version: "0"
114
- type: :development
115
- version_requirements: *id006
116
- - !ruby/object:Gem::Dependency
117
- name: rake
118
- prerelease: false
119
- requirement: &id007 !ruby/object:Gem::Requirement
120
99
  none: false
121
100
  requirements:
122
101
  - - "="
123
102
  - !ruby/object:Gem::Version
124
- hash: 49
125
103
  segments:
126
104
  - 0
127
- - 8
128
- - 7
129
- version: 0.8.7
105
+ - 9
106
+ - 9
107
+ version: 0.9.9
130
108
  type: :development
131
- version_requirements: *id007
109
+ version_requirements: *id006
132
110
  description: VRaptor scaffold extension to make it easier configuring new projects and plugins.
133
111
  email: rodolfoliviero@gmail.com
134
112
  executables:
@@ -138,7 +116,6 @@ extensions: []
138
116
  extra_rdoc_files: []
139
117
 
140
118
  files:
141
- - .document
142
119
  - .gitignore
143
120
  - Gemfile
144
121
  - Gemfile.lock
@@ -190,9 +167,9 @@ files:
190
167
  - lib/vraptor-scaffold/generators/app_generator/templates/webapp/WEB-INF/web.xml
191
168
  - lib/vraptor-scaffold/generators/app_generator/templates/webapp/images/.empty_directory
192
169
  - lib/vraptor-scaffold/generators/app_generator/templates/webapp/index.jsp
170
+ - lib/vraptor-scaffold/generators/app_generator/templates/webapp/javascripts/application.js
193
171
  - lib/vraptor-scaffold/generators/app_generator/templates/webapp/javascripts/jquery.min.js
194
172
  - lib/vraptor-scaffold/generators/app_generator/templates/webapp/stylesheets/common.css
195
- - lib/vraptor-scaffold/generators/app_generator/templates/webapp/stylesheets/reset.css
196
173
  - lib/vraptor-scaffold/generators/app_generator/templates/webapp/stylesheets/scaffold.css
197
174
  - lib/vraptor-scaffold/generators/app_generator/templates/webapp/stylesheets/stylesheets.css
198
175
  - lib/vraptor-scaffold/generators/base.rb
@@ -271,21 +248,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
271
248
  requirements:
272
249
  - - ">="
273
250
  - !ruby/object:Gem::Version
274
- hash: 3
275
251
  segments:
276
252
  - 0
277
253
  version: "0"
278
254
  required_rubygems_version: !ruby/object:Gem::Requirement
279
255
  none: false
280
256
  requirements:
281
- - - ">"
257
+ - - ">="
282
258
  - !ruby/object:Gem::Version
283
- hash: 25
284
259
  segments:
285
- - 1
286
- - 3
287
- - 1
288
- version: 1.3.1
260
+ - 0
261
+ version: "0"
289
262
  requirements: []
290
263
 
291
264
  rubyforge_project:
@@ -293,37 +266,5 @@ rubygems_version: 1.3.7
293
266
  signing_key:
294
267
  specification_version: 3
295
268
  summary: VRaptor Scaffold.
296
- test_files:
297
- - spec/resources/vraptor-scaffold.properties
298
- - spec/spec.opts
299
- - spec/spec_helper.rb
300
- - spec/vraptor-scaffold/configuration_spec.rb
301
- - spec/vraptor-scaffold/generators/app_generator/app_generator_spec.rb
302
- - spec/vraptor-scaffold/generators/app_generator/dependency_manager_spec.rb
303
- - spec/vraptor-scaffold/generators/app_generator/dependency_spec.rb
304
- - spec/vraptor-scaffold/generators/app_generator/freemarker_template_engine_spec.rb
305
- - spec/vraptor-scaffold/generators/app_generator/jsp_template_engine_spec.rb
306
- - spec/vraptor-scaffold/generators/app_generator/templates/Entity.java
307
- - spec/vraptor-scaffold/generators/app_generator/templates/FreemarkerPathResolver.java
308
- - spec/vraptor-scaffold/generators/app_generator/templates/Repository.java
309
- - spec/vraptor-scaffold/generators/app_generator/templates/build.gradle
310
- - spec/vraptor-scaffold/generators/app_generator/templates/build.properties
311
- - spec/vraptor-scaffold/generators/app_generator/templates/decorators-jsp.xml
312
- - spec/vraptor-scaffold/generators/app_generator/templates/decorators.xml
313
- - spec/vraptor-scaffold/generators/app_generator/templates/freemarker-web.xml
314
- - spec/vraptor-scaffold/generators/app_generator/templates/ivy.xml
315
- - spec/vraptor-scaffold/generators/app_generator/templates/jsp-web.xml
316
- - spec/vraptor-scaffold/generators/app_generator/templates/pom.xml
317
- - spec/vraptor-scaffold/generators/scaffold_generator/attribute_spec.rb
318
- - spec/vraptor-scaffold/generators/scaffold_generator/base_scaffold_spec.rb
319
- - spec/vraptor-scaffold/generators/scaffold_generator/controller_generator/controller_generator_spec.rb
320
- - spec/vraptor-scaffold/generators/scaffold_generator/controller_generator/templates/ProductController.java
321
- - spec/vraptor-scaffold/generators/scaffold_generator/freemarker_generator/freemarker_generator_spec.rb
322
- - spec/vraptor-scaffold/generators/scaffold_generator/jsp_generator/jsp_generator_spec.rb
323
- - spec/vraptor-scaffold/generators/scaffold_generator/model_generator/model_generator_spec.rb
324
- - spec/vraptor-scaffold/generators/scaffold_generator/model_generator/templates/Product.java
325
- - spec/vraptor-scaffold/generators/scaffold_generator/repository_generator/repository_generator_spec.rb
326
- - spec/vraptor-scaffold/generators/scaffold_generator/repository_generator/templates/ProductRepository.java
327
- - spec/vraptor-scaffold/generators/scaffold_generator/repository_generator/templates/ProductRepositoryImpl.java
328
- - spec/vraptor-scaffold/generators/scaffold_generator/scaffold_generator_spec.rb
329
- - spec/vraptor-scaffold_spec.rb
269
+ test_files: []
270
+
data/.document DELETED
@@ -1,4 +0,0 @@
1
- README.textile
2
- lib/**/*.rb
3
- bin/*
4
- LICENSE
data/lib/vraptor-scaffold/generators/app_generator/templates/webapp/stylesheets/reset.css DELETED
@@ -1,47 +0,0 @@
1
- :focus {
2
- outline: 0;
3
- }
4
-
5
- blockquote, q {
6
- quotes: none;
7
- }
8
-
9
- blockquote:before, blockquote:after, q:before, q:after {
10
- content: '';
11
- content: none;
12
- }
13
-
14
- del {
15
- text-decoration: line-through;
16
- }
17
-
18
- ins {
19
- text-decoration: none;
20
- }
21
-
22
- ol, ul {
23
- list-style: none;
24
- }
25
-
26
- table {
27
- border-collapse: collapse;
28
- border-spacing: 0;
29
- }
30
-
31
- html, body, div, span, applet, object, iframe,
32
- h1, h2, h3, h4, h5, h6, p, blockquote, pre,
33
- a, abbr, acronym, address, big, cite, code,
34
- del, dfn, em, font, img, ins, kbd, q, s, samp,
35
- small, strike, strong, sub, sup, tt, var,
36
- b, u, i, center,
37
- dl, dt, dd, ol, ul, li,
38
- fieldset, form, label, legend,
39
- table, caption, tbody, tfoot, thead, tr, th, td {
40
- background: transparent;
41
- border: 0;
42
- margin: 0;
43
- font-size: 100%;
44
- outline: 0;
45
- padding: 0;
46
- vertical-align: baseline;
47
- }