kablam 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54eb6a0722a2f5d9f8edfe00c14a6c336c06619dcbc7c0bf6ff7b13700de34fa
-  data.tar.gz: 82ef1dec52bf58eb3ad65d30abc6745ddd2079469fbfa27968666b5bbe421d53
+  metadata.gz: ea5aa8b0bb18d19bf0fb27248b0280fc1defc81541116db1c8f20ae78b6dcbbe
+  data.tar.gz: 608717219ca9f67c3bbaa551353c28d6804b6b0d172cf4ccc0980919a918369d
 SHA512:
-  metadata.gz: f8f2b47c6f5067ca9438916e45fc0256f3fdacd1988503899c7fe61b9c83e36bc026f5aa914a52cb862cc93b70df9e9b0ecceb4061f84bbd4562a3a700bcd9cd
-  data.tar.gz: f8d3c20d51c13387f2fc3f37d9de8d88b301ee753371160208f55e0ed92240c30cfe7e871c449f3e3181193523e04a411e8306648cfa141da090640fce70aecf
+  metadata.gz: 60958bb2d96a09fd523784bb4332f039926de3f3e4785ec8619cc46fe531b10d035681c10d7c20ee189f430e864614c41af759b3f398826bf51e170bcb6fe503
+  data.tar.gz: abe3ce049c4a68f68a14c1610c5d78bc52efc9a9e41d112f0fbbc12d7f0462371b1893ceaf270dbb710379de533962dd1f6575fb9a104acb53842c4bf7514558

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

@@ -6,164 +6,38 @@ function AjaxRequest() {
   // Instance properties
   // -------------------
 
-  /**
-   * Timeout period (in ms) until an async request will be aborted, and
-   * the onTimeout function will be called
-   */
   req.timeout = null;
-
-  /**
-   *  Since some browsers cache GET requests via XMLHttpRequest, an
-   * additional parameter called AjaxRequestUniqueId will be added to
-   * the request URI with a unique numeric value appended so that the requested
-   * URL will not be cached.
-   */
   req.generateUniqueUrl = true;
-
-  /**
-   * The url that the request will be made to, which defaults to the current
-   * url of the window
-   */
   req.url = window.location.href;
-
-  /**
-   * The method of the request, either GET (default), POST, or HEAD
-   */
   req.method = "GET";
-
-  /**
-   * Whether or not the request will be asynchronous. In general, synchronous
-   * requests should not be used so this should rarely be changed from true
-   */
   req.async = true;
-
-  /**
-   * The username used to access the URL
-   */
   req.username = null;
-
-  /**
-   * The password used to access the URL
-   */
   req.password = null;
-
-  /**
-   * The parameters is an object holding name/value pairs which will be
-   * added to the url for a GET request or the request content for a POST request
-   */
   req.parameters = new Object();
-
-  /**
-   * The sequential index number of this request, updated internally
-   */
   req.requestIndex = AjaxRequest.numAjaxRequests++;
-
-  /**
-   * Indicates whether a response has been received yet from the server
-   */
   req.responseReceived = false;
-
-  /**
-   * The name of the group that this request belongs to, for activity
-   * monitoring purposes
-   */
   req.groupName = null;
-
-  /**
-   * The query string to be added to the end of a GET request, in proper
-   * URIEncoded format
-   */
   req.queryString = "";
-
-  /**
-   * After a response has been received, this will hold the text contents of
-   * the response - even in case of error
-   */
   req.responseText = null;
-
-  /**
-   * After a response has been received, this will hold the XML content
-   */
   req.responseXML = null;
-
-  /**
-   * After a response has been received, this will hold the status code of
-   * the response as returned by the server.
-   */
   req.status = null;
-
-  /**
-   * After a response has been received, this will hold the text description
-   * of the response code
-   */
   req.statusText = null;
-
-  /**
-   * An internal flag to indicate whether the request has been aborted
-   */
   req.aborted = false;
-
-  /**
-   * The XMLHttpRequest object used internally
-   */
   req.xmlHttpRequest = null;
 
   // --------------
   // Event handlers
   // --------------
 
-  /**
-   * If a timeout period is set, and it is reached before a response is
-   * received, a function reference assigned to onTimeout will be called
-   */
   req.onTimeout = null;
-
-  /**
-   * A function reference assigned will be called when readyState=1
-   */
   req.onLoading = null;
-
-  /**
-   * A function reference assigned will be called when readyState=2
-   */
   req.onLoaded = null;
-
-  /**
-   * A function reference assigned will be called when readyState=3
-   */
   req.onInteractive = null;
-
-  /**
-   * A function reference assigned will be called when readyState=4
-   */
   req.onComplete = null;
-
-  /**
-   * A function reference assigned will be called after onComplete, if
-   * the statusCode=200
-   */
   req.onSuccess = null;
-
-  /**
-   * A function reference assigned will be called after onComplete, if
-   * the statusCode != 200
-   */
   req.onError = null;
-
-  /**
-   * If this request has a group name, this function reference will be called
-   * and passed the group name if this is the first request in the group to
-   * become active
-   */
   req.onGroupBegin = null;
-
-  /**
-   * If this request has a group name, and this request is the last request
-   * in the group to complete, this function reference will be called
-   */
   req.onGroupEnd = null;
-
-  // Get the XMLHttpRequest object itself
   req.xmlHttpRequest = AjaxRequest.getXmlHttpRequest();
   if (req.xmlHttpRequest==null) { return null; }
 
@@ -182,9 +56,6 @@ function AjaxRequest() {
   // ---------------------------------------------------------------------------
   // Internal event handlers that fire, and in turn fire the user event handlers
   // ---------------------------------------------------------------------------
-  // Flags to keep track if each event has been handled, in case of
-  // multiple calls (some browsers may call the onreadystatechange
-  // multiple times for the same state)
   req.onLoadingInternalHandled = false;
   req.onLoadedInternalHandled = false;
   req.onInteractiveInternalHandled = false;
@@ -287,12 +158,6 @@ function AjaxRequest() {
   // ----------------
   // Instance methods
   // ----------------
-  /**
-   * The process method is called to actually make the request. It builds the
-   * querystring for GET requests (the content for POST requests), sets the
-   * appropriate headers if necessary, and calls the
-   * XMLHttpRequest.send() method
-  */
   req.process =
     function() {
       if (req.xmlHttpRequest!=null) {
@@ -323,11 +188,6 @@ function AjaxRequest() {
         req.xmlHttpRequest.send(content);
       }
     };
-
-  /**
-   * An internal function to handle an Object argument, which may contain
-   * either AjaxRequest field values or parameter name/values
-   */
   req.handleArguments =
     function(args) {
       for (var i in args) {
@@ -340,11 +200,6 @@ function AjaxRequest() {
         }
       }
     };
-
-  /**
-   * Returns the results of XMLHttpRequest.getAllResponseHeaders().
-   * Only available after a response has been returned
-   */
   req.getAllResponseHeaders =
     function() {
       if (req.xmlHttpRequest!=null) {
@@ -354,12 +209,6 @@ function AjaxRequest() {
         alert("Cannot getAllResponseHeaders because a response has not yet been received");
       }
     };
-
-  /**
-   * Returns the the value of a response header as returned by
-   * XMLHttpRequest,getResponseHeader().
-   * Only available after a response has been returned
-   */
   req.getResponseHeader =
     function(headerName) {
       if (req.xmlHttpRequest!=null) {
@@ -377,10 +226,6 @@ function AjaxRequest() {
 // Static methods of the AjaxRequest class
 // ---------------------------------------
 
-/**
- * Returns an XMLHttpRequest object, either as a core object or an ActiveX
- * implementation. If an object cannot be instantiated, it will return null;
- */
 AjaxRequest.getXmlHttpRequest = function() {
   if (window.XMLHttpRequest) {
     return new XMLHttpRequest();
@@ -405,36 +250,18 @@ AjaxRequest.getXmlHttpRequest = function() {
   }
 };
 
-/**
- * See if any request is active in the background
- */
 AjaxRequest.isActive = function() {
   return (AjaxRequest.numActiveAjaxRequests>0);
 };
 
-/**
- * Make a GET request. Pass an object containing parameters and arguments as
- * the second argument.
- * These areguments may be either AjaxRequest properties to set on the request
- * object or name/values to set in the request querystring.
- */
 AjaxRequest.get = function(args) {
   AjaxRequest.doRequest("GET",args);
 };
 
-/**
- * Make a POST request. Pass an object containing parameters and arguments as
- * the second argument.
- * These areguments may be either AjaxRequest properties to set on the request
- * object or name/values to set in the request querystring.
- */
 AjaxRequest.post = function(args) {
   AjaxRequest.doRequest("POST",args);
 };
 
-/**
- * The internal method used by the .get() and .post() methods
- */
 AjaxRequest.doRequest = function(method,args) {
   if (typeof(args)!="undefined" && args!=null) {
     var myRequest = new AjaxRequest();
@@ -444,13 +271,6 @@ AjaxRequest.doRequest = function(method,args) {
   }
 }  ;
 
-/**
- * Submit a form. The requested URL will be the form's ACTION, and the request
- * method will be the form's METHOD.
- * Returns true if the submittal was handled successfully, else false so it
- * can easily be used with an onSubmit event for a form, and fallback to
- * submitting the form normally.
- */
 AjaxRequest.submit = function(theform, args) {
   var myRequest = new AjaxRequest();
   if (myRequest==null) { return false; }
@@ -463,13 +283,6 @@ AjaxRequest.submit = function(theform, args) {
   return true;
 };
 
-/**
- * Serialize a form into a format which can be sent as a GET string or a POST
- * content.It correctly ignores disabled fields, maintains order of the fields
- * as in the elements[] array. The 'file' input type is not supported, as
- * its content is not available to javascript. This method is used internally
- * by the submit class method.
- */
 AjaxRequest.serializeForm = function(theform) {
   var els = theform.elements;
   var len = els.length;
@@ -515,17 +328,6 @@ AjaxRequest.serializeForm = function(theform) {
 // Static Class variables
 // -----------------------
 
-/**
- * The number of total AjaxRequest objects currently active and running
- */
 AjaxRequest.numActiveAjaxRequests = 0;
-
-/**
- * An object holding the number of active requests for each group
- */
 AjaxRequest.numActiveAjaxGroupRequests = new Object();
-
-/**
- * The total number of AjaxRequest objects instantiated
- */
 AjaxRequest.numAjaxRequests = 0;

data/app/assets/javascripts/kablam/{messaging.js → messaging.js.erb}

@@ -53,7 +53,8 @@ function UserChatSub(chat_div_id, chat_id, channel, user_id, options={}){
 
   App.cable.subscriptions.create({ channel: channel, id: chat_id }, {
     received: function(data) {
-      HtmlNode(data, options);
+      // HtmlNode(data, options);
+      RenderMessage(data);
       if (data['chat']['sender_id'] != user_id) {
         TopDot();
       }
@@ -61,7 +62,23 @@ function UserChatSub(chat_div_id, chat_id, channel, user_id, options={}){
   })
 }
 
-function HtmlNode(data, options={}){
+function RenderMessage(data) {
+  console.log(data);
+  AjaxRequest.post(
+    {
+      'url': '<%= Kablam::Engine.routes.url_helpers.message_path %>',
+      'parameters': {'message': JSON.stringify(data['chat'])},
+      // 'onSuccess':function(req){ insertAndExecute(target, req.responseText); }
+      'onSuccess': function(req){eval(req.responseText);}
+    }
+  );
+}
+
+function insertHTML(target, content, location) {
+
+}
+
+function HtmlNode(target, data, options={}){
   options = {
     outerDivClass: options.outerDivClass || "pt3 ph3 ph2-l bg-white br2 shadow1 mb3",
     innerDivClass: options.innerDivClass || "dt w-100 pb2 ph2 mt2",
@@ -88,7 +105,7 @@ function HtmlNode(data, options={}){
     </div>
     </div>
     <div class="${options.messageDivClass}"><p class="${options.messageClass}">${content}</p></div>`;
-    chatdiv.insertAdjacentElement('afterbegin', new_message);
+    target.insertAdjacentElement('afterbegin', new_message);
 }
 
 var scrollPosition;

data/app/controllers/kablam_controller.rb

@@ -1,10 +1,12 @@
 require 'rest-client'
+require 'json'
 
 class KablamController < ApplicationController
   protect_from_forgery with: :exception
   before_action :set_model, only: [:create, :update, :undo, :destroy, :form]
   before_action :set_object, only: [:update, :destroy]
   before_action :set_undo_object, only: [:undo]
+  skip_before_action :verify_authenticity_token, only: [:message]
   include Concerns::ApiSettings
 
   def form
@@ -18,6 +20,16 @@ class KablamController < ApplicationController
     render layout: false
   end
 
+  def message
+    @message = JSON.parse(params[:message])
+    respond_to do |format|
+      format.js
+      format.html do
+        redirect_to request.referrer
+      end
+    end
+  end
+
   def create
     @object = @model.new(model_params)
 

data/app/views/application/_flash_notice.html.erb

@@ -0,0 +1,6 @@
+<div class="alert alert-info note" id="alert-notification" role="alert" onclick="toggle_visibility('displayalert');">
+  <div id="displayalert">
+  <%= message %>
+  </div>
+</div>
+

data/app/views/application/_flash_undo.html.erb

@@ -0,0 +1,3 @@
+<div class="alert alert-info note" role="alert" onclick="toggle_visibility('displayalert')">
+  <%= message %><%= link %>
+</div>

data/app/views/kablam/_message.html.erb

@@ -0,0 +1,15 @@
+<div class="pt3 ph3 ph2-l bg-white br2 shadow1 mb3">
+  <div class="dt w-100 pb2 ph2 mt2">
+    <div class="dtc w2 w3-ns v-mid">
+      <img src="<%= message['image'].blank? ? image_path('rocket2.png') : message['image'] %>" class="ba b--black-10 db br-100 w2 w3-ns h2 h3-ns"/>
+    </div>
+    <div class="dtc v-mid pl3">
+      <h1 class="f6 f5-ns fw6 lh-title black mv0"><%= message['username'] %></h1>
+      <h2 class="f6 fw4 mt0 mb0 black-60 i"><%= message['created_at'].to_time.strftime("%H:%M:%S%p %m-%d-%Y") %></h2>
+      <h2 class="f6 fw4 mt0 mb0 black-60 i">User Time:<%= message['user_time'].to_time.strftime("%H:%M:%S%p %m-%d-%Y") if message['user_time'].present? %></h2>
+    </div>
+  </div>
+  <div class="ph3-l pb2 ">
+   <%= simple_format(message['content']) %>
+  </div>
+</div>

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

@@ -1,7 +1,7 @@
 <%= hide @object %>
 <% if @object.undoable? %>
 <%= render_flash message: 'Deleted', partial: 'application/flash_undo',
-  link: button_to('Undo', kablam_undo_path(@object.class.table_name, @object,
+  link: button_to('Undo', undo_path(@object.class.table_name, @object,
     @object.model_name.singular.to_sym => { destroyed_at: nil }),
   {data: { disable_with: 'Restoring…' },
   class: 'no-underline mt3 f4 tc pv2 ph4 white bg-black hover-bg-green shadow-5',

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

@@ -0,0 +1,5 @@
+var content = '<%= j render "kablam/message", message: @message %>';
+var newMessage = HTMLElement.From(content);
+var target = document.getElementById("kablam-chat-window");
+
+target.innerHTML = newMessage.outerHTML + target.innerHTML;

data/config/routes.rb

@@ -1,4 +1,5 @@
 Kablam::Engine.routes.draw do
+  post   '/message'   => 'kablam#message',   as: 'message'
   get    '/:name/form' => 'kablam#form',     as: 'form'
   post   '/:name'      => 'kablam#create',   as: 'create'
   patch  '/:name/:id'  => 'kablam#update',   as: 'update'

data/kablam.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'kablam'
-  s.version     = '0.2.4'
+  s.version     = '0.2.5'
   s.date        = '2018-09-14'
   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.}"

data/lib/generators/kablam/templates/_message.html.erb

@@ -0,0 +1,15 @@
+<div class="pt3 ph3 ph2-l bg-white br2 shadow1 mb3">
+  <div class="dt w-100 pb2 ph2 mt2">
+    <div class="dtc w2 w3-ns v-mid">
+      <img src="<%= message['image'].blank? ? image_path('rocket2.png') : message['image'] %>" class="ba b--black-10 db br-100 w2 w3-ns h2 h3-ns"/>
+    </div>
+    <div class="dtc v-mid pl3">
+      <h1 class="f6 f5-ns fw6 lh-title black mv0"><%= message['username'] %></h1>
+      <h2 class="f6 fw4 mt0 mb0 black-60 i"><%= message['created_at'].to_time.strftime("%H:%M:%S%p %m-%d-%Y") %></h2>
+      <h2 class="f6 fw4 mt0 mb0 black-60 i">User Time:<%= message['user_time'].to_time.strftime("%H:%M:%S%p %m-%d-%Y") if message['user_time'].present? %></h2>
+    </div>
+  </div>
+  <div class="ph3-l pb2 ">
+   <%= simple_format(message['content']) %>
+  </div>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kablam
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Sergio Rivas
@@ -67,15 +67,19 @@ files:
 - app/.DS_Store
 - app/assets/javascripts/kablam/ajax.js
 - app/assets/javascripts/kablam/forms.js
-- app/assets/javascripts/kablam/messaging.js
+- app/assets/javascripts/kablam/messaging.js.erb
 - app/assets/stylesheets/kablam.scss
 - app/channels/chat_channel.rb
 - app/controllers/concerns/api_settings.rb
 - app/controllers/kablam_controller.rb
 - app/views/.DS_Store
+- app/views/application/_flash_notice.html.erb
+- app/views/application/_flash_undo.html.erb
+- app/views/kablam/_message.html.erb
 - app/views/kablam/create.js.erb
 - app/views/kablam/destroy.js.erb
 - app/views/kablam/form.html.erb
+- app/views/kablam/message.js.erb
 - app/views/kablam/undo.js.erb
 - app/views/kablam/update.js.erb
 - app/views/kablam_forms/.DS_Store
@@ -97,6 +101,7 @@ files:
 - lib/generators/kablam/forms_generator.rb
 - lib/generators/kablam/install_generator.rb
 - lib/generators/kablam/messaging_generator.rb
+- lib/generators/kablam/templates/_message.html.erb
 - lib/generators/kablam/templates/_sample_target_item.html.erb
 - lib/generators/kablam/templates/chat.rb
 - lib/generators/kablam/templates/kablam.rb