beardley 0.5.0 → 0.6.0

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    beardley (0.4.1)
+    beardley (0.5.0)
       beardley-barcode (>= 0.0.1)
       beardley-batik (>= 0.0.0)
       beardley-core (>= 5.0.0)
       beardley-groovy (>= 1.7.5)
-      rjb (= 1.4.6)
+      rjb (>= 1.4.6)
 
 GEM
   remote: https://rubygems.org/
@@ -22,12 +22,12 @@ GEM
       rest-client
       simplecov (>= 0.7)
       thor
-    mime-types (1.23)
-    multi_json (1.7.6)
-    rake (10.0.4)
+    mime-types (1.24)
+    multi_json (1.7.9)
+    rake (10.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rjb (1.4.6)
+    rjb (1.4.8)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)

data/beardley.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency('rjb', '1.4.6')
+  spec.add_dependency('rjb', '>= 1.4.6')
   spec.add_dependency('beardley-core', '>= 5.0.0')
   spec.add_dependency('beardley-groovy', '>= 1.7.5')
   spec.add_dependency('beardley-barcode', '>= 0.0.1')

data/lib/beardley/report.rb

@@ -111,36 +111,53 @@ module Beardley
       load_datasource(datasource)
     end
 
-    # Load parsed XML datasource with java component
-    def load_datasource(datasource = nil)
+
+    # Build the default parameters Hash for printing
+    def prepare_params
       # Converting default report params to java HashMap
-      jasper_params = HashMap.new
+      params = HashMap.new
       Beardley.config[:report_params].each do |k,v|
-        jasper_params.put(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|
-        jasper_params.put(JavaString.new(key.to_s), parameter_value_of(value))
+        params.put(JavaString.new(key.to_s), parameter_value_of(value))
       end
+      
+      return params
+    end
 
-      jasper_print = nil
+    # Load parseable XML datasource with java component
+    def load_datasource(datasource = nil)
+      jasper_params = prepare_params
 
-      # Fill the report
+      # Parse and load XML as datasource 
       if datasource
         input_source = InputSource.new
         input_source.setCharacterStream(StringReader.new(datasource.to_s))
-        data_document = Beardley.with_warnings { JRXmlUtils._invoke('parse', 'Lorg.xml.sax.InputSource;', input_source) }
-        
+        data_document = Beardley.with_warnings do
+          JRXmlUtils._invoke('parse', 'Lorg.xml.sax.InputSource;', input_source)
+        end
         jasper_params.put(JRXPathQueryExecuterFactory.PARAMETER_XML_DATA_DOCUMENT, data_document)
-        jasper_print = JasperFillManager.fillReport(@object_file.to_s, jasper_params)
+      end
+
+      # Build JasperPrint
+      return fill_report(jasper_params, datasource)
+    end
+
+
+    # Fill the report with valid method depending on datasource
+    def fill_report(params, datasource = nil)
+      if datasource
+        return JasperFillManager.fillReport(@object_file.to_s, params)
       else
-        jasper_print = JasperFillManager.fillReport(@object_file.to_s, jasper_params, JREmptyDataSource.new)
+        return JasperFillManager.fillReport(@object_file.to_s, params, JREmptyDataSource.new)
       end
-      return jasper_print
     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.

data/lib/beardley/version.rb

@@ -2,7 +2,7 @@
 module Beardley
   module VERSION
     MAJOR = 0
-    MINOR = 5
+    MINOR = 6
     PATCH = 0
     PRE = nil
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beardley
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.6
 - !ruby/object:Gem::Dependency