kablam 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0870b7d145b1cfc130362b9b81d8b75a792c1e64af27a4be8cbf523c2fbaa96
-  data.tar.gz: bf3628876f40c3c2b46c47a43c8b5d269e64a07343d453fb1a66f7cfc0694ca0
+  metadata.gz: 844e20a6b77e991b17e78586160b713b57134f5f0cef806bebe1077415f24d5e
+  data.tar.gz: 17bc14cc1eb940e97d0d0f1c5bae1e16b02eaebd0b93095c7de119583685a7f5
 SHA512:
-  metadata.gz: e01613faec8c519fdadf72ce6faef0e468f47bb06c0498105403518c3dab9dba7bc07866b131da8bf8cc0146d29e85d970180b44ea151b1a0dc8af9e53aa1306
-  data.tar.gz: 5bfddaf63d0e56a84472c1847db3fc6adc6917120470118f584a3af92f6a4ddf19e45f9db6ffc0eb230807d9ab81d4d443d442240399743f9515c6be84bbb795
+  metadata.gz: 27dd4f187625cf129af98e99863db3aa8750031627da7dcedf3d5d16051b224caa6b8d2b808ef1002bccbbfde8e8e6360a3c9baf30b4fc3d4fb3e2b59ee642ef
+  data.tar.gz: 9ce64047a88ce76de4cd473f57770e1579c57d32ed1cbf69c9c3f27d0f44d383977b71aaaab32502d8f0f9ea0b096360d5bbe8d9124df24dd610c28bc69655df

data/app/assets/javascripts/kablam/forms.js

@@ -105,28 +105,28 @@ function rmParent(el){
 
 
 Object.defineProperty(HTMLElement, 'From', {
-    enumerable: false,
-    value: (function (document) {
-        //https://www.measurethat.net/Benchmarks/Show/2149/0/element-creation-speed
-        var rgx = /(\S+)=(["'])(.*?)(?:\2)|(\w+)/g;
-        return function CreateElementFromHTML(html) {
-            html = html.trim();
-            var bodystart = html.indexOf('>') + 1, bodyend = html.lastIndexOf('<');
-            var elemStart = html.substr(0, bodystart);
-            var innerHTML = html.substr(bodystart, bodyend - bodystart);
-            rgx.lastIndex = 0;
-            var elem = document.createElement(rgx.exec(elemStart)[4]);
-            var match; while ((match = rgx.exec(elemStart))) {
-                if (match[1] === undefined) {
-                    elem.setAttribute(match[4], "");
-                } else {
-                    elem.setAttribute(match[1], match[3]);
-                }
-            }
-            elem.innerHTML = innerHTML;
-            return elem;
-        };
-    }(window.document))
+  enumerable: false,
+  value: (function (document) {
+    //https://www.measurethat.net/Benchmarks/Show/2149/0/element-creation-speed
+    var rgx = /(\S+)=(["'])(.*?)(?:\2)|(\w+)/g;
+    return function CreateElementFromHTML(html) {
+      html = html.trim();
+      var bodystart = html.indexOf('>') + 1, bodyend = html.lastIndexOf('<');
+      var elemStart = html.substr(0, bodystart);
+      var innerHTML = html.substr(bodystart, bodyend - bodystart);
+      rgx.lastIndex = 0;
+      var elem = document.createElement(rgx.exec(elemStart)[4]);
+      var match; while ((match = rgx.exec(elemStart))) {
+        if (match[1] === undefined) {
+          elem.setAttribute(match[4], "");
+        } else {
+          elem.setAttribute(match[1], match[3]);
+        }
+      }
+      elem.innerHTML = innerHTML;
+      return elem;
+    };
+  }(window.document))
 });
 
 
@@ -138,6 +138,14 @@ function submitRemove(form_id){
   });
 }
 
+function submitClear(form_id){
+  var form = document.getElementById(form_id);
+  form.addEventListener("ajax:success", function(e) {
+    e.preventDefault();
+    form.reset();
+  });
+}
+
 function submitRedirect(form_id){
   var form = document.getElementById(form_id),
       path = document.getElementById(form_id+'_redirect').value;

data/app/controllers/concerns/api_settings.rb

@@ -3,11 +3,13 @@ module Concerns
     extend ActiveSupport::Concern
     require 'securerandom'
     protected
-    def send_to_bucket(bucket, upload_item)
+    def send_to_bucket(upload_item)
       puts "uploading..."
       path = ENV.fetch("BUCKET_TRANSFER_API")
       bucket = ENV.fetch("BUCKET_NAME")
-
+      puts "path: #{path}"
+      puts "bucket: #{bucket}"
+      puts "#{upload_item.class}"
 
       post_params = {"oss"=> {
         "bucket"     => bucket,

data/app/controllers/kablam_controller.rb

@@ -1,4 +1,4 @@
-# require 'rest-client'
+require 'rest-client'
 require 'json'
 
 class KablamController < ApplicationController

data/app/views/kablam/create.js.erb

@@ -1,12 +1,14 @@
 <% if params[:target].present? %>
 var content = `<%= j render "kablam/models/#{@object.model_name.singular}", obj: @object %>`
-
-document
+var newMessage = HTMLElement.From(content);
+var target = document
   .getElementById('<%= params[:target] || "target_index" %>')
-  .insertAdjacentHTML('beforeend', content)
 
-document
-  .querySelector('[action$="/<%= params[:target] || "target_index" %>"]')
-  .reset()
+<% if Kablam.render_item["#{@object.class.table_name}"] == "top" %>
+  target.innerHTML = newMessage.outerHTML + target.innerHTML;
+<% elsif Kablam.render_item["#{@object.class.table_name}"] == "bottom" %>
+  target.innerHTML = target.innerHTML + newMessage.outerHTML;
+<% end %>
+
 <% end %>
 <%= render_flash message: 'Created' %>

data/app/views/kablam/message.js.erb

@@ -2,8 +2,8 @@ var content = `<%= j render "kablam/message", message: @message %>`;
 var newMessage = HTMLElement.From(content);
 var target = document.getElementById("kablam-chat-window");
 
-<% if Kablam.message_location == "start" %>
+<% if Kablam.render_item["message"] == "top" %>
   target.innerHTML = newMessage.outerHTML + target.innerHTML;
-<% elsif Kablam.message_location == "end" %>
+<% elsif Kablam.render_item["message"] == "bottom" %>
   target.innerHTML = target.innerHTML + newMessage.outerHTML;
 <% end %>

data/app/views/kablam_forms/_form_generator.html.erb

@@ -8,7 +8,7 @@
   @url = (@method == :post ? Kablam::Engine.routes.url_helpers.create_path(@table_name) : Kablam::Engine.routes.url_helpers.update_path(@table_name, obj.id))
 %>
 
-<%= form_with model: obj, url: @url, method: @method, id: @form_id, class: classes[:form_wrapper] do |f| %>
+<%= form_with model: obj, url: @url, method: @method, id: @form_id, class: classes[:form_wrapper], multipart: true do |f| %>
     <% if redirect.present? %>
     <input id="<%= @form_id %>_redirect" type="hidden" name="redirect" value="<%= redirect %>">
     <% end %>
@@ -37,6 +37,7 @@
 
 <script>
   initFileUploads({'class': '<%= classes[:file_upload]%>', 'icon': '<%= classes[:file_upload_icon] %>'});
+  submitClear('<%= @form_id %>');
   <% if ajax_remove.present? %>
   submitRemove('<%= @form_id %>');
   <% end %>

data/kablam.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'kablam'
-  s.version     = '0.3.5'
+  s.version     = '0.3.6'
   s.date        = Time.now.strftime("%Y-%m-%d")
   s.summary     = "Kablam! All the things you hate. But Faster."
   s.description = "Gem to make development of everything in rails faster. Form creation & styling, all the resource routes, even actioncable messaging!\n {NOTE: In Development. NOT READY FOR TESTING.}"
@@ -13,5 +13,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency("rails", ">= 5.1.6")
   s.add_dependency('rails-i18n', ">= 5.1.1")
+  s.add_dependency('rest-client')
   s.add_dependency('puma')
 end

data/lib/generators/kablam/templates/kablam.rb

@@ -12,8 +12,8 @@ Kablam.setup do |config|
   #     for the datetime_handler.
   # ===========================================================
   #           .___
-  #           [__  _ ._.._ _  Classes &
-  #           |   (_)[  [ | )   Handlers
+  #           [__  _ ._.._ _  Classes
+  #           |   (_)[  [ | )
   # ===========================================================
 
   # These classes are used for the labels/group-wrappers, etc.
@@ -31,7 +31,6 @@ Kablam.setup do |config|
   config.dropdown_select =  "ba bg-white b--black-20 pa2 mb2 db w-100"
   config.file_upload =  "ba b--black-20 pa5 mb2 db w-100 b--dashed b--red"
   config.file_upload_icon =  "fa fa-upload absolute left-0 right-0 ml-auto mr-auto top-2 mt3 f1 black-05"
-  config.datetime_handler = nil
 
   # Checkbox Classes
   config.checkbox_group_wrapper =  "" # Wrapper around all checkboxes
@@ -49,7 +48,8 @@ Kablam.setup do |config|
   config.multi_remove_icon =  "fa fa-trash"
 
   # ============================================================
-  #                     KABLAM MESSAGING
+  #                     KABLAM OPTIONS
   # ============================================================
-  config.message_location = "start" # Accepted values are "start" and "end"
+  config.datetime_handler = nil
+  config.render_item["message"] = "top" #also accepts bottom
 end

data/lib/kablam.rb

@@ -14,7 +14,6 @@ module Kablam
   mattr_accessor :dropdown_select
   mattr_accessor :file_upload
   mattr_accessor :file_upload_icon
-  mattr_accessor :datetime_handler
 
   # Checkbox classes
   mattr_accessor :checkbox_group_wrapper
@@ -29,8 +28,9 @@ module Kablam
   mattr_accessor :multi_add_icon
   mattr_accessor :multi_remove_icon
 
-  # Message settings
-  mattr_accessor :message_location
+  # Options settings
+  mattr_accessor :datetime_handler
+  mattr_accessor :render_item, default: {}
 
   module ClassMethods
 

data/lib/kablam/kablam_record.rb

@@ -28,7 +28,7 @@ module Kablam
         hint: I18n.translate(:hint, scope: kablam_scope, default: ""),
         choices: self.class.choices(field, I18n.locale),
         onchange: I18n.translate(:onchange, scope: kablam_scope, default: ""),
-        true_statement: I18n.translate(:hint, scope: kablam_scope, default: "")
+        true_statement: I18n.translate(:true_statement, scope: kablam_scope, default: "")
       }
     end
 
@@ -96,6 +96,7 @@ module Kablam
         text: [],
         hidden: [],
         select: [],
+        datetime: [],
         checkbox_array: [],
         checkbox_boolean: [],
         multi_inputs: [],
@@ -112,11 +113,13 @@ module Kablam
       # This method will prepare hash of hashes
       # for each data-field w/ the form input type.
       # ex: date, radio, select, etc.
+
       obj = self.new
       hashy = {}
       fields_array = self.fields
       fields_array.each do |k|
-        hashy[k] = obj.column_for_attribute(k).type
+        hashy[k] = :not_set
+        hashy[k] = obj.column_for_attribute(k).type if obj.column_for_attribute(k).type
         hashy[k] = :input             if     [:string, :float, :integer].include? hashy[k]
         hashy[k] = :checkbox_boolean  if     [:boolean].include? hashy[k]
         self.field_set.keys.each{|type| hashy[k] = type if self.field_set[type].include?(k)}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kablam
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Sergio Rivas
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.1
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  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: puma
   requirement: !ruby/object:Gem::Requirement