brick 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f1a45a5262526e69cf49f16773049eb348e3971bddf09ecf05927002a265019
-  data.tar.gz: e9566a423a19ab55d44522b44e8b4abfcc39e92335b6093fe782c6344644bbbe
+  metadata.gz: add7e232024e140e2fb089ef158600e2a2a955efd787dc986769b43b4b1f6d24
+  data.tar.gz: a45d187a7b739f90b1fede46dfc9f63a2057a3410d052e0ad57322f4741ebfee
 SHA512:
-  metadata.gz: cb89dff96dccc7051bc854fe523b03f818255d81e4f2e2a65eb9808115e719b8bad98e38114f15ee79b32b1f035c95c364a74392948cd2e99f4030e6988e0217
-  data.tar.gz: cd5507fde2f1f23481696ab051d14f89e5e7e7d3fc2be97af947ff287313b7ada8ca7b4e3f9e0e54dc2ab7f14e7f39a3c18f78cf7fc995c58b3d60cf68487973
+  metadata.gz: '0897e041c617f0e1e695d0402784184ce2f7ec575d9b0e7a7b1b59b2efbcb40a4de28bcbe2eb124f576dddb8e7371f572c67ee3b19120cd281bf3358249b4508'
+  data.tar.gz: fc7a4a93a7d2409f4aa82fb3dbf23710aaad45a1dca1193c8cbcefa86d5d9061a773214c8fe0dd02375660bfb6e5a9856df3a202f57a73990e79d23850918f9b

data/lib/brick/config.rb

@@ -108,7 +108,7 @@ module Brick
     end
 
     def exclude_tables
-      @mutex.synchronize { @exclude_tables }
+      @mutex.synchronize { @exclude_tables || [] }
     end
 
     def exclude_tables=(value)

data/lib/brick/extensions.rb

@@ -454,7 +454,7 @@ class Object
 
         if model.primary_key
           code << "  def show\n"
-          code << "    @#{singular_table_name} = #{model.name}.find(params[:id].split(','))\n"
+          code << (find_by_id = "    @#{singular_table_name} = #{model.name}.find(params[:id].split(','))\n")
           code << "  end\n"
           self.define_method :show do
             ::Brick.set_db_schema(params)
@@ -463,9 +463,36 @@ class Object
         end
 
         # By default, views get marked as read-only
-        unless (relation = relations[model.table_name]).key?(:isView)
-          code << "  # (Define :new, :create, :edit, :update, and :destroy)\n"
-          # Get column names for params from relations[model.table_name][:cols].keys
+        unless false # model.readonly # (relation = relations[model.table_name]).key?(:isView)
+          code << "  # (Define :new, :create)\n"
+
+          if model.primary_key
+            is_need_params = true
+            # code << "  # (Define :edit, and :destroy)\n"
+            code << "  def update\n"
+            code << find_by_id
+            params_name = "#{singular_table_name}_params"
+            code << "    @#{singular_table_name}.update(#{params_name})\n"
+            code << "  end\n"
+            self.define_method :update do
+              ::Brick.set_db_schema(params)
+              instance_variable_set("@#{singular_table_name}".to_sym, (obj = model.find(params[:id].split(','))))
+              obj = obj.first if obj.is_a?(Array)
+              obj.send(:update, send(params_name = params_name.to_sym))
+            end
+          end
+
+          if is_need_params
+            code << "private\n"
+            code << "  def params\n"
+            code << "    params.require(:#{singular_table_name}).permit(#{model.columns_hash.keys.map { |c| c.to_sym.inspect }.join(', ')})\n"
+            code << "  end\n"
+            self.define_method(params_name) do
+              params.require(singular_table_name.to_sym).permit(model.columns_hash.keys)
+            end
+            private params_name
+            # Get column names for params from relations[model.table_name][:cols].keys
+          end
         end
         code << "end # #{class_name}\n\n"
       end # class definition
@@ -629,14 +656,12 @@ module ActiveRecord::ConnectionHandling
       puts "\nClasses that can be built from views:"
       views.keys.each { |k| puts ActiveSupport::Inflector.singularize(k).camelize }
     end
+
     # Try to load the initializer pretty danged early
     if File.exist?(brick_initialiser = Rails.root.join('config/initializers/brick.rb'))
       load brick_initialiser
       ::Brick.load_additional_references
     end
-
-    # relations.keys.each { |k| ActiveSupport::Inflector.singularize(k).camelize.constantize }
-    # Layout table describes permissioned hierarchy throughout
   end
 end
 

data/lib/brick/frameworks/rails/engine.rb

@@ -89,7 +89,8 @@ module Brick
                 end
 
                 schema_options = ::Brick.db_schemas.each_with_object(+'') { |v, s| s << "<option value=\"#{v}\">#{v}</option>" }.html_safe
-                table_options = ::Brick.relations.keys.each_with_object(+'') { |v, s| s << "<option value=\"#{v}\">#{v}</option>" }.html_safe
+                table_options = (::Brick.relations.keys - ::Brick.config.exclude_tables)
+                                .each_with_object(+'') { |v, s| s << "<option value=\"#{v}\">#{v}</option>" }.html_safe
                 hms_columns = +'' # Used for 'index'
                 hms_headers = hms.each_with_object([]) do |hm, s|
                   next if exclude_hms.key?((hm_assoc = hm.last).name)
@@ -163,6 +164,23 @@ a.big-arrow {
   font-size: 2.5em;
   text-decoration: none;
 }
+.wide-input {
+  display: block;
+  overflow: hidden;
+}
+.wide-input input[type=text] {
+  width: 100%;
+}
+.dimmed {
+  background-color: #C0C0C0;
+}
+input[type=submit] {
+  background-color: #004998;
+  color: #FFF;
+}
+.right {
+  text-align: right;
+}
 </style>
 <% def is_bcrypt?(val)
   val.is_a?(String) && val.length == 60 && val.start_with?('$2a$')
@@ -173,8 +191,9 @@ end %>"
 
                 script = "<script>
 var schemaSelect = document.getElementById(\"schema\");
+var brickSchema;
 if (schemaSelect) {
-  var brickSchema = changeout(location.href, \"_brick_schema\");
+  brickSchema = changeout(location.href, \"_brick_schema\");
   if (brickSchema) {
     [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
   }
@@ -184,6 +203,17 @@ if (schemaSelect) {
     location.href = changeout(location.href, \"_brick_schema\", this.value);
   });
 }
+[... document.getElementsByTagName(\"FORM\")].forEach(function (form) {
+  if (brickSchema)
+    form.action = changeout(form.action, \"_brick_schema\", brickSchema);
+  form.addEventListener('submit', function (ev) {
+    [... ev.target.getElementsByTagName(\"SELECT\")].forEach(function (select) {
+      if (select.value === \"^^^brick_NULL^^^\")
+        select.value = null;
+    });
+    return true;
+  });
+});
 
 var tblSelect = document.getElementById(\"tbl\");
 if (tblSelect) {
@@ -265,14 +295,18 @@ function changeout(href, param, value) {
 
 #{"<hr><%= link_to \"New #{obj_name}\", new_#{obj_name}_path %>" unless @_brick_model.is_view?}
 #{script}"
-                when 'show'
-  "#{css}
-    <p style=\"color: green\"><%= notice %></p>#{"
-    <select id=\"schema\">#{schema_options}</select>" if ::Brick.db_schemas.length > 1}
-    <select id=\"tbl\">#{table_options}</select>
-    <h1>#{model_name}: <%= (obj = @#{obj_name}.first).brick_descrip %></h1>
-    <%= link_to '(See all #{obj_name.pluralize})', #{table_name}_path %>
-  <%= form_for obj do |f| %>
+                when 'show', 'update'
+"#{css}
+<p style=\"color: green\"><%= notice %></p>#{"
+<select id=\"schema\">#{schema_options}</select>" if ::Brick.db_schemas.length > 1}
+<select id=\"tbl\">#{table_options}</select>
+<h1>#{model_name}: <%= (obj = @#{obj_name}&.first)&.brick_descrip || controller_name %></h1>
+<%= link_to '(See all #{obj_name.pluralize})', #{table_name}_path %>
+<% if obj %>
+  <%= # path_options = [obj.#{pk}]
+   # path_options << { '_brick_schema':  } if 
+   # url = send(:#{model_name.underscore}_path, obj.#{pk})
+   form_for(obj) do |f| %>
   <table>
   <% bts = { #{bts.each_with_object([]) { |v, s| s << "#{v.first.inspect} => [#{v.last.first.inspect}, #{v.last[1].name}, #{v.last[1].primary_key.inspect}]"}.join(', ')} }
       @#{obj_name}.first.attributes.each do |k, val| %>
@@ -281,25 +315,40 @@ function changeout(href, param, value) {
     <th class=\"show-field\">
     <% if (bt = bts[k])
       # Add a final member in this array with descriptive options to be used in <select> drop-downs
+      bt_name = bt[1].name
       # %%% Only do this if the user has permissions to edit this bt field
-      bt << bt[1].order(:#{pk}).map { |obj| [obj.brick_descrip, obj.#{pk}] } if bt.length < 4 %>
-      BT <%= \"#\{bt.first\}-\" unless bt[1].name.underscore == bt.first.to_s %><%= bt[1].name %>
+      if bt.length < 4
+        bt << (option_detail = [[\"(No #\{bt_name\} chosen)\", '^^^brick_NULL^^^']])
+        bt[1].order(:#{pk}).each { |obj| option_detail << [obj.brick_descrip, obj.#{pk}] }
+      end %>
+      BT <%= \"#\{bt.first\}-\" unless bt_name.underscore == bt.first.to_s %><%= bt_name %>
     <% else %>
       <%= k %>
     <% end %>
     </th>
     <td>
-    <% if (bt = bts[k]) # bt_obj.brick_descrip %>
-      <%= f.select k.to_sym, bt[3], {}, prompt: 'Select #{model_name}' %>
-      <%= bt_obj = bt[1].find_by(bt[2] => val); link_to('⇛', send(\"#\{bt_obj_class = bt[1].name.underscore\}_path\".to_sym, bt_obj.send(bt[1].primary_key.to_sym)), { class: 'show-arrow' }) if bt_obj %>
-    <% elsif is_bcrypt?(val) %>
-      <%= hide_bcrypt(val) %>
-    <% else %>
-      <%= f.text_field k.to_sym %>
+    <% if (bt = bts[k]) # bt_obj.brick_descrip
+      html_options = { prompt: \"Select #\{bt_name\}\" }
+      html_options[:class] = 'dimmed' unless val %>
+      <%= f.select k.to_sym, bt[3], { value: val || '^^^brick_NULL^^^' }, html_options %>
+      <%= bt_obj = bt[1].find_by(bt[2] => val); link_to('⇛', send(\"#\{bt_obj_class = bt_name.underscore\}_path\".to_sym, bt_obj.send(bt[1].primary_key.to_sym)), { class: 'show-arrow' }) if bt_obj %>
+    <% else case #{model_name}.column_for_attribute(k).type
+      when :string, :text %>
+        <% if is_bcrypt?(val) # || .readonly? %>
+          <%= hide_bcrypt(val) %>
+        <% else %>
+          <div class=\"wide-input\"><%= f.text_field k.to_sym %></div>
+        <% end %>
+      <% when :boolean %>
+        <%= f.check_box k.to_sym %>
+      <% when :integer, :date, :datetime, :decimal %>
+        <%= val %>
+      <% end %>
     <% end %>
     </td>
     </tr>
-  <% end %>
+    <% end %>
+    <tr><td colspan=\"2\" class=\"right\"><%= f.submit %></td></tr>
   </table>
   <% end %>
 
@@ -317,6 +366,7 @@ function changeout(href, param, value) {
       <% end %>
     <% end %>
   </table>" end.join}
+<% end %>
 #{script}"
 
                 end

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 17
+    TINY = 18
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Lorin Thwaits