easy_reports 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a302a193c8ff80d4a4ea8642339fb0040731ad4
-  data.tar.gz: 6b18432abc312199315d3e7c88036763e4af93a4
+  metadata.gz: 2a06454a1c40dda15773fbff6ccaded3fb50bda7
+  data.tar.gz: a65e2e88df4ac14a947d4699087cbab9152a21fc
 SHA512:
-  metadata.gz: 169245d4b47377e168ffca34548e6139ecb47698678cd433f147980108fb266c062fe25c3f94cd6237f6cc21d4600b7f2bea685e9c4d813ff4f131a3edb2b531
-  data.tar.gz: e3d3e5efe13017087bf2fc2d32bd34a425bdf8bcabb655cf12928ebe1c49b4e16372b6fc4aead8ac56fbaba3341194d712cc1ddf2e4ff04ff28eb549203cc7e7
+  metadata.gz: 67e0bdb44d5036c23b1dc0853a6d1ad5102b9c4f6ce8ba4b3c6fd0dc624245e164db3abf8391e47574fca8c4395dcb906501eed58edf9a6467374e2bea0df734
+  data.tar.gz: 48ffd8a838edc8cfef7317cb63e183f19fce2a1b75ada83df7a2de06db676e35ca9265e35d223686967aabf300f7ed5d09e3962fa56eb85da63e9a3e15d96409

data/app/controllers/easy_reports/reports_controller.rb

@@ -8,21 +8,8 @@ module EasyReports
       @reports = Report.all
 
       # TODO: remove into service
-      @old_connection = ActiveRecord::Base.connection
-      db_config = EasyReports::DatabaseConfig.last
-
-      ActiveRecord::Base.establish_connection(
-        adapter: db_config.adapter,
-        encoding: db_config.encoding,
-        pool: db_config.pool,
-        username: db_config.username,
-        password: db_config.password,
-        host:     db_config.host,
-        database: db_config.database
-      )
-      @table_list = ActiveRecord::Base.connection.tables
-      ActiveRecord::Base.establish_connection("#{Rails.env}")
-
+      database_mediator = EasyReports::DatabaseMediator.new
+      @table_list = database_mediator.tables
     end
 
     def show

data/app/services/easy_reports/database_mediator.rb

@@ -0,0 +1,18 @@
+module EasyReports
+  class DatabaseMediator
+
+    attr_reader :db
+
+    def initialize
+      db_config = EasyReports::DatabaseConfig.last
+
+      @db = ::Sequel.connect(
+        "#{db_config.adapter}://#{db_config.username}:#{db_config.password}@#{db_config.host}:#{db_config.port}/#{db_config.database}",
+             :max_connections => db_config.pool, :logger => Logger.new('log/db.log'))
+    end
+
+    def tables
+      db.tables
+    end
+  end
+end

data/app/views/easy_reports/database_configs/_form.html.slim

@@ -25,6 +25,9 @@
     = f.label :host
     = f.text_field :host
   .field
-    = f.label :database
-    = f.text_field :database
+    = f.label :port
+    = f.text_field :port
+  .field
+    = f.label :database_name
+    = f.text_field :database_name
   .actions = f.submit 'Save'

data/db/migrate/20141213173509_create_easy_reports_database_configs.rb

@@ -3,11 +3,12 @@ class CreateEasyReportsDatabaseConfigs < ActiveRecord::Migration
     create_table :easy_reports_database_configs do |t|
       t.string :adapter
       t.string :encoding
-      t.string :pool
+      t.integer :pool
       t.string :username
       t.string :password
       t.string :host
-      t.string :database
+      t.integer :port
+      t.string :database_name
 
       t.timestamps
     end

data/lib/easy_reports/version.rb

@@ -1,3 +1,3 @@
 module EasyReports
-  VERSION = "0.0.11"
+  VERSION = "0.0.13"
 end

data/lib/easy_reports.rb

@@ -1,5 +1,7 @@
 require "easy_reports/engine"
 require "easy_reports/version"
+require "sequel"
+DB = Sequel.postgres
 
 module EasyReports
 end

data/test/dummy/Gemfile

@@ -7,5 +7,6 @@ gem 'slim'
 
 gem 'thin'
 gem 'pg'
+gem 'sequel'
 
 # gem "rails"

data/test/dummy/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: ../..
   specs:
-    easy_reports (0.0.10)
+    easy_reports (0.0.11)
+      pg
       rails (~> 4.1.8)
+      sequel
       slim
-      slim-rails
 
 GEM
   remote: https://rubygems.org/
@@ -68,14 +69,10 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
+    sequel (4.17.0)
     slim (2.1.0)
       temple (~> 0.6.9)
       tilt (>= 1.3.3, < 2.1)
-    slim-rails (2.1.5)
-      actionpack (>= 3.0, < 4.2)
-      activesupport (>= 3.0, < 4.2)
-      railties (>= 3.0, < 4.2)
-      slim (~> 2.0)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -103,6 +100,7 @@ PLATFORMS
 DEPENDENCIES
   easy_reports!
   pg
+  sequel
   slim
   sqlite3
   thin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_reports
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Davydenkov Mihail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-13 00:00:00.000000000 Z
+date: 2014-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,6 +123,7 @@ files:
 - app/helpers/easy_reports/reports_helper.rb
 - app/models/easy_reports/database_config.rb
 - app/models/easy_reports/report.rb
+- app/services/easy_reports/database_mediator.rb
 - app/views/easy_reports/database_configs/_form.html.slim
 - app/views/easy_reports/database_configs/edit.html.slim
 - app/views/easy_reports/database_configs/index.html.slim
@@ -180,8 +181,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20141207144158_create_easy_reports_reports.easy_reports.rb
-- test/dummy/db/migrate/20141213190452_create_easy_reports_database_configs.easy_reports.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
@@ -257,8 +256,6 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20141207144158_create_easy_reports_reports.easy_reports.rb
-- test/dummy/db/migrate/20141213190452_create_easy_reports_database_configs.easy_reports.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep

data/test/dummy/db/migrate/20141207144158_create_easy_reports_reports.easy_reports.rb

@@ -1,11 +0,0 @@
-# This migration comes from easy_reports (originally 20141207141745)
-class CreateEasyReportsReports < ActiveRecord::Migration
-  def change
-    create_table :easy_reports_reports do |t|
-      t.string :title
-      t.text :description
-
-      t.timestamps
-    end
-  end
-end

data/test/dummy/db/migrate/20141213190452_create_easy_reports_database_configs.easy_reports.rb

@@ -1,16 +0,0 @@
-# This migration comes from easy_reports (originally 20141213173509)
-class CreateEasyReportsDatabaseConfigs < ActiveRecord::Migration
-  def change
-    create_table :easy_reports_database_configs do |t|
-      t.string :adapter
-      t.string :encoding
-      t.string :pool
-      t.string :username
-      t.string :password
-      t.string :host
-      t.string :database
-
-      t.timestamps
-    end
-  end
-end