bhf 0.8.0 → 0.8.2

data/lib/bhf/{pagination.rb → platform/pagination.rb}

@@ -10,7 +10,7 @@ Kaminari::Helpers::Tag.class_eval do
 end
 # TODO: monitor https://github.com/amatsuda/kaminari/issues/542#issuecomment-40294388
 
-module Bhf
+module Bhf::Platform
 
   class Pagination
 

data/lib/bhf/{settings.rb → settings/base.rb}

@@ -1,9 +1,12 @@
-module Bhf
+module Bhf::Settings
 
-  class Settings
+  class Base
+    
+    attr_accessor :user
 
-    def initialize(options)
-      @options = options
+    def initialize(settings_hash, user = nil)
+      @settings_hash = settings_hash
+      @user = user
       
       t = pages.each_with_object([]) do |page, obj|
         content_for_page(page).each do |platform|
@@ -19,8 +22,7 @@ module Bhf
     end
 
     def pages
-      return @pages if @pages
-      @pages = @options['pages'].each_with_object([]) do |page, obj|
+      @pages ||= @settings_hash['pages'].each_with_object([]) do |page, obj|
         if page.is_a?(String)
           page = {page => nil}
         end
@@ -29,7 +31,7 @@ module Bhf
     end
 
     def content_for_page(selected_page)
-      @options['pages'].each do |page|
+      @settings_hash['pages'].each do |page|
         page = {page => nil} if page.is_a?(String)
         
         if selected_page == page.keys[0]
@@ -39,11 +41,12 @@ module Bhf
       nil
     end
 
-    def find_platform(platform_name, current_account = nil, config = nil)
+    def find_platform_settings(platform_name)
       pages.each do |page|
-        content_for_page(page).each do |platform|
-          bhf_platform = Bhf::Platform.new(platform, page, config == nil ? self : config, current_account)
-          return bhf_platform if bhf_platform.name.to_s == platform_name.to_s
+        content_for_page(page).each do |platform_hash|
+          if platform_hash.keys[0] == platform_name.to_s
+            return Bhf::Settings::Platform.new(platform_hash, page, self)
+          end
         end
       end
       nil

data/lib/bhf/settings/platform.rb

@@ -0,0 +1,20 @@
+module Bhf::Settings
+
+  class Platform
+
+    attr_reader :name, :data, :page_name, :hash, :settings_base
+    
+    def initialize(settings_hash, page_name, settings_base)
+      if settings_hash.is_a?(String)
+        settings_hash = {settings_hash => nil}
+      end
+      @name = settings_hash.keys[0]
+      @hash = settings_hash.values[0] || {}
+      
+      @settings_base = settings_base
+      @page_name = page_name
+    end
+    
+  end
+  
+end

data/lib/bhf/settings/yaml_parser.rb

@@ -0,0 +1,84 @@
+module Bhf::Settings
+
+  class YAMLParser
+    
+    attr_accessor :settings_hash
+    
+    def initialize(roles_array, area = nil)
+      roles_settings = roles_yml(roles_array, area)
+
+      if Bhf.configuration.abstract_settings.any?
+  
+        tmp_pages = get_settings_array(Bhf.configuration.abstract_settings, '/abstract')['pages']
+        abstract_platform_settings = tmp_pages.each_with_object({}) do |abstract_pages, hash|
+          abstract_pages.each do |abstract_page|
+            abstract_page[1].each do |abstract_platform|
+              hash.merge!(abstract_platform)
+            end
+          end
+        end
+  
+        roles_settings['pages'].each_with_index do |pages, i_1|
+          pages.each_pair do |key_1, page|
+            page.each_with_index do |platform, i_2|
+              platform.each_pair do |key_2, value|
+                abstract_platform_key = if value.to_h['extend_abstract']
+                  value.to_h['extend_abstract']
+                elsif abstract_platform_settings[key_2]
+                  key_2
+                end
+                next unless abstract_platform_key
+                roles_settings['pages'][i_1][key_1][i_2][key_2] = abstract_platform_settings[abstract_platform_key].deep_merge(value.to_h)
+              end
+            end
+          end
+        end
+      end
+      
+      @settings_hash = roles_settings
+    end
+
+
+    def get_settings_array(array, dir)
+      array.each_with_object({'pages' => []}) do |r, account_roles|
+        pages = load_yml("#{dir}/#{r}")['pages']
+        account_roles['pages'] += pages if pages
+      end
+    end
+
+    def roles_yml(roles = nil, area = nil)
+      area_dir = "/#{area}" if area.present?
+      if roles.is_a?(String)
+        load_yml("#{area_dir}/#{roles}")
+      elsif roles.is_a?(Array)
+        files = get_settings_array(roles, area_dir)
+
+        # find the same pages and merge them
+        merged_files = {'pages' => []}
+        files['pages'].each do |pages|
+          merged = false
+          pages.each_pair do |key, page|
+            merged_files['pages'].each do |m_page|
+              if m_page.include?(key)
+                merged = true
+                m_page[key] = m_page[key] + page
+              end
+            end
+          end
+          if !merged
+            merged_files['pages'] << pages
+          end
+        end
+        merged_files
+      else
+        load_yml(area.present? ? "/#{area}/bhf" : nil)
+      end
+    end
+
+    def load_yml(suffix = nil)
+      YAML::load(IO.read("config/bhf#{suffix}.yml"))
+    end
+  
+  end
+
+end

data/lib/rails/generators/bhf/templates/initializer.rb

@@ -1,7 +1,7 @@
 Bhf.configure do |config|
   # config.css << 'bhf'
   # config.js << 'bhf'
-  # config.abstract_config << 'abstract'
+  # config.abstract_settings << 'abstract'
   
   # config.on_login_fail = :root_url
   # config.logout_path = :logout_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
@@ -174,8 +174,6 @@ files:
 - app/assets/images/bhf/wmd-buttons.png
 - app/assets/images/logo_bhf.svg
 - app/assets/javascripts/bhf/application.js
-- app/assets/javascripts/bhf/classes/AjaxEdit.js
-- app/assets/javascripts/bhf/classes/AjaxEditStack.js
 - app/assets/javascripts/bhf/classes/Ajaxify.js
 - app/assets/javascripts/bhf/classes/ArrayFields.js
 - app/assets/javascripts/bhf/classes/FormHelper.js
@@ -187,6 +185,8 @@ files:
 - app/assets/javascripts/bhf/classes/Picker_Attach.js
 - app/assets/javascripts/bhf/classes/Picker_Date.js
 - app/assets/javascripts/bhf/classes/PlatformHelper.js
+- app/assets/javascripts/bhf/classes/QuickEdit.js
+- app/assets/javascripts/bhf/classes/QuickEditStack.js
 - app/assets/javascripts/bhf/classes/Setlatlng.js
 - app/assets/javascripts/bhf/classes/showdown.js
 - app/assets/javascripts/bhf/classes/wmd.js
@@ -212,34 +212,31 @@ files:
 - app/views/bhf/entries/_form.haml
 - app/views/bhf/entries/_validation_errors.haml
 - app/views/bhf/entries/edit.haml
-- app/views/bhf/entries/form/belongs_to/_account_scope.haml
-- app/views/bhf/entries/form/belongs_to/_radio.haml
-- app/views/bhf/entries/form/belongs_to/_select.haml
-- app/views/bhf/entries/form/belongs_to/_static.haml
-- app/views/bhf/entries/form/column/_array.haml
-- app/views/bhf/entries/form/column/_boolean.haml
-- app/views/bhf/entries/form/column/_date.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
-- app/views/bhf/entries/form/column/_number.haml
-- app/views/bhf/entries/form/column/_paperclip.haml
-- app/views/bhf/entries/form/column/_password.haml
-- app/views/bhf/entries/form/column/_static.haml
-- app/views/bhf/entries/form/column/_string.haml
-- app/views/bhf/entries/form/column/_text.haml
-- app/views/bhf/entries/form/column/_wysiwyg.haml
-- app/views/bhf/entries/form/embeds_many/_static.haml
-- app/views/bhf/entries/form/embeds_one/_static.haml
-- app/views/bhf/entries/form/has_and_belongs_to_many/_account_scope.haml
-- app/views/bhf/entries/form/has_and_belongs_to_many/_check_box.haml
-- app/views/bhf/entries/form/has_and_belongs_to_many/_static.haml
-- app/views/bhf/entries/form/has_many/_static.haml
-- app/views/bhf/entries/form/has_one/_account_scope.haml
-- app/views/bhf/entries/form/has_one/_static.haml
 - app/views/bhf/entries/new.haml
 - app/views/bhf/entries/show.haml
+- app/views/bhf/form/belongs_to/_radio.haml
+- app/views/bhf/form/belongs_to/_select.haml
+- app/views/bhf/form/belongs_to/_static.haml
+- app/views/bhf/form/column/_array.haml
+- app/views/bhf/form/column/_boolean.haml
+- app/views/bhf/form/column/_date.haml
+- app/views/bhf/form/column/_hash.haml
+- app/views/bhf/form/column/_mappin.haml
+- app/views/bhf/form/column/_markdown.haml
+- app/views/bhf/form/column/_multiple_fields.haml
+- app/views/bhf/form/column/_number.haml
+- app/views/bhf/form/column/_paperclip.haml
+- app/views/bhf/form/column/_password.haml
+- app/views/bhf/form/column/_static.haml
+- app/views/bhf/form/column/_string.haml
+- app/views/bhf/form/column/_text.haml
+- app/views/bhf/form/column/_wysiwyg.haml
+- app/views/bhf/form/embeds_many/_static.haml
+- app/views/bhf/form/embeds_one/_static.haml
+- app/views/bhf/form/has_and_belongs_to_many/_check_box.haml
+- app/views/bhf/form/has_and_belongs_to_many/_static.haml
+- app/views/bhf/form/has_many/_static.haml
+- app/views/bhf/form/has_one/_static.haml
 - app/views/bhf/helper/_definition_item.haml
 - app/views/bhf/helper/_field_errors.haml
 - app/views/bhf/helper/_flash.haml
@@ -249,25 +246,25 @@ files:
 - app/views/bhf/helper/_reflection_node.haml
 - app/views/bhf/pages/_platform.haml
 - app/views/bhf/pages/_search.haml
-- app/views/bhf/pages/macro/belongs_to/_default.haml
-- 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
-- app/views/bhf/pages/macro/column/_number.haml
-- app/views/bhf/pages/macro/column/_paperclip.haml
-- app/views/bhf/pages/macro/column/_primary_key.haml
-- app/views/bhf/pages/macro/column/_string.haml
-- app/views/bhf/pages/macro/column/_text.haml
-- app/views/bhf/pages/macro/embeds_many/_default.haml
-- app/views/bhf/pages/macro/embeds_one/_default.haml
-- app/views/bhf/pages/macro/has_and_belongs_to_many/_default.haml
-- app/views/bhf/pages/macro/has_many/_default.haml
-- app/views/bhf/pages/macro/has_one/_default.haml
 - app/views/bhf/pages/show.haml
+- app/views/bhf/table/belongs_to/_default.haml
+- app/views/bhf/table/column/_array.haml
+- app/views/bhf/table/column/_boolean.haml
+- app/views/bhf/table/column/_date.haml
+- app/views/bhf/table/column/_extern_link.haml
+- app/views/bhf/table/column/_file.haml
+- app/views/bhf/table/column/_hash.haml
+- app/views/bhf/table/column/_image.haml
+- app/views/bhf/table/column/_number.haml
+- app/views/bhf/table/column/_paperclip.haml
+- app/views/bhf/table/column/_primary_key.haml
+- app/views/bhf/table/column/_string.haml
+- app/views/bhf/table/column/_text.haml
+- app/views/bhf/table/embeds_many/_default.haml
+- app/views/bhf/table/embeds_one/_default.haml
+- app/views/bhf/table/has_and_belongs_to_many/_default.haml
+- app/views/bhf/table/has_many/_default.haml
+- app/views/bhf/table/has_one/_default.haml
 - app/views/kaminari/bhf/_gap.html.haml
 - app/views/kaminari/bhf/_next_page.html.haml
 - app/views/kaminari/bhf/_page.html.haml
@@ -280,14 +277,18 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - lib/bhf.rb
-- lib/bhf/active_record/active_record.rb
-- lib/bhf/data.rb
-- lib/bhf/form.rb
+- lib/bhf/action_view/form_builder.rb
+- lib/bhf/action_view/form_options.rb
+- lib/bhf/active_record/base.rb
 - lib/bhf/mongoid/document.rb
-- lib/bhf/pagination.rb
-- lib/bhf/platform.rb
-- lib/bhf/settings.rb
-- lib/bhf/settings_parser.rb
+- lib/bhf/platform/attribute/abstract.rb
+- lib/bhf/platform/attribute/column.rb
+- lib/bhf/platform/attribute/reflection.rb
+- lib/bhf/platform/base.rb
+- lib/bhf/platform/pagination.rb
+- lib/bhf/settings/base.rb
+- lib/bhf/settings/platform.rb
+- lib/bhf/settings/yaml_parser.rb
 - lib/rails/generators/bhf/templates/initializer.rb
 - test/database.yml
 - test/test_helper.rb

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

@@ -1,2 +0,0 @@
-- 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/app/views/bhf/entries/form/belongs_to/_radio.haml

@@ -1,8 +0,0 @@
-- data_source ||= field.reflection.klass.all
-= reflection_node f, field do
-  - fk = field.reflection.foreign_key
-  %ul
-    - data_source.each do |obj|
-      %li
-        = f.radio_button fk, obj.id, id: "belongs_to_#{fk}_#{obj.id}"
-        = label_tag "belongs_to_#{fk}_#{obj.id}", obj.to_bhf_s

data/app/views/bhf/entries/form/belongs_to/_select.haml

@@ -1,7 +0,0 @@
-- data_source ||= field.reflection.klass.all
-- fk = field.reflection.foreign_key
-.node
-  .label= f.label fk, reflection_title(f, field)
-  .input
-    = f.select fk, options_from_collection_for_select(data_source, :id, :to_bhf_s, f.object.send(fk)), include_blank: true
-    = render partial: 'bhf/helper/field_errors', locals: {f: f, field: fk}

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

@@ -1 +0,0 @@
-= render partial: 'bhf/entries/form/has_one/static', locals: {ref_object: f.object.send(field.reflection.name), field: field, f: f}

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

@@ -1,12 +0,0 @@
-= reflection_node f, field do
-  - ref_objects = f.object.send(field.reflection.name)
-  %p.empty{class: ('hide' unless ref_objects.blank?)}= t 'bhf.helpers.entry.empty', count: 2
-  %ul.relation{class: field.macro}
-    - ref_objects.each do |ref_object|
-      %li
-        = link_to_if field.link && ! field.link.hide_edit, ref_object.to_bhf_s, edit_entry_embed_path(field.link || 0, f.object, ref_object), class: :quick_edit
-        - if field.link && ! field.link.hide_delete
-          = link_to '×'.html_safe, entry_embed_path(field.link, f.object, ref_object), method: :delete, class: :delete, remote: true, data: {confirm: t('bhf.helpers.promts.confirm')}
-
-  - if field.link && ! field.link.hide_create
-    = link_to '+', new_entry_embed_path(field.link, f.object), class: 'add_field quick_edit'

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

@@ -1,12 +0,0 @@
-= reflection_node f, field do
-  - ref_object = f.object.send(field.reflection.name)
-  %p.empty{class: ('hide' if ref_object)}= t 'bhf.helpers.entry.empty', count: 1
-  %ul.relation{class: field.macro}
-    %li
-      - if ref_object
-        = link_to_if field.link && ! field.link.hide_edit, ref_object.to_bhf_s, edit_entry_embed_path(field.link || 0, f.object, ref_object), class: :quick_edit
-        - if field.link && ! field.link.hide_delete
-          = link_to '×'.html_safe, entry_embed_path(field.link, f.object, ref_object), method: :delete, class: :delete, remote: true, data: {confirm: t('bhf.helpers.promts.confirm')}
-
-  - if field.link && ! field.link.hide_create
-    = link_to '+', new_entry_embed_path(field.link, f.object), class: "add_field quick_edit #{('hide' if ref_object)}"

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

@@ -1,2 +0,0 @@
-- data_source = current_account.send(field.reflection.name.to_s.pluralize)
-= render partial: 'bhf/entries/form/has_and_belongs_to_many/check_box', locals: {data_source: data_source, field: field, f: f}

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

@@ -1,5 +0,0 @@
-- data_source ||= field.reflection.klass.all
-= reflection_node f, field do
-  %ul
-    - data_source.each do |obj|
-      %li= f.many_to_many_check_box obj, field.reflection.name, params

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

@@ -1 +0,0 @@
-= render partial: 'bhf/entries/form/has_many/static', locals: {ref_objects: f.object.send(field.reflection.name), field: field, f: f}

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

@@ -1,12 +0,0 @@
-= reflection_node f, field do
-  - ref_objects ||= f.object.send(field.reflection.name)
-  %p.empty{class: ('hide' unless ref_objects.blank?)}= t 'bhf.helpers.entry.empty', count: 2
-  %ul.relation{class: field.macro}
-    - ref_objects.each do |ref_object|
-      %li
-        = link_to_if field.link && ! field.link.hide_edit, ref_object.to_bhf_s, edit_entry_path(field.link || 0, ref_object), class: :quick_edit
-        - if field.link && ! field.link.hide_delete
-          = link_to '×'.html_safe, entry_path(field.link, ref_object), method: :delete, class: :delete, remote: true, data: {confirm: t('bhf.helpers.promts.confirm')}
-
-  - if field.link && ! field.link.hide_create
-    = link_to '+', new_entry_path(field.link), class: 'add_field quick_edit'

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

@@ -1,2 +0,0 @@
-- 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

@@ -1,9 +0,0 @@
-= reflection_node f, field do
-  - ref_object ||= f.object.send(field.reflection.name)
-  %p.empty{class: ('hide' if ref_object)}= t 'bhf.helpers.entry.empty', count: 1
-  %ul.relation{class: field.macro}
-    - if ref_object
-      %li= link_to_if field.link && ! field.link.hide_edit, ref_object.to_bhf_s, edit_entry_path(field.link || 0, ref_object), class: :quick_edit
-
-  -# if field.link
-    = link_to '+', new_entry_path(field.link), class: 'add_field quick_edit'