easy_reports 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d26f9e3ea77696746e0ec1af155e7128c26ea5cd
-  data.tar.gz: 8654c7e4aaf941c29c194285474f22333adcb9db
+  metadata.gz: 746d45a01ec80bcf9507b683b27cb6211be5d688
+  data.tar.gz: 13c690001188fa46cf8153f4d0f48a7aa5812f9c
 SHA512:
-  metadata.gz: 8c4b9547a315e013254e60516f6e549ae2126b6ec3734208ba430e59f2d9d770e64e817413bf87e2dc4b4586e3f882c024ac5712cd42c79b2b05e278326d1a2c
-  data.tar.gz: c99a030ce9eec483dccdfd39c0ac609d9d1af385255299d43d515fe65f37e444d2135a65dcb1960d7b1d9f293430ed9865b7bd4600927eed794fda76c7d24309
+  metadata.gz: 9e5bc837d0399f510324485ad5e83ee39fa982452d0e2ab474770c82c27d59c5f9b8269d3621af1e712cee6ec92d0d1fb47be3e63a1838b5e8a750fedd6e90c8
+  data.tar.gz: 36263b604e022d66262232ac81ff1e5cea544fe2cbc4f46ebbda132e2b8a913811a277ce96925ed34e02e29701fa06deaae63df8b2371d3cb54e855647a6e4bc

data/app/assets/stylesheets/easy_reports/dashboard/dashboard_content.css

@@ -1,9 +1,3 @@
-/*!
- * Start Bootstrap - SB Admin 2 Bootstrap Admin Theme (http://startbootstrap.com)
- * Code licensed under the Apache License v2.0.
- * For details, see http://www.apache.org/licenses/LICENSE-2.0.
- */
-
 body {
     background-color: #f8f8f8;
 }
@@ -18,13 +12,8 @@ body {
     background-color: #fff;
 }
 
-@media(min-width:768px) {
-    #page-wrapper {
-        position: inherit;
-        margin: 0 0 0 250px;
-        padding: 0 30px;
-        border-left: 1px solid #e7e7e7;
-    }
+.navbar.navbar-default {
+  margin-bottom: 0;
 }
 
 .navbar-top-links {

data/app/controllers/easy_reports/databases_controller.rb

@@ -0,0 +1,53 @@
+require_dependency "easy_reports/application_controller"
+
+module EasyReports
+  class DatabasesController < ApplicationController
+    before_action :set_database, only: [:show, :edit, :update, :destroy]
+
+    def index
+      @databases = Database.all
+    end
+
+    def show
+    end
+
+    def new
+      @database = Database.new
+    end
+
+    def edit
+    end
+
+    def create
+      @database = Database.new(database_params)
+
+      if @database.save
+        redirect_to @database, notice: 'Database was successfully created.'
+      else
+        render :new
+      end
+    end
+
+    def update
+      if @database.update(database_params)
+        redirect_to @database, notice: 'Database was successfully updated.'
+      else
+        render :edit
+      end
+    end
+
+    def destroy
+      @database.destroy
+      redirect_to databases_url, notice: 'Database was successfully destroyed.'
+    end
+
+    private
+      def set_database
+        @database = Database.find(params[:id])
+      end
+
+      def database_params
+        params.require(:database).permit(:adapter, :encoding, :pool, :username, :password, :host, :name, :port)
+      end
+  end
+end

data/app/controllers/easy_reports/reports_controller.rb

@@ -11,26 +11,27 @@ module EasyReports
       @table_list = database_mediator.tables
     end
 
-    def show
-    end
-
     def new
-      @report = Report.new
-    end
-
-    def edit
+      @report_form = ReportForm.new
     end
 
     def create
-      @report = Report.new(report_params)
+      @report_form = ReportForm.new(report_params)
 
-      if @report.save
-        redirect_to @report, notice: 'Report was successfully created.'
+      if @report_form.save
+        redirect_to @report_form, notice: 'Report was successfully created.'
       else
         render :new
       end
     end
 
+
+    def show
+    end
+
+    def edit
+    end
+
     def update
       if @report.update(report_params)
         redirect_to @report, notice: 'Report was successfully updated.'

data/app/forms/easy_reports/report_form.rb

@@ -0,0 +1,22 @@
+module EasyReports
+  class ReportForm
+    include ActiveModel::Model
+
+    attr_accessor :report
+
+    delegate :database,
+             :title,
+             :description,
+      to: :report
+
+
+    def initialize
+      @report = Report.new
+      # @mediator = EasyReports::DatabaseMediator.new(params)
+    end
+
+    def database_list
+      EasyReports::Database.all
+    end
+  end
+end

data/app/helpers/easy_reports/databases_helper.rb

@@ -0,0 +1,4 @@
+module EasyReports
+  module DatabasesHelper
+  end
+end

data/app/models/easy_reports/database.rb

@@ -0,0 +1,11 @@
+module EasyReports
+  class Database < ActiveRecord::Base
+
+    has_many :reports
+
+    def to_s
+      name
+    end
+
+  end
+end

data/app/models/easy_reports/report.rb

@@ -1,4 +1,6 @@
 module EasyReports
   class Report < ActiveRecord::Base
+
+    belongs_to :database
   end
 end

data/app/services/easy_reports/database_mediator.rb

@@ -2,35 +2,34 @@ module EasyReports
   class DatabaseMediator
     class DatabaseNotFoundError < StandardError; end
 
-    attr_reader :db, :db_config
+    attr_reader :connection, :db
 
-    delegate :adapter, :username, :password, :host, :port, :database_name,
-          to: :db_config
+    delegate :adapter, :username, :password, :host, :port, :name,
+      to: :db
 
-    def initialize
-      @db_config = load_database_config
-      @db = establish_connection
+    def initialize(database_id)
+      @db = set_database(database_id)
+      @connection = establish_connection
     rescue => e
       Rails.logger.info "#{e.message}"
       raise DatabaseNotFoundError
     end
 
     def tables
-      db.tables
+      connection.tables
     end
 
     private
 
-    def load_database_config
-      EasyReports::DatabaseConfig.find(params[:db_id])
+    def set_database(id)
+      EasyReports::Database.find(id)
     end
 
     def establish_connection
       ::Sequel.connect(
-        "#{adapter}://#{username}:#{password}@#{host}:#{port}/#{database_name}",
-        :max_connections => db_config.pool,
+        "#{adapter}://#{username}:#{password}@#{host}:#{port}/#{name}",
+        :max_connections => db.pool,
         :logger => Logger.new('log/db.log'))
     end
-
   end
 end

data/app/views/easy_reports/dashboard/show.html.slim

@@ -1,4 +1,4 @@
-#page-wrapper style=("min-height: 200px;") 
+#page-wrapper style=("min-height: 200px;")
   .row
     .col-lg-12
       h1.page-header Dashboard
@@ -13,13 +13,13 @@
               i.fa.fa-comments.fa-5x
             .col-xs-9.text-right
               .huge 26
-              div New Comments!
-        a href="#" 
-        .panel-footer
-          span.pull-left View Details
-          span.pull-right
-            i.fa.fa-arrow-circle-right
-          .clearfix
+              div View Reports
+        = link_to new_report_path do
+          .panel-footer
+            span.pull-left Create report
+            span.pull-right
+              i.fa.fa-arrow-circle-right
+            .clearfix
     .col-lg-3.col-md-6
       .panel.panel-green
         .panel-heading

data/app/views/easy_reports/{database_configs → databases}/_form.html.slim

@@ -1,9 +1,9 @@
-= form_for @database_config do |f|
-  - if @database_config.errors.any?
+= form_for @database do |f|
+  - if @database.errors.any?
     #error_explanation
-      h2 = "#{pluralize(@database_config.errors.count, "error")} prohibited this database_config from being saved:"
+      h2 = "#{pluralize(@database.errors.count, "error")} prohibited this database from being saved:"
       ul
-        - @database_config.errors.full_messages.each do |message|
+        - @database.errors.full_messages.each do |message|
           li = message
 
   .field
@@ -28,6 +28,6 @@
     = f.label :port
     = f.text_field :port
   .field
-    = f.label :database_name
-    = f.text_field :database_name
+    = f.label :name
+    = f.text_field :name
   .actions = f.submit 'Save'

data/app/views/easy_reports/databases/edit.html.slim

@@ -0,0 +1,8 @@
+h1 Editing database config
+
+== render 'form'
+
+= link_to 'Show', @database
+'|
+= link_to 'Back', databases_path
+

data/app/views/easy_reports/databases/index.html.slim

@@ -0,0 +1,35 @@
+h1 Listing databases
+
+table
+  thead
+    tr
+      th Adapter
+      th Encoding
+      th Pool
+      th Username
+      th Password
+      th Host
+      th Port
+      th Name
+      th
+      th
+      th
+
+  tbody
+    - @databases.each do |database|
+      tr
+        td = database.adapter
+        td = database.encoding
+        td = database.pool
+        td = database.username
+        td = database.password
+        td = database.host
+        td = database.port
+        td = database.name
+        td = link_to 'Show', database
+        td = link_to 'Edit', edit_database_path(database)
+        td = link_to 'Destroy', database, data: {:confirm => 'Are you sure?'}, :method => :delete
+
+br
+
+= link_to 'New Database config', new_database_path

data/app/views/easy_reports/databases/new.html.slim

@@ -0,0 +1,5 @@
+h1 New database_config
+
+== render 'form'
+
+= link_to 'Back', databases_path

data/app/views/easy_reports/databases/show.html.slim

@@ -0,0 +1,27 @@
+p#notice = notice
+
+p
+  strong Adapter:
+  = @database.adapter
+p
+  strong Encoding:
+  = @database.encoding
+p
+  strong Pool:
+  = @database.pool
+p
+  strong Username:
+  = @database.username
+p
+  strong Password:
+  = @database.password
+p
+  strong Host:
+  = @database.host
+p
+  strong Database:
+  = @database.name
+
+= link_to 'Edit', edit_database_path(@database)
+'|
+= link_to 'Back', databases_path

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

@@ -1,17 +1,19 @@
-= form_for @report do |f|
-  - if @report.errors.any?
+= simple_form_for @report_form, url: reports_path, html: { multipart: true } do |f|
+  - if @report_form.errors.any?
     #error_explanation
-      h2 = "#{pluralize(@report.errors.count, "error")} prohibited this report from being saved:"
+      h2 = "#{pluralize(@report_form.errors.count, "error")} prohibited this report from being saved:"
       ul
-        - @report.errors.full_messages.each do |message|
+        - @report_form.errors.full_messages.each do |message|
           li = message
 
-  .field
-    select.selectpicker
-  .field
-    = f.label :title
-    = f.text_field :title
-  .field
-    = f.label :description
-    = f.text_area :description
-  .actions = f.submit 'Save'
+  .form-inputs
+    /* = f.association :database, label: 'database config', input_html: { class: 'selectpicker' } */
+    = f.simple_fields_for :database, @report_form.database do |f_database|
+      = f_database.input :name, as: :select, collection: @report_form.database_list, label: 'Database config', input_html: { class: 'selectpicker' }
+      = f_database.input :name, as: :select, collection: @report_form.database_list, label: 'Database config', input_html: { class: 'selectpicker' }
+    /* = f.input :table_ids, label: 'table list', input_html: { class: 'selectpicker' } */
+    = f.input :title, label: 'title'
+    = f.input :description, as: :text, label: 'description'
+
+  .actions
+    = f.button :submit

data/app/views/layouts/easy_reports/application.html.slim

@@ -7,6 +7,6 @@ html
     = csrf_meta_tags
   body
     = render 'shared/header'
-    = render 'shared/sidebar'
-    = yield
+    .container-fluid
+      = yield
 

data/app/views/shared/_header.html.slim

@@ -2,21 +2,11 @@ nav.navbar.navbar-default
   .container-fluid
     /! Brand and toggle get grouped for better mobile display
     .navbar-header
-      button.navbar-toggle.collapsed data-target="#bs-example-navbar-collapse-1" data-toggle="collapse" type="button" 
-        span.sr-only Toggle navigation
-        span.icon-bar
-        span.icon-bar
-        span.icon-bar
-      a.navbar-brand href="#"  Easy Reports
+      = link_to 'Easy Reports', root_path, class: 'navbar-brand'
+
     /! Collect the nav links, forms, and other content for toggling
-    #bs-example-navbar-collapse-1.collapse.navbar-collapse
+    #easy_reports_navbat.collapse.navbar-collapse
       ul.nav.navbar-nav
-        li.active
-          a href="#" 
-            | Link
-            span.sr-only (current)
-        li
-          a href="#"  Link
         li.dropdown
           a.dropdown-toggle aria-expanded="false" data-toggle="dropdown" href="#" role="button" 
             | Dropdown
@@ -34,10 +24,6 @@ nav.navbar.navbar-default
             li.divider
             li
               a href="#"  One more separated link
-      form.navbar-form.navbar-left role="search" 
-        .form-group
-          input.form-control placeholder="Search" type="text" /
-        button.btn.btn-default type="submit"  Submit
       ul.nav.navbar-nav.navbar-right
         li
           a href="#"  Link
@@ -55,6 +41,3 @@ nav.navbar.navbar-default
             li.divider
             li
               a href="#"  Separated link
-    /! /.navbar-collapse
-  /! /.container-fluid
-