beardley 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fb39c7d9e87727cb784ba5a0aa657a958d2dea5
-  data.tar.gz: 2afddcefe455d1d62763c475115f3636be3916c9
+  metadata.gz: 2f58f515d166e39603ec3f4728ec495dfc01d7fe
+  data.tar.gz: a4a30e2b36d687576a5b5b6cc14d20d8bda182ef
 SHA512:
-  metadata.gz: a64f8932195186124df96d11742b8cc257212368d20d2c67f89ef3eaca05f21bd2dd15d2299023e1009143d279a6ff86892ba1f05b32e46b2fd8286cd84020ad
-  data.tar.gz: a2a7af806fac157475365bb2e16c83d10e7f195fbba48cf6c62778334cb1b3fbca5b019ef4acce62ec30a2f89f7154f043712c6c8aa6e2941e193d0b0c5ef06a
+  metadata.gz: f6b12e641c0392c07aab5cae431909070cce792cfaf564e0d8690a9e07609267a5d705d096a2fa5c588a8aa796f2ec5e1d68265352fcff3eb850c5f1868532bb
+  data.tar.gz: f3a7b78287225a60b9a24ca638841a5ae0c4b56e0400e5f71902d4847b9dbef51f9e5397947f57f2aa9401eb6d332007016508d79e46aa9f08e05de4b1d9755c

data/lib/beardley.rb

@@ -21,31 +21,29 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require "beardley/version"
-require "pathname"
-require "digest"
-require "rjb"
-require "rjb-loader"
-
+require 'beardley/version'
+require 'pathname'
+require 'digest'
+require 'rjb'
+require 'rjb-loader' if ENV['DISABLED_JAVA'].to_i.zero?
 
 module Beardley
-
   class << self
     attr_accessor :config, :exporters
 
     # Changes the level of verbosity
     def with_warnings(flag = nil)
-      old_verbose, $VERBOSE = $VERBOSE, flag
+      old_verbose = $VERBOSE
+      $VERBOSE = flag
       yield
     ensure
       $VERBOSE = old_verbose
     end
-    
   end
 
   # Default report params
   self.config = {
-    report_params: {} 
+    report_params: {}
   }
   self.exporters = {
     odt: 'net.sf.jasperreports.engine.export.oasis.JROdtExporter',
@@ -54,21 +52,22 @@ module Beardley
     docx: 'net.sf.jasperreports.engine.export.ooxml.JRDocxExporter',
     xlsx: 'net.sf.jasperreports.engine.export.ooxml.JRXlsxExporter'
   }
-  
-  RjbLoader.before_load do |config|
-    Dir[Pathname.new(__FILE__).dirname.join("..", "vendor", "java", "*.jar")].each do |path|
-      config.classpath << File::PATH_SEPARATOR + File.expand_path(path)
+
+  if ENV['DISABLED_JAVA'].to_i.zero?
+    RjbLoader.before_load do |config|
+      Dir[Pathname.new(__FILE__).dirname.join('..', 'vendor', 'java', '*.jar')].each do |path|
+        config.classpath << File::PATH_SEPARATOR + File.expand_path(path)
+      end
     end
-  end
 
-  RjbLoader.after_load do |config|
-    _Locale = Rjb::import('java.util.Locale')
-    Beardley.config[:report_params]["REPORT_LOCALE"]    = _Locale.new('en', 'US')
-    Beardley.config[:report_params]["XML_LOCALE"]       = _Locale.new('en', 'US')
-    Beardley.config[:report_params]["XML_DATE_PATTERN"] = "yyyy-MM-dd'T'HH:mm:ss"
-    Beardley.config[:report_params]["XML_NUMBER_PATTERN"] = '###0.00'
+    RjbLoader.after_load do |_config|
+      _Locale = Rjb.import('java.util.Locale')
+      Beardley.config[:report_params]['REPORT_LOCALE']    = _Locale.new('en', 'US')
+      Beardley.config[:report_params]['XML_LOCALE']       = _Locale.new('en', 'US')
+      Beardley.config[:report_params]['XML_DATE_PATTERN'] = "yyyy-MM-dd'T'HH:mm:ss"
+      Beardley.config[:report_params]['XML_NUMBER_PATTERN'] = '###0.00'
+    end
   end
 
   autoload :Report, 'beardley/report'
-
 end

data/lib/beardley/report.rb

@@ -22,33 +22,33 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Beardley
-
   # This class permit to produce reports in PDF, ODT and DOCX using Jasper
   class Report
     attr_reader :source_file, :object_file
-    
+
     # Constructor for a report generator
     def initialize(report, options = {})
       @parameters = options.delete(:report) || {}
-      @source_file, @object_file = nil, nil
+      @source_file = nil
+      @object_file = nil
       if report.is_a?(Pathname)
-        @source_file = report if report.extname.downcase == ".jrxml" or report.extname.downcase == ".xml"
-        @object_file = report if report.extname.downcase == ".jasper"
+        @source_file = report if report.extname.casecmp('.jrxml').zero? || report.extname.casecmp('.xml').zero?
+        @object_file = report if report.extname.casecmp('.jasper').zero?
       elsif report.is_a?(String)
         hash = Digest::SHA256.hexdigest(report)
-        @source_file = Pathname.new(options[:tmp_dir] || "/tmp").join("report-" + hash + '.jrxml')
+        @source_file = Pathname.new(options[:tmp_dir] || '/tmp').join('report-' + hash + '.jrxml')
         File.open(@source_file, 'wb') do |f|
           f.write(report)
         end
       end
       if locale = options.delete(:locale)
-        locale_parts = locale.split("-")[0..2]
-        _Locale = Rjb::import('java.util.Locale')
-        @parameters["REPORT_LOCALE"] = _Locale.new(*locale_parts)
+        locale_parts = locale.split('-')[0..2]
+        _Locale = Rjb.import('java.util.Locale')
+        @parameters['REPORT_LOCALE'] = _Locale.new(*locale_parts)
       end
-      @object_file ||= @source_file.dirname.join(@source_file.basename.to_s + ".jasper")
+      @object_file ||= @source_file.dirname.join(@source_file.basename.to_s + '.jasper')
       unless @object_file.is_a?(Pathname)
-        raise ArgumentError, "An object must be given at least"
+        raise ArgumentError, 'An object must be given at least'
       end
     end
 
@@ -56,34 +56,34 @@ module Beardley
     def to_pdf(*args)
       options = extract_options!(args)
       datasource = args[0]
-      _JasperPrint                 = Rjb::import('net.sf.jasperreports.engine.JasperPrint')
-      _JasperExportManager         = Rjb::import('net.sf.jasperreports.engine.JasperExportManager')
-      return _JasperExportManager._invoke('exportReportToPdf', 'Lnet.sf.jasperreports.engine.JasperPrint;', prepare(datasource))
+      _JasperPrint                 = Rjb.import('net.sf.jasperreports.engine.JasperPrint')
+      _JasperExportManager         = Rjb.import('net.sf.jasperreports.engine.JasperExportManager')
+      _JasperExportManager._invoke('exportReportToPdf', 'Lnet.sf.jasperreports.engine.JasperPrint;', prepare(datasource))
     end
 
     # Export report to ODT with given datasource
     def to_odt(*args)
-      return to(:odt, *args)
+      to(:odt, *args)
     end
 
     # Export report to ODS with given datasource
     def to_ods(*args)
-      return to(:ods, *args)
+      to(:ods, *args)
     end
 
     # Export report to CSV with given datasource
     def to_csv(*args)
-      return to(:csv, *args)
+      to(:csv, *args)
     end
 
     # Export report to DOCX with given datasource
     def to_docx(*args)
-      return to(:docx, *args)
+      to(:docx, *args)
     end
 
     # Export report to XLSX with given datasource
     def to_xlsx(*args)
-      return to(:xlsx, *args)
+      to(:xlsx, *args)
     end
 
     # Generic method to export to some format like ODT and DOCX as file in the given place
@@ -92,21 +92,27 @@ module Beardley
       datasource = args[0]
       path = options[:path] || File.join(Dir.tmpdir, "beardley_#{Time.now.to_i.to_s(36)}_#{rand(100_000_000_000).to_s(36)}.#{format}")
       if format == :pdf
-        _JasperPrint                 = Rjb::import('net.sf.jasperreports.engine.JasperPrint')
-        _JasperExportManager         = Rjb::import('net.sf.jasperreports.engine.JasperExportManager')
-        _JasperExportManager._invoke('exportReportToPdfFile', 'Lnet.sf.jasperreports.engine.JasperPrint;Ljava.lang.String;', prepare(datasource), Rjb::import('java.lang.String').new(path.to_s))
+        _JasperPrint                 = Rjb.import('net.sf.jasperreports.engine.JasperPrint')
+        _JasperExportManager         = Rjb.import('net.sf.jasperreports.engine.JasperExportManager')
+        _JasperExportManager._invoke('exportReportToPdfFile', 'Lnet.sf.jasperreports.engine.JasperPrint;Ljava.lang.String;', prepare(datasource), Rjb.import('java.lang.String').new(path.to_s))
       elsif Beardley.exporters[format]
-        exporter = Beardley.with_warnings { Rjb::import(Beardley.exporters[format]) }.new
-        _JRExporterParameter = Rjb::import('net.sf.jasperreports.engine.JRExporterParameter')
+        exporter = Beardley.with_warnings { Rjb.import(Beardley.exporters[format]) }.new
+        _JRExporterParameter = Rjb.import('net.sf.jasperreports.engine.JRExporterParameter')
         exporter.setParameter(_JRExporterParameter.JASPER_PRINT, prepare(datasource))
         exporter.setParameter(_JRExporterParameter.OUTPUT_FILE_NAME, path.to_s)
         exporter.exportReport
       else
         raise "Invalid export format: #{format.inspect}"
       end
-      return path
+      path
     end
 
+    def compile(xml_path, compiled_path)
+      if File.exist?(xml_path)
+        _JasperCompileManager = Rjb.import('net.sf.jasperreports.engine.JasperCompileManager')
+        _JasperCompileManager.compileReportToFile(xml_path, compiled_path)
+      end
+    end
 
     # XLS and RTF are not suitable anymore
     # NOTE: JasperReports can not produce DOC files
@@ -118,64 +124,63 @@ module Beardley
       options = extract_options!(args)
       datasource = args[0]
       file = Tempfile.new("to_#{format}")
-      exporter = Beardley.with_warnings { Rjb::import(Beardley.exporters[format]) }.new
-      _JRExporterParameter = Rjb::import('net.sf.jasperreports.engine.JRExporterParameter')
+      exporter = Beardley.with_warnings { Rjb.import(Beardley.exporters[format]) }.new
+      _JRExporterParameter = Rjb.import('net.sf.jasperreports.engine.JRExporterParameter')
       exporter.setParameter(_JRExporterParameter.JASPER_PRINT, prepare(datasource))
       exporter.setParameter(_JRExporterParameter.OUTPUT_FILE_NAME, file.path.to_s)
       exporter.exportReport
       file.rewind
       report = file.read
       file.close(true)
-      return report
+      report
     end
 
     # Extract options from a list of arguments
     def extract_options!(args)
-      return (args[-1].is_a?(Hash) ? args.delete_at(-1) : {})
+      (args[-1].is_a?(Hash) ? args.delete_at(-1) : {})
     end
 
     # Create object file if not exist and load datasource
     def prepare(datasource = nil)
       # Compile it, if needed
       if @source_file && ((!@object_file.exist? && @source_file.exist?) || (@source_file.exist? && @source_file.mtime > @object_file.mtime))
-        _JasperCompileManager = Rjb::import('net.sf.jasperreports.engine.JasperCompileManager')
+        _JasperCompileManager = Rjb.import('net.sf.jasperreports.engine.JasperCompileManager')
         _JasperCompileManager.compileReportToFile(@source_file.to_s, @object_file.to_s)
       end
       load_datasource(datasource)
     end
 
-
     # Build the default parameters Hash for printing
     def prepare_params
-      _HashMap    = Rjb::import('java.util.HashMap')
-      _JavaString = Rjb::import('java.lang.String')
+      _HashMap    = Rjb.import('java.util.HashMap')
+      _JavaString = Rjb.import('java.lang.String')
 
       # Converting default report params to java HashMap
       params = _HashMap.new
-      Beardley.config[:report_params].each do |k,v|
+      Beardley.config[:report_params].each do |k, v|
         params.put(k, v)
       end
-      
+
       # Convert the ruby parameters' hash to a java HashMap, but keeps it as
       # default when they already represent a JRB entity.
       # Pay attention that, for now, all other parameters are converted to string!
       @parameters.each do |key, value|
         params.put(_JavaString.new(key.to_s), parameter_value_of(value))
       end
-      
-      return params
+
+      params
     end
 
     # Load parseable XML datasource with java component
     def load_datasource(datasource = nil)
       jasper_params = prepare_params
 
-      # Parse and load XML as datasource 
+      # Parse and load XML as datasource
       if datasource
-        _InputSource                 = Rjb::import('org.xml.sax.InputSource')
-        _StringReader                = Rjb::import('java.io.StringReader')
-        _JRXmlUtils                  = Rjb::import('net.sf.jasperreports.engine.util.JRXmlUtils')
-        _JRXPathQueryExecuterFactory = Beardley.with_warnings { Rjb::import('net.sf.jasperreports.engine.query.JRXPathQueryExecuterFactory') }
+        _InputSource                 = Rjb.import('org.xml.sax.InputSource')
+        _StringReader                = Rjb.import('java.io.StringReader')
+        _JRXmlUtils                  = Rjb.import('net.sf.jasperreports.engine.util.JRXmlUtils')
+        _JRXPathQueryExecuterFactory = Beardley.with_warnings { Rjb.import('net.sf.jasperreports.engine.query.JRXPathQueryExecuterFactory') }
         input_source = _InputSource.new
         input_source.setCharacterStream(_StringReader.new(datasource.to_s))
         data_document = Beardley.with_warnings do
@@ -185,21 +190,19 @@ module Beardley
       end
 
       # Build JasperPrint
-      return fill_report(jasper_params, datasource)
+      fill_report(jasper_params, datasource)
     end
 
-
     # Fill the report with valid method depending on datasource
     def fill_report(params, datasource = nil)
-      _JasperFillManager           = Rjb::import('net.sf.jasperreports.engine.JasperFillManager')
+      _JasperFillManager = Rjb.import('net.sf.jasperreports.engine.JasperFillManager')
       if datasource
         return _JasperFillManager.fillReport(@object_file.to_s, params)
       else
-        _JREmptyDataSource           = Rjb::import('net.sf.jasperreports.engine.JREmptyDataSource')
+        _JREmptyDataSource = Rjb.import('net.sf.jasperreports.engine.JREmptyDataSource')
         return _JasperFillManager.fillReport(@object_file.to_s, params, _JREmptyDataSource.new)
       end
     end
-    
 
     # Returns the value without conversion when it's converted to Java Types.
     # When isn't a Rjb class, returns a Java String of it.
@@ -209,10 +212,8 @@ module Beardley
       if param.class.parent == Rjb
         param
       else
-        Rjb::import('java.lang.String').new(param.to_s)
+        Rjb.import('java.lang.String').new(param.to_s)
       end
     end
-
   end
-
 end

data/lib/beardley/version.rb

@@ -1,10 +1,10 @@
 module Beardley
   module VERSION
     MAJOR = 1
-    MINOR = 3
-    PATCH = 0
+    MINOR = 4
+    PATCH = 1
     PRE = nil
-    
-    STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
+
+    STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beardley
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Brice Texier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2017-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rjb
@@ -94,6 +94,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1'
 description: Generate reports using JasperReports reporting tool
 email: burisu@oneiros.fr
 executables: []
@@ -133,9 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: JasperReports integration
 test_files: []
-has_rdoc: