jreport 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeb00636766f8affe56c46d9563a8e9b90b55614
-  data.tar.gz: 3fa524a0f106dabb9a0362407720c40bb024f6c0
+  metadata.gz: 8ae098da68e76d1ec098964073b15d82e97d7033
+  data.tar.gz: caeeffb61ff055814868db6112c3be1dd320d70e
 SHA512:
-  metadata.gz: 66e04621a3d014a94bc420b79d6d9ecd5553ea694c8fb81cbab3d9dfec6edc72d93f79ab963570f1f7ec38e6dcb9c14bb7e206ae0f2e0eec35e8efd9d21e9172
-  data.tar.gz: 18bc69d08eae6df63e5431d62af26b7d9553160646f210dfdd05bbcac70b495e803d4f594ea744e10093470010530c6459a7b7472a4f177cbcc2ecc2e5e12efa
+  metadata.gz: 18723152e117c79d845695f1f7fd23933a60c9dd09b51e76bfeb24e5df409da48292e82f172ea24153e79be52690982be2f02c9d9a9406bc9f5ff945752761b1
+  data.tar.gz: 4e9c00d7692fe50081915da9c005aeaf6c8a7ebb7849257bd6c1f459d801e1bca06f1fc41389c6eacdfb9b8492450a74d24c4b70c30e6025fe9970a1dce4548f

data/bin/jreport

@@ -39,15 +39,22 @@ module JreportCommand
       `echo "#{code}" > "#{file}"`
     end
     
+    option :css
     desc 'view','generate view'
     def view(name,*views)
+      dir=File.expand_path('../../skel/views',__FILE__)
+      if options[:css]
+	default_css=dir+'/'+options[:css].to_s+'.css'
+      else
+	default_css=dir+'/highlight.css'
+      end
       `mkdir "./views/#{name}"` unless File.exists?("./views/#{name}")
       views<<'example' if views.empty?
       views.map{|x| x+'_report'}.each do |fname|
         dir=File.expand_path('../../skel/views',__FILE__)
         content=Erubis::Eruby.new(File.read("#{dir}/template.eruby")).result(:report_name=>name)
         `echo "#{content}" > "./views/#{name}/#{fname}.eruby"`
-        `touch "./views/#{name}/#{fname}.css"`
+        `cp "#{default_css}"  "./views/#{name}/#{fname}.css"`
       end
     end
     

data/lib/jreport.rb

@@ -4,5 +4,4 @@ require "jreport/assembler"
 
 module Jreport
   # Your code goes here...
-  Style={ :css=>:highlight }
 end

data/lib/jreport/assembler.rb

@@ -51,16 +51,10 @@ module Jreport
     def render_html(dir,report_name,bindings)
       base="#{dir}/#{report_name}"
       html=Erubis::Eruby.new(File.read("#{base}.eruby")).result(bindings)
-      if Jreport::Style[:css]==:custom && File.exist?("#{base}.css")
-  			css=File.read "#{base}.css"
-  			html<<%Q{<style type="text/css" media="screen">#{css}</style>}
-  			html=InlineStyle.process(html)
-      else
-		fcss=File.expand_path('../../../skel/views',__FILE__)+"/#{Jreport::Style[:css].to_s}.css"
-		css=File.read fcss
-		html<<%Q{<style type="text/css" media="screen">#{css}</style>}
+      if File.exist?("#{base}.css")
+  		css=File.read "#{base}.css"
+  		html<<%Q{<style type="text/css" media="screen">#{css}</style>}
   		html=InlineStyle.process(html)
-		
       end
       html
     end

data/lib/jreport/version.rb

@@ -1,3 +1,3 @@
 module Jreport
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/skel/boot.rb

@@ -2,6 +2,7 @@
 require 'bundler'
 Bundler.require(:default)
 require 'date'
+require 'active_record'
 
 JreportRoot=File.expand_path('..',__FILE__)
 
@@ -14,7 +15,7 @@ Dir[JreportRoot+'/config/*.rb'].each{|config| require config }
 Dir[JreportRoot+'/helpers/*_helper.rb'].each do |hlp|
   hlp_name=File.basename(hlp)[0..-4].split('_').map{|x| x.capitalize}.join
   require hlp
-  include Kernel.const_get(hlp_name) if Kernel.const_defined?(hlp_name)
+  include Kernel.const_get(hlp_name) 
 end
 # Load collectors and controllers
 Dir[JreportRoot+'/collectors/*.rb'].each{|c| require c }

data/skel/db/connection.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'active_record'
 
 dbconfig = YAML::load(File.open(File.expand_path('..',__FILE__)+'/database.yml'))  
 ActiveRecord::Base.establish_connection(dbconfig) 

data/skel/rakefile

@@ -1,6 +1,4 @@
-require 'bundler'
-Bundler.require(:deafult)
-require './db/connection'
+require './boot'
 
 Dir.glob('tasks/*.rake').each { |r| import r }
 

data/skel/views/green.css

@@ -86,4 +86,5 @@ tbody tr.odd td {
         font-weight:bolder;
         font-family:隶书;
         font-size: 300%;
-}
+	text-align:center
+}

data/skel/views/highlight.css

@@ -93,4 +93,5 @@ tfoot  {
         font-weight:bolder;
         font-family:隶书;
         font-size: 300%;
+	text-align:center
 }

data/skel/views/template.eruby

@@ -1,4 +1,4 @@
-<p class="jtitle"><%=report_name%></p>
+<h1 class="jtitle"><%=report_name%></h1>
 <table>
     <thead>    
     	<tr>

metadata

@@ -1,127 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: jreport
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - qjpcpu
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: activesupport
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: thor
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: mail
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: inline-style
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: inline-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: erubis
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: activerecord
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create a report easily.
 email:
 - qjpcpu@gmail.com
@@ -130,7 +130,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -159,24 +159,24 @@ homepage: https://github.com/qjpcpu/jreport
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.0
+signing_key: 
 specification_version: 4
 summary: Jreport
 test_files: []