abstracted 0.4.14 → 0.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e94662b590205430d680f86c0c0dcaac7588d9b5
-  data.tar.gz: b89dceacbb970ccf25f2f1f695b9462ee5807dc1
+  metadata.gz: 1dcf51a329c0e1df1f2f9c4d1101a92d23694adc
+  data.tar.gz: 8db87d563718a51ec36e1e4c484f46ccfba4dd14
 SHA512:
-  metadata.gz: 66f9faaff4a646fa1dc926413114a6ce6f197f49684d6ed3a5438d38dd1dc46d8f621b2e24c1489bd26824ad70850e90bd96e0790935b265f24c39fd3fc6c9d8
-  data.tar.gz: b35cbb3780b953daf5b6593187de5004ae6c37ed7d3d7653f145b44b5bfbaedc675c489b1ec6995fd6728386e31f5be968b3efbba7294797ec779a2223a646fe
+  metadata.gz: cff92410ac4a7fe6b625aeddd522aef47a93e44c784a1530dbce428849e5e692b50f86ffd94608e9562fbffc799b3ac327d6c6b5bc08387696b869281ab4d906
+  data.tar.gz: c95a0451cddbe10785903d66d5a381d8e762246b687a2f684cc6171be89a637b1d34d36ea4e782e43874dfc630ca3a3b68ab78c4fdafaf2dcdb9265fd5367703

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    abstracted (0.3.4)
+    abstracted (0.4.15)
+      amoeba
       kaminari
       pundit
       rails (~> 4.1)
@@ -45,7 +46,9 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
+    amoeba (3.0.0)
+      activerecord (>= 3.2.6)
+    arel (6.0.4)
     builder (3.2.2)
     capybara (2.4.4)
       mime-types (>= 1.16)
@@ -60,7 +63,7 @@ GEM
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
       thor (>= 0.14.6)
-    concurrent-ruby (1.0.0)
+    concurrent-ruby (1.0.4)
     database_cleaner (1.4.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
@@ -71,7 +74,7 @@ GEM
       railties (>= 3.0.0)
     ffi (1.9.6)
     formatador (0.2.5)
-    globalid (0.3.6)
+    globalid (0.3.7)
       activesupport (>= 4.1.0)
     guard (2.12.4)
       formatador (>= 0.2.4)
@@ -90,9 +93,18 @@ GEM
     hitimes (1.2.2)
     i18n (0.7.0)
     json (1.8.2)
-    kaminari (0.16.3)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    kaminari (1.0.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.0.1)
+      kaminari-activerecord (= 1.0.1)
+      kaminari-core (= 1.0.1)
+    kaminari-actionview (1.0.1)
+      actionview
+      kaminari-core (= 1.0.1)
+    kaminari-activerecord (1.0.1)
+      activerecord
+      kaminari-core (= 1.0.1)
+    kaminari-core (1.0.1)
     listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
@@ -100,8 +112,8 @@ GEM
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
+    mail (2.6.4)
+      mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (2.4.3)
     mini_portile (0.6.2)
@@ -154,7 +166,7 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    responders (2.1.1)
+    responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
@@ -182,10 +194,10 @@ GEM
     rspec-support (3.2.2)
     shellany (0.0.1)
     slop (3.6.0)
-    sprockets (3.5.2)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.0)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
@@ -220,4 +232,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.10.5
+   1.13.6

data/app/assets/javascripts/abstracted/app.fab_delete.coffee

@@ -22,6 +22,8 @@ class App.fabDelete
         if $remove
           $remove.hide()
         App.shared.closeSweetAlert($elem)
+        if (window.location.href).endsWith($elem.data('url')+"/"+$elem.data('id'))
+          window.location = $elem.data('url')
         #swal("Deleted!", "Your file was successfully deleted!", "success")
       .fail (data) =>
         $('#message_container').html(data.responseText)
@@ -61,10 +63,13 @@ class App.fabDelete
     switch elem.data('action')
       when undefined  then alert 'Fejl!\n Kontakt ALCO på 9791 1470\n (fejlen er: handleFABLinks ikke sat)'
       when 'new'      then App.shared.openNewWindow(elem)                    # data-action="new",    data-url="/endpoint", data-selector="#id.modal"
+      when 'reset'    then App.shared.resetForm(elem)                        # data-action="reset",  data-selector="form"
       when 'submit'   then App.shared.submitForm(elem)                       # data-action="submit", data-selector="form"
+      when 'post'     then App.shared.submitForm(elem)                       # data-action="post",   data-selector="form"
+      when 'delete'   then @handleDeleteLinks(e)                             # data-action="delete", data-selector="form", data-id="id", data-url="url"
       when 'ajax'     then App.shared.callAjax(elem,loaded_element)          # data-action="ajax",   data-url="/endpoint", data-selector="#id.modal", data-method="get", data-type="html"
       when 'get'      then window.location.href = elem.data('url')           # data-action="get",    data-url="/endpoint"
-      else eval(elem.data('action'))                                       # data-action="$(document.body).trigger({ type: 'app:modal:state:changed', state: {print_format: 'record' }})"
+      else eval(elem.data('action'))                                         # data-action="$(document.body).trigger({ type: 'app:modal:state:changed', state: {print_format: 'record' }})"
 
 
   #

data/app/assets/javascripts/abstracted/app.shared.coffee

@@ -48,8 +48,35 @@ class App.Shared
       return $($elem.data('selector')).submit()
     $(document.body).find('form').first().submit()
 
+  #
+  # resetCheckBoxAndRadio
+  # is a supportive funktion
+  # to resetForm
+  #
+  resetCheckBoxAndRadio: (fld) =>
+    if $(fld).data('original-value') && $(fld).data('original-value')==true
+      fld.checked = true
+    else
+      fld.checked = false  if fld.checked
 
-
+  #
+  # resetForm
+  # resets everything to <field data-original-value="" />
+  # - except <field data-no-reset="true" />
+  #
+  resetForm: ($elem=null) =>
+    if $elem && $elem.data('selector')
+      frm = $elem.data('selector')
+    else
+      frm = $(document.body).find('form').first()[0]
+
+    for fld in frm.elements
+      do (fld) ->
+        unless $(fld).data('no-reset')
+          switch fld.type.toLowerCase()
+            when 'text', 'password', 'textarea', 'hidden' then fld.value = $(fld).data('original-value') || ''
+            when 'radio', 'checkbox'                      then App.shared.resetCheckBoxAndRadio(fld)
+            when 'select-one', 'select-multi'             then fld.selectedIndex = $(fld).data('original-value') || -1
 
   getDownload: (xhr,data) =>
     # Check if a filename is existing on the response headers.

data/app/helpers/fab_button_helper.rb

@@ -32,35 +32,42 @@ LISTEND
   #
   def build_fab_options resource, options={}
     lst = []
-
     # if items are empty - dream them up
     options[:items] ||= {}
 
-    options[:items][:list] ||= { ajax: 'get', icon: 'list', class: 'blue', url: resources_url(resources, controller: params[:controller]), oxremote: 'false'  }
+    options[:items].merge!( list: { ajax: 'get', icon: 'list', class: 'blue', url: resources_url(resources, controller: params[:controller]), oxremote: 'false'  }){ |key, v1, v2| v1 }
+
     case options[:action]
     when 'new','create'
-      options[:items].merge! add: { ajax: 'get', icon: 'add', class: 'green lighten-1', url: new_resource_url, oxremote: 'false' }
-      options[:items].merge! publish: { ajax: 'post', icon: 'publish', class: 'green', url: resources_url(resources, controller: params[:controller]), oxremote: 'false' }
+      options[:items].merge!( reset: { action: 'reset', icon: 'undo', class: 'orange darken-2' }){ |key, v1, v2| v1 }
+      options[:items].merge!( publish: { ajax: 'post', icon: 'publish', class: 'green', url: resources_url(resources, controller: params[:controller]), oxremote: 'false' }){ |key, v1, v2| v1 }
 
       options[:button] ||= "<a class='btn-floating btn-large green'><i class='large material-icons'>publish</i> </a>"
+
     when 'show'
-      options[:items].merge! add: { ajax: 'get', icon: 'add', class: 'green lighten-1', url: new_resource_url, oxremote: 'false' }
-      options[:items].merge! edit: { ajax: 'get', icon: 'edit', class: 'yellow darken-2', url: edit_resource_url, oxremote: 'false' }
+      options[:items].merge!( add: { ajax: 'get', icon: 'add', class: 'green lighten-1', url: new_resource_url, oxremote: 'false' }){ |key, v1, v2| v1 }
+      options[:items].merge!( edit: { ajax: 'get', icon: 'edit', class: 'yellow darken-2', url: edit_resource_url, oxremote: 'false' }){ |key, v1, v2| v1 }
+      options[:items].merge!( delete: { ajax: 'delete', icon: 'delete', class: 'red darken-1', url: resources_url, id: resource.id, oxremote: 'false' }){ |key, v1, v2| v1 }
+
+      options[:button] ||= "<a class='btn-floating btn-large blue'><i class='fab-button large material-icons'>edit</i> </a>"
 
-      options[:button] ||= "<a class='btn-floating btn-large blue'><i class='fab-button large material-icons'>mode_edit</i> </a>"
     when 'edit', 'update'
-      options[:items].merge! add: { ajax: 'get', icon: 'add', class: 'green lighten-1', url: new_resource_url , oxremote: 'false'}
-      options[:items].merge! publish: { ajax: 'post', icon: 'publish', class: 'green', url: resource_url, oxremote: 'false' }
+      options[:items].merge!( add: { ajax: 'get', icon: 'add', class: 'green lighten-1', url: new_resource_url , oxremote: 'false'}){ |key, v1, v2| v1 }
+      options[:items].merge!( publish: { ajax: 'post', icon: 'publish', class: 'green', url: resource_url, oxremote: 'false' }){ |key, v1, v2| v1 }
+      options[:items].merge!( delete: { ajax: 'delete', icon: 'delete', class: 'red darken-1', url: resources_url, id: resource.id, oxremote: 'false' }){ |key, v1, v2| v1 }
+
       options[:button] ||= "<a class='btn-floating btn-large green'><i class='large material-icons'>publish</i> </a>"
 
     when 'index'
-      options[:items].merge! add: { ajax: 'get', icon: 'add', class: 'green lighten-1', url: new_resource_url(controller: params[:controller]), oxremote: 'false' } unless options[:items].keys.include? :add
+      options[:items].merge!( add: { ajax: 'get', icon: 'add', class: 'green lighten-1', url: new_resource_url(controller: params[:controller]), oxremote: 'false' }){ |key, v1, v2| v1 }
 
       options[:button] ||= "<a class='btn-floating btn-large blue'><i class='fab-button large material-icons'>mode_edit</i> </a>"
+
     end
 
     if !options[:items].nil?
       options[:items].each do |k,item|
+        next if item.empty?
         item[:ajax] ||= 'get'
         item[:action] ||= item[:ajax]
         item[:oxremote] ||= 'false'

data/app/models/abstract_resource.rb

@@ -2,6 +2,10 @@
 class AbstractResource < ActiveRecord::Base
   self.abstract_class=true
 
+  amoeba do
+    enable
+  end
+
   attr_accessor :current_user
 
   def self.logit( log_type, msg )

data/app/views/abstract_resources/edit.html.haml

@@ -3,6 +3,6 @@
 		%h3= render partial: 'title'
 - @disabled = false
 = render 'form'
-= render partial: 'edit'
+= render partial: 'edit' rescue nil
 - unless params[:format] == 'js'
 	= build_fab_button build_fab_options( resource, fab_button_options.merge!( action: params[:action] ))

data/app/views/abstract_resources/new.html.haml

@@ -3,6 +3,6 @@
 		%h3= render partial: 'title'
 - @disabled = false
 = render 'form'
-= render partial: 'new'
+= render partial: 'new' rescue nil
 - unless params[:format] == 'js'
 	= build_fab_button build_fab_options( resource, fab_button_options.merge!( action: params[:action] ))

data/app/views/abstract_resources/show.html.haml

@@ -3,6 +3,6 @@
 		%h3= render partial: 'title'
 - @disabled = true
 = render 'form'
-= render partial: 'show'
+= render partial: 'show' rescue nil
 - unless params[:format] == 'js'
 	= build_fab_button build_fab_options( resource, fab_button_options.merge!( action: params[:action] ))

data/lib/abstracted/version.rb

@@ -1,3 +1,3 @@
 module Abstracted
-  VERSION = "0.4.14"
+  VERSION = "0.4.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstracted
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.15
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: amoeba
+  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: responders
   requirement: !ruby/object:Gem::Requirement