rails_db 0.9.9 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee0ce0d6e3a70aa6c991f4dc375d28d219cb452a
-  data.tar.gz: 3fb59fa306290006d2e462abd6d88f0d10c3909c
+  metadata.gz: 6b8edcd55cb5deaa338dde74868d85c838906507
+  data.tar.gz: 4f641001dc8e886869ed8644a6a7e9dff4575ae9
 SHA512:
-  metadata.gz: 90db375ee0998789dbc68d35c20518f63861d432cc7f93f646040e9f9b65fb3df386642f5a1e19a0fc4b5327d36304df3f87bb1a331515e589cd30941177d221
-  data.tar.gz: 5f5676c71b5c9b4439bd36b9e4edb5174348e1402c2bfc912cfc770113f662705bfa3510404e4c6a096ca068555ce5da966cfe931d492ac858e3a4196412d455
+  metadata.gz: 48b2dc79959b7f7682f43cf6577b784db747aa8df3ad45325ca0922c65105ddca9b532bf5aabc62be1f9bf17c69e6044a5cb26ff136850c3b1166f9129049ae0
+  data.tar.gz: 553f9b1c71c073a75c3dd4f7c773dfaae90cc7d9def1b6a8e7ef589e70610cbc979b9d0cae92d755a5a456b0b6fbb28c8fff3e177282a4e14392187ee2c24cbe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails_db (0.9.9)
+    rails_db (1.0)
       axlsx_rails
       codemirror-rails
       font-awesome-rails

data/app/controllers/rails_db/tables_controller.rb

@@ -1,9 +1,11 @@
 module RailsDb
   class TablesController < RailsDb::ApplicationController
+    LOAD_TABLE_ACTIONS = [:show, :data, :csv, :truncate, :destroy, :edit, :update, :xlsx, :search, :new, :create]
+
     if Rails::VERSION::MAJOR >= 4
-      before_action :find_table, only: [:show, :data, :csv, :truncate, :destroy, :edit, :update, :xlsx, :search]
+      before_action :find_table, only: LOAD_TABLE_ACTIONS
     else
-      before_filter :find_table
+      before_filter :find_table, only: LOAD_TABLE_ACTIONS
     end
 
     def index
@@ -13,14 +15,23 @@ module RailsDb
     def show
     end
 
+    def new
+      @record = model.new
+    end
+
+    def create
+      @record = model.new(record_attributes)
+      @record.save!
+      build_search
+      respond_to do |page|
+        page.html { redirect_to action: :data, table_id: params[:table_id] }
+        page.js {}
+      end
+    end
+
     def data
       session[:per_page] = per_page
-      @model   = @table.as_model
-      @q       = @model.ransack(params[:q])
-      @sql     = @q.result.page(params[:page]).per(per_page).to_sql
-      @records = @q.result.page(params[:page]).per(per_page)
-      @q.build_condition if @q.conditions.empty?
-      @q.build_sort      if @q.sorts.empty?
+      build_search
       respond_to do |page|
         page.html {}
         page.js {}
@@ -41,12 +52,7 @@ module RailsDb
     end
 
     def destroy
-      @model   = @table.as_model
-      @q       = @model.ransack(params[:q])
-      @sql     = @q.result.page(params[:page]).per(per_page).to_sql
-      @records = @q.result.page(params[:page]).per(per_page)
-      @q.build_condition if @q.conditions.empty?
-      @q.build_sort      if @q.sorts.empty?
+      build_search
       @table.delete(params[:pk_id])
       respond_to do |page|
         page.html { redirect_to action: :data, table_id: params[:table_id] }
@@ -73,6 +79,18 @@ module RailsDb
 
     private
 
+    def build_search
+      @q       = model.ransack(params[:q])
+      @sql     = @q.result.page(params[:page]).per(per_page).to_sql
+      @records = @q.result.page(params[:page]).per(per_page)
+      @q.build_condition if @q.conditions.empty?
+      @q.build_sort      if @q.sorts.empty?
+    end
+
+    def model
+      @model ||= @table.as_model
+    end
+
     def record_attributes
       if Rails::VERSION::MAJOR >= 4
         params[:record].permit!

data/app/helpers/rails_db/application_helper.rb

@@ -42,58 +42,6 @@ module RailsDb
       end
     end
 
-    def paginate_table_entries(entries)
-      params.delete(:id)
-      return if entries.total_pages == 1
-      prev_page_text = "#{fa_icon('arrow-left')} Previous".html_safe
-      next_page_text = "Next #{fa_icon('arrow-right')}".html_safe
-
-      html = '<div class="pagination">'
-      if entries.previous_page
-        html << link_to(prev_page_text, params.merge({ action: :data, page: entries.previous_page }), { remote: true, class: 'page' })
-      end
-      html << "#{page_links_for_pagination(entries)}"
-      if entries.next_page
-        html << link_to(next_page_text, params.merge({ action: :data, page: entries.next_page }), { remote: true, class: 'page' })
-      end
-      html << '</div>'
-
-      sanitize(html)
-    end
-
-    private
-
-    def page_links_for_pagination(entries)
-      pages = pages_for_pagination(entries)
-      links = []
-
-      pages.each_with_index do |page,index|
-        if page == entries.current_page
-          links << content_tag(:b, page, { class: 'page current' })
-        else
-          links << link_to(page, params.merge({ action: :data, page: page}), { remote: true, class: 'page' })
-        end
-        links << ' ... ' if page != pages.last && (page + 1) != pages[index+1]
-      end
-
-      links.join(' ')
-    end
-
-    def pages_for_pagination(entries)
-      last_page    = entries.total_pages
-      current_page = entries.current_page
-
-      pages = if last_page > 10
-        [1, 2, 3] +
-        (current_page-2..current_page+2).to_a +
-        (last_page-2..last_page).to_a
-      else
-        (1..last_page).to_a
-      end
-
-      pages.uniq.select { |p| p > 0 && p <= last_page }
-    end
-
     def db_hint_options
       result = {}
       RailsDb::Database.accessible_tables.each do |table_name|

data/app/views/rails_db/dashboard/index.html.erb

@@ -8,7 +8,7 @@
 <ul>
   <li>use command line tools `railsdb` and `runsql` to run app and sql for your apps.</li>
   <li>view content and schema of DB tables (including indexes)</li>
-  <li>edit content</li>
+  <li>create, edit content</li>
   <li>sort content of DB tables</li>
   <li>filters support</li>
   <li>execute SQL queries</li>

data/app/views/rails_db/sql/_explain.html.erb

@@ -1,5 +1,5 @@
 <div id="explain_modal" class="reveal-modal" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog">
-  <h2 id="modalTitle">Explain:</h2>
+  <h2 id="modalTitle">Explain SQL</h2>
   <p class="lead"><%= sql %></p>
   <pre>
     <% sql_query.explain.rows.each do |row| %>

data/app/views/rails_db/tables/_data.html.erb

@@ -1,6 +1,9 @@
 <% title "'#{@table.name}'"%>
 
-<h2>Table: <%= @table.name %></h2>
+<h2 class='left'>Table: <%= @table.name %></h2>
+<div class='right'>
+  <%= link_to '+ ADD', table_new_path(@table), remote: true, class: 'button small' %>
+</div>
 
 <div class='clear'></div>
 
@@ -68,7 +71,7 @@
         <% end %>
         <% @model.column_names.each do |column| %>
           <th class="column_<%= column %>" style="<%= display_style_column(@table.name, column)%>">
-            <%= sort_link(@q, column) %>
+            <%= sort_link @q, column, controller: :tables, action: :data %>
           </th>
         <% end %>
       </tr>
@@ -92,7 +95,7 @@
             <th colspan="2">Actions</th>
           <% end %>
           <% @model.column_names.each do |column| %>
-            <th> <%= sort_link(@q, column) %> </th>
+            <th> <%= sort_link @q, column, controller: :tables, action: :data %> </th>
           <% end %>
         </tr>
       </tfoot>
@@ -102,6 +105,7 @@
 
 <p>
   <span class="radius success label">Total: <%= pluralize @records.total_count, 'record' %></span>
+  <span class="radius secondary label"><a href="#" data-reveal-id="sql_modal" id='sql_modal_link'>SQL</a></span>
 </p>
 
 <% if @records.total_count > 10 %>
@@ -112,8 +116,10 @@
   </div>
 
   <div class='left per_page_pagination'>
-    <%= paginate @records, remote: true %>
+    <%= paginate @records, remote: true, params: { controller: :tables, action: :data } %>
   </div>
 <% end %>
 
-<div class='clear'></div>
+<div class='clear'></div>
+
+<%= render 'sql', sql: @sql %>

data/app/views/rails_db/tables/_edit.html.erb

@@ -6,7 +6,7 @@
     <div class='scrollable_form'>
       <% @record.class.columns.each do |column| %>
         <% name = column.name %>
-        <% next if name == 'id' %>
+        <% next if name == @table.primary_key %>
 
         <% if ['datetime', 'date', 'time'].include?(column.sql_type) %>
           <div class='form-inline'>

data/app/views/rails_db/tables/_new.html.erb

@@ -0,0 +1,25 @@
+<a class="close-reveal-modal" aria-label="Close">&#215;</a>
+
+<h2 id="modalTitle">New</h2>
+
+<%= simple_form_for @record, as: 'record', url: table_create_path(@table, pk_id: @record[@table.primary_key]), remote: true, method: :post, html: {class: 'vertical_form'} do |form| %>
+    <div class='scrollable_form'>
+      <% @record.class.columns.each do |column| %>
+        <% name = column.name %>
+        <% next if [@table.primary_key, 'created_at', 'updated_at'].include?(column.name) %>
+
+        <% if ['datetime', 'date', 'time'].include?(column.sql_type) %>
+          <div class='form-inline'>
+            <%= form.input name, label: name, input_html: {class: 'date_or_time'} %>
+          </div>
+
+        <% else %>
+          <%= form.input name, label: name %>
+        <% end %>
+      <% end %>
+    </div>
+    <%= form.submit 'SAVE', class: 'button small' %>
+    <a class='close' onclick="$('#system_modal').foundation('reveal', 'close');$">Close</a>
+<% end %>
+
+<span class="radius warning label">NOTE: Update will happen without any validations.</span>

data/app/views/rails_db/tables/_sql.html.erb

@@ -0,0 +1,7 @@
+<div id="sql_modal" class="reveal-modal" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog">
+  <h2 id="modalTitle">SQL</h2>
+  <pre>
+    <%= sql %>
+  </pre>
+  <a class="close-reveal-modal" aria-label="Close">&#215;</a>
+</div>

data/app/views/rails_db/tables/create.js.erb

@@ -0,0 +1,9 @@
+$('#main_content').html("<%= j(render 'data') %>");
+
+$('#system_modal').foundation('reveal', 'close');
+
+stickyFooter();
+
+$(document).foundation('reflow');
+
+$(document).scrollTop(0);

data/app/views/rails_db/tables/new.js.erb

@@ -0,0 +1,7 @@
+$('#system_modal').html("<%= j(render 'new') %>");
+
+$('#system_modal').foundation('reveal', 'open');
+
+stickyFooter();
+
+$(document).foundation('reflow');

data/config/routes.rb

@@ -9,6 +9,8 @@ RailsDb::Engine.routes.draw do
     get 'edit'    # to handle opens in new window (GET)
     put 'update'  # to handle opens in new window (GET)
     get 'xlsx'
+    get 'new'
+    post 'create'
   end
 
   get '/sql' => 'sql#index', as: :sql

data/lib/rails_db/version.rb

@@ -1,3 +1,3 @@
 module RailsDb
-  VERSION = "0.9.9"
+  VERSION = "1.0"
 end

data/test/dashboard_controller_test.rb

@@ -69,6 +69,14 @@ class DashboardControllerTest < ActionDispatch::IntegrationTest
     assert_equal 200, status
     edit_user.reload
     assert_equal 'JOHN', edit_user.name
+
+    xhr :get, '/rails/db/tables/users/new'
+    assert_equal 200, status
+
+    assert_equal 1, User.count
+    xhr :post, '/rails/db/tables/users/create', {record: { name: 'XXX' }}
+    assert_equal 200, status
+    assert_equal 2, User.count
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_db
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: '1.0'
 platform: ruby
 authors:
 - Igor Kasyanchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -311,14 +311,18 @@ files:
 - app/views/rails_db/tables/_condition_fields.html.erb
 - app/views/rails_db/tables/_data.html.erb
 - app/views/rails_db/tables/_edit.html.erb
+- app/views/rails_db/tables/_new.html.erb
 - app/views/rails_db/tables/_row.html.erb
 - app/views/rails_db/tables/_search.html.erb
 - app/views/rails_db/tables/_show.html.erb
+- app/views/rails_db/tables/_sql.html.erb
+- app/views/rails_db/tables/create.js.erb
 - app/views/rails_db/tables/data.html.erb
 - app/views/rails_db/tables/data.js.erb
 - app/views/rails_db/tables/destroy.js.erb
 - app/views/rails_db/tables/edit.js.erb
 - app/views/rails_db/tables/index.html.erb
+- app/views/rails_db/tables/new.js.erb
 - app/views/rails_db/tables/show.html.erb
 - app/views/rails_db/tables/show.js.erb
 - app/views/rails_db/tables/table.xls.axlsx
@@ -443,7 +447,6 @@ files:
 - test/dummy/test/models/legacy_account_test.rb
 - test/dummy/test/models/project_test.rb
 - test/dummy/test/models/user_test.rb
-- test/dummy/tmp/pids/server.pid
 - test/rails_db_data_table_helper_test.rb
 - test/rails_db_test.rb
 - test/sql_import_test.rb
@@ -611,7 +614,6 @@ test_files:
 - test/dummy/test/models/legacy_account_test.rb
 - test/dummy/test/models/project_test.rb
 - test/dummy/test/models/user_test.rb
-- test/dummy/tmp/pids/server.pid
 - test/rails_db_data_table_helper_test.rb
 - test/rails_db_test.rb
 - test/sql_import_test.rb

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-91954