rails_db 1.6.0 → 2.0.0

data/lib/rails_db/table.rb

@@ -55,20 +55,13 @@ module RailsDb
           self.table_name = table_name
           self.inheritance_column = nil
         end
-        temp  = klass.count # verify that it works, if not load other
+        klass.count # verify that it works, if not load other, hack
       rescue
         klass = ActiveRecord::Base.descendants.detect { |c| c.table_name == table_name }
       end
 
       klass.class_eval(&block) if block_given?
 
-      if Rails::VERSION::MAJOR == 3
-        klass.class_eval do
-          klass.columns.each do |e|
-            attr_accessor e.name
-          end
-        end
-      end
       klass
     end
 

data/lib/rails_db/version.rb

@@ -1,3 +1,3 @@
 module RailsDb
-  VERSION = "1.6.0"
+  VERSION = "2.0.0"
 end

data/rails_db.gemspec

@@ -17,16 +17,12 @@ Gem::Specification.new do |s|
 
   s.executables   = ["railsdb", "rails_db", 'runsql']
 
-  s.add_dependency 'rails', ">= 3.1.0"
+  s.add_dependency 'rails', ">= 5.0.0"
   s.add_dependency 'codemirror-rails'
   s.add_dependency 'terminal-table'
   s.add_dependency 'simple_form'
   s.add_dependency 'ransack'
-  if RUBY_VERSION == '1.9.3'
-    s.add_dependency 'kaminari', '< 1.0.0'
-  else
-    s.add_dependency 'kaminari'
-  end
+  s.add_dependency 'kaminari'
 
   s.add_development_dependency "launchy"
   s.add_development_dependency "sqlite3"

data/test/dashboard_controller_test.rb

@@ -64,26 +64,26 @@ class DashboardControllerTest < ActionDispatch::IntegrationTest
     post '/rails/db/sql-xls.xls?sql=select+%2A+from+users+limit+10'
     assert_equal 200, status
 
-    xhr :get, '/rails/db/tables/users/edit?pk_id=' + edit_user.id.to_s
+    get '/rails/db/tables/users/edit?pk_id=' + edit_user.id.to_s, xhr: true
     assert_equal 200, status
 
-    xhr :put, '/rails/db/tables/users/update?pk_id=' + edit_user.id.to_s, {record: { name: 'JOHN' }}
+    put '/rails/db/tables/users/update?pk_id=' + edit_user.id.to_s, {xhr: true, params: { record: { name: 'JOHN' }}}
     assert_equal 200, status
     edit_user.reload
     assert_equal 'JOHN', edit_user.name
 
-    xhr :get, '/rails/db/tables/users/new'
+    get '/rails/db/tables/users/new', xhr: true
     assert_equal 200, status
 
     assert_equal 2, User.count
-    xhr :post, '/rails/db/tables/users/create', {record: { name: 'XXX' }}
+    post '/rails/db/tables/users/create', {xhr: true, params: { record: { name: 'XXX' }} }
     assert_equal 200, status
     assert_equal 3, User.count
 
-    xhr :get, '/rails/db/tables/users/edit?pk_id=' + customer.id.to_s
+    get '/rails/db/tables/users/edit?pk_id=' + customer.id.to_s, xhr: true
     assert_equal 200, status
 
-    xhr :put, '/rails/db/tables/users/update?pk_id=' + customer.id.to_s, {record: { name: 'STI' }}
+    put '/rails/db/tables/users/update?pk_id=' + customer.id.to_s, {xhr: true, params: { record: { name: 'STI' }} }
     assert_equal 200, status
     customer.reload
     assert_equal 'STI', customer.name

data/test/database_test.rb

@@ -1,9 +1,6 @@
 require 'test_helper'
 
 class DatabaseTest < ActiveSupport::TestCase
-  def setup
-    clean_db
-  end
 
   test "tables" do
     ["accounts", "comments", "contacts", "legacy_accounts", "payments", "projects", "projects_users", "users"].each do |t|

data/test/dummy/config/application.rb

@@ -6,7 +6,10 @@ Bundler.require(*Rails.groups)
 
 require "rails_db"
 
-Ransack::Adapters::ActiveRecord::Base.class_eval('remove_method :search')
+begin
+  Ransack::Adapters::ActiveRecord::Base.class_eval('remove_method :search')
+rescue Exception
+end
 
 module Dummy
   class Application < Rails::Application

data/test/dummy/config/environments/development.rb

@@ -13,6 +13,16 @@ Rails.application.configure do
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
+  begin
+    config.serve_static_files = true
+  rescue NoMethodError
+  end
+
+  begin
+    config.public_file_server.enabled = true
+  rescue NoMethodError
+  end
+
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 

data/test/dummy/config/environments/production.rb

@@ -22,7 +22,15 @@ Rails.application.configure do
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  begin
+    config.serve_static_files = true
+  rescue NoMethodError
+  end
+
+  begin
+    config.public_file_server.enabled = true
+  rescue NoMethodError
+  end
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/test/dummy/config/environments/test.rb

@@ -16,7 +16,15 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
+  begin
+    config.serve_static_files = true
+  rescue NoMethodError
+  end
+
+  begin
+    config.public_file_server.enabled = true
+  rescue NoMethodError
+  end
   #config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/test/dummy/config/initializers/mime_types.rb

@@ -2,3 +2,6 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
+
+Mime::Type.register "application/vnd.ms-excel", :xls
+Mime::Type.register "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", :xlsx

data/test/dummy/db/migrate/20151013203739_create_users.rb

@@ -1,4 +1,10 @@
-class CreateUsers < ActiveRecord::Migration
+klass = if Rails::VERSION::MAJOR < 5
+  ActiveRecord::Migration
+else
+  ActiveRecord::Migration[4.2]
+end
+
+class CreateUsers < klass
   def change
     create_table :users do |t|
       t.string :name

data/test/dummy/db/migrate/20151013203757_create_comments.rb

@@ -1,4 +1,4 @@
-class CreateComments < ActiveRecord::Migration
+class CreateComments < ActiveRecord::Migration[4.2]
   def change
     create_table :comments do |t|
       t.text :comment

data/test/dummy/db/migrate/20151013204027_populate_data.rb

@@ -1,4 +1,4 @@
-class PopulateData < ActiveRecord::Migration
+class PopulateData < ActiveRecord::Migration[4.2]
   def change
     # name:string age:integer salary:decimal bio:text
     user_1 = User.create(:name => "John Smith", :age => 30, :salary => 123.45, :bio => 'This is text')

data/test/dummy/db/migrate/20151014074454_create_accounts.rb

@@ -1,4 +1,4 @@
-class CreateAccounts < ActiveRecord::Migration
+class CreateAccounts < ActiveRecord::Migration[4.2]
   def change
     create_table :accounts do |t|
       t.string :name

data/test/dummy/db/migrate/20151014074655_create_contacts.rb

@@ -1,4 +1,4 @@
-class CreateContacts < ActiveRecord::Migration
+class CreateContacts < ActiveRecord::Migration[4.2]
   def change
     create_table :contacts do |t|
       t.string :name

data/test/dummy/db/migrate/20151014152932_add_bd.rb

@@ -1,4 +1,4 @@
-class AddBd < ActiveRecord::Migration
+class AddBd < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :dob, :date
     User.all.each do |user|

data/test/dummy/db/migrate/20151014183823_create_projects.rb

@@ -1,4 +1,4 @@
-class CreateProjects < ActiveRecord::Migration
+class CreateProjects < ActiveRecord::Migration[4.2]
   def change
     create_table :projects do |t|
       t.string :name

data/test/dummy/db/migrate/20151014184243_add_long_text.rb

@@ -1,4 +1,4 @@
-class AddLongText < ActiveRecord::Migration
+class AddLongText < ActiveRecord::Migration[4.2]
   def change
     text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris ligula arcu, commodo et mauris ut, efficitur aliquet ex. Aliquam iaculis justo maximus, dapibus nibh a, tincidunt enim. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Pellentesque hendrerit pharetra nulla, ac euismod tellus rutrum non. Ut tortor enim, tincidunt vitae pharetra quis, tincidunt sit amet felis. Sed convallis nulla sed urna finibus aliquet. Aliquam a molestie orci. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum in finibus sem, ut sagittis enim.
 Sed nulla sem, suscipit sit amet lobortis eget, gravida in lectus. In sagittis urna sit amet commodo egestas. Donec vulputate, orci ac gravida congue, orci arcu facilisis ante, sed blandit quam lacus ullamcorper eros. Duis vitae sem et eros luctus tempor et ut neque. Donec at molestie quam, vel gravida velit. Etiam eu consectetur massa, sit amet vehicula risus. Nullam elementum, neque non dignissim dignissim, arcu erat lobortis orci, quis venenatis eros nibh ac risus."

data/test/dummy/db/migrate/20151015145740_populate_db.rb

@@ -1,4 +1,4 @@
-class PopulateDb < ActiveRecord::Migration
+class PopulateDb < ActiveRecord::Migration[4.2]
   def change
   end
 end

data/test/dummy/db/migrate/20151027192250_create_payments.rb

@@ -1,4 +1,4 @@
-class CreatePayments < ActiveRecord::Migration
+class CreatePayments < ActiveRecord::Migration[4.2]
   def change
     create_table :payments do |t|
       t.decimal :amount

data/test/dummy/db/migrate/20151027223149_add_non_pk_table.rb

@@ -1,4 +1,4 @@
-class AddNonPkTable < ActiveRecord::Migration
+class AddNonPkTable < ActiveRecord::Migration[4.2]
   def change
     create_table :projects_users, id: false do |t|
       t.integer :project_id

data/test/dummy/db/migrate/20151028191429_create_legacy_accounts.rb

@@ -1,4 +1,4 @@
-class CreateLegacyAccounts < ActiveRecord::Migration
+class CreateLegacyAccounts < ActiveRecord::Migration[4.2]
   def change
     create_table :legacy_accounts, :primary_key => :uuid do |t|
       t.string :name, uniq: true

data/test/dummy/db/migrate/20151121125538_add_boolean_field_to_user.rb

@@ -1,4 +1,4 @@
-class AddBooleanFieldToUser < ActiveRecord::Migration
+class AddBooleanFieldToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :active, :boolean, default: true
   end

data/test/dummy/db/migrate/20170126124628_add_sti_model.rb

@@ -1,4 +1,4 @@
-class AddStiModel < ActiveRecord::Migration
+class AddStiModel < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :type, :string
   end

data/test/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,114 +10,110 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170126124628) do
+ActiveRecord::Schema.define(version: 2017_01_26_124628) do
 
   create_table "accounts", force: :cascade do |t|
-    t.string   "name"
-    t.integer  "users_count"
-    t.datetime "created_at",  null: false
-    t.datetime "updated_at",  null: false
+    t.string "name"
+    t.integer "users_count"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "comments", force: :cascade do |t|
-    t.text     "comment"
-    t.integer  "user_id"
+    t.text "comment"
+    t.integer "user_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
   create_table "contacts", force: :cascade do |t|
-    t.string   "name"
-    t.string   "email"
-    t.text     "message"
+    t.string "name"
+    t.string "email"
+    t.text "message"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["name", "email"], name: "index_contacts_on_name_and_email"
   end
 
-  add_index "contacts", ["name", "email"], name: "index_contacts_on_name_and_email"
-
   create_table "legacy_accounts", primary_key: "uuid", force: :cascade do |t|
     t.string "name"
   end
 
   create_table "payments", force: :cascade do |t|
-    t.decimal  "amount"
-    t.integer  "project_id"
+    t.decimal "amount"
+    t.integer "project_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["project_id"], name: "index_payments_on_project_id"
   end
 
-  add_index "payments", ["project_id"], name: "index_payments_on_project_id"
-
   create_table "projects", force: :cascade do |t|
-    t.string   "name"
-    t.string   "description_492106"
-    t.string   "description_200949"
-    t.string   "description_180665"
-    t.string   "description_806273"
-    t.string   "description_93256"
-    t.string   "description_191220"
-    t.string   "description_147227"
-    t.string   "description_18924"
-    t.string   "description_280694"
-    t.string   "description_398815"
-    t.string   "description_552891"
-    t.string   "description_30028"
-    t.string   "description_492900"
-    t.string   "description_925333"
-    t.string   "description_418541"
-    t.string   "description_703855"
-    t.string   "description_25680"
-    t.string   "description_273217"
-    t.string   "description_235296"
-    t.string   "description_398291"
-    t.integer  "amount_723167"
-    t.integer  "amount_973995"
-    t.integer  "amount_10079"
-    t.integer  "amount_478676"
-    t.integer  "amount_293483"
-    t.integer  "amount_99616"
-    t.integer  "amount_449220"
-    t.integer  "amount_715853"
-    t.integer  "amount_235541"
-    t.integer  "amount_427091"
-    t.integer  "amount_782579"
-    t.integer  "amount_358029"
-    t.integer  "amount_930716"
-    t.integer  "amount_27449"
-    t.integer  "amount_935730"
-    t.integer  "amount_545041"
-    t.integer  "amount_81780"
-    t.integer  "amount_206186"
-    t.integer  "amount_68814"
-    t.integer  "amount_962381"
-    t.datetime "created_at",         null: false
-    t.datetime "updated_at",         null: false
+    t.string "name"
+    t.string "description_245592"
+    t.string "description_450580"
+    t.string "description_183349"
+    t.string "description_341325"
+    t.string "description_277196"
+    t.string "description_943405"
+    t.string "description_904897"
+    t.string "description_267877"
+    t.string "description_47807"
+    t.string "description_713494"
+    t.string "description_696562"
+    t.string "description_976508"
+    t.string "description_918800"
+    t.string "description_27002"
+    t.string "description_393763"
+    t.string "description_960166"
+    t.string "description_804457"
+    t.string "description_684568"
+    t.string "description_98716"
+    t.string "description_337791"
+    t.integer "amount_584190"
+    t.integer "amount_898177"
+    t.integer "amount_599511"
+    t.integer "amount_308345"
+    t.integer "amount_572259"
+    t.integer "amount_562080"
+    t.integer "amount_684853"
+    t.integer "amount_77648"
+    t.integer "amount_377109"
+    t.integer "amount_246825"
+    t.integer "amount_91844"
+    t.integer "amount_787673"
+    t.integer "amount_158730"
+    t.integer "amount_331843"
+    t.integer "amount_540084"
+    t.integer "amount_780019"
+    t.integer "amount_745694"
+    t.integer "amount_715202"
+    t.integer "amount_887110"
+    t.integer "amount_607339"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "projects_users", id: false, force: :cascade do |t|
     t.integer "project_id"
     t.integer "user_id"
+    t.index ["project_id"], name: "index_projects_users_on_project_id"
+    t.index ["user_id"], name: "index_projects_users_on_user_id"
   end
 
-  add_index "projects_users", ["project_id"], name: "index_projects_users_on_project_id"
-  add_index "projects_users", ["user_id"], name: "index_projects_users_on_user_id"
-
   create_table "users", force: :cascade do |t|
-    t.string   "name"
-    t.integer  "age"
-    t.decimal  "salary"
-    t.text     "bio"
-    t.datetime "created_at",                null: false
-    t.datetime "updated_at",                null: false
-    t.integer  "account_id"
-    t.date     "dob"
-    t.boolean  "active",     default: true
-    t.string   "type"
+    t.string "name"
+    t.integer "age"
+    t.decimal "salary"
+    t.text "bio"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.integer "account_id"
+    t.date "dob"
+    t.boolean "active", default: true
+    t.string "type"
+    t.index ["account_id"], name: "index_users_on_account_id"
+    t.index ["name"], name: "index_users_on_name"
+    t.index ["salary"], name: "index_users_on_salary"
   end
 
-  add_index "users", ["account_id"], name: "index_users_on_account_id"
-  add_index "users", ["name"], name: "index_users_on_name"
-  add_index "users", ["salary"], name: "index_users_on_salary"
-
 end