birt-core 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 299fc1930ccff07a320781bc0d9696ae7114b574
-  data.tar.gz: 9cdec5daf262906130b29362d38cd4ad226f17f0
+  metadata.gz: 50901c67b2049adcbed2c955c1d756cccb1b1867
+  data.tar.gz: bc6cda56190cbb2494236835826fbdff6d6ca1ac
 SHA512:
-  metadata.gz: 552bce0244578656a036a20b2a89bb9f4283b344b812784fb0e0318ccb9d5fb0589a64ec43c2ed46381048ba110bb96cc35d492af11740f4498f9976bdfd42fe
-  data.tar.gz: d976c468c55b9b79ffbd3bc82b6fa3aff68232cd788fe519401b067eb51f7081a992a7ac065ad4e749ad0e982a30f820457872cc55e7837041984fc82a91991a
+  metadata.gz: 6118e7d94219701603ca967e3ceda6d757fb6599bbb2af0812a98e08d20cab698abc22695c2234349bc9661d337a16d84be1a80ad9c5649226b36211608c495a
+  data.tar.gz: 5f5317d5ca3e3d5bb8ce6801742862b5cd849e43bd58b08c430f963770f6096b79154714c86965be504728bd99f402e4731a180dde148e599d3529be221a254c

data/lib/birt/core/data_set.rb

@@ -3,15 +3,15 @@ class Birt::Core::DataSet
   attr_accessor :name
   attr_accessor :columns
   attr_accessor :query_text
-  attr_accessor :query_result
+  attr_accessor :data_set_result
   attr_accessor :data_source
 
   def initialize(xml_element)
-    self.columns = Array.new
+    @columns = []
     if xml_element
       self.name = xml_element.attribute(:name).value
       xml_element.get_elements("list-property[@name='resultSet']/structure/property[@name='name']").each do |column|
-        self.columns.push column.text
+        self.columns << column.text
       end
       self.query_text = xml_element.get_elements("xml-property[@name='queryText']")[0].text.gsub("\n", ' ')
     end
@@ -20,8 +20,12 @@ class Birt::Core::DataSet
 
   #开始查询
   def query
-    Birt::Core::Mysql.query(self.data_source, query_text).each do |row|
-        p row
-    end
+    Birt::Core::Mysql.query(self.data_source, query_text)
+  end
+
+  #查询结果
+  def data_set_result
+    @data_set_result ||= Birt::Core::DataSetResult.new(self.query)
   end
+
 end

data/lib/birt/core/data_set_result.rb

@@ -0,0 +1,20 @@
+class Birt::Core::DataSetResult
+
+  attr_accessor :rows
+  attr_accessor :row_headers
+  attr_accessor :columns
+  attr_accessor :column_headers
+
+  def initialize(data_result)
+    @rows, @row_headers, @columns, @column_headers= [], [], [], []
+
+    data_result.each do |row|
+      @column_headers = row.keys.inject([]) { |acc, (k,v)| acc<<k.to_s; acc } if column_headers.empty?
+      @row_headers << row.values[0]
+      @rows << row.values
+      row.values.each_with_index { |v, i| @columns[i]||=[]; @columns[i]<<v; }
+    end if data_result
+
+  end
+
+end

data/lib/birt/core/rpt_design.rb

@@ -31,13 +31,10 @@ class Birt::Core::RptDesign
 
     #报表
     _root.each_element(xpath='/report/body/table') do |item|
-       self.reports[item.attribute(:id).value] = Birt::Core::TableReport.new(item) do |report|
+       self.reports["#{item.attribute(:id).value}_table"] = Birt::Core::TableReport.new(item) do |report|
         report.data_set = self.data_sets[item.get_elements("property[@name='dataSet']")[0].text]
       end
     end
-
-    p self.reports
-
   end
 
 end

data/lib/birt/core/version.rb

@@ -1,5 +1,5 @@
 module Birt
   module Core
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birt-core
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Stream
@@ -86,6 +86,7 @@ files:
 - birt-core.gemspec
 - lib/birt/core.rb
 - lib/birt/core/data_set.rb
+- lib/birt/core/data_set_result.rb
 - lib/birt/core/data_source.rb
 - lib/birt/core/mysql.rb
 - lib/birt/core/report/base_report.rb