bhf 0.6.22 → 0.6.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d655617e2044bd17eed546420dbb327be3a5249c
-  data.tar.gz: a469136f9ff5e25146665d49ba4de00ce72fa09e
+  metadata.gz: 40eb9f60546480d4d8244eb96df55ba465ff7ff8
+  data.tar.gz: eb2483a8c3a52c516e7920e07f32fd11d59c14a8
 SHA512:
-  metadata.gz: bad7751589cf51c48fa5ccba35fd4d4b99ec73a345f1436bbf3592bdeafb01f2225020504913459d7c4e7288594de89ca032ebc727ee0c3d4ca89fbfe5ea8af2
-  data.tar.gz: fec1926b811562320c7bdc0d3c09ed947e9493ccd0bb31e1ab8b8eb6bc6f9f38f36df4ab0a1b31387a28a6bf262bec4dafc2274e9ce0ce5be57ec944e2a3a756
+  metadata.gz: c349ee82d84cc308573f6887eee7e57ee43b89a82e0742b33394b1ed780e70cba5ce418e522cfb83a4bb7ed9d67ac6abc7cfcdff139dfc37342eac759dd2a1fb
+  data.tar.gz: 58604f9039e028a3c4d1267f21cefe296338968e0ce800da5727e6d70728dab62c7016a0a8de5cefe2741535512751558052aa28eda278b59c98d36837b2ddca

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

@@ -52,8 +52,6 @@ var initHelper = function(callback){
 				ajaxNote.success();
 			},
 			onSave: function(form){
-				// TODO: visual flash of the quick_edit content on success
-				// also after update, create and duplicate
 				ajaxNote.success();
 			},
 			onBeforeSubmit: function(){

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

@@ -15,9 +15,7 @@ var AjaxEdit = new Class({
 	},
 	
 	startEdit: function(element, wrapElement){
-		this.clean();
 		this.wrapElement = wrapElement ? wrapElement : element;
-		this.wrapElement.addClass('live_edit');
 		this.newEntry = this.wrapElement.hasClass('add_field');
 		
 		this.fireEvent('startRequest');
@@ -74,12 +72,7 @@ var AjaxEdit = new Class({
 		this.holder.getElements('.open, .cancel, .save_and_next, .save').set('disabled', 'disabled');
 	},
 	
-	clean: function(){
-		document.body.getElements('.live_edit').removeClass('live_edit');
-	},
-	
 	close: function(){
-		this.clean();
 		this.holder.dispose();
 		this.fireEvent('closed')
 	},

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

@@ -28,6 +28,24 @@ var AjaxEditStack = new Class({
 			}
 		});
 		
+		var fadeTm;
+		qe.addEvents({
+			startRequest: function(){
+				this.wrapElement.addClass('live_edit');
+				setTimeout(function(){
+					this.wrapElement.addClass('live_edit');
+				}.bind(this), 10);
+			},
+			closed: function(){
+				this.wrapElement.addClass('animate');
+				setTimeout(function(){
+					this.wrapElement.removeClass('live_edit');
+				}.bind(this));
+				setTimeout(function(){
+					this.wrapElement.removeClass('animate');
+				}.bind(this), 600);
+			}
+		});
 		qe.startEdit(link, linkParent);
 	},
 	addStack: function(){

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

@@ -329,32 +329,36 @@ table.data_table
     
 
     tr
-      &:hover td,
-      &.live_edit td
-        +bg-gradient($b1, $b2)
-        border-bottom-color: $b1
-        color: $w1
-        .duplicate
-          background-position: -348px -50px
-          &:hover
-            background-position: -348px -100px
-        .edit
-          background-position: 0 -50px
-          &:hover
-            background-position: 0 -100px
-        .delete
-          background-position: -50px -50px
-          &:hover
-            background-position: -50px -100px
-        .handle
-          background-position: -98px -50px
-          &:hover
-            background-position: -98px -100px
-        .duplicate,
-        .edit,
-        .delete
-          &.clicked
-            background: image-url('bhf/small_ajax_loader_h.gif') no-repeat center center
+      &.animate td
+        +transition-duration(.3)
+        +transition-delay(.28)
+      &:hover,
+      &.live_edit
+        td
+          +bg-gradient($b1, $b2)
+          border-bottom-color: $b1
+          color: $w1
+          .duplicate
+            background-position: -348px -50px
+            &:hover
+              background-position: -348px -100px
+          .edit
+            background-position: 0 -50px
+            &:hover
+              background-position: 0 -100px
+          .delete
+            background-position: -50px -50px
+            &:hover
+              background-position: -50px -100px
+          .handle
+            background-position: -98px -50px
+            &:hover
+              background-position: -98px -100px
+          .duplicate,
+          .edit,
+          .delete
+            &.clicked
+              background: image-url('bhf/small_ajax_loader_h.gif') no-repeat center center
       &.live_edit td
         +bg-gradient($b2, $b1)
         border-bottom-color: $b2
@@ -366,11 +370,9 @@ table.data_table
   thead
     th.drag
       width: 24px
-
   tfoot
     td
       padding-top: 10px
-
   thead,
   tbody
     .primary_key,
@@ -387,6 +389,7 @@ table.data_table
   tbody
     .primary_key
       color: #999
+
 .icon
   text-indent: -9999px
   display: inline-block
@@ -541,7 +544,7 @@ form
     text-decoration: none
     border: 2px solid $b1
     background: white
-    padding: 3px 6px
+    padding: 3px 4px
     border-radius: 4px
     margin-left: -6px
     display: inline-block
@@ -553,6 +556,9 @@ form
       color: white
       background-color: $b2
       border-color: $b2
+    &.animate
+      +transition-duration(.3)
+      +transition-delay(.28)
   .add_field
     font-size: 20px
     font-weight: bold
@@ -941,6 +947,8 @@ input[type="submit"].alt_button,
   float: right
 .clear
   clear: both
+.animate
+  +transition-duration
   
 #ajax_holder
   text-indent: -9999px
@@ -1108,17 +1116,13 @@ input[type="submit"].alt_button,
     input[type="text"] 
       border: 0
       color: black
-  > form
     input[type="button"]
       border: 0
       font-size: 0.8em
       font-weight: bold
 
 
-// TODO: bigger radio buttons
-
 
-// TODO: remove me
 .translation_missing
   color: red !important
   

data/app/controllers/bhf/application_controller.rb

@@ -45,11 +45,23 @@ class Bhf::ApplicationController < ActionController::Base
           pages = load_yml("/#{r}")['pages']
           account_roles['pages'] += pages if pages
         end
-        # TODO: merge platforms of the same pages rather the replace them 
-        files['pages'].uniq! do |a|
-          a.keys
+        
+        merged_files = {'pages' => []}
+        files['pages'].each do |pages|
+          merged = false
+          pages.each do |page|
+            merged_files['pages'].each do |m_page|
+              if m_page.include?(page[0])
+                merged = true
+                m_page[page[0]] << page[1]
+              end
+            end
+          end
+          if !merged
+            merged_files['pages'] << pages
+          end
         end
-        files
+        merged_files
       else
         load_yml
       end

data/app/controllers/bhf/entries_controller.rb

@@ -114,7 +114,6 @@ class Bhf::EntriesController < Bhf::ApplicationController
       @model = @platform.model
       @model_sym = ActiveModel::Naming.singular(@model).to_sym
       @permited_params = ActionController::Parameters.new(params[@model_sym]).permit!
-      #params.require(@model_sym).permit! TODO: check this
     end
 
     def load_object
@@ -129,17 +128,21 @@ class Bhf::EntriesController < Bhf::ApplicationController
 
     def manage_many_to_many
       return unless params[:has_and_belongs_to_many]
-      params[:has_and_belongs_to_many].each_pair do |relation, ids|
+      params[:has_and_belongs_to_many].each_pair do |relation, all_ids|
         reflection = @model.reflections[relation.to_sym]
 
-        @object.send(reflection.name).delete_all # TODO: drop only the diff
 
-        ids = ids.values.reject(&:blank?)
-
-        next if ids.blank?
-
-        reflection.klass.unscoped.find(ids).each do |relation_obj|
-          @object.send(relation) << relation_obj
+        if all_ids.any?
+          reflection.klass.unscoped.find(all_ids.keys).each do |relation_obj|
+            @object.send(relation).delete(relation_obj)
+          end
+          
+          ids = all_ids.values.reject(&:blank?)
+          if ids.any?
+            reflection.klass.unscoped.find(ids).each do |relation_obj|
+              @object.send(relation) << relation_obj
+            end
+          end
         end
       end
     end

data/app/helpers/bhf/frontend_helper.rb

@@ -1,7 +1,7 @@
 module Bhf
   module FrontendHelper
 
-    def bhf_edit(object, options = {}) # TODO: add a block of html for custom editing buttons and links
+    def bhf_edit(object, options = {}, &block)
       return unless session[Bhf::Engine.config.session_auth_name.to_s] == true
 
       options[:platform_name] ||= object.class.to_s.pluralize.downcase
@@ -10,7 +10,7 @@ module Bhf
         return unless object.bhf_can_edit?(options)
       end
 
-      render partial: 'bhf/helper/frontend_edit', locals: { platform_name: options[:platform_name], object: object }
+      render partial: 'bhf/helper/frontend_edit', locals: { platform_name: options[:platform_name], object: object, block: (with_output_buffer(&block) if block_given?)}
     end
 
   end

data/app/views/bhf/entries/form/has_one/_account_scope.haml

@@ -1,3 +1,2 @@
-- # TODO: this doesnt work
-- data_source = current_account.send(field.reflection.name.to_s.pluralize)
-= render partial: 'bhf/entries/form/belongs_to/select', locals: {data_source: data_source, field: field, f: f}
+- data_source = current_account.send(field.reflection.name)
+= render partial: 'bhf/entries/form/has_one/static', locals: {ref_object: ref_object, field: field, f: f}

data/app/views/bhf/entries/form/has_one/_static.haml

@@ -5,5 +5,5 @@
     - if ref_object
       %li= link_to_if field.link, ref_object.to_bhf_s, edit_entry_path(field.link || 0, ref_object), class: :quick_edit
 
-  - if field.link
+  -# if field.link
     = link_to '+', new_entry_path(field.link), class: 'add_field quick_edit'

data/app/views/bhf/helper/_frontend_edit.haml

@@ -1 +1,3 @@
-= link_to t('bhf.helpers.entry.edit', platform_name: object.to_bhf_s), bhf.edit_entry_path(platform_name, object), class: 'bhf_edit', data: {:'no-turbolink' => true}
+- link_title = t('bhf.helpers.entry.edit', platform_name: object.to_bhf_s)
+= link_to bhf.edit_entry_path(platform_name, object), class: 'bhf_edit', data: {:'no-turbolink' => true}, title: link_title do
+  = block ? block : link_title

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

@@ -37,7 +37,6 @@
             - if platform.sortable
               %td.drag
                 %span.handle.icon  
-            -# TODO: external link partial from anpex
             - platform.columns.each do |column|
               %td{class: "#{column.field.macro} #{column.field.display_type}", :'data-column-name' => column.name}
                 - a = if column.field.display_type != :boolean && object.send(column.name).blank?

data/app/views/bhf/pages/macro/column/_extern_link.haml

@@ -0,0 +1,2 @@
+= link_to object.send(column.name), title: object.send(column.name), target: '_blank' do
+  %strong= t('bhf.helpers.link', link: object.send(column.name)).html_safe

data/config/locales/de.yml

@@ -4,6 +4,7 @@ de:
       boolean:
         a: ja
         b: nein
+      link: Link ⬀
       searchform:
         placeholder: Suche
       promts:

data/config/locales/en.yml

@@ -1,12 +1,10 @@
 en:  
   bhf:
-    pages:
-      headline: Content
-    
     helpers:
       boolean:
-        a: 'yes'
-        b: 'no'
+        a: yes
+        b: no
+      link: Link ⬀
       searchform:
         placeholder: Search
       promts:

data/lib/bhf/active_record/active_record.rb

@@ -22,9 +22,9 @@ module Bhf
         self.to_s.humanize
       end
 
-      module ClassMethods        
+      module ClassMethods
         def bhf_default_search(search_params)
-          return if (search_term = search_params[:text]).blank?
+          return self if (search_term = search_params[:text]).blank?
           where_statement = []
           columns_hash.each_pair do |name, props|
             is_number = search_term.to_i.to_s == search_term || search_term.to_f.to_s == search_term
@@ -38,7 +38,7 @@ module Bhf
             end
           end
 
-          where_statement.join(' OR ')
+          where(where_statement.join(' OR '))
         end
         
         def bhf_primary_key

data/lib/bhf/mongoid/document.rb

@@ -82,25 +82,33 @@ module Bhf
           '_id'
         end
         
-        def except(key)
-          if key == :order || key == :sort
-            #order_by.extras(sort: []) #TODO: drop default_scope criteria
-          end
-          self
+        def order(a)
+          order_by(a)
         end
         
-        def order(a)
-          field, direction = a.split(' ')
-          return self if field.blank? or direction.blank?
-          self.send(direction.downcase, field)
+        def reorder(a)
+          order_by(a)
         end
         
         def bhf_default_search(search_params)
-          return if (search_term = search_params[:text]).blank?
-          
-          # TODO: add mongoid search
-          return where(name: /^antp/i)
-          #return where("this.nick == 'antpaw'")
+          return self if (search_term = search_params[:text]).blank?
+
+          arr = []
+          columns_hash.each_pair do |column, props|
+            is_number = search_term.to_i.to_s == search_term || search_term.to_f.to_s == search_term
+
+            if props.type == :primary_key
+              arr << {props.name.to_sym => search_term}
+            elsif props.type == :string || props.type == :text
+              arr << {props.name.to_sym => /#{search_term}/i}
+            elsif props.type == :integer && is_number
+              arr << {props.name.to_sym => search_term.to_i}
+            elsif props.type == :float && is_number
+              arr << {props.name.to_sym => search_term.to_f}
+            end
+
+          end
+          self.or(arr)
         end
 
         def get_embedded_parent(parent_id, &block)

data/lib/bhf/pagination.rb

@@ -3,13 +3,13 @@ module Kaminari
     class Tag
       def initialize(template, options = {}) #:nodoc:
         @template, @options = template, options.dup
-        @param_name = @options.delete(:param_name)
+        @param_name = @options.delete(:param_name) || Kaminari.config.param_name
         @theme = @options[:theme] ? "#{@options.delete(:theme)}/" : ''
         @params = @options[:params] ? template.params.merge(@options.delete :params) : template.params
       end
 
       def to_s(locals = {}) #:nodoc:
-        @template.render partial: "kaminari/#{@theme}#{self.class.name.demodulize.underscore}", locals: @options.merge(locals)
+        @template.render :partial => "kaminari/#{@theme}#{self.class.name.demodulize.underscore}", :locals => @options.merge(locals), :formats => [:html]
       end
 
       def page_url_for(page)
@@ -23,8 +23,8 @@ module Kaminari
     end
   end
 end
-# TODO: lets hope they'll fix nested params and we can remove this
-# https://github.com/amatsuda/kaminari/issues/152
+# TODO: check for support here
+# https://github.com/amatsuda/kaminari/pull/491
 
 
 module Bhf

data/lib/bhf/platform.rb

@@ -51,10 +51,6 @@ module Bhf
       @user && table_options(:user_scope)
     end
 
-    def search_source
-      table_options(:search) || :where
-    end
-
     def prepare_objects(options, paginate_options = nil)
       if user_scope?
         chain = @user.send(table_options(:user_scope).to_sym)
@@ -63,7 +59,7 @@ module Bhf
         chain = chain.send data_source if data_source
       end
 
-      if options[:order]
+      unless options[:order].blank?
         chain = chain.reorder("#{options[:order]} #{options[:direction]}")
       end
 
@@ -183,13 +179,11 @@ module Bhf
     private
 
       def do_search(chain, search_params)
-        search_condition = if table_options(:search)
-          search_params
+        if table_options(:search)
+          chain.send table_options(:search), search_params
         else
-          model.bhf_default_search(search_params)
+          chain.bhf_default_search(search_params)
         end
-
-        chain.send search_source, search_condition
       end
 
       def data_source

data/lib/bhf/settings.rb

@@ -4,10 +4,20 @@ module Bhf
 
     def initialize(options)
       @options = options
+      
+      t = pages.each_with_object([]) do |page, obj|
+        content_for_page(page).each do |platform|
+          obj << platform.keys.flatten
+        end
+      end.flatten!
+      if t.uniq.length != t.length
+        raise Exception.new("Platforms with identical names: '#{t.detect{ |e| t.count(e) > 1 }}'")
+      end
     end
 
     def pages
-      @options['pages'].each_with_object([]) do |page, obj|
+      return @pages if @pages
+      @pages = @options['pages'].each_with_object([]) do |page, obj|
         if page.is_a?(String)
           page = {page => nil}
         end
@@ -27,7 +37,6 @@ module Bhf
     end
 
     def find_platform(platform_name, current_account = nil)
-      # TODO: error for platforms whit the same name
       pages.each do |page|
         content_for_page(page).each do |platform|
           bhf_platform = Bhf::Platform.new(platform, page, current_account)

data/lib/bhf.rb

@@ -28,6 +28,17 @@ module Bhf
       end
     end
     
+    initializer 'bhf.hooks' do
+      if defined?(::I18n)
+        ::I18n.send :include, Bhf::I18nTranslationFallbackHelper
+      end
+      if defined?(::ActiveRecord)
+        ::ActiveRecord::Base.send :include, Bhf::ActiveRecord::Object
+      end
+      if defined?(::Mongoid)
+        ::Mongoid::Document.send :include, Bhf::Mongoid::Document
+      end
+    end
   end
 end
 
@@ -41,12 +52,4 @@ require 'bhf/settings'
 require 'bhf/pagination'
 require 'bhf/form'
 
-::I18n.send :include, Bhf::I18nTranslationFallbackHelper
-
-if defined?(ActiveRecord)
-  ::ActiveRecord::Base.send :include, Bhf::ActiveRecord::Object
-end
-if defined?(Mongoid)
-  ::Mongoid::Document.send :include, Bhf::Mongoid::Document
-end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.6.22
+  version: 0.6.23
 platform: ruby
 authors:
 - Anton Pawlik
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ files:
 - app/views/bhf/pages/macro/column/_array.haml
 - app/views/bhf/pages/macro/column/_boolean.haml
 - app/views/bhf/pages/macro/column/_date.haml
+- app/views/bhf/pages/macro/column/_extern_link.haml
 - app/views/bhf/pages/macro/column/_file.haml
 - app/views/bhf/pages/macro/column/_hash.haml
 - app/views/bhf/pages/macro/column/_image.haml