easy_reports 0.0.25 → 0.0.26

data/config/initializers/simple_form.rb

@@ -0,0 +1,145 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  # Wrappers are used by the form builder to generate a
+  # complete input. You can remove any component from the
+  # wrapper, change the order or even add your own to the
+  # stack. The options given below are used to wrap the
+  # whole input.
+  config.wrappers :default, class: :input,
+    hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+    ## Extensions enabled by default
+    # Any of these extensions can be disabled for a
+    # given input by passing: `f.input EXTENSION_NAME => false`.
+    # You can make any of these extensions optional by
+    # renaming `b.use` to `b.optional`.
+
+    # Determines whether to use HTML5 (:email, :url, ...)
+    # and required attributes
+    b.use :html5
+
+    # Calculates placeholders automatically from I18n
+    # You can also pass a string as f.input placeholder: "Placeholder"
+    b.use :placeholder
+
+    ## Optional extensions
+    # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup`
+    # to the input. If so, they will retrieve the values from the model
+    # if any exists. If you want to enable the lookup for any of those
+    # extensions by default, you can change `b.optional` to `b.use`.
+
+    # Calculates maxlength from length validations for string inputs
+    b.optional :maxlength
+
+    # Calculates pattern from format validations for string inputs
+    b.optional :pattern
+
+    # Calculates min and max from length validations for numeric inputs
+    b.optional :min_max
+
+    # Calculates readonly automatically from readonly attributes
+    b.optional :readonly
+
+    ## Inputs
+    b.use :label_input
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
+  end
+
+  # The default wrapper to be used by the FormBuilder.
+  config.default_wrapper = :default
+
+  # Define the way to render check boxes / radio buttons with labels.
+  # Defaults to :nested for bootstrap config.
+  #   inline: input + label
+  #   nested: label > input
+  config.boolean_style = :nested
+
+  # Default class for buttons
+  config.button_class = 'btn'
+
+  # Method used to tidy up errors. Specify any Rails Array method.
+  # :first lists the first message for each field.
+  # Use :to_sentence to list all errors for each field.
+  # config.error_method = :first
+
+  # Default tag used for error notification helper.
+  config.error_notification_tag = :div
+
+  # CSS class to add for error notification helper.
+  config.error_notification_class = 'alert alert-error'
+
+  # ID to add for error notification helper.
+  # config.error_notification_id = nil
+
+  # Series of attempts to detect a default label method for collection.
+  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
+
+  # Series of attempts to detect a default value method for collection.
+  # config.collection_value_methods = [ :id, :to_s ]
+
+  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
+  # config.collection_wrapper_tag = nil
+
+  # You can define the class to use on all collection wrappers. Defaulting to none.
+  # config.collection_wrapper_class = nil
+
+  # You can wrap each item in a collection of radio/check boxes with a tag,
+  # defaulting to :span. Please note that when using :boolean_style = :nested,
+  # SimpleForm will force this option to be a label.
+  # config.item_wrapper_tag = :span
+
+  # You can define a class to use in all item wrappers. Defaulting to none.
+  # config.item_wrapper_class = nil
+
+  # How the label text should be generated altogether with the required text.
+  # config.label_text = lambda { |label, required| "#{required} #{label}" }
+
+  # You can define the class to use on all labels. Default is nil.
+  config.label_class = 'control-label'
+
+  # You can define the class to use on all forms. Default is simple_form.
+  # config.form_class = :simple_form
+
+  # You can define which elements should obtain additional classes
+  # config.generate_additional_classes_for = [:wrapper, :label, :input]
+
+  # Whether attributes are required by default (or not). Default is true.
+  # config.required_by_default = true
+
+  # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+  # These validations are enabled in SimpleForm's internal config but disabled by default
+  # in this configuration, which is recommended due to some quirks from different browsers.
+  # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+  # change this configuration to true.
+  config.browser_validations = false
+
+  # Collection of methods to detect if a file type was given.
+  # config.file_methods = [ :mounted_as, :file?, :public_filename ]
+
+  # Custom mappings for input types. This should be a hash containing a regexp
+  # to match as key, and the input type that will be used when the field name
+  # matches the regexp as value.
+  # config.input_mappings = { /count/ => :integer }
+
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  # config.wrapper_mappings = { string: :prepend }
+
+  # Default priority for time_zone inputs.
+  # config.time_zone_priority = nil
+
+  # Default priority for country inputs.
+  # config.country_priority = nil
+
+  # When false, do not use translations for labels.
+  # config.translate_labels = true
+
+  # Automatically discover new inputs in Rails' autoload path.
+  # config.inputs_discovery = true
+
+  # Cache SimpleForm inputs discovery
+  # config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  # config.input_class = nil
+end

data/config/initializers/simple_form_bootstrap.rb

@@ -0,0 +1,45 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  config.wrappers :bootstrap, tag: 'div', class: 'control-group', error_class: 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper tag: 'div', class: 'controls' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-inline' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :prepend, tag: 'div', class: "control-group", error_class: 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper tag: 'div', class: 'controls' do |input|
+      input.wrapper tag: 'div', class: 'input-prepend' do |prepend|
+        prepend.use :input
+      end
+      input.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+      input.use :error, wrap_with: { tag: 'span', class: 'help-inline' }
+    end
+  end
+
+  config.wrappers :append, tag: 'div', class: "control-group", error_class: 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.wrapper tag: 'div', class: 'controls' do |input|
+      input.wrapper tag: 'div', class: 'input-append' do |append|
+        append.use :input
+      end
+      input.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+      input.use :error, wrap_with: { tag: 'span', class: 'help-inline' }
+    end
+  end
+
+  # Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
+  # Check the Bootstrap docs (http://twitter.github.com/bootstrap)
+  # to learn about the different styles for forms and inputs,
+  # buttons and other elements.
+  config.default_wrapper = :bootstrap
+end

data/config/locales/simple_form.en.yml

@@ -0,0 +1,26 @@
+en:
+  simple_form:
+    "yes": 'Yes'
+    "no": 'No'
+    required:
+      text: 'required'
+      mark: '*'
+      # You can uncomment the line below if you need to overwrite the whole required html.
+      # When using html, text and mark won't be used.
+      # html: '<abbr title="required">*</abbr>'
+    error_notification:
+      default_message: "Please review the problems below:"
+    # Labels and hints examples
+    # labels:
+    #   defaults:
+    #     password: 'Password'
+    #   user:
+    #     new:
+    #       email: 'E-mail to sign in.'
+    #     edit:
+    #       email: 'E-mail.'
+    # hints:
+    #   defaults:
+    #     username: 'User name to sign in.'
+    #     password: 'No special characters, please.'
+

data/config/routes.rb

@@ -2,7 +2,7 @@ EasyReports::Engine.routes.draw do
 
   root to: 'dashboard#show'
   get 'dashboard', to: 'dashboard#show', as: 'dashboard'
-  resource :report
+  resources :reports
 
-  resources :database_configs
+  resources :databases
 end

data/db/migrate/{20141213173509_create_easy_reports_database_configs.rb → 20141213173509_create_easy_reports_databases.rb}

@@ -1,6 +1,6 @@
-class CreateEasyReportsDatabaseConfigs < ActiveRecord::Migration
+class CreateEasyReportsDatabases < ActiveRecord::Migration
   def change
-    create_table :easy_reports_database_configs do |t|
+    create_table :easy_reports_databases do |t|
       t.string :adapter
       t.string :encoding
       t.integer :pool
@@ -8,7 +8,7 @@ class CreateEasyReportsDatabaseConfigs < ActiveRecord::Migration
       t.string :password
       t.string :host
       t.integer :port
-      t.string :database_name
+      t.string :name
 
       t.timestamps
     end

data/db/migrate/20150131195101_add_config_id_to_reports.rb

@@ -0,0 +1,5 @@
+class AddConfigIdToReports < ActiveRecord::Migration
+  def change
+    add_column :easy_reports_reports, :database_id, :integer
+  end
+end

data/easy_reports.gemspec

@@ -25,12 +25,16 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_dependency 'slim'
+
+  spec.add_dependency 'backbone-rails'
+  spec.add_dependency 'bootstrap-select-rails'
+  spec.add_dependency 'jquery-rails'
+  spec.add_dependency 'less-rails'
   spec.add_dependency 'pg'
+  spec.add_dependency 'sequel'
+  spec.add_dependency 'simple_form'
+  # spec.add_dependency 'skim'
+  spec.add_dependency 'slim-rails'
   spec.add_dependency 'therubyracer'
-  spec.add_dependency 'less-rails'
-  spec.add_dependency 'jquery-rails'
   spec.add_dependency 'twitter-bootstrap-rails'
-  spec.add_dependency 'bootstrap-select-rails'
-  spec.add_dependency 'sequel'
 end

data/lib/easy_reports.rb

@@ -1,13 +1,16 @@
 require 'easy_reports/engine'
 require 'easy_reports/version'
-require 'sequel'
+
+require 'bootstrap-select-rails'
+require 'backbone-rails'
+require 'jquery-rails'
+require 'less-rails'
 require 'pg'
+require 'sequel'
+require 'slim'
+require 'simple_form'
 require 'therubyracer'
-require 'less-rails'
-require 'jquery-rails'
 require 'twitter-bootstrap-rails'
-require 'bootstrap-select-rails'
-require 'slim'
 
 module EasyReports
 end

data/lib/easy_reports/version.rb

@@ -1,3 +1,3 @@
 module EasyReports
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

data/lib/templates/erb/scaffold/_form.html.erb

@@ -0,0 +1,13 @@
+<%%= simple_form_for(@<%= singular_table_name %>) do |f| %>
+  <%%= f.error_notification %>
+
+  <div class="form-inputs">
+  <%- attributes.each do |attribute| -%>
+    <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
+  <%- end -%>
+  </div>
+
+  <div class="form-actions">
+    <%%= f.button :submit %>
+  </div>
+<%% end %>

data/test/dummy/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: ../..
   specs:
-    easy_reports (0.0.23)
+    easy_reports (0.0.25)
       bootstrap-select-rails
       jquery-rails
       less-rails
       pg
       rails (~> 4.1.8)
       sequel
+      simple_form
       slim
       therubyracer
       twitter-bootstrap-rails
@@ -88,6 +89,9 @@ GEM
     rake (10.4.2)
     ref (1.0.5)
     sequel (4.18.0)
+    simple_form (3.0.2)
+      actionpack (~> 4.0)
+      activemodel (~> 4.0)
     slim (3.0.1)
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)

data/test/dummy/db/migrate/{20141214161417_create_easy_reports_reports.easy_reports.rb → 20150131203555_create_easy_reports_reports.easy_reports.rb}

@@ -1,4 +1,4 @@
-# This migration comes from easy_reports (originally 20141207141745)
+# This migration comes from easy_reports (originally 20141207141745)
 class CreateEasyReportsReports < ActiveRecord::Migration
   def change
     create_table :easy_reports_reports do |t|

data/test/dummy/db/migrate/{20141214161418_create_easy_reports_database_configs.easy_reports.rb → 20150131203556_create_easy_reports_databases.easy_reports.rb}

@@ -1,7 +1,7 @@
-# This migration comes from easy_reports (originally 20141213173509)
-class CreateEasyReportsDatabaseConfigs < ActiveRecord::Migration
+# This migration comes from easy_reports (originally 20141213173509)
+class CreateEasyReportsDatabases < ActiveRecord::Migration
   def change
-    create_table :easy_reports_database_configs do |t|
+    create_table :easy_reports_databases do |t|
       t.string :adapter
       t.string :encoding
       t.integer :pool
@@ -9,7 +9,7 @@ class CreateEasyReportsDatabaseConfigs < ActiveRecord::Migration
       t.string :password
       t.string :host
       t.integer :port
-      t.string :database_name
+      t.string :name
 
       t.timestamps
     end

data/test/dummy/db/migrate/20150131203557_add_config_id_to_reports.easy_reports.rb

@@ -0,0 +1,6 @@
+# This migration comes from easy_reports (originally 20150131195101)
+class AddConfigIdToReports < ActiveRecord::Migration
+  def change
+    add_column :easy_reports_reports, :database_id, :integer
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,9 +11,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141214161418) do
+ActiveRecord::Schema.define(version: 20150131203557) do
 
-  create_table "easy_reports_database_configs", force: true do |t|
+  create_table "easy_reports_databases", force: true do |t|
     t.string   "adapter"
     t.string   "encoding"
     t.integer  "pool"
@@ -21,7 +21,7 @@ ActiveRecord::Schema.define(version: 20141214161418) do
     t.string   "password"
     t.string   "host"
     t.integer  "port"
-    t.string   "database_name"
+    t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -31,6 +31,7 @@ ActiveRecord::Schema.define(version: 20141214161418) do
     t.text     "description"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "database_id"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_reports
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Davydenkov Mihail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: slim
+  name: backbone-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: bootstrap-select-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: therubyracer
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: twitter-bootstrap-rails
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-select-rails
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: slim-rails
+  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'
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  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'
+- !ruby/object:Gem::Dependency
+  name: twitter-bootstrap-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -187,25 +215,25 @@ files:
 - app/assets/stylesheets/easy_reports/application.css
 - app/assets/stylesheets/easy_reports/bootstrap_and_overrides.css.less
 - app/assets/stylesheets/easy_reports/dashboard/dashboard_content.css
-- app/assets/stylesheets/easy_reports/dashboard/sidebar.css
 - app/assets/stylesheets/easy_reports/database_configs.css
 - app/assets/stylesheets/easy_reports/reports.css
 - app/controllers/easy_reports/application_controller.rb
 - app/controllers/easy_reports/dashboard_controller.rb
-- app/controllers/easy_reports/database_configs_controller.rb
+- app/controllers/easy_reports/databases_controller.rb
 - app/controllers/easy_reports/reports_controller.rb
+- app/forms/easy_reports/report_form.rb
 - app/helpers/easy_reports/application_helper.rb
-- app/helpers/easy_reports/database_configs_helper.rb
+- app/helpers/easy_reports/databases_helper.rb
 - app/helpers/easy_reports/reports_helper.rb
-- app/models/easy_reports/database_config.rb
+- app/models/easy_reports/database.rb
 - app/models/easy_reports/report.rb
 - app/services/easy_reports/database_mediator.rb
 - app/views/easy_reports/dashboard/show.html.slim
-- 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
-- app/views/easy_reports/database_configs/new.html.slim
-- app/views/easy_reports/database_configs/show.html.slim
+- app/views/easy_reports/databases/_form.html.slim
+- app/views/easy_reports/databases/edit.html.slim
+- app/views/easy_reports/databases/index.html.slim
+- app/views/easy_reports/databases/new.html.slim
+- app/views/easy_reports/databases/show.html.slim
 - app/views/easy_reports/reports/_form.html.slim
 - app/views/easy_reports/reports/edit.html.slim
 - app/views/easy_reports/reports/index.html.slim
@@ -213,18 +241,21 @@ files:
 - app/views/easy_reports/reports/show.html.slim
 - app/views/layouts/easy_reports/application.html.slim
 - app/views/shared/_header.html.slim
-- app/views/shared/_sidebar.html.slim
 - bin/rails
+- config/initializers/simple_form.rb
+- config/initializers/simple_form_bootstrap.rb
 - config/locales/en.bootstrap.yml
+- config/locales/simple_form.en.yml
 - config/routes.rb
 - db/migrate/20141207141745_create_easy_reports_reports.rb
-- db/migrate/20141213173509_create_easy_reports_database_configs.rb
+- db/migrate/20141213173509_create_easy_reports_databases.rb
+- db/migrate/20150131195101_add_config_id_to_reports.rb
 - easy_reports.gemspec
 - lib/easy_reports.rb
 - lib/easy_reports/engine.rb
 - lib/easy_reports/version.rb
 - lib/tasks/easy_reports_tasks.rake
-- test/controllers/easy_reports/database_configs_controller_test.rb
+- lib/templates/erb/scaffold/_form.html.erb
 - test/controllers/easy_reports/reports_controller_test.rb
 - test/dummy/Gemfile
 - test/dummy/Gemfile.lock
@@ -264,8 +295,9 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20141214161417_create_easy_reports_reports.easy_reports.rb
-- test/dummy/db/migrate/20141214161418_create_easy_reports_database_configs.easy_reports.rb
+- test/dummy/db/migrate/20150131203555_create_easy_reports_reports.easy_reports.rb
+- test/dummy/db/migrate/20150131203556_create_easy_reports_databases.easy_reports.rb
+- test/dummy/db/migrate/20150131203557_add_config_id_to_reports.easy_reports.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep
@@ -304,7 +336,6 @@ signing_key:
 specification_version: 4
 summary: Add reports dashboard in your rails app
 test_files:
-- test/controllers/easy_reports/database_configs_controller_test.rb
 - test/controllers/easy_reports/reports_controller_test.rb
 - test/dummy/Gemfile
 - test/dummy/Gemfile.lock
@@ -344,8 +375,9 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20141214161417_create_easy_reports_reports.easy_reports.rb
-- test/dummy/db/migrate/20141214161418_create_easy_reports_database_configs.easy_reports.rb
+- test/dummy/db/migrate/20150131203555_create_easy_reports_reports.easy_reports.rb
+- test/dummy/db/migrate/20150131203556_create_easy_reports_databases.easy_reports.rb
+- test/dummy/db/migrate/20150131203557_add_config_id_to_reports.easy_reports.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.keep
 - test/dummy/log/.keep