modal_logic 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDViZWI1NDAwYjVkZWI1ZDk5MmZmZGNlZDE4MTNlNDFjYTA2MWRmMQ==
+    NjRhZWYxMTUwZjM4ZmIxYWFiYzljNWEwNjk3MDVjYzZjMzEzNDhkNw==
   data.tar.gz: !binary |-
-    NWExM2QxZDVjMzMyNTJkNDRlNWFhZmQzNWRmOGJlZWQ0YTc1Y2I3MA==
+    MDgyYjBhZjdlOTRjZjJiOWNlZDM4ZTQzNmFlYTBjMTNjMjI0NzhlNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzFkNGY4ZDQ3MGU0ZDhhZDE0Mzc3ZDRhZGMzYWE0YWEyNTI1MDU5NjQ1YzE3
-    ZTM5ZTk5OTRiOGFmNzI4MTdlNzU0YTRhYmViM2RmZGYyY2JhMDJkNDk5MTFm
-    ZGE0ZWUwNjc3NWU1ZTZkZDhhNWIwNGNkZTBhYjcxZDM0OTJkNzQ=
+    MWQ0MmIzZTRkMTJmMDNlZTVkYTljNDUzZjVlYWVmNDZkMTNmNjA3NjVhZTIy
+    ZmQ4OWEwMmE3YjcyNjg0NjdmNmIzOGMxMDRjNjFkMjg0ODcyZjYxYjIyYjFj
+    MzZmMWMwMzg2MzdiMGNhY2MwZWEwNDMwMTBhMTU2NDExM2YyZjc=
   data.tar.gz: !binary |-
-    Njc5ZGRlYTJhZDdlNmU4YmExZmY2NDE3ODY5MGExOGRmMjc5MTFlMmU4MmY1
-    OGQ2ZWQ3YjJmODBlMjE5MzVmNDUzMjA4NTliMWNhMGNiNDQ2NWMyNDE0NmJk
-    Y2ZjZWE3ZGY4N2U5ZjkwMDUyMmE2N2VjN2RkNjlhZDgwNWJmZmM=
+    YzllZDEwMTZkN2VmNTI2OGU2M2RkMzk3MThjOGVkZjA5MGNmMmM1N2QwZDM1
+    N2EzZWEzOWI0YzJlMjVhMWFhNWEyZmZhZDU0NzVhZTkwMzczNjFiM2Q4YWI1
+    ODk3ZGEyODlhY2M3NzkyZGFlNDY3NjJkYTkwMTkxOTQzNzRjMmU=

data/README.md

@@ -1,3 +1,23 @@
 = ModalLogic
 
-This project rocks and uses MIT-LICENSE.
+
+
+
+===Install
+
+```ruby
+  # Gemfile
+
+  gem 'modal_logic'
+
+  group :assets do 
+    gem 'handlebars_assets'
+  end
+```
+
+```javascript
+  /* app/assets/javascripts/application.js */
+  //= require modal_logic
+  //= require handlebars.runtime
+  //= require templates/modal/crud
+```

data/app/assets/javascripts/modal_logic.coffee

@@ -3,42 +3,25 @@ class ModalLogic
     that = @
     $('a[data-remote][modal],form[data-remote][modal]').live 'ajax:complete', (jq_event, xhr) ->
       response = JSON.parse(xhr.responseText)
-      if response.close?
-        if response.redirect_location?
-          window.location = response.redirect_location
+      if response?      
+        if response.close?
+          window.location = if response.redirect_location? then response.redirect_location else window.location
         else
-          window.location = window.location
-      else if ! response.html?
+          that.createOrUpdateModalContent(response)
+      else
         that.createOrUpdateModalContent
           title: 'Error'
-          html: 'There was an error.  Please reload the page and try again'
-      else
-        that.createOrUpdateModalContent(response)
+          body: 'There was an error.  Please reload the page and try again'
+
   createOrUpdateModalContent: (context) =>
-    modal = $('.modal.modal-logic')
-    if modal.length is 0
-      html = @renderTemplate
-        title: context.title
-        body: context.html     
-      $('body').append html
+    html = HandlebarsTemplates['modal/crud']( modal: context )
+    $modal = $('.modal.modal-logic')
+    if $modal.length > 0
+      $modal.modal('hide').replaceWith html
     else
-      modal.find('.modal-body').empty().append context.html
-      modal.find('.modal-header > .modal-title').empty().append context.title
-
+      $('body').append html
     @showModal()
 
   showModal: =>
     $('.modal.modal-logic').modal('show')
 
-  renderTemplate: (context) =>
-    """
-      <div class="modal modal-logic hide fade">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-          <h3 class='modal-title'>#{context.title}</h3>
-        </div>
-        <div class="modal-body">
-          #{context.body}
-        </div>
-      </div>
-    """

data/app/assets/javascripts/modal_logic.js

@@ -4,7 +4,6 @@ var ModalLogic,
 
 ModalLogic = (function() {
   function ModalLogic() {
-    this.renderTemplate = __bind(this.renderTemplate, this);
     this.showModal = __bind(this.showModal, this);
     this.createOrUpdateModalContent = __bind(this.createOrUpdateModalContent, this);
     var that;
@@ -14,36 +13,32 @@ ModalLogic = (function() {
       var response;
 
       response = JSON.parse(xhr.responseText);
-      if (response.close != null) {
-        if (response.redirect_location != null) {
-          return window.location = response.redirect_location;
+      if (response != null) {
+        if (response.close != null) {
+          return window.location = response.redirect_location != null ? response.redirect_location : window.location;
         } else {
-          return window.location = window.location;
+          return that.createOrUpdateModalContent(response);
         }
-      } else if (response.html == null) {
+      } else {
         return that.createOrUpdateModalContent({
           title: 'Error',
-          html: 'There was an error.  Please reload the page and try again'
+          body: 'There was an error.  Please reload the page and try again'
         });
-      } else {
-        return that.createOrUpdateModalContent(response);
       }
     });
   }
 
   ModalLogic.prototype.createOrUpdateModalContent = function(context) {
-    var html, modal;
-
-    modal = $('.modal.modal-logic');
-    if (modal.length === 0) {
-      html = this.renderTemplate({
-        title: context.title,
-        body: context.html
-      });
-      $('body').append(html);
+    var $modal, html;
+
+    html = HandlebarsTemplates['modal/crud']({
+      modal: context
+    });
+    $modal = $('.modal.modal-logic');
+    if ($modal.length > 0) {
+      $modal.modal('hide').replaceWith(html);
     } else {
-      modal.find('.modal-body').empty().append(context.html);
-      modal.find('.modal-header > .modal-title').empty().append(context.title);
+      $('body').append(html);
     }
     return this.showModal();
   };
@@ -52,10 +47,6 @@ ModalLogic = (function() {
     return $('.modal.modal-logic').modal('show');
   };
 
-  ModalLogic.prototype.renderTemplate = function(context) {
-    return "<div class=\"modal modal-logic hide fade\">\n  <div class=\"modal-header\">\n    <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-hidden=\"true\">×</button>\n    <h3 class='modal-title'>" + context.title + "</h3>\n  </div>\n  <div class=\"modal-body\">\n    " + context.body + "\n  </div>\n</div>";
-  };
-
   return ModalLogic;
 
 })();

data/app/assets/javascripts/templates/modal/crud.hbs

@@ -0,0 +1,12 @@
+<div class="modal modal-logic hide">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 class='modal-title'>{{modal.title}}</h3>
+  </div>
+  <div class="modal-body">
+    {{#if modal.errors.base}}
+      <div class='alert alert-error'>{{{modal.errors.base}}}</div>
+    {{/if}}
+    {{{modal.body}}}
+  </div>
+</div>

data/lib/modal_logic/helpers.rb

@@ -3,20 +3,22 @@ module ModalLogic
     def modal_form_response( model, opts = {})
       response = {}
       case params[:action]
-      when 'create'
-        if ! model.valid?
-          response[:html]   = render_to_string path_to_current_controller_form
-          response[:errors] = model.errors
+      when 'new', 'edit'
+        response[:body]  = render_to_string path_to_current_controller_form, layout: false
+        response[:title] = opts[:title] || modal_title(model)
+
+      when 'create', 'update'
+        if ! model.valid? || ! model.persisted? || opts[:errors].present?
+          response[:body]   = render_to_string path_to_current_controller_form
+          response[:errors] = opts[:errors] || model.errors
           response[:flash]  = flash
           response[:title]  = opts[:title] || modal_title(model)
         else
           response[:redirect_location] = opts[:redirect_location] if opts[:redirect_location]
           response[:close] = true
         end
-      when 'new'
-        response[:html]  = render_to_string path_to_current_controller_form, layout: false
-        response[:title] = opts[:title] || modal_title(model)
       end
+
       response
     end
 
@@ -26,9 +28,7 @@ module ModalLogic
     end
 
     def path_to_current_controller_form( opts = {} )
-      filename = opts[:filename] || '_form'
-      request_base_path = request.path.split(params[:action].to_s).last
-      File.join(Rails.root, 'app/views', request_base_path, filename )
+      File.join(Rails.root, 'app/views', params[:controller], opts[:filename] || '_form')
     end
   end
 end

data/lib/modal_logic/version.rb

@@ -1,3 +1,3 @@
 module ModalLogic
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modal_logic
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Adam Hallett
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
+- !ruby/object:Gem::Dependency
+  name: handlebars_assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.1
 description: The simplicity of Rails forms coupled with Bootstrap modal
 email:
 - adam.t.hallett@gmail.com
@@ -33,6 +47,7 @@ extra_rdoc_files: []
 files:
 - app/assets/javascripts/modal_logic.coffee
 - app/assets/javascripts/modal_logic.js
+- app/assets/javascripts/templates/modal/crud.hbs
 - lib/modal_logic/engine.rb
 - lib/modal_logic/helpers.rb
 - lib/modal_logic/version.rb