bhf 0.10.13 → 0.10.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a140fe70021fd5465f86cbd6df27bb58bc47fd1
-  data.tar.gz: 3099b6a20bd3fa24a6bbbaa388d97d5d1476d09c
+  metadata.gz: d52f22e8e17c8a3f1385b4322105b1f56d0df108
+  data.tar.gz: 36bcbe73fbf572dbcbccd2da1fc0b9719d70fb14
 SHA512:
-  metadata.gz: c9d6903797d6fb4017631d798c9132e7841e5e23d1891e136576bd4f3266d796241cb6a7584dd68f675774f20d5b0d5da6d350428228a2864821dc8d99348477
-  data.tar.gz: b3e00412522c5f9354b69ba9857e8af065a87e5d8cbd1bdd8803fd6cb2ca3a29ffdd6128e9bbb9934918f360afef34da9737f0b8602176161bc2c4080797b967
+  metadata.gz: 76508689f724d0ce51b33898565fe61297ddf3ef2031456db5976dd64b7cc15d4c6eb6b76ea8711273fba2ce21107d35a37cdc8313b5b7c5ae44d3c5236e344d
+  data.tar.gz: d7209cae58d7e66103978a2f5cfc26f66299906119607310c214ae869b70b622ad37f3a81dacba4bd03bceb80b1dedc94ed29fd60add2beeb690db81d3780ff9

data/README.md

@@ -14,6 +14,11 @@ Also see [Getting Started](Getting_Started.md) document for additional info.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
 
+## Roadmap
+
+* Adding unit tests and integration tests
+* Adding bulk edit for the table view (aka platform)
+
 ## Support
 
 <p><a href='https://pledgie.com/campaigns/25956'><img alt='Click here to lend your support to: bhf and make a donation at pledgie.com !' src='https://pledgie.com/campaigns/25956.png?skin_name=chrome' border='0' ></a></p>

data/VERSION

@@ -1 +1 @@
-0.10.13
+0.10.14

data/app/assets/javascripts/bhf/application.js

@@ -105,7 +105,7 @@ Turbolinks.pagesCached(0);
 			}
 		}
 		if (eventNames.contains('successAndChange')) {
-			if (entry) {
+			if (entry && parsedTemplate) {
 				entry.innerHTML = parsedTemplate;
 			}
 		}
@@ -206,11 +206,21 @@ Turbolinks.pagesCached(0);
 			});
 		});
 
+		mainScope.addEvent('click:relay(.js_toggle)', function(e){
+			e.target.addEvents({
+				'ajax:success': function(xhr, responseJSON){
+					updateElementsAfterQuickEditSuccess(['successAndChange'], e.target, responseJSON);
+				},
+				'ajax:failure': function(){
+					alert(Locale.get('Notifications.failure'));
+				}
+			});
+		});
 
 		if (platforms.length) {
 			quickEditOptions = Object.merge({
 				onSuccessAndNext: function(){
-					var tr = this.linkElem;
+					var tr = this.linkElem.getParent('tr');
 					var nextTr = tr.getNext('tr');
 
 					if (nextTr) {

data/app/assets/javascripts/bhf/classes/PlatformHelper.js

@@ -35,11 +35,11 @@ var PlatformHelper = new Class({
 				}
 			}).send({data: e.target});
 		});
-		scope.getElements('.quick_edit').addEvent('click', function(e){
+		scope.addEvent('click:relay(.quick_edit)', function(e){
 			e.preventDefault();
 			_this.fireEvent('quickEditStart', [this]);
 		});
-		scope.getElements('.action a').addEvent('click', function(e){
+		scope.addEvent('click:relay(.action a, .js_toggle)', function(e){
 			this.addClass('clicked');
 			setTimeout(function(){
 				this.removeClass('clicked');

data/app/assets/javascripts/bhf/mootools_ujs.js

@@ -119,45 +119,6 @@ window.addEvent('domready', function(){
     }
   };
 
-  var _reqestClassMethods = {
-    initialize: function(element, options){
-      this.el = element;
-      this.parent(Object.merge({
-        method: this.el.get('method') || this.el.get('data-method') || 'get',
-        url: this.el.get('action') || this.el.get('href')
-      }, options));
-      this.addRailsEvents();
-    },
-
-    send: function(options) {
-      this.el.fireEvent('ajax:before');
-      if (this.el.get('tag') === 'form'){
-        this.options.data = this.el;
-      }
-      this.parent(options);
-      this.el.fireEvent('ajax:after', this.xhr);
-    },
-
-    addRailsEvents: function(){
-      this.addEvent('request', function(){
-        this.el.fireEvent('ajax:loading', this.xhr);
-      });
-
-      this.addEvent('success', function(){
-        this.el.fireEvent('ajax:success', this.xhr);
-      });
-
-      this.addEvent('complete', function(){
-        this.el.fireEvent('ajax:complete', this.xhr);
-        this.el.fireEvent('ajax:loaded', this.xhr);
-      });
-
-      this.addEvent('failure', function(){
-        this.el.fireEvent('ajax:failure', this.xhr);
-      });
-    }
-  };
-
   var _reqestClassMethods = {
     initialize: function(element, options){
       this.el = element;
@@ -189,8 +150,8 @@ window.addEvent('domready', function(){
         this.el.fireEvent('ajax:loading', this.xhr);
       });
 
-      this.addEvent('success', function(){
-        this.el.fireEvent('ajax:success', this.xhr);
+      this.addEvent('success', function(responseJSON){
+        this.el.fireEvent('ajax:success', [this.xhr, responseJSON]);
       });
 
       this.addEvent('complete', function(){

data/app/assets/stylesheets/bhf/application.css.sass

@@ -40,7 +40,7 @@ body
 
 a
   text-decoration: none
-  color: inherit 
+  color: inherit
   &:focus,
   &:active
     outline: 0
@@ -93,7 +93,7 @@ header
           +box-shadow(0, 1, 4)
         &:active
           background: $b2
-            
+
 .content_box
   margin: 10px 20px 20px 20px
 .dl
@@ -129,7 +129,7 @@ header
 
 .font_size_bigger
   font-size: 1.2em
-    
+
 
 .quick_edit_holder,
 #main
@@ -143,7 +143,7 @@ header
   > h3
     padding: 9px 20px
     background: $g3
-    
+
 
 #area_select
   -webkit-appearance: none
@@ -163,7 +163,7 @@ header
   cursor: pointer
   background-color: transparent
   background-position: -393px 0
-  
+
 
 
 #content
@@ -202,11 +202,11 @@ header
     .input
       padding-top: 0
       min-height: 31px
-    
+
     textarea
       width: 300px
       height: 100px
-    
+
     .group
       margin-top: 0
       margin-bottom: 10px
@@ -232,7 +232,7 @@ header
           &:focus,
           &:hover
             background-position: -140px -90px
-        
+
 
     .quick_edit_helper > a
       &.cancel,
@@ -280,7 +280,7 @@ table.data_table
     padding-left: 17px
   th:first-child
     padding-left: 20px
-  
+
   thead
     th
       padding: 4px 0
@@ -290,7 +290,7 @@ table.data_table
       color: $g5
       &.primary_key
         text-transform: uppercase
-      &.sorted 
+      &.sorted
         & a:after,
         &.desc:hover a:after
           content: ' ▲'
@@ -345,7 +345,7 @@ table.data_table
 
     .handle
       display: block
-    
+
 
     tr
       &.animate td
@@ -365,6 +365,14 @@ table.data_table
             background-position: 0 -50px
             &:hover
               background-position: 0 -100px
+          .toggle
+            background-position: -448px -50px
+            &:hover
+              background-position: -448px -100px
+            &.h_true
+              background-position: -448px -200px
+              &:hover
+                background-position: -448px -250px
           .delete
             background-position: -50px -50px
             &:hover
@@ -375,6 +383,8 @@ table.data_table
               background-position: -98px -100px
           .duplicate,
           .edit,
+          .toggle,
+          .toggle.h_true,
           .delete
             &.clicked
               background: image-url('bhf/small_ajax_loader_h.gif') no-repeat center center
@@ -425,6 +435,7 @@ table.data_table
   width: 20px
   height: 20px
   background: image-url('bhf/pictos.png') no-repeat
+  &.toggle,
   &.duplicate,
   &.edit,
   &.delete
@@ -435,6 +446,11 @@ table.data_table
     background-position: -348px 0
   &.delete
     background-position: -50px 0
+  &.toggle
+    width: 24px
+    background-position: -448px 0
+    &.h_true
+      background-position: -448px -150px
   &.handle
     background-position: -98px 0
     cursor: move
@@ -522,7 +538,7 @@ form
       &.live_edit,
       &:hover
         background-position: 0 -200px
-      
+
   .input
     input[type="file"]
       display: block
@@ -542,7 +558,7 @@ form
       .quick_edit_holder &
         width: 320px
         margin-top: 0px
-    
+
     textarea
       width: 500px
       height: 200px
@@ -595,7 +611,7 @@ form
         color: $b1
     .warning
       font-weight: bold
-  
+
   input[type="submit"]
     margin-right: 20px
   input[type="submit"].alt_button
@@ -616,7 +632,7 @@ form
     color: $g6
     a
       text-decoration: underline
-  
+
   .error_explanation
     h5
       padding: 10px 20px
@@ -789,7 +805,7 @@ input[type="submit"].alt_button,
     padding: 0 8px
   a, span, em
     @extend .alt_button
-  
+
   span
     color: $g4
     cursor: default
@@ -802,7 +818,7 @@ input[type="submit"].alt_button,
     border-color: $g4
     &:hover
       color: $w1
-      
+
   em
     font-style: normal
     font-weight: bold
@@ -869,8 +885,8 @@ input[type="submit"].alt_button,
     padding: 2px 4px 4px 4px !important
     &:hover
       background: $g4 !important
-      
-      
+
+
 .datepicker
   position: absolute
   width: 172px
@@ -920,7 +936,7 @@ input[type="submit"].alt_button,
     > div
       margin-top: 2px
       margin-left: 2px
-    
+
   .time
     position: relative
     width: 100%
@@ -969,7 +985,7 @@ input[type="submit"].alt_button,
         background-color: $w1
         color: $b2
         +border-radius(2)
-        
+
     .otherMonth
       color: $g5
     .selected
@@ -1042,7 +1058,7 @@ input[type="submit"].alt_button,
   clear: both
 .animate
   +transition-duration
-  
+
 #ajax_holder
   text-indent: -9999px
   height: 60px
@@ -1066,18 +1082,18 @@ input[type="submit"].alt_button,
     width: auto
     opacity: 1
     top: 0
-    text-indent: 0px    
+    text-indent: 0px
     +transition-duration(0)
     height: auto
     color: white
     padding: 20px
     marign-left: -120px
     font-weight: bold
-    
+
 
 
 .wmd-preview,
-.wmd-output 
+.wmd-output
   @extend .default_input
   width: 700px
   margin: 0 -6px 0 -6px
@@ -1104,7 +1120,7 @@ input[type="submit"].alt_button,
     text-decoration: underline
     color: $b2
     font-weight: bold
-    
+
 .preview_switch
   padding-right: 6px
   span
@@ -1114,7 +1130,7 @@ input[type="submit"].alt_button,
     &.active
       color: $b2
 
-.wmd-output 
+.wmd-output
   font-size: 12px
   line-height: 16px
   background: $g6
@@ -1123,7 +1139,7 @@ input[type="submit"].alt_button,
     font-family: Monaco,Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Courier New",Courier,monospace
     white-space: pre-wrap
 
-.wmd-button-row 
+.wmd-button-row
   width: 700px
   background: $w1
   padding: 6px 5px 1px 5px
@@ -1135,17 +1151,17 @@ input[type="submit"].alt_button,
 
 
 .wmd-spacer
-  width: 1px 
-  height: 20px 
+  width: 1px
+  height: 20px
   margin-left: 14px
   position: absolute
   background-color: Silver
-  display: inline-block 
+  display: inline-block
   list-style: none
 
 .wmd-button
-  width: 20px 
-  height: 20px 
+  width: 20px
+  height: 20px
   margin-left: 5px
   margin-right: 5px
   position: relative
@@ -1203,11 +1219,11 @@ input[type="submit"].alt_button,
 .wmd-prompt-dialog
   border: 1px solid $g5
   background-color: $g1
-  > div 
+  > div
     font-size: 0.8em
     font-family: arial, helvetica, sans-serif
   > form
-    input[type="text"] 
+    input[type="text"]
       border: 0
       color: black
     input[type="button"]
@@ -1219,11 +1235,9 @@ input[type="submit"].alt_button,
 
 .translation_missing
   color: $r1 !important
-  
+
 
 @media screen and (-webkit-min-device-pixel-ratio: 1.5), screen and (min--moz-device-pixel-ratio: 1.5), screen and (min-device-pixel-ratio: 1.5)
   .icon
     background-image: image-url('bhf/pictos_2x.png')
-    background-size: 440px 260px
-
-
+    background-size: 510px 280px

data/app/controllers/bhf/entries_controller.rb

@@ -116,11 +116,30 @@ class Bhf::EntriesController < Bhf::ApplicationController
       extra_data.merge!(@object.to_bhf_hash) if @object.respond_to?(:to_bhf_hash)
 
       @platform.columns.each_with_object(extra_data) do |column, hash|
-        column_value = @object.send(column.name)
-        unless column.macro == :column && column_value.blank?
-          p = "bhf/table/#{column.macro}/#{column.display_type}"
-          hash[column.name] = render_to_string partial: p, formats: [:html], locals: {object: @object, column_value: column_value, link: false, add_quick_link: false}
+        respond_to_column = @object.respond_to?(column.name)
+        column_value = @object.send(column.name) if respond_to_column
+        custom_link = send(@platform.custom_link, platform: @platform.name, id: @object) if @platform.custom_link
+        if column.display_type == :toggle
+          query = {}
+          query[@platform.model_name] = {}
+          query[@platform.model_name][column.name] = !column_value
+          custom_link = entry_path(@platform.name, @object, query)
         end
+        edit_link = @platform.hide_edit ? "##{@object.id}_#{@platform.name}" : edit_entry_path(@platform.name, @object)
+        partial_name = if respond_to_column && ! column.type_ignore_emtpy? && column_value.blank?
+          'column/empty'
+        else
+          "#{column.macro}/#{column.display_type}"
+        end
+        hash[column.name] = render_to_string(
+          partial: "bhf/table/#{column.macro}/#{column.display_type}",
+          formats: [:html],
+          locals: {
+            object: @object, column_value: column_value,
+            link: (custom_link ? custom_link : edit_link),
+            add_quick_link: (!custom_link && @platform.table_quick_edit)
+          }
+        )
       end
     end
 

data/app/views/bhf/entries/show.html.haml

@@ -5,7 +5,9 @@
       - column_value = @object.send(column.name)
       - if ! column_value.blank?
         = definition_item @object, column do
-          = render(partial: "bhf/table/#{column.macro}/#{column.show_type}", locals: {column_value: column_value, object: @object, link: false, add_quick_link: false})
+          = render(partial: "bhf/table/#{column.macro}/#{column.show_type}",
+            locals: {column_value: column_value,
+              object: @object, link: false, add_quick_link: false})
 
 - if @platform.show_extra_fields and @platform.show_extra_fields.any?
   .content_box

data/app/views/bhf/pages/_platform.html.haml

@@ -47,18 +47,25 @@
               %td.drag
                 %span.handle.icon  
             - platform.columns.each do |column|
-              - css_classes = [column.macro, column.display_type]
               - respond_to_column = object.respond_to?(column.name)
               - column_value = object.send(column.name) if respond_to_column
+              - if column.display_type == :toggle
+                - query = {}
+                - query[platform.model_name] = {}
+                - query[platform.model_name][column.name] = !column_value
+                - custom_link = entry_path(platform.name, object, query)
+              - css_classes = [column.macro, column.display_type]
               - if column.display_type == :primary_key && column_value.to_s.length > 6
                 - css_classes << :key_long
               %td{class: css_classes}
-                - partial_name = if respond_to_column && column.display_type != :boolean && column_value.blank?
+                - partial_name = if respond_to_column && ! column.type_ignore_emtpy? && column_value.blank?
                   - 'column/empty'
                 - else
                   - "#{column.macro}/#{column.display_type}"
                 - cached_partials[partial_name] ||= lookup_context.find_template(partial_name, ['bhf/table'], true, local_names)
-                - locals = {column_value: column_value, object: object, link: (platform.custom_link ? custom_link : edit_link), add_quick_link: (!platform.custom_link && platform.table_quick_edit)}
+                - locals = { column_value: column_value, object: object,
+                    link: (custom_link ? custom_link : edit_link),
+                    add_quick_link: (!custom_link && platform.table_quick_edit) }
                 = cached_partials[partial_name].render(self, locals)
                 -# render(partial: "bhf/table/#{column.macro}/#{column.display_type}", locals: {column_value: column_value, object: object})
 
@@ -76,24 +83,22 @@
           - unless platform.hide_create
             = link_to new_t(platform), new_entry_path(platform.name)
 
-      - if platform.table_quick_edit
-        %template.quick_edit_template{type: 'text/template'}
-          %tr.quick_edit_entry{id: "{object_id}_#{platform.name}"}
-            - edit_link = edit_entry_path(platform.name, '{object_id}')
-            - if platform.sortable
-              %td.drag
-                %span.handle.icon &nbsp;
-            - platform.columns.each do |column|
-              - css_classes = [column.macro, column.display_type]
-              - custom_link = send(platform.custom_link, platform: platform.name, id: '{object_id}') if platform.custom_link
-              %td{class: css_classes}
-                = render(partial: "bhf/table/#{column.macro}/#{column.display_type}", locals: {column_value: "{#{column.name}}", object: platform.model.new, link: (platform.custom_link ? custom_link : edit_link), add_quick_link: (!platform.custom_link && platform.table_quick_edit)})
+      %template.quick_edit_template{type: 'text/template'}
+        %tr.quick_edit_entry{id: "{object_id}_#{platform.name}"}
+          - edit_link = edit_entry_path(platform.name, '{object_id}')
+          - if platform.sortable
+            %td.drag
+              %span.handle.icon &nbsp;
+          - platform.columns.each do |column|
+            - css_classes = [column.macro, column.display_type]
+            %td{class: css_classes}
+              = "{#{column.name}}"
 
-            %td.action{class: ('wider' if platform.show_duplicate && !platform.hide_edit && !platform.hide_delete)}
-              - if platform.show_duplicate
-                - dt = duplicate_t(platform)
-                = link_to dt, duplicate_entry_path(platform.name, '{object_id}'), class: 'icon duplicate', method: :post, title: dt
-              - unless platform.hide_edit
-                = link_to edit_t(platform), edit_link, class: 'icon edit'
-              - unless platform.hide_delete
-                = link_to delete_t(platform), entry_path(platform.name, '{object_id}'), method: :delete, remote: true, class: 'icon delete js_delete', data: {type: :json, confirm: t('bhf.helpers.promts.confirm', platform_title: platform.title_singular.titleize)}
+          %td.action{class: ('wider' if platform.show_duplicate && !platform.hide_edit && !platform.hide_delete)}
+            - if platform.show_duplicate
+              - dt = duplicate_t(platform)
+              = link_to dt, duplicate_entry_path(platform.name, '{object_id}'), class: 'icon duplicate', method: :post, title: dt
+            - unless platform.hide_edit
+              = link_to edit_t(platform), edit_link, class: 'icon edit'
+            - unless platform.hide_delete
+              = link_to delete_t(platform), entry_path(platform.name, '{object_id}'), method: :delete, remote: true, class: 'icon delete js_delete', data: {type: :json, confirm: t('bhf.helpers.promts.confirm', platform_title: platform.title_singular.titleize)}

data/app/views/bhf/table/column/_toggle.html.haml

@@ -0,0 +1,4 @@
+- if link
+  = link_to t('bhf.helpers.entry.toggle'), link, method: :patch, remote: true, class: ['icon toggle js_toggle', ('h_true' if column_value)], data: {type: :json}
+- else
+  = t("bhf.helpers.boolean.#{!!column_value}")

data/bhf.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bhf 0.10.13 ruby lib
+# stub: bhf 0.10.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf"
-  s.version = "0.10.13"
+  s.version = "0.10.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Anton Pawlik"]
-  s.date = "2015-10-27"
+  s.date = "2015-11-01"
   s.description = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user. Easy integratable and highly configurable and agnostic. Works with ActiveRecord and Mongoid."
   s.email = "anton.pawlik@gmail.com"
   s.extra_rdoc_files = [
@@ -129,6 +129,7 @@ Gem::Specification.new do |s|
     "app/views/bhf/table/column/_string.html.haml",
     "app/views/bhf/table/column/_text.html.haml",
     "app/views/bhf/table/column/_thumbnail.html.haml",
+    "app/views/bhf/table/column/_toggle.html.haml",
     "app/views/bhf/table/column/_type.html.haml",
     "app/views/bhf/table/embeds_many/_default.html.haml",
     "app/views/bhf/table/embeds_one/_default.html.haml",

data/config/locales/de.yml

@@ -20,6 +20,7 @@ de:
         show: "%{platform_title} anzeigen"
         new: "%{platform_title} anlegen"
         duplicate: "%{platform_title} duplizieren"
+        toggle: "umschalten"
         edit: "%{platform_title} editieren"
         delete: "%{platform_title} löschen"
         empty: Leer

data/config/locales/en.yml

@@ -23,6 +23,7 @@ en:
         new: "New %{platform_title}"
         show: "Show %{platform_title}"
         duplicate: "Duplicate %{platform_title}"
+        toggle: "Toggle"
         edit: "Edit %{platform_title}"
         delete: "Delete %{platform_title}"
         empty: Empty

data/lib/bhf/platform/attribute/abstract.rb

@@ -27,6 +27,10 @@ module Bhf::Platform::Attribute
       @options_display_type || @name
     end
 
+    def type_ignore_emtpy?
+      false
+    end
+
     def show_type
       @options_show_type || display_type || @name
     end

data/lib/bhf/platform/attribute/column.rb

@@ -44,6 +44,10 @@ module Bhf::Platform::Attribute
       end
     end
 
+    def type_ignore_emtpy?
+      display_type == :boolean || display_type == :toggle
+    end
+
     def show_type
       @options_show_type || display_type
     end
@@ -63,7 +67,7 @@ module Bhf::Platform::Attribute
     private
 
       def supported_types(check_type)
-        if [:boolean, :text, :array, :hash].include?(check_type)
+        if [:boolean, :toggle, :text, :array, :hash].include?(check_type)
           check_type
         elsif type_sym = group_types(check_type)
           type_sym

data/lib/bhf/platform/attribute/reflection.rb

@@ -31,6 +31,10 @@ module Bhf::Platform::Attribute
       @options_display_type || :default
     end
 
+    def type_ignore_emtpy?
+      false
+    end
+
     def show_type
       @options_show_type || display_type
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.10.13
+  version: 0.10.14
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -270,6 +270,7 @@ files:
 - app/views/bhf/table/column/_string.html.haml
 - app/views/bhf/table/column/_text.html.haml
 - app/views/bhf/table/column/_thumbnail.html.haml
+- app/views/bhf/table/column/_toggle.html.haml
 - app/views/bhf/table/column/_type.html.haml
 - app/views/bhf/table/embeds_many/_default.html.haml
 - app/views/bhf/table/embeds_one/_default.html.haml