bhf 0.8.0 → 0.8.2

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

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

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

@@ -1,4 +1,4 @@
 %p
   %span.dt #{object.class.human_attribute_name(column.name)}:
-  %span.dd{class: [column.field.macro, column.field.display_type], data: {column_name: column.name}}
+  %span.dd{class: [column.macro, column.show_type], data: {column_name: column.name}}
     = content

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

@@ -1,4 +1,4 @@
-- link_title = t('bhf.helpers.entry.edit', platform_name: object.to_bhf_s)
+- link_title = t('bhf.helpers.entry.edit', platform_title: object.to_bhf_s)
 
 = link_to bhf.edit_entry_url(platform_name, object, {return_to: request.original_url}.merge(area ? {bhf_area: area} : {})), class: 'bhf_edit', data: {:'no-turbolink' => true}, title: link_title do
   = block ? block : link_title

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

@@ -4,7 +4,7 @@
   - referral_id = (referral_entry[:platform] == platform.name && referral_entry[:id])
 
 - if platform.custom_partial
-  = render partial: "bhf/pages/#{platform.custom_partial}", locals: {platform: platform, referral_id: referral_id}
+  = render partial: "bhf/platform/#{platform.custom_partial}", locals: {platform: platform, referral_id: referral_id}
 - else
   %table.data_table{id: "#{platform.name}_platform", class: (platform.custom_columns? ? :custom_columns : :default_columns)}
     %caption
@@ -20,11 +20,8 @@
         - if platform.sortable
           %th.drag
         - platform.columns.each do |column|
-          - 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.bhf_attribute_method?(db_column_name)
-            = link_to_if can_sort, column_name, current_order_path(db_column_name, platform.name)
+          %th{class: "#{column.macro} #{column.display_type} #{order_class(column.db_name, platform.name)}"}
+            = link_to_if column.reorderble, column.title, current_order_path(column.db_name, platform.name)
         %th.action
 
     %tfoot
@@ -32,25 +29,30 @@
         %td{colspan: platform.columns_count}
           = platform.pagination.create(platform) unless platform.sortable
 
-    %tbody{class: (:sortable if platform.sortable), data: {sort_url: sort_entries_path(platform.name)}}
+    %tbody.quick_edit_block{class: ('js_sortable' if platform.sortable), data: {sort_url: sort_entries_path(platform.name)}}
       - if platform.objects.any?
         - platform.objects.each do |object|
           - edit_link = edit_entry_path(platform.name, object)
           - custom_link = send(platform.custom_link, platform.name, object) if platform.custom_link
-          %tr{id: "#{object.id}_#{platform.name}", class: ('animate live_edit initial_referral' if referral_id == object.id)}
+          %tr.quick_edit_entry{id: "#{object.id}_#{platform.name}", class: ('animate live_edit initial_referral' if referral_id == object.id)}
             - if platform.sortable
               %td.drag
                 %span.handle.icon  
             - platform.columns.each do |column|
-              - css_classes = [column.field.macro, column.field.display_type]
-              - if column.field.display_type == :primary_key && object.send(column.name).to_s.length > 6
+              - css_classes = [column.macro, column.display_type]
+              - column_value = object.send(column.name)
+              - if column.display_type == :primary_key && column_value.to_s.length > 6
                 - css_classes << :key_long
-              %td{class: css_classes, data: {column_name: column.name}}
-                - a = if column.field.display_type != :boolean && object.send(column.name).blank?
-                  - '&nbsp;'
+              %td{class: css_classes}
+                - value = if column.display_type != :boolean && column_value.blank?
+                  - '&nbsp;'.html_safe
                 - else
-                  - render(partial: "bhf/pages/macro/#{column.field.macro}/#{column.field.display_type}", locals: {column: column, object: object})
-                = link_to_if !has_link?(column.field.overwrite_display_type), a.html_safe, (platform.custom_link ? custom_link : edit_link), class: ('quick_edit' unless platform.custom_link)
+                  - if column.display_type == :string
+                    - column_value
+                  - else
+                    - # Haml::Engine.new(File.read(File.expand_path File.dirname(__FILE__)+"/../table/#{column.macro}/_#{column.display_type}.haml")).render(OpenStruct.new({column_value: column_value, object: object}))
+                    - render(partial: "bhf/table/#{column.macro}/#{column.display_type}", locals: {column_value: column_value, object: object})
+                = link_to value, (platform.custom_link ? custom_link : edit_link), class: ('quick_edit' unless platform.custom_link)
 
             %td.action{class: ('wider' if platform.show_duplicate && !platform.hide_edit && !platform.hide_delete)}
               - if platform.show_duplicate
@@ -59,10 +61,31 @@
               - 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), method: :delete, remote: true, class: 'icon delete', data: {confirm: t('bhf.helpers.promts.confirm')}
+                = link_to delete_t(platform), entry_path(platform.name, object), method: :delete, remote: true, class: 'icon delete js_delete', data: {confirm: t('bhf.helpers.promts.confirm', platform_title: platform.title_singular)}
       - else
         %td.no_entries{colspan: platform.columns_count}
           = t 'bhf.pagination.info', name_zero: platform.title, count: 0
           - unless platform.hide_create
             = link_to new_t(platform), new_entry_path(platform.name)
 
+    
+      %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.name, '{object_id}') if platform.custom_link
+            %td{class: css_classes}
+              = link_to "{#{column.name}}", (platform.custom_link ? custom_link : edit_link), class: ('quick_edit' unless platform.custom_link)
+
+          %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: {confirm: t('bhf.helpers.promts.confirm', platform_title: platform.title_singular)}

data/app/views/bhf/{pages/macro → table}/belongs_to/_default.haml

@@ -1,2 +1,2 @@
-- ref_object = object.send(column.name)
+- ref_object = column_value
 = ref_object.blank? ? t('bhf.helpers.entry.empty', count: 1) : ref_object.to_bhf_s

data/app/views/bhf/table/column/_array.haml

@@ -0,0 +1 @@
+= column_value[0..5].join(', ')

data/app/views/bhf/table/column/_boolean.haml

@@ -0,0 +1 @@
+= t("bhf.helpers.boolean.#{!!column_value}")

data/app/views/bhf/table/column/_date.haml

@@ -0,0 +1 @@
+= l(column_value, format: :short) if column_value

data/app/views/bhf/table/column/_extern_link.haml

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

data/app/views/bhf/table/column/_file.haml

@@ -0,0 +1 @@
+= link_to_if column_value, column_value, column_value

data/app/views/bhf/table/column/_hash.haml

@@ -0,0 +1 @@
+= column_value.inspect

data/app/views/bhf/table/column/_image.haml

@@ -0,0 +1 @@
+= image_tag column_value, alt: column_value, class: 'preview_image'

data/app/views/bhf/table/column/_number.haml

@@ -0,0 +1 @@
+= column_value

data/app/views/bhf/table/column/_paperclip.haml

@@ -0,0 +1,5 @@
+- file = column_value
+- if type_is_image?(file.content_type)
+  = image_tag find_smallest_size_url_for_file(file), alt: column_value, class: 'preview_image'
+- else
+  = file.original_filename

data/app/views/bhf/table/column/_primary_key.haml

@@ -0,0 +1 @@
+%strong= column_value

data/app/views/bhf/table/column/_string.haml

@@ -0,0 +1 @@
+= column_value

data/app/views/bhf/table/column/_text.haml

@@ -0,0 +1 @@
+= sanitize(column_value.to_s, tags: %w(strong em))

data/app/views/bhf/table/embeds_many/_default.haml

@@ -0,0 +1 @@
+= render partial: 'bhf/table/has_many/default', locals: {ref_objects: column_value}

data/app/views/bhf/table/embeds_one/_default.haml

@@ -0,0 +1 @@
+= render partial: 'bhf/table/has_one/default', locals: {ref_object: column_value}

data/app/views/bhf/table/has_and_belongs_to_many/_default.haml

@@ -0,0 +1 @@
+= render partial: 'bhf/table/has_many/default', locals: {ref_objects: column_value}

data/app/views/bhf/table/has_many/_default.haml

@@ -0,0 +1,2 @@
+- ref_objects ||= column_value
+= ref_objects.blank? ? t('bhf.helpers.entry.empty', count: 2) : ref_objects.collect(&:to_bhf_s).join(', ')

data/app/views/bhf/{pages/macro → table}/has_one/_default.haml

@@ -1,2 +1,2 @@
-- ref_object ||= object.send(column.name)
+- ref_object ||= column_value
 = ref_object.blank? ? t('bhf.helpers.entry.empty', count: 1) : ref_object.to_bhf_s

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.8.0 ruby lib
+# stub: bhf 0.8.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf"
-  s.version = "0.8.0"
+  s.version = "0.8.2"
 
   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 = "2014-06-11"
+  s.date = "2014-07-02"
   s.description = "Gets you there on time"
   s.email = "anton.pawlik@gmail.com"
   s.extra_rdoc_files = [
@@ -35,8 +35,6 @@ Gem::Specification.new do |s|
     "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",
@@ -48,6 +46,8 @@ Gem::Specification.new do |s|
     "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",
@@ -73,34 +73,31 @@ Gem::Specification.new do |s|
     "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",
@@ -110,25 +107,25 @@ Gem::Specification.new do |s|
     "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",
@@ -141,14 +138,18 @@ Gem::Specification.new do |s|
     "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"
@@ -162,7 +163,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 4.1.1"])
+      s.add_runtime_dependency(%q<rails>, ["~> 4"])
       s.add_runtime_dependency(%q<turbolinks>, ["~> 2.1"])
       s.add_runtime_dependency(%q<kaminari>, ["~> 0.15"])
       s.add_runtime_dependency(%q<haml-rails>, ["~> 0.4"])
@@ -173,7 +174,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
       s.add_development_dependency(%q<simplecov>, ["~> 0.8"])
     else
-      s.add_dependency(%q<rails>, ["~> 4.1.1"])
+      s.add_dependency(%q<rails>, ["~> 4"])
       s.add_dependency(%q<turbolinks>, ["~> 2.1"])
       s.add_dependency(%q<kaminari>, ["~> 0.15"])
       s.add_dependency(%q<haml-rails>, ["~> 0.4"])
@@ -185,7 +186,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, ["~> 0.8"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 4.1.1"])
+    s.add_dependency(%q<rails>, ["~> 4"])
     s.add_dependency(%q<turbolinks>, ["~> 2.1"])
     s.add_dependency(%q<kaminari>, ["~> 0.15"])
     s.add_dependency(%q<haml-rails>, ["~> 0.4"])

data/config/locales/de.yml

@@ -4,22 +4,22 @@ de:
       boolean:
         'true': 'ja'
         'false': 'nein'
-      link: Link ⬀
+      link: 'Link ⬀'
       form:
         buttons:
-          save: '%{platform_name} speichern'
+          save: '%{platform_title} speichern'
           and_edit: und editieren
           and_add: und anlegen
       searchform:
         placeholder: Suche
       promts:
-        confirm: Sind Sie sicher?
+        confirm: 'Wollen Sie diesen %{platform_title}-Eintrag löschen?'
       entry:
-        show: "%{platform_name} anzeigen"
-        new: "%{platform_name} anlegen"
-        duplicate: "%{platform_name} duplizieren"
-        edit: "%{platform_name} editieren"
-        delete: "%{platform_name} löschen"
+        show: "%{platform_title} anzeigen"
+        new: "%{platform_title} anlegen"
+        duplicate: "%{platform_title} duplizieren"
+        edit: "%{platform_title} editieren"
+        delete: "%{platform_title} löschen"
         empty: Leer
         cancel: Abbrechen
       user:

data/config/locales/en.yml

@@ -10,19 +10,19 @@ en:
       link: Link ⬀
       form:
         buttons:
-          save: 'Save %{platform_name}'
+          save: 'Save %{platform_title}'
           and_edit: and edit
           and_add: and add another
       searchform:
         placeholder: Search
       promts:
-        confirm: Are you sure?
+        confirm: 'Do you want to delete this %{platform_title}-entry?'
       entry:
-        new: "New %{platform_name}"
-        show: "Show %{platform_name}"
-        duplicate: "Duplicate %{platform_name}"
-        edit: "Edit %{platform_name}"
-        delete: "Delete %{platform_name}"
+        new: "New %{platform_title}"
+        show: "Show %{platform_title}"
+        duplicate: "Duplicate %{platform_title}"
+        edit: "Edit %{platform_title}"
+        delete: "Delete %{platform_title}"
         empty: Empty
         cancel: Cancel
       user:

data/lib/bhf.rb

@@ -2,24 +2,8 @@ require 'haml'
 require 'sass'
 require 'turbolinks'
 require 'kaminari'
-require 'bhf/active_record/active_record'
-require 'bhf/mongoid/document'
-require 'bhf/data'
-require 'bhf/platform'
-require 'bhf/settings_parser'
-require 'bhf/settings'
-require 'bhf/pagination'
-require 'bhf/form'
-
 
 module Bhf
-  def self.configuration
-    @configuration ||= Bhf::Configuration.new
-  end
-  def self.configure
-    yield configuration
-  end
-  
   class Engine < Rails::Engine
     
     isolate_namespace Bhf
@@ -32,15 +16,21 @@ module Bhf
     
     initializer 'bhf.model_hooks' do
       ActiveSupport.on_load :active_record do
-        include Bhf::ActiveRecord::Object
+        include Bhf::ActiveRecord::Base
       end
       ActiveSupport.on_load :mongoid do
         include Bhf::Mongoid::Document
       end
     end
   end
-  PAPERCLIP_IMAGE_TYPES = ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif']
   
+  
+  def self.configuration
+    @configuration ||= Bhf::Configuration.new
+  end
+  def self.configure
+    yield configuration
+  end
   class Configuration
     include ActiveSupport::Configurable
 
@@ -52,7 +42,22 @@ module Bhf
     config_accessor(:account_model_find_method) { 'find'              }
     config_accessor(:css)                       { ['bhf/application'] }
     config_accessor(:js)                        { ['bhf/application'] }
-    config_accessor(:abstract_config)           { []                  }
+    config_accessor(:abstract_settings)         { []                  }
+    config_accessor(:paperclip_image_types)     {
+      ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif']
+    }
   end
-  
-end
+end
+
+require 'bhf/settings/base'
+require 'bhf/settings/platform'
+require 'bhf/settings/yaml_parser'
+require 'bhf/platform/base'
+require 'bhf/platform/pagination'
+require 'bhf/platform/attribute/abstract'
+require 'bhf/platform/attribute/column'
+require 'bhf/platform/attribute/reflection'
+require 'bhf/active_record/base'
+require 'bhf/mongoid/document'
+require 'bhf/action_view/form_options'
+require 'bhf/action_view/form_builder'