bhf 0.10.14 → 0.10.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d52f22e8e17c8a3f1385b4322105b1f56d0df108
-  data.tar.gz: 36bcbe73fbf572dbcbccd2da1fc0b9719d70fb14
+  metadata.gz: 73abb1591371e3997fe6b22fc5760e151d3907f6
+  data.tar.gz: eb7cb00592990c0462232f92931ad13f1ab9f635
 SHA512:
-  metadata.gz: 76508689f724d0ce51b33898565fe61297ddf3ef2031456db5976dd64b7cc15d4c6eb6b76ea8711273fba2ce21107d35a37cdc8313b5b7c5ae44d3c5236e344d
-  data.tar.gz: d7209cae58d7e66103978a2f5cfc26f66299906119607310c214ae869b70b622ad37f3a81dacba4bd03bceb80b1dedc94ed29fd60add2beeb690db81d3780ff9
+  metadata.gz: c076188d9fd8c68e5db03dd4acfe98774480f7d170443f30b895d92da8a5ba18de040380314bff892ec787ebe1866b311e3f1327a38e4a9f182df682b98bcd0f
+  data.tar.gz: 89b699f76a6a52f0b45ba45601e29719b86c10059ae18aed696001f5a60f1e8d8149b926e9d4c55ccfbb94219c4df441f8dbbfd3c75a548b31377f572e9dcfa1

data/README.md

@@ -18,6 +18,8 @@ Also see [Getting Started](Getting_Started.md) document for additional info.
 
 * Adding unit tests and integration tests
 * Adding bulk edit for the table view (aka platform)
+* Manage relations with help of autocomplete inputs
+* Move from MooTools to jQuery
 
 ## Support
 

data/VERSION

@@ -1 +1 @@
-0.10.14
+0.10.15

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

@@ -327,6 +327,9 @@ Turbolinks.pagesCached(0);
 					element.removeClass('dragged');
 					new Request({
 						method: 'put',
+						headers: {
+							'X-CSRF-Token': rails && rails.csrf && rails.csrf.token
+						},
 						url: sortableElems.get('data-sort-url')
 					}).send({data: {order: this.serialize()}});
 				}

data/app/controllers/bhf/entries_controller.rb

@@ -29,7 +29,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
   def create
     before_save
     if @object.save
-      manage_many_to_many
+      manage_relations
       after_save
 
       if @quick_edit
@@ -54,7 +54,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
 
     before_save
     if @object.update_attributes(@permited_params)
-      manage_many_to_many
+      manage_relations
       after_save
 
       if @quick_edit
@@ -166,9 +166,8 @@ 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|
-        reflection = @model.reflections[relation]
-
         next unless ids.any?
+        reflection = @model.reflections[relation]
         relation_array = @object.send(relation)
         reflection.klass.unscoped.find(ids.keys).each do |relation_obj|
           has_relation = relation_array.include?(relation_obj)
@@ -186,6 +185,55 @@ class Bhf::EntriesController < Bhf::ApplicationController
       end
     end
 
+    def manage_has_one
+      return unless params[:has_one]
+      object_id = @object.send(@model.bhf_primary_key)
+      params[:has_one].each_pair do |relation, id|
+        reflection = @model.reflections[relation]
+        reflection.klass.where(reflection.foreign_key, object_id).each do |ref_object|
+          next if ref_object.send(reflection.klass.bhf_primary_key) == id
+          ref_object.update_attribute(reflection.foreign_key, nil)
+        end
+        unless id.blank?
+          ref_object = reflection.klass.find(id)
+          next if ref_object.send(reflection.foreign_key) == object_id
+          ref_object.update_attribute(reflection.foreign_key, object_id)
+        end
+      end
+    end
+
+    def manage_has_many
+      return unless params[:has_many]
+      object_id = @object.send(@model.bhf_primary_key)
+      params[:has_many].each_pair do |relation, ids|
+        next unless ids.any?
+        reflection = @model.reflections[relation]
+        preset_ids = @object.send(relation).collect do |object|
+          object.send(object.class.bhf_primary_key).to_s
+        end
+        @object.send(relation).klass.find(ids.keys).each do |relation_obj|
+          fk = relation_obj.class.reflections[reflection.inverse_of.name.to_s].foreign_key
+          relation_obj_id_as_string = relation_obj.send(relation_obj.class.bhf_primary_key).to_s
+
+          if ids[relation_obj_id_as_string].blank?
+            if preset_ids.include?(relation_obj_id_as_string)
+              relation_obj.update_attribute(fk, nil)
+            end
+          else
+            if ! preset_ids.include?(relation_obj_id_as_string)
+              relation_obj.update_attribute(fk, object_id)
+            end
+          end
+        end
+      end
+    end
+
+    def manage_relations
+      manage_many_to_many
+      manage_has_many
+      manage_has_one
+    end
+
     def after_load
       @object.send(@platform.hooks(:after_load)) if @platform.hooks(:after_load)
     end

data/app/views/bhf/form/has_and_belongs_to_many/_check_box.html.haml

@@ -1,10 +1,11 @@
 - data_source ||= field.link ? field.link.get_objects : field.reflection.klass.all
+- check_box_type ||= :many_to_many_check_box
 = reflection_node f, field do
   .quick_edit_block
     %ul.relation.quick_edit_inject
       - data_source.each do |ref_object|
         %li.quick_edit_entry
-          = f.many_to_many_check_box(ref_object, field.reflection.name, params, field.link && ! field.link.hide_edit)
+          = f.send(check_box_type, ref_object, field.reflection.name, params, field.link && ! field.link.hide_edit)
           - if field.link && ! field.link.hide_edit
             = link_to ref_object.to_bhf_s, edit_entry_path(field.link.name, ref_object), class: 'js_edit_field qe_button quick_edit'
           - if field.link && ! field.link.hide_delete
@@ -12,7 +13,7 @@
 
     .quick_edit_template{type: 'text/template'}
       %li.quick_edit_entry
-        = f.many_to_many_check_box(OpenStruct.new(to_bhf_s: '{to_bhf_s}'), field.reflection.name, params, field.link && ! field.link.hide_edit, true, "{object_id}", {class: 'js_remove_disabled', disabled: true}).gsub('_object_id_', '{object_id}').html_safe # fix for id attr
+        = f.send(check_box_type, OpenStruct.new(to_bhf_s: '{to_bhf_s}'), field.reflection.name, params, field.link && ! field.link.hide_edit, true, "{object_id}", {class: 'js_remove_disabled', disabled: true}).gsub('_object_id_', '{object_id}').html_safe # fix for id attr
         - if field.link && ! field.link.hide_edit
           = link_to '{to_bhf_s}', edit_entry_path(field.link.name, '{object_id}'), class: 'js_edit_field qe_button quick_edit'
         - if field.link && ! field.link.hide_delete

data/app/views/bhf/form/has_many/_check_box.html.haml

@@ -0,0 +1 @@
+= render partial: "bhf/form/has_and_belongs_to_many/check_box", locals: {f: f, field: field, check_box_type: :has_many_check_box}

data/app/views/bhf/form/has_one/_select.html.haml

@@ -0,0 +1,23 @@
+- data_source ||= field.link ? field.link.get_objects : field.reflection.klass.all
+- fk = field.reflection.name
+- ref_obj = f.object.send(fk)
+- ref_obj_id = ref_obj ? ref_obj.send(field.reflection.klass.bhf_primary_key) : nil
+.node
+  .label= f.label fk, reflection_title(f, field, 1)
+  .input.select_input.quick_edit_block
+    - if field.link
+      .quick_edit_template{type: 'text/template'}
+        = options_for_select([['{to_bhf_s}', '{object_id}', {data: {edit: edit_entry_path(field.link.name, '{object_id}'), delete: entry_path(field.link.name, '{object_id}')}}]])
+      - select_options ||= options_from_collection_for_select_with_html_attrs(data_source, :id, :to_bhf_s, ref_obj_id, Proc.new {|obj| {data: {edit: edit_entry_path(field.link.name, obj), delete: entry_path(field.link.name, obj)}}})
+    - else
+      - select_options ||= options_from_collection_for_select(data_source, :id, :to_bhf_s, ref_obj_id)
+
+    = select :has_one, fk, select_options, {include_blank: true}, {class: ('quick_edit_inject quick_edit_select' if field.link)}
+    = render partial: 'bhf/helper/field_errors', locals: {f: f, field: fk}
+
+    - if field.link && ! field.link.hide_edit
+      = link_to edit_t(field.link), '', class: 'js_edit_field icon edit quick_edit'
+    - if field.link && ! field.link.hide_delete
+      = link_to '×'.html_safe, '', method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
+    - if field.link && ! field.link.hide_create
+      = link_to '+', new_entry_path(field.link.name), class: 'js_add_field plus_button qe_button quick_edit'

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.14 ruby lib
+# stub: bhf 0.10.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf"
-  s.version = "0.10.14"
+  s.version = "0.10.15"
 
   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-11-01"
+  s.date = "2016-03-08"
   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 = [
@@ -101,7 +101,9 @@ Gem::Specification.new do |s|
     "app/views/bhf/form/embeds_one/_static.html.haml",
     "app/views/bhf/form/has_and_belongs_to_many/_check_box.html.haml",
     "app/views/bhf/form/has_and_belongs_to_many/_static.html.haml",
+    "app/views/bhf/form/has_many/_check_box.html.haml",
     "app/views/bhf/form/has_many/_static.html.haml",
+    "app/views/bhf/form/has_one/_select.html.haml",
     "app/views/bhf/form/has_one/_static.html.haml",
     "app/views/bhf/helper/_definition_item.html.haml",
     "app/views/bhf/helper/_field_errors.html.haml",

data/lib/bhf/action_view/form_builder.rb

@@ -14,8 +14,7 @@ module Bhf::ActionView
       field_errors(field).any?
     end
 
-    def many_to_many_check_box(obj, ref_name, params, hide_label = false, checked = false, bhf_primary_key = nil, extra_html_attrs = {})
-      mm = :has_and_belongs_to_many
+    def many_to_many_or_has_many_check_box(mm, obj, ref_name, params, hide_label = false, checked = false, bhf_primary_key = nil, extra_html_attrs = {})
       bhf_primary_key ||= obj.send(obj.class.bhf_primary_key).to_s
       unless checked
         checked = if params[mm] && params[mm][ref_name]
@@ -32,5 +31,13 @@ module Bhf::ActionView
       html
     end
 
+    def many_to_many_check_box(obj, ref_name, params, hide_label = false, checked = false, bhf_primary_key = nil, extra_html_attrs = {})
+      many_to_many_or_has_many_check_box(:has_and_belongs_to_many, obj, ref_name, params, hide_label, checked, bhf_primary_key, extra_html_attrs)
+    end
+
+    def has_many_check_box(obj, ref_name, params, hide_label = false, checked = false, bhf_primary_key = nil, extra_html_attrs = {})
+      many_to_many_or_has_many_check_box(:has_many, obj, ref_name, params, hide_label, checked, bhf_primary_key, extra_html_attrs)
+    end
+
   end
 end

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

@@ -42,9 +42,9 @@ module Bhf::Platform::Attribute
     def type
       return @options_form_type if @options_form_type
 
-      if macro == :has_and_belongs_to_many
+      if macro == :has_and_belongs_to_many or macro == :has_many
         :check_box
-      elsif macro == :belongs_to
+      elsif macro == :belongs_to or macro == :has_one
         :select
       else
         :static

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.10.14
+  version: 0.10.15
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-01 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -242,7 +242,9 @@ files:
 - app/views/bhf/form/embeds_one/_static.html.haml
 - app/views/bhf/form/has_and_belongs_to_many/_check_box.html.haml
 - app/views/bhf/form/has_and_belongs_to_many/_static.html.haml
+- app/views/bhf/form/has_many/_check_box.html.haml
 - app/views/bhf/form/has_many/_static.html.haml
+- app/views/bhf/form/has_one/_select.html.haml
 - app/views/bhf/form/has_one/_static.html.haml
 - app/views/bhf/helper/_definition_item.html.haml
 - app/views/bhf/helper/_field_errors.html.haml