jreport 0.0.7 → 0.0.8

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 (12) hide show
  1. checksums.yaml +4 -4
  2. data/bin/jreport +8 -1
  3. data/lib/jreport.rb +0 -1
  4. data/lib/jreport/assembler.rb +3 -9
  5. data/lib/jreport/version.rb +1 -1
  6. data/skel/boot.rb +2 -1
  7. data/skel/db/connection.rb +1 -0
  8. data/skel/rakefile +1 -3
  9. data/skel/views/green.css +2 -1
  10. data/skel/views/highlight.css +1 -0
  11. data/skel/views/template.eruby +1 -1
  12. metadata +53 -53
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: eeb00636766f8affe56c46d9563a8e9b90b55614
4
- data.tar.gz: 3fa524a0f106dabb9a0362407720c40bb024f6c0
3
+ metadata.gz: 8ae098da68e76d1ec098964073b15d82e97d7033
4
+ data.tar.gz: caeeffb61ff055814868db6112c3be1dd320d70e
5
5
  SHA512:
6
- metadata.gz: 66e04621a3d014a94bc420b79d6d9ecd5553ea694c8fb81cbab3d9dfec6edc72d93f79ab963570f1f7ec38e6dcb9c14bb7e206ae0f2e0eec35e8efd9d21e9172
7
- data.tar.gz: 18bc69d08eae6df63e5431d62af26b7d9553160646f210dfdd05bbcac70b495e803d4f594ea744e10093470010530c6459a7b7472a4f177cbcc2ecc2e5e12efa
6
+ metadata.gz: 18723152e117c79d845695f1f7fd23933a60c9dd09b51e76bfeb24e5df409da48292e82f172ea24153e79be52690982be2f02c9d9a9406bc9f5ff945752761b1
7
+ data.tar.gz: 4e9c00d7692fe50081915da9c005aeaf6c8a7ebb7849257bd6c1f459d801e1bca06f1fc41389c6eacdfb9b8492450a74d24c4b70c30e6025fe9970a1dce4548f
data/bin/jreport CHANGED
@@ -39,15 +39,22 @@ module JreportCommand
39
39
  `echo "#{code}" > "#{file}"`
40
40
  end
41
41
 
42
+ option :css
42
43
  desc 'view','generate view'
43
44
  def view(name,*views)
45
+ dir=File.expand_path('../../skel/views',__FILE__)
46
+ if options[:css]
47
+ default_css=dir+'/'+options[:css].to_s+'.css'
48
+ else
49
+ default_css=dir+'/highlight.css'
50
+ end
44
51
  `mkdir "./views/#{name}"` unless File.exists?("./views/#{name}")
45
52
  views<<'example' if views.empty?
46
53
  views.map{|x| x+'_report'}.each do |fname|
47
54
  dir=File.expand_path('../../skel/views',__FILE__)
48
55
  content=Erubis::Eruby.new(File.read("#{dir}/template.eruby")).result(:report_name=>name)
49
56
  `echo "#{content}" > "./views/#{name}/#{fname}.eruby"`
50
- `touch "./views/#{name}/#{fname}.css"`
57
+ `cp "#{default_css}" "./views/#{name}/#{fname}.css"`
51
58
  end
52
59
  end
53
60
 
data/lib/jreport.rb CHANGED
@@ -4,5 +4,4 @@ require "jreport/assembler"
4
4
 
5
5
  module Jreport
6
6
  # Your code goes here...
7
- Style={ :css=>:highlight }
8
7
  end
data/lib/jreport/assembler.rb CHANGED
@@ -51,16 +51,10 @@ module Jreport
51
51
  def render_html(dir,report_name,bindings)
52
52
  base="#{dir}/#{report_name}"
53
53
  html=Erubis::Eruby.new(File.read("#{base}.eruby")).result(bindings)
54
- if Jreport::Style[:css]==:custom && File.exist?("#{base}.css")
55
- css=File.read "#{base}.css"
56
- html<<%Q{<style type="text/css" media="screen">#{css}</style>}
57
- html=InlineStyle.process(html)
58
- else
59
- fcss=File.expand_path('../../../skel/views',__FILE__)+"/#{Jreport::Style[:css].to_s}.css"
60
- css=File.read fcss
61
- html<<%Q{<style type="text/css" media="screen">#{css}</style>}
54
+ if File.exist?("#{base}.css")
55
+ css=File.read "#{base}.css"
56
+ html<<%Q{<style type="text/css" media="screen">#{css}</style>}
62
57
  html=InlineStyle.process(html)
63
-
64
58
  end
65
59
  html
66
60
  end
data/lib/jreport/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Jreport
2
- VERSION = "0.0.7"
2
+ VERSION = "0.0.8"
3
3
  end
data/skel/boot.rb CHANGED
@@ -2,6 +2,7 @@
2
2
  require 'bundler'
3
3
  Bundler.require(:default)
4
4
  require 'date'
5
+ require 'active_record'
5
6
 
6
7
  JreportRoot=File.expand_path('..',__FILE__)
7
8
 
@@ -14,7 +15,7 @@ Dir[JreportRoot+'/config/*.rb'].each{|config| require config }
14
15
  Dir[JreportRoot+'/helpers/*_helper.rb'].each do |hlp|
15
16
  hlp_name=File.basename(hlp)[0..-4].split('_').map{|x| x.capitalize}.join
16
17
  require hlp
17
- include Kernel.const_get(hlp_name) if Kernel.const_defined?(hlp_name)
18
+ include Kernel.const_get(hlp_name)
18
19
  end
19
20
  # Load collectors and controllers
20
21
  Dir[JreportRoot+'/collectors/*.rb'].each{|c| require c }
data/skel/db/connection.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  require 'yaml'
2
+ require 'active_record'
2
3
 
3
4
  dbconfig = YAML::load(File.open(File.expand_path('..',__FILE__)+'/database.yml'))
4
5
  ActiveRecord::Base.establish_connection(dbconfig)
data/skel/rakefile CHANGED
@@ -1,6 +1,4 @@
1
- require 'bundler'
2
- Bundler.require(:deafult)
3
- require './db/connection'
1
+ require './boot'
4
2
 
5
3
  Dir.glob('tasks/*.rake').each { |r| import r }
6
4
 
data/skel/views/green.css CHANGED
@@ -86,4 +86,5 @@ tbody tr.odd td {
86
86
  font-weight:bolder;
87
87
  font-family:隶书;
88
88
  font-size: 300%;
89
- }
89
+ text-align:center
90
+ }
data/skel/views/highlight.css CHANGED
@@ -93,4 +93,5 @@ tfoot {
93
93
  font-weight:bolder;
94
94
  font-family:隶书;
95
95
  font-size: 300%;
96
+ text-align:center
96
97
  }
data/skel/views/template.eruby CHANGED
@@ -1,4 +1,4 @@
1
- <p class="jtitle"><%=report_name%></p>
1
+ <h1 class="jtitle"><%=report_name%></h1>
2
2
  <table>
3
3
  <thead>
4
4
  <tr>
metadata CHANGED
@@ -1,127 +1,127 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jreport
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.7
4
+ version: 0.0.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - qjpcpu
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-20 00:00:00.000000000 Z
11
+ date: 2014-02-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
15
- version_requirements: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - ~>
18
- - !ruby/object:Gem::Version
19
- version: '1.5'
20
15
  requirement: !ruby/object:Gem::Requirement
21
16
  requirements:
22
- - - ~>
17
+ - - "~>"
23
18
  - !ruby/object:Gem::Version
24
19
  version: '1.5'
25
- prerelease: false
26
20
  type: :development
27
- - !ruby/object:Gem::Dependency
28
- name: rake
21
+ prerelease: false
29
22
  version_requirements: !ruby/object:Gem::Requirement
30
23
  requirements:
31
- - - '>='
24
+ - - "~>"
32
25
  - !ruby/object:Gem::Version
33
- version: '0'
26
+ version: '1.5'
27
+ - !ruby/object:Gem::Dependency
28
+ name: rake
34
29
  requirement: !ruby/object:Gem::Requirement
35
30
  requirements:
36
- - - '>='
31
+ - - ">="
37
32
  - !ruby/object:Gem::Version
38
33
  version: '0'
39
- prerelease: false
40
34
  type: :development
41
- - !ruby/object:Gem::Dependency
42
- name: activesupport
35
+ prerelease: false
43
36
  version_requirements: !ruby/object:Gem::Requirement
44
37
  requirements:
45
- - - '>='
38
+ - - ">="
46
39
  - !ruby/object:Gem::Version
47
40
  version: '0'
41
+ - !ruby/object:Gem::Dependency
42
+ name: activesupport
48
43
  requirement: !ruby/object:Gem::Requirement
49
44
  requirements:
50
- - - '>='
45
+ - - ">="
51
46
  - !ruby/object:Gem::Version
52
47
  version: '0'
53
- prerelease: false
54
48
  type: :development
55
- - !ruby/object:Gem::Dependency
56
- name: thor
49
+ prerelease: false
57
50
  version_requirements: !ruby/object:Gem::Requirement
58
51
  requirements:
59
- - - '>='
52
+ - - ">="
60
53
  - !ruby/object:Gem::Version
61
54
  version: '0'
55
+ - !ruby/object:Gem::Dependency
56
+ name: thor
62
57
  requirement: !ruby/object:Gem::Requirement
63
58
  requirements:
64
- - - '>='
59
+ - - ">="
65
60
  - !ruby/object:Gem::Version
66
61
  version: '0'
67
- prerelease: false
68
62
  type: :runtime
69
- - !ruby/object:Gem::Dependency
70
- name: mail
63
+ prerelease: false
71
64
  version_requirements: !ruby/object:Gem::Requirement
72
65
  requirements:
73
- - - '>='
66
+ - - ">="
74
67
  - !ruby/object:Gem::Version
75
68
  version: '0'
69
+ - !ruby/object:Gem::Dependency
70
+ name: mail
76
71
  requirement: !ruby/object:Gem::Requirement
77
72
  requirements:
78
- - - '>='
73
+ - - ">="
79
74
  - !ruby/object:Gem::Version
80
75
  version: '0'
81
- prerelease: false
82
76
  type: :runtime
83
- - !ruby/object:Gem::Dependency
84
- name: inline-style
77
+ prerelease: false
85
78
  version_requirements: !ruby/object:Gem::Requirement
86
79
  requirements:
87
- - - '>='
80
+ - - ">="
88
81
  - !ruby/object:Gem::Version
89
82
  version: '0'
83
+ - !ruby/object:Gem::Dependency
84
+ name: inline-style
90
85
  requirement: !ruby/object:Gem::Requirement
91
86
  requirements:
92
- - - '>='
87
+ - - ">="
93
88
  - !ruby/object:Gem::Version
94
89
  version: '0'
95
- prerelease: false
96
90
  type: :runtime
97
- - !ruby/object:Gem::Dependency
98
- name: erubis
91
+ prerelease: false
99
92
  version_requirements: !ruby/object:Gem::Requirement
100
93
  requirements:
101
- - - '>='
94
+ - - ">="
102
95
  - !ruby/object:Gem::Version
103
96
  version: '0'
97
+ - !ruby/object:Gem::Dependency
98
+ name: erubis
104
99
  requirement: !ruby/object:Gem::Requirement
105
100
  requirements:
106
- - - '>='
101
+ - - ">="
107
102
  - !ruby/object:Gem::Version
108
103
  version: '0'
109
- prerelease: false
110
104
  type: :runtime
111
- - !ruby/object:Gem::Dependency
112
- name: activerecord
105
+ prerelease: false
113
106
  version_requirements: !ruby/object:Gem::Requirement
114
107
  requirements:
115
- - - '>='
108
+ - - ">="
116
109
  - !ruby/object:Gem::Version
117
110
  version: '0'
111
+ - !ruby/object:Gem::Dependency
112
+ name: activerecord
118
113
  requirement: !ruby/object:Gem::Requirement
119
114
  requirements:
120
- - - '>='
115
+ - - ">="
121
116
  - !ruby/object:Gem::Version
122
117
  version: '0'
123
- prerelease: false
124
118
  type: :runtime
119
+ prerelease: false
120
+ version_requirements: !ruby/object:Gem::Requirement
121
+ requirements:
122
+ - - ">="
123
+ - !ruby/object:Gem::Version
124
+ version: '0'
125
125
  description: Create a report easily.
126
126
  email:
127
127
  - qjpcpu@gmail.com
@@ -130,7 +130,7 @@ executables:
130
130
  extensions: []
131
131
  extra_rdoc_files: []
132
132
  files:
133
- - .gitignore
133
+ - ".gitignore"
134
134
  - Gemfile
135
135
  - LICENSE.txt
136
136
  - README.md
@@ -159,24 +159,24 @@ homepage: https://github.com/qjpcpu/jreport
159
159
  licenses:
160
160
  - MIT
161
161
  metadata: {}
162
- post_install_message:
162
+ post_install_message:
163
163
  rdoc_options: []
164
164
  require_paths:
165
165
  - lib
166
166
  required_ruby_version: !ruby/object:Gem::Requirement
167
167
  requirements:
168
- - - '>='
168
+ - - ">="
169
169
  - !ruby/object:Gem::Version
170
170
  version: '0'
171
171
  required_rubygems_version: !ruby/object:Gem::Requirement
172
172
  requirements:
173
- - - '>='
173
+ - - ">="
174
174
  - !ruby/object:Gem::Version
175
175
  version: '0'
176
176
  requirements: []
177
- rubyforge_project:
178
- rubygems_version: 2.1.9
179
- signing_key:
177
+ rubyforge_project:
178
+ rubygems_version: 2.2.0
179
+ signing_key:
180
180
  specification_version: 4
181
181
  summary: Jreport
182
182
  test_files: []