bhf 0.7.7 → 0.7.8

data/app/controllers/bhf/application_controller.rb

@@ -12,18 +12,17 @@ class Bhf::ApplicationController < ActionController::Base
   private
 
     def check_admin_account
-      if session[Bhf::Engine.config.session_auth_name.to_s] == true
+      if session[Bhf::Engine.config.bhf.session_auth_name.to_s] == true
         return true
       end
-
-      redirect_to(main_app.send(Bhf::Engine.config.on_login_fail.to_sym), error: t('bhf.helpers.user.login.error')) and return false
+      redirect_to(main_app.send(Bhf::Engine.config.bhf.on_login_fail.to_sym), error: t('bhf.helpers.user.login.error')) and return false
     end
 
     def setup_current_account
-      if session[Bhf::Engine.config.session_account_id]
-        @current_account = Bhf::Engine.config.account_model.constantize.send(
-          Bhf::Engine.config.account_model_find_method.to_sym,
-          session[Bhf::Engine.config.session_account_id.to_s]
+      if session[Bhf::Engine.config.bhf.session_account_id]
+        @current_account = Bhf::Engine.config.bhf.account_model.constantize.send(
+          Bhf::Engine.config.bhf.account_model_find_method.to_sym,
+          session[Bhf::Engine.config.bhf.session_account_id.to_s]
         )
         # => User.find(current_account.id)
       end
@@ -37,17 +36,17 @@ class Bhf::ApplicationController < ActionController::Base
       return unless current_account
       
       if area
-        if current_account.respond_to?(:area_role)
-          return current_account.area_role(area)
-        elsif current_account.respond_to?(:area_roles)
-          return current_account.area_roles(area).collect(&:identifier)
+        if current_account.respond_to?(:bhf_area_role)
+          return current_account.bhf_area_role(area)
+        elsif current_account.respond_to?(:bhf_area_roles)
+          return current_account.bhf_area_roles(area).collect(&:identifier)
         end
       end
 
-      if current_account.respond_to?(:role)
-        current_account.role.is_a?(String) ? current_account.role : current_account.role.identifier
-      elsif current_account.respond_to?(:roles)
-        current_account.roles.collect(&:identifier)
+      if current_account.respond_to?(:bhf_role)
+        current_account.bhf_role.is_a?(String) ? current_account.bhf_role : current_account.bhf_role.identifier
+      elsif current_account.respond_to?(:bhf_roles)
+        current_account.bhf_roles.collect(&:identifier)
       end
     end
 
@@ -58,24 +57,20 @@ class Bhf::ApplicationController < ActionController::Base
     def set_title
       @app_title = Rails.application.class.to_s.split('::').first
       
-      @title = if Bhf::Engine.config.page_title
-        Bhf::Engine.config.page_title
-      else
-        if params[:bhf_area]
-          t("bhf.areas.page_title.#{params[:bhf_area]}", 
-            area: params[:bhf_area],
+      @title = if params[:bhf_area]
+        t("bhf.areas.page_title.#{params[:bhf_area]}", 
+          area: params[:bhf_area],
+          title: @app_title,
+          default: t('bhf.areas.page_title', 
             title: @app_title,
-            default: t('bhf.areas.page_title', 
-              title: @app_title,
-              area: t("bhf.areas.links.#{params[:bhf_area]}", default: params[:bhf_area])
-            )
+            area: t("bhf.areas.links.#{params[:bhf_area]}", default: params[:bhf_area])
           )
-        else
-          t('bhf.page_title', title: @app_title)
-        end
+        )
+      else
+        t('bhf.page_title', title: @app_title)
       end.html_safe
     end
-    
+
     def set_areas
       @areas = []
       if current_account and current_account.respond_to?(:bhf_areas)

data/app/controllers/bhf/embed_entries_controller.rb

@@ -22,7 +22,7 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
       if @quick_edit
         render json: object_to_bhf_display_hash.merge(edit_path: edit_path), status: :ok
       else
-        redirect_to(edit_path, notice: set_message('create.success', @model))
+        redirect_back_or_default(edit_path, notice: set_message('create.success', @model))
       end
     else
       @form_url = entry_embed_index_path(@platform.name, @model.get_embedded_parent(params[:entry_id]))
@@ -42,7 +42,7 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
       if @quick_edit
         render json: object_to_bhf_display_hash, status: :ok
       else
-        redirect_to(edit_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object), notice: set_message('update.success', @model))
+        redirect_back_or_default(edit_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object), notice: set_message('update.success', @model))
       end
     else
       @form_url = entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)

data/app/helpers/bhf/frontend_helper.rb

@@ -2,7 +2,7 @@ module Bhf
   module FrontendHelper
 
     def bhf_edit(object, options = {}, &block)
-      return unless session[Bhf::Engine.config.session_auth_name.to_s] == true
+      return unless session[Bhf::Engine.config.bhf.session_auth_name.to_s] == true
 
       options[:platform_name] ||= object.class.to_s.pluralize.downcase
       

data/app/views/bhf/_user.haml

@@ -1,5 +1,5 @@
 - if defined?(current_account) && current_account
   %p.user
     = t('bhf.helpers.user.login.as', user: current_account.to_bhf_s).html_safe
-    - if main_app.respond_to?(Bhf::Engine.config.logout_path)
-      = link_to t('bhf.helpers.user.logout.link'), main_app.send(Bhf::Engine.config.logout_path), method: :delete, class: :alt_button
+    - if main_app.respond_to?(Bhf::Engine.config.bhf.logout_path)
+      = link_to t('bhf.helpers.user.logout.link'), main_app.send(Bhf::Engine.config.bhf.logout_path), method: :delete, class: :alt_button

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

@@ -4,7 +4,7 @@
     %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.css.to_a).each do |css|
+    - (['bhf/application'] + Bhf::Engine.config.bhf.css.to_a).each do |css|
       = stylesheet_link_tag css
   %body
     %header
@@ -36,5 +36,5 @@
       = render 'bhf/user'
       = render 'bhf/footer'
 
-    - (['bhf/application'] + Bhf::Engine.config.js.to_a).each do |js|
+    - (['bhf/application'] + Bhf::Engine.config.bhf.js.to_a).each do |js|
       = javascript_include_tag js, {:'data-turbolinks-eval' => false}

data/lib/bhf.rb

@@ -9,19 +9,20 @@ module Bhf
     
     isolate_namespace Bhf
     
-    # Config defaults
-    config.page_title = nil
-    config.on_login_fail = :root_url
-    config.logout_path = :logout_path
-    config.session_auth_name = :is_admin
-    config.session_account_id = :admin_account_id
-    config.account_model = 'User'
-    config.account_model_find_method = 'find'
-    config.css = []
-    config.js = []
-    config.abstract_config = []
+    # 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_logic = YAML::load(IO.read('config/bhf.yml'))
+    # config.bhf.bhf_logic = YAML::load(IO.read('config/bhf.yml'))
     
     initializer 'bhf.action_controller' do |app|
       ActiveSupport.on_load :action_controller do

data/lib/bhf/config_parser.rb

@@ -6,9 +6,9 @@ module Bhf
       def parse(roles_array, area = nil)
         roles_config = roles_yml(roles_array, area)
   
-        if Bhf::Engine.config.abstract_config.any?
+        if Bhf::Engine.config.bhf.abstract_config.any?
     
-          tmp_pages = get_config_array(Bhf::Engine.config.abstract_config, '/abstract')['pages']
+          tmp_pages = get_config_array(Bhf::Engine.config.bhf.abstract_config, '/abstract')['pages']
           abstract_platform_config = tmp_pages.each_with_object({}) do |abstract_pages, hash|
             abstract_pages.each do |abstract_page|
               abstract_page[1].each do |abstract_platform|

data/lib/bhf/data.rb

@@ -107,6 +107,7 @@ module Bhf
       end
       
       def macro
+        return :has_and_belongs_to_many if @reflection.macro == :has_many && @reflection.options[:through]
         @reflection.macro
       end
       

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

@@ -1,17 +1,17 @@
 module Bhf
   class Engine < Rails::Engine
     
-    # config.css << 'bhf'
-    # config.js << 'bhf'
-    # config.abstract_config << 'abstract'
+    # config.bhf.css << 'bhf'
+    # config.bhf.js << 'bhf'
+    # config.bhf.abstract_config << 'abstract'
 
-    # config.on_login_fail = :root_url
-    # config.logout_path = :logout_path
+    # config.bhf.on_login_fail = :root_url
+    # config.bhf.logout_path = :logout_path
     
-    # config.session_account_id = :admin_account_id
-    # config.session_auth_name = :is_admin
-    # config.account_model = 'User'
-    # config.account_model_find_method = 'find'
+    # config.bhf.session_account_id = :admin_account_id
+    # config.bhf.session_auth_name = :is_admin
+    # config.bhf.account_model = 'User'
+    # config.bhf.account_model_find_method = 'find'
     
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Anton Pawlik
@@ -114,6 +114,8 @@ files:
 - app/assets/javascripts/bhf/classes/Setlatlng.js
 - app/assets/javascripts/bhf/classes/showdown.js
 - app/assets/javascripts/bhf/classes/wmd.js
+- app/assets/javascripts/bhf/mootools-core-1.5.0-full-compat.js
+- app/assets/javascripts/bhf/mootools-more-1.5.0.js
 - app/assets/javascripts/bhf/mootools_ujs.js
 - app/assets/stylesheets/bhf/MooEditable.css.scss
 - app/assets/stylesheets/bhf/application.css.sass