bhf 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca7ecc48d4690f8d6e07435afdf450ae8b810fbb
-  data.tar.gz: 9d3b1e951d0b6c433d23adce11905c6f85ab8ca2
+  metadata.gz: b6b072d3fad537ce6456fcc0168c8c9336f3287e
+  data.tar.gz: b0c551207da7b4cd0590a6fa2d9963c05ffa7ae6
 SHA512:
-  metadata.gz: d4991d73a86d9873c78d4400a10829416d99700d325276dd7c2aec271167eb97d24ab411d672c72fd154026ac5ef4b97aa362121eb73bf7ccf739d14d4cbda52
-  data.tar.gz: df1d6afd1d25930ea096dbea5eea00c1fb2e914e71ca2c27de2441c64a104fd5f5f561dea31949d22150f4f1df89f91e8206f9a295e8d700f3504ba9b5a4ba84
+  metadata.gz: e74b31acdff6601157fc7f8054e861a9d4bd3db7042e2df8dba15ab26831e4752e28cef810df3aaa4da90c21cb9380a83de96c8f0ec004fe67cb53da21cb05a6
+  data.tar.gz: 31c4507fcea034ff1ee07d5d1a3d18a423a32b23de65dc5de34d48531060027194ec1a9b1b3be80ec725dbafb3c5270d012dedf73d72fa3c8725c9c14b944922

data/app/controllers/bhf/entries_controller.rb

@@ -73,12 +73,12 @@ class Bhf::EntriesController < Bhf::ApplicationController
       redirect_to(bhf_page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('duplicate.error', @model))
     end
   end
-
+  
   def sort
     return unless @platform.sortable
     
     sort_attr = @platform.sortable.to_sym
-
+    
     params[:order].each do |order|
       @model.
         find(order[1].gsub("_#{@platform.name}", '')).

data/app/views/bhf/entries/form/column/_hash.haml

@@ -0,0 +1,2 @@
+= node f, field do
+  WIP

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

@@ -5,5 +5,5 @@
     - ref_objects.each do |ref_object|
       %li= link_to_if field.link, ref_object.to_bhf_s, edit_bhf_entry_path(field.link || 0, ref_object), class: :quick_edit
 
-  -# if field.link
+  - if field.link
     = link_to '+', new_bhf_entry_path(field.link), class: 'add_field quick_edit'

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_bhf_entry_path(field.link || 0, ref_object), class: :quick_edit
 
-  -# if field.link
+  - if field.link
     = link_to '+', new_bhf_entry_path(field.link), class: 'add_field quick_edit'

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

@@ -14,10 +14,10 @@
         - if platform.sortable
           %th.drag
         - platform.columns.each do |column|
-          - db_column_name = platform.model.column_names.include?(column.name+'_id') ? column.name+'_id' : column.name
+          - db_column_name = platform.model.bhf_attribute_method?(column.name+'_id') ? column.name+'_id' : column.name
           %th{class: "#{column.field.macro} #{column.field.display_type} #{order_class(db_column_name, platform.name)}"}
             - column_name = platform.model.human_attribute_name(column.name)
-            - can_sort = platform.model.column_names.include?(db_column_name)
+            - can_sort = platform.model.bhf_attribute_method?(db_column_name)
             = link_to_if can_sort, column_name, current_order_path(db_column_name, platform.name)
         %th.action
 

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

@@ -0,0 +1 @@
+WIP

data/lib/bhf/active_record/active_record.rb

@@ -45,6 +45,10 @@ module Bhf
           primary_key
         end
         
+        def bhf_attribute_method?(column_name)
+          column_names.include?(column_name)
+        end
+        
         def bhf_embedded?
           false
         end

data/lib/bhf/data.rb

@@ -66,7 +66,7 @@ module Bhf
       private
 
         def supported_types(check_type)
-          if [:boolean, :text, :array].include?(check_type)
+          if [:boolean, :text, :array, :hash].include?(check_type)
             check_type
           elsif type_sym = group_types(check_type)
             type_sym

data/lib/bhf/mongoid/document.rb

@@ -74,8 +74,11 @@ module Bhf
           c
         end
         
+        def bhf_attribute_method?(column_name)
+          attribute_method?(column_name)
+        end
+        
         def bhf_primary_key
-          # TODO: still needed?
           '_id'
         end
         
@@ -115,18 +118,29 @@ module Bhf
 
         def bhf_new_embed(parent_id, params = nil)
           get_embedded_parent parent_id do |parent, meta|
-            if parent.relations[meta.inverse_of.to_s].macro == :embeds_one
-              parent.send("build_#{meta.inverse_of}", params)
+            key_name = if meta.inverse_of?
+              meta.inverse_of
             else
-              parent.send(meta.inverse_of).build(params)
+              meta.inverse_foreign_key.pluralize
+            end.to_s
+            if parent.relations[key_name].macro == :embeds_one
+              parent.send("build_#{key_name}", params)
+            else
+              parent.send(key_name).build(params)
             end
           end
         end
 
         def bhf_find_embed(parent_id, ref_id)
           get_embedded_parent parent_id do |parent, meta|
-            relation = parent.send(meta.inverse_of)
-            if parent.relations[meta.inverse_of.to_s].macro == :embeds_one
+            # :forced_nil_inverse?, :foreign_key, :foreign_key_check, :foreign_key_setter, :index, :indexed?, :inspect, :inverses, :inverse, :inverse_class_name, :inverse_class_name?, :inverse_foreign_key, :inverse_klass, :inverse_metadata, :inverse_of, :inverse_of?, :inverse_setter, :inverse_type, :inverse_type_setter
+            key_name = if meta.inverse_of?
+              meta.inverse_of
+            else
+              meta.inverse_foreign_key.pluralize
+            end.to_s
+            relation = parent.send(key_name)
+            if parent.relations[key_name].macro == :embeds_one
               relation
             else
               relation.find(ref_id)

data/lib/bhf/platform.rb

@@ -235,7 +235,7 @@ module Bhf
         output = []
 
         attrs.each_pair do |key, value|
-          if key == model.primary_key
+          if key == model.bhf_primary_key
             id << value
           elsif key == 'created_at' || key == 'updated_at'
             static_dates << value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,7 @@ files:
 - app/views/bhf/entries/form/column/_boolean.haml
 - app/views/bhf/entries/form/column/_date.haml
 - app/views/bhf/entries/form/column/_file.haml
+- app/views/bhf/entries/form/column/_hash.haml
 - app/views/bhf/entries/form/column/_mappin.haml
 - app/views/bhf/entries/form/column/_markdown.haml
 - app/views/bhf/entries/form/column/_multiple_fields.haml
@@ -141,6 +142,7 @@ files:
 - app/views/bhf/pages/macro/column/_boolean.haml
 - app/views/bhf/pages/macro/column/_date.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
 - app/views/bhf/pages/macro/column/_number.haml
 - app/views/bhf/pages/macro/column/_primary_key.haml