birt-api 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6686f23e3e43711c93d69554cb71ab8466086750
-  data.tar.gz: 872258dc8be915bfd1e67bea6fd87c7b1f41b7a9
+  metadata.gz: 1d870b284d3729375d13a7802adb38eb1e5a9895
+  data.tar.gz: 76bffd051b86ee002413ffe23f1c32a676badd76
 SHA512:
-  metadata.gz: 3425dfe1f2a58b96e011bb78e89814384421a274f7c7f17abcaf0ac8f73d5912f4eaf03e321d0c64b5c6f4e5a72bfadd0423150e3b23cbd5800eabaa70915aa3
-  data.tar.gz: c986fcdc9c694b6addcdf5815daaa23f10706ac39517d284051fc5554d4eb52543f0a99df230e77be36ecf0a06b786f9446a530999465dfd2efc247b13846011
+  metadata.gz: 7ee7a62728c8015dab4658d0795677f5de99b32c2faeee1d056ddae4271f6ee49c1922d758ad702d946c5cec3b6d31dc2c9c290256db81917af40ff2c8d48a4a
+  data.tar.gz: 3d3653fa5e09021fba78ed5f95ed3c62d6f2d2e1a35f2efd06762871d55ee0b7ca1c016506a25c3f1e4534b3064a6b8813847cbb78012f301f32bd5042b0108d

data/Gemfile

@@ -12,12 +12,13 @@ gem 'turbolinks'
 gem 'jbuilder', '~> 2.0'
 gem 'sdoc', '~> 0.4.0', group: :doc
 
-gem 'birt-core', '~> 0.1.2'
+gem 'birt-core', '~> 0.1.4'
 
 
 group :development, :test do
   gem 'byebug'
-
+  gem 'pry'
+  gem 'pry-nav'
   gem 'web-console', '~> 2.0'
 
   gem 'spring'

data/app/controllers/birt/api_controller.rb

@@ -5,8 +5,9 @@ class Birt::ApiController < ActionController::Base
 
     rpt_design_path = params[:_report] || '003.rptdesign'
     @rpt_design = Birt::Core::RptDesign.new("./birt/reports/#{rpt_design_path}")
-    @rpt_design.parse_rpt
 
-    render json: @rpt_design
+    #数据解析
+    @rpt_design.parse_rpt
+    @rpt_design.data_sets.values.each { |data_set| data_set.data_set_result }
   end
 end

data/app/helpers/birt/api_helper.rb

@@ -1,3 +1,14 @@
 module Birt::ApiHelper
 
+  def parse_table_header(table_header)
+    header = []
+    table_header.rows.each_with_index { |row, index|
+      header << []
+      row.row_cells.each { |row_cell|
+        header[index] << row_cell.cell_labels[0].text_properties[0].text
+      }
+    }
+
+    header
+  end
 end

data/app/views/birt/api/index.json.jbuilder

@@ -0,0 +1,6 @@
+json.rpt_design do
+  json.tables @rpt_design.reports[:tables].values do |table|
+    json.id table.id
+    json.header parse_table_header(table.header)
+  end
+end

data/birt-api.gemspec

@@ -6,7 +6,7 @@ require 'birt/api/version'
 Gem::Specification.new do |spec|
   spec.name          = "birt-api"
   spec.version       = Birt::Api::VERSION
-  spec.authors       = ["Stream"]
+  spec.authors       = ["Saxer"]
   spec.email         = ["15201280641@qq.com"]
 
   spec.summary       = %q{birt api}
@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/mumaoxi/birt-api"
   spec.license      = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(public|test|spec|features|birt|app/assets)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(public|test|spec|features|birt|app/assets|lib/tasks)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["app","lib"]
@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "birt-core", ">= 0.1.2"
+  spec.add_development_dependency "birt-core", "~> 0.1.4"
 end

data/lib/birt/api/version.rb

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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: birt-api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
-- Stream
+- Saxer
 autorequire: 
 bindir: exe
 cert_chain: []
@@ -42,16 +42,16 @@ dependencies:
   name: birt-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
 description: birt report data api
 email:
 - 15201280641@qq.com
@@ -68,8 +68,7 @@ files:
 - Rakefile
 - app/controllers/birt/api_controller.rb
 - app/helpers/birt/api_helper.rb
-- app/views/birt/api/application.html.erb
-- app/views/birt/api/index.html.erb
+- app/views/birt/api/index.json.jbuilder
 - bin/bundle
 - bin/console
 - bin/rails
@@ -98,7 +97,6 @@ files:
 - lib/assets/.keep
 - lib/birt/api.rb
 - lib/birt/api/version.rb
-- lib/tasks/.keep
 homepage: https://github.com/mumaoxi/birt-api
 licenses:
 - MIT
@@ -121,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: birt api

data/app/views/birt/api/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>BirtApi</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/app/views/birt/api/index.html.erb

@@ -1,4 +0,0 @@
-Hello
-
-
-<%= @rpt_design.data_sets %>