birt 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3905ae31d2825e827dbd5782531b828df936781
-  data.tar.gz: 9fb645709376d55d6be68d02331ed575fd1b185f
+  metadata.gz: 73de487306437a5f2436c45ea2eb0b09a14663a1
+  data.tar.gz: c68d43bb533f6f104b0280abfd76d108f2ecfdc9
 SHA512:
-  metadata.gz: 0477ca0ffb713d2695a9b2c2c82b6e3f52da8af37e10615cb3db07257b721b792137697e8ed5b61fb169cfef1b678b34da9384799e730af5f9e380103d0fc641
-  data.tar.gz: 2bf7fb221a9444fed9e60c472fa0eef0c6cd8acbc3f5dde55b0545bec564a742a7c99f6fa8f3609de12b1caa6a738a6b203d3b31704b690fe95267633a21c8c9
+  metadata.gz: 2a015056d3bbd6e78903784641929dd5bce22b214b20895214b6886478ab09e957192e54378eb5b80ac936b617a28c6ad9ae1830a4fc1336073a51962542729b
+  data.tar.gz: 87beae04b1ac18f60bb8f6febf4b9faefb6b751f03403632bbb0c97a429e1b8e838945fcaf164b0ef3648376331653437a2091bb3f4553cd62e09f6e5490717f

data/config/birt.yml

@@ -0,0 +1,9 @@
+default: &default
+  datasource: rptdesign
+  adapter: mysql
+development:
+  <<: *default
+  datasource: rails
+production:
+  <<: *default
+  datasource: rails

data/config/database.yml

@@ -0,0 +1,13 @@
+default: &default
+  adapter: mysql2
+  encoding: utf8
+  pool: 5
+  username: root
+  password: sun
+  host: localhost
+development:
+  <<: *default
+  database: spider
+production:
+  <<: *default
+  database: spider

data/lib/birt/core/data_source.rb

@@ -7,7 +7,7 @@ class Birt::Core::DataSource
   attr_accessor :password
   attr_accessor :database
 
-  def initialize(xml_element)
+  def initialize(xml_element = nil)
     if xml_element
       self.name = xml_element.attribute(:name).value
       self.host = xml_element.get_elements("property[@name='odaURL']")[0].text
@@ -24,4 +24,7 @@ class Birt::Core::DataSource
     @port = port_database[0]
     @database = port_database[1]
   end
-end
+  def set_host(host)
+    @host = host
+  end
+end

data/lib/birt/core/mysql.rb

@@ -1,13 +1,7 @@
 class Birt::Core::Mysql
 
-  def self.client(data_source)
-    @client ||=Mysql2::Client.new(
-        host: data_source.host,
-        port: data_source.port,
-        username: data_source.username,
-        password: data_source.password,
-        database: data_source.database
-    )
+  def self.client(data_source = nil)
+    create_client(choose_data_source(data_source))
   end
 
   def self.query(data_source, query_text)
@@ -16,4 +10,40 @@ class Birt::Core::Mysql
     yield(results) if block_given?
     results
   end
-end
+  def self.create_client(data_source)
+    Mysql2::Client.new(
+        host: data_source.host,
+        port: data_source.port,
+        username: data_source.username,
+        password: data_source.password,
+        database: data_source.database
+    )
+  end
+  def self.rails_data_source
+    config_path = Rails.root ? File.join(Rails.root, "config", "database.yml") : './config/database.yml'
+    database_yml = File.open(config_path)
+    dbconfig = YAML::load(database_yml)
+    dbconfig = dbconfig[Rails.env] if defined? Rails
+    data_source = Birt::Core::DataSource.new do |item|
+      item.set_host dbconfig['host']
+      item.port = dbconfig['port'] ||= 3306
+      item.username = dbconfig['username']
+      item.password = dbconfig['password']
+      item.database = dbconfig['database']
+    end
+    data_source
+  end
+  def self.choose_data_source(data_source = nil)
+    return rails_data_source if data_source.nil?
+    config_path = Rails.root ? File.join(Rails.root, "config", "birt.yml") : './config/birt.yml'
+    if (File.exist?(config_path))
+      config = YAML.load(ERB.new(File.new(config_path).read).result)
+      config = config[Rails.env] if defined? Rails
+    end
+    if "rptdesign" == config["datasource"]
+      data_source
+    else
+      rails_data_source
+    end
+  end
+end

data/lib/birt/core/rpt_design.rb

@@ -40,7 +40,7 @@ class Birt::Core::RptDesign
 
     #数据源
     _root.each_element(xpath = '/report/data-sources/oda-data-source') do |item|
-      p @data_sources[item.attribute(:name).value] = Birt::Core::DataSource.new(item)
+      @data_sources[item.attribute(:name).value] = Birt::Core::DataSource.new(item)
     end
 
     #数据集
@@ -72,4 +72,4 @@ class Birt::Core::RptDesign
     end
   end
 
-end
+end

data/lib/birt/version.rb

@@ -1,5 +1,5 @@
 module Birt
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
   module Core
 
   end

data/lib/birt.rb

@@ -1,11 +1,12 @@
 require "birt/routing"
 require "birt/version"
+require 'rails'
 require "birt/engine"
 require 'rexml/document'
 require 'base64'
 require 'pry'
 require 'mysql2'
-require 'rails'
+
 
 
 %w{ controllers helpers views}.each do |dir|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: birt
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - saxer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.18
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: birt report
 email:
 - 15201280641@qq.com
@@ -114,6 +142,8 @@ files:
 - app/assets/stylesheets/birt/components/loading.scss
 - app/assets/stylesheets/birt/components/table.scss
 - app/views/birt/api/index.json.jbuilder
+- config/birt.yml
+- config/database.yml
 - config/routes.rb
 - lib/app/controllers/birt/api_controller.rb
 - lib/app/helpers/application_helper.rb