bhf 0.6.20 → 0.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df4b4e02c7a3ff276bf5fa43b43f1945ef314175
-  data.tar.gz: 3768bbb9588dd1e84e2b24b3515fde68af523702
+  metadata.gz: ea3828bf228388314f66419153703d30d693255f
+  data.tar.gz: c8391df2548607b8a27363b550b73edaa0610b3e
 SHA512:
-  metadata.gz: 500ae8b85c83571f366179a8870a2adf50a1ddbed89cb8be8cdc29cf19d9042983627c1ac7018890dc502c0e46eb297a5a46674dc503cb2249c948ac247c4299
-  data.tar.gz: 7ba90cdc49913a0e395ab94090bc93918d1b4d607949b03f962a8fd32b478cf52365b7fe54b8ee937a5ae69d14ef382749354c9afd40ab70cb8c9a2196d232a4
+  metadata.gz: 95313defc1225ba4e8b4965a4a799136a0060edb80facee19a279a9e370411bb1631d7ec2739d2e5cc3d4b4b6c778e0c0ecda133e6eb467af862b7423ffa8754
+  data.tar.gz: 1fd7e80f81ca5f5fe5ee4b9a6b55e4edd7ac5090f118496e291a9d112bac2af369940b7a8da6023a89c988446ca921fd9d26536cd4ada92c3b35b78d27e0caec

data/app/controllers/bhf/application_controller.rb

@@ -16,7 +16,7 @@ class Bhf::ApplicationController < ActionController::Base
         return true
       end
 
-      redirect_to(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.on_login_fail.to_sym), error: t('bhf.helpers.user.login.error')) and return false
     end
 
     def setup_current_account

data/app/controllers/bhf/embed_entries_controller.rb

@@ -1,13 +1,13 @@
 class Bhf::EmbedEntriesController < Bhf::EntriesController
 
   def new
-    @form_url = bhf_entry_embed_index_path(@platform.name, @model.get_embedded_parent(params[:entry_id]))
+    @form_url = entry_embed_index_path(@platform.name, @model.get_embedded_parent(params[:entry_id]))
 
     render 'bhf/entries/new', ({layout: 'bhf/quick_edit'} if @quick_edit) || {}
   end
 
   def edit
-    @form_url = bhf_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)
+    @form_url = entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)
 
     render 'bhf/entries/edit', ({layout: 'bhf/quick_edit'} if @quick_edit) || {}
   end
@@ -18,14 +18,14 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
       manage_many_to_many
       after_save
 
-      edit_path = edit_bhf_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)
+      edit_path = edit_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)
       if @quick_edit
-        render json: object_to_bhf_display_hash.merge(edit_path: edit_path), status: :ok
+        render json: object_to_display_hash.merge(edit_path: edit_path), status: :ok
       else
         redirect_back_or_default(edit_path, notice: set_message('create.success', @model))
       end
     else
-      @form_url = bhf_entry_embed_index_path(@platform.name, @model.get_embedded_parent(params[:entry_id]))
+      @form_url = entry_embed_index_path(@platform.name, @model.get_embedded_parent(params[:entry_id]))
 
       r_settings = {status: :unprocessable_entity}
       r_settings[:layout] = 'bhf/quick_edit' if @quick_edit
@@ -42,10 +42,10 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
       if @quick_edit
         render json: object_to_bhf_display_hash, status: :ok
       else
-        redirect_back_or_default(edit_bhf_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 = bhf_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)
+      @form_url = entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)
 
       r_settings = {status: :unprocessable_entity}
       r_settings[:layout] = 'bhf/quick_edit' if @quick_edit

data/app/controllers/bhf/entries_controller.rb

@@ -4,7 +4,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
   before_filter :load_new_object, only: [:create, :new]
 
   def new
-    @form_url = bhf_entries_path(@platform.name)
+    @form_url = entries_path(@platform.name)
     
     render layout: 'bhf/quick_edit' if @quick_edit
   end
@@ -12,7 +12,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
   def edit
     render file: 'public/404.html', layout: false and return unless @object
     
-    @form_url = bhf_entry_path(@platform.name, @object)
+    @form_url = entry_path(@platform.name, @object)
     
     render layout: 'bhf/quick_edit' if @quick_edit
   end
@@ -30,10 +30,10 @@ class Bhf::EntriesController < Bhf::ApplicationController
       if @quick_edit
         render json: object_to_bhf_display_hash, status: :ok
       else
-        redirect_back_or_default(bhf_page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('create.success', @model))
+        redirect_back_or_default(page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('create.success', @model))
       end
     else
-      @form_url = bhf_entries_path(@platform.name)
+      @form_url = entries_path(@platform.name)
 
       r_settings = {status: :unprocessable_entity}
       r_settings[:layout] = 'bhf/quick_edit' if @quick_edit
@@ -52,10 +52,10 @@ class Bhf::EntriesController < Bhf::ApplicationController
       if @quick_edit
         render json: object_to_bhf_display_hash, status: :ok
       else
-        redirect_back_or_default(bhf_page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('update.success', @model))
+        redirect_back_or_default(page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('update.success', @model))
       end
     else
-      @form_url = bhf_entry_path(@platform.name, @object)
+      @form_url = entry_path(@platform.name, @object)
 
       r_settings = {status: :unprocessable_entity}
       r_settings[:layout] = 'bhf/quick_edit' if @quick_edit
@@ -68,9 +68,9 @@ class Bhf::EntriesController < Bhf::ApplicationController
     new_record.before_bhf_duplicate(@object) if new_record.respond_to?(:before_bhf_duplicate)
     if new_record.save
       new_record.after_bhf_duplicate(@object) if new_record.respond_to?(:after_bhf_duplicate)
-      redirect_to(bhf_page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('duplicate.success', @model))
+      redirect_to(page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('duplicate.success', @model))
     else
-      redirect_to(bhf_page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('duplicate.error', @model))
+      redirect_to(page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('duplicate.error', @model))
     end
   end
   
@@ -91,14 +91,14 @@ class Bhf::EntriesController < Bhf::ApplicationController
     if @quick_edit
       head :ok
     else
-      redirect_back_or_default(bhf_page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('destory.success', @model))
+      redirect_back_or_default(page_url(@platform.page_name, anchor: "#{@platform.name}_platform"), notice: set_message('destory.success', @model))
     end
   end
 
   private
 
     def object_to_bhf_display_hash
-      @platform.columns.each_with_object({to_bhf_s: @object.to_bhf_s, edit_path: edit_bhf_entry_path(@platform.name, @object), object_id: @object.id}) do |column, hash|
+      @platform.columns.each_with_object({to_bhf_s: @object.to_bhf_s, edit_path: edit_entry_path(@platform.name, @object), object_id: @object.id}) do |column, hash|
         unless column.field.macro == :column && @object.send(column.name).blank?
           p = "bhf/pages/macro/#{column.field.macro}/#{column.field.display_type}"
           hash[column.name] = render_to_string partial: p, locals: {column: column, object: @object}

data/app/helpers/bhf/frontend_helper.rb

@@ -0,0 +1,17 @@
+module Bhf
+  module FrontendHelper
+
+    def bhf_edit(object, options = {}) # TODO: add a block of html for custom editing buttons and links
+      return unless session[Bhf::Engine.config.session_auth_name.to_s] == true
+
+      options[:platform_name] ||= object.class.to_s.pluralize.downcase
+      
+      if object.respond_to?(:'bhf_can_edit?', true)
+        return unless object.bhf_can_edit?(options)
+      end
+
+      render partial: 'bhf/helper/frontend_edit', locals: { platform_name: options[:platform_name], object: object }
+    end
+
+  end
+end

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 self.respond_to?(Bhf::Engine.config.logout_path)
-      = link_to t('bhf.helpers.user.logout.link'), self.send(Bhf::Engine.config.logout_path), method: :delete, class: :alt_button
+    - 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

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

@@ -1,4 +1,4 @@
 .content_box
   %ul.basic_info_list
     - @config.pages.each do |page|
-      %li= link_to t("bhf.pages.navigation.#{page}", default: page.capitalize), bhf_page_path(page)
+      %li= link_to t("bhf.pages.navigation.#{page}", default: page.capitalize), page_path(page)

data/app/views/bhf/entries/_form.haml

@@ -13,4 +13,4 @@
       .label
       .input
         = f.submit f.object.new_record? ? new_t(@platform) : edit_t(@platform)
-        = link_to t('bhf.helpers.entry.cancel'), bhf_page_path(@platform.page_name), class: 'cancel'
+        = link_to t('bhf.helpers.entry.cancel'), page_path(@platform.page_name), class: 'cancel'

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

@@ -4,9 +4,9 @@
   %ul.relation{class: field.macro}
     - ref_objects.each do |ref_object|
       %li
-        = link_to_if field.link, ref_object.to_bhf_s, edit_bhf_entry_embed_path(field.link || 0, f.object, ref_object), class: :quick_edit
+        = link_to_if field.link, ref_object.to_bhf_s, edit_entry_embed_path(field.link || 0, f.object, ref_object), class: :quick_edit
         - if field.link
-          = link_to '×'.html_safe, bhf_entry_embed_path(field.link, f.object, ref_object), method: :delete, class: :delete, remote: true, data: {confirm: t('bhf.helpers.promts.confirm')}
+          = 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
-    = link_to '+', new_bhf_entry_embed_path(field.link, f.object), class: 'add_field quick_edit'
+    = 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

@@ -4,9 +4,9 @@
   %ul.relation{class: field.macro}
     %li
       - if ref_object
-        = link_to_if field.link, ref_object.to_bhf_s, edit_bhf_entry_embed_path(field.link || 0, f.object, ref_object), class: :quick_edit
+        = link_to_if field.link, ref_object.to_bhf_s, edit_entry_embed_path(field.link || 0, f.object, ref_object), class: :quick_edit
         - if field.link
-          = link_to '×'.html_safe, bhf_entry_embed_path(field.link, f.object, ref_object), method: :delete, class: :delete, remote: true, data: {confirm: t('bhf.helpers.promts.confirm')}
+          = 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
-    = link_to '+', new_bhf_entry_embed_path(field.link, f.object), class: "add_field quick_edit #{('hide' if ref_object)}"
+    = 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_many/_static.haml

@@ -3,7 +3,7 @@
   %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, ref_object.to_bhf_s, edit_bhf_entry_path(field.link || 0, ref_object), class: :quick_edit
+      %li= link_to_if field.link, ref_object.to_bhf_s, edit_entry_path(field.link || 0, ref_object), class: :quick_edit
 
   - if field.link
-    = link_to '+', new_bhf_entry_path(field.link), class: 'add_field quick_edit'
+    = link_to '+', new_entry_path(field.link), class: 'add_field quick_edit'

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

@@ -3,7 +3,7 @@
   %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, ref_object.to_bhf_s, edit_bhf_entry_path(field.link || 0, ref_object), class: :quick_edit
+      %li= link_to_if field.link, ref_object.to_bhf_s, edit_entry_path(field.link || 0, ref_object), class: :quick_edit
 
   - if field.link
-    = link_to '+', new_bhf_entry_path(field.link), class: 'add_field quick_edit'
+    = link_to '+', new_entry_path(field.link), class: 'add_field quick_edit'

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

@@ -1 +1 @@
-= link_to t('bhf.helpers.entry.edit', platform_name: object.to_bhf_s), edit_bhf_entry_path(platform_name, object), class: 'bhf_edit', data: {:'no-turbolink' => true}
+= link_to t('bhf.helpers.entry.edit', platform_name: object.to_bhf_s), bhf.edit_entry_path(platform_name, object), class: 'bhf_edit', data: {:'no-turbolink' => true}

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

@@ -7,7 +7,7 @@
       %h4= platform.title
       %p.info= platform.pagination.info platform
       - unless platform.hide_create
-        %p.create= link_to new_t(platform), new_bhf_entry_path(platform.name), class: :alt_button
+        %p.create= link_to new_t(platform), new_entry_path(platform.name), class: :alt_button
       - unless platform.custom_partial
         = render partial: 'search', locals: {platform: platform} if platform.search?
 
@@ -28,10 +28,10 @@
         %td{colspan: platform.columns_count}
           = platform.pagination.create(platform) unless platform.sortable
 
-    %tbody{class: (:sortable if platform.sortable), :'data-sort-url' => sort_bhf_entries_path(platform.name)}
+    %tbody{class: (:sortable if platform.sortable), :'data-sort-url' => sort_entries_path(platform.name)}
       - if platform.objects.any?
         - platform.objects.each do |object|
-          - edit_link = edit_bhf_entry_path(platform.name, 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}"}
             - if platform.sortable
@@ -49,14 +49,14 @@
             %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_bhf_entry_path(platform.name, object), class: 'icon duplicate', method: :post, title: dt
+                = link_to dt, duplicate_entry_path(platform.name, object), 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), bhf_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', data: {confirm: t('bhf.helpers.promts.confirm')}
       - 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_bhf_entry_path(platform.name)
+            = link_to new_t(platform), new_entry_path(platform.name)
 

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

@@ -10,13 +10,13 @@
     %header
       %h1
         - logo = Rails.application.assets.find_asset('logo_bhf.png') ? 'logo_bhf.png' : 'logo_bhf.svg'
-        = link_to image_tag(asset_path(logo)), root_url, :'data-no-turbolink' => true
+        = link_to image_tag(asset_path(logo)), main_app.root_url, :'data-no-turbolink' => true
       - if @config && @config.pages.any?
         %nav
           %ul
             - @config.pages.each do |page|
               %li{class: ('active' if @page == page)}
-                = link_to t("bhf.pages.navigation.#{page}", default: page.capitalize), bhf_page_path(page)
+                = link_to t("bhf.pages.navigation.#{page}", default: page.capitalize), page_path(page)
 
     #content
       #main

data/config/routes.rb

@@ -1,4 +1,16 @@
-unless Bhf::Engine.config.remove_default_routes
-  Rails.application.routes.draw(&Bhf::Engine.config.bhf_routes)
-  #(bhf_)((.+)_?(path|url))
-end
+Bhf::Engine.routes.draw do
+  root to: 'application#index'
+  
+  get 'page/:page', to: 'pages#show', as: :page
+  
+  scope ':platform' do
+    resources :entries, except: [:index] do
+      put :sort, on: :collection
+      
+      resources :embed_entries, except: [:index, :show], as: :embed
+      post :duplicate, on: :member
+    end
+  end
+  
+  #()((.+)_?(path|url))
+end

data/lib/bhf/pagination.rb

@@ -93,7 +93,7 @@ module Bhf
       direction = plus ? 'more' : 'less'
       template.link_to(
         I18n.t("bhf.pagination.load_#{direction}"),
-        template.bhf_page_path(
+        template.page_path(
           platform.page_name,
           template.params.merge(platform.name => platform_params)
         ), attributes.merge(class: "load_#{direction}")

data/lib/bhf.rb

@@ -6,9 +6,11 @@ require 'kaminari'
 
 module Bhf
   class Engine < Rails::Engine
+    
+    isolate_namespace Bhf
+    
     # Config defaults
     config.page_title = nil
-    config.mount_at = 'bhf'
     config.on_login_fail = :root_url
     config.logout_path = :logout_path
     config.session_auth_name = :is_admin
@@ -18,29 +20,14 @@ module Bhf
     config.css = []
     config.js = []
     
-    config.bhf_routes = lambda {
-      namespace :bhf, path: Bhf::Engine.config.mount_at do
-        root to: 'application#index'
-
-        get 'page/:page', to: 'pages#show', as: :page
-
-        scope ':platform' do
-          resources :entries, except: [:index] do
-            put :sort, on: :collection
-
-            resources :embed_entries, except: [:index, :show], as: :embed
-            post :duplicate, on: :member
-          end
-        end
-
-      end
-    }
-
+    # config.bhf_logic = YAML::load(IO.read('config/bhf.yml'))
     
-    config.remove_default_routes = false
+    initializer 'bhf.action_controller' do |app|
+      ActiveSupport.on_load :action_controller do
+        helper Bhf::FrontendHelper
+      end
+    end
     
-    # config.bhf_logic = YAML::load(IO.read('config/bhf.yml'))
-
   end
 end
 
@@ -48,7 +35,6 @@ require 'bhf/i18n'
 require 'bhf/active_record/active_record'
 require 'bhf/active_record/upload'
 require 'bhf/mongoid/document'
-require 'bhf/view_helpers'
 require 'bhf/data'
 require 'bhf/platform'
 require 'bhf/settings'
@@ -64,4 +50,3 @@ if defined?(Mongoid)
   ::Mongoid::Document.send :include, Bhf::Mongoid::Document
 end
 
-::ActionView::Base.send :include, Bhf::ViewHelpers::ActionView

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

@@ -2,7 +2,6 @@ module Bhf
   class Engine < Rails::Engine
 
     config.page_title = 'Bahnhof Admin'
-    config.mount_at = '/bhf'
     # config.current_admin_account = :current_user
     # config.session_auth_name = :admin
     # config.css = ['bhf_extend']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.6.20
+  version: 0.6.21
 platform: ruby
 authors:
 - Anton Pawlik
@@ -127,6 +127,7 @@ files:
 - app/controllers/bhf/pages_controller.rb
 - app/helpers/bhf/application_helper.rb
 - app/helpers/bhf/entries_helper.rb
+- app/helpers/bhf/frontend_helper.rb
 - app/helpers/bhf/pages_helper.rb
 - app/views/bhf/_footer.haml
 - app/views/bhf/_user.haml