bhf 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a11ce825c2b389e3240cb1cde9da695a23e4fb2b
-  data.tar.gz: ad5abf46d9afd087f7ad23ed74536da517f29d95
+  metadata.gz: 6258a93fccb709c75facbf4c58f86773f25c8d45
+  data.tar.gz: bf9b39ef971a4c9107135615df4debda7db5d616
 SHA512:
-  metadata.gz: 35d7ad8fe8327650d80c02c023f96db907f63a498e78c5817c02c07c520686adef905086288673bbf4082a476301d179f6dfd51548a36080cce97c85c7a32d97
-  data.tar.gz: 3ca16947d38d86c37f979adf6e502fe598202783dc2aa99ffdab5e757b4bfb49b410f3d5e5271220363f52ee7e00c4b987a58c4b3690e564ce6543594813ca47
+  metadata.gz: 3dce6785d36d190332c0eaea91c33e7d482df8075ade512648dce0decb4ddc072e68184f925dd0171d5d8e35f3f638b24b5e97ef67f79757d60eca0354a67988
+  data.tar.gz: 03e40f0335a6097dfa8fb9cec8150c98b7014827dfbfced2211bc2f5c6306daee6fbca117bf4db54b0f42c02b10067bebaa50c911f4cb93d5861d514904149a1

data/app/views/layouts/bhf/application.haml

@@ -4,11 +4,11 @@
     %meta{charset: 'utf-8'}
     %title= @title
     %link{href: "/favicon.ico?#{@app_title.to_s.downcase}", rel: 'icon', type: 'image/x-icon'}
-    - (['bhf/application'] + Bhf::Engine.config.bhf.css.to_a).each do |css|
+    - Bhf::Engine.config.bhf.css.each do |css|
       = stylesheet_link_tag css
   %body
+    
     %header
-      
       %h1
         - logo = if params[:bhf_area] && Rails.application.assets.find_asset("logo_#{params[:bhf_area]}_bhf.svg")
           - "logo_#{params[:bhf_area]}_bhf.svg"
@@ -17,7 +17,7 @@
         
         = link_to image_tag(logo), @root_link ? @root_link : main_app.root_url, :'data-no-turbolink' => true
 
-      - if @areas and @areas.length > 1
+      - if @areas && @areas.length > 1
         = select_tag :area_select, options_from_collection_for_select(@areas, 'path', 'name', main_app.bhf_path(params[:bhf_area])), class: 'icon'
         
       - if @config && @config.pages.any?
@@ -36,5 +36,5 @@
       = render 'bhf/user'
       = render 'bhf/footer'
 
-    - (['bhf/application'] + Bhf::Engine.config.bhf.js.to_a).each do |js|
+    - Bhf::Engine.config.bhf.js.each do |js|
       = javascript_include_tag js, {:'data-turbolinks-eval' => false}

data/config/locales/en.yml

@@ -1,4 +1,4 @@
-en:  
+en:
   bhf:
     page_title: "%{title} – Admin"
     areas:
@@ -41,10 +41,9 @@ en:
       input:
         date_format:
           timestamp: '%Y-%m-%d %H:%M'
-          datetime:  '%Y-%m-%d %H:%M'
+          datetime: '%Y-%m-%d %H:%M'
           date: '%Y-%m-%d'
           time: '%H:%M'
-      
     quick_edit:
       buttons:
         cancel: Cancel

data/lib/bhf.rb

@@ -1,46 +1,39 @@
-def d(var)
-  raise var.inspect.split(', ').join(",\n")
-end
-require 'haml'
-require 'kaminari'
-
 module Bhf
   class Engine < Rails::Engine
     
     isolate_namespace Bhf
     
-    # config.bhf defaults
-    config.bhf = OpenStruct.new
-    config.bhf.page_title = nil
-    config.bhf.on_login_fail = :root_url
-    config.bhf.logout_path = :logout_path
-    config.bhf.session_auth_name = :is_admin
-    config.bhf.session_account_id = :admin_account_id
-    config.bhf.account_model = 'User'
-    config.bhf.account_model_find_method = 'find'
-    config.bhf.css = []
-    config.bhf.js = []
-    config.bhf.abstract_config = []
-    
-    # config.bhf.bhf_logic = YAML::load(IO.read('config/bhf.yml'))
+    config.bhf = OpenStruct.new(
+      on_login_fail: :root_url,
+      logout_path: :logout_path,
+      session_auth_name: :is_admin,
+      session_account_id: :admin_account_id,
+      account_model: 'User',
+      account_model_find_method: 'find',
+      css: ['bhf/application'],
+      js: ['bhf/application'],
+      abstract_config: []
+    )
     
-    initializer 'bhf.action_controller' do |app|
+    initializer 'bhf.helper' do |app|
       ActiveSupport.on_load :action_controller do
         helper Bhf::FrontendHelper
       end
     end
     
-    initializer 'bhf.hooks' do
-      if defined?(::ActiveRecord)
-        ::ActiveRecord::Base.send :include, Bhf::ActiveRecord::Object
+    initializer 'bhf.model_hooks' do
+      ActiveSupport.on_load :active_record do
+        include Bhf::ActiveRecord::Object
       end
-      if defined?(::Mongoid)
-        ::Mongoid::Document.send :include, Bhf::Mongoid::Document
+      ActiveSupport.on_load :mongoid do
+        include Bhf::Mongoid::Document
       end
     end
   end
 end
 
+require 'haml'
+require 'kaminari'
 require 'bhf/active_record/active_record'
 require 'bhf/mongoid/document'
 require 'bhf/data'
@@ -49,5 +42,3 @@ require 'bhf/config_parser'
 require 'bhf/settings'
 require 'bhf/pagination'
 require 'bhf/form'
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails