bhf 0.6.32 → 0.7.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6ccdbe72fbdb750d12441dcde4893527e33f15
-  data.tar.gz: e64a43e7e8207f963f85e11162f13ff584e27baf
+  metadata.gz: b97aa128d23d24b3449238bafc617ef50000da7e
+  data.tar.gz: c1903326a2ea3aee1df39635e2dad64aa98aec54
 SHA512:
-  metadata.gz: 57f4cd5e2d3ed0efc7dc76fe3a1f955eea8d3fe70730871bfda5c635211aa1522db2463f404ba936b0d80b0c6f44664e92ff253b1a6c9dee6a1320029ab9da3a
-  data.tar.gz: 7c0467a9a0e5f6c162c78322aea42922f89f4086ea4da988765f64cc5222b2a9bc4e7b83cfeefd8d094f83eadd6e071915eb4555e5d21c54de44899d6f7dd551
+  metadata.gz: a83ad3de716aeb36ee8bb8d1ad47bd585f168aec23b8726e459d27721522134733562b1212612a4c26c0c6e3dabe51e237b1539966643cbf8a03704701989739
+  data.tar.gz: eca937ce81d08337c924e422430e89b8631c0ba045580eeb09676f1882a0179a8901e2fdab0526233db0d950719fbfb494090efe3b649a6895f5d921d016bd88

data/app/assets/javascripts/bhf/application.js

@@ -27,6 +27,13 @@ var initHelper = function(callback){
 	var editStack = new AjaxEditStack();
 	
 	initHelper(function(mainScope){
+		var areaSelect = mainScope.getElement('#area_select');
+		if (areaSelect) {
+			areaSelect.addEvent('change', function(){
+				location.href = this.value;
+			});
+		}
+		
 		var quickEditArray = [];
 		var ajaxEditOptions;
 		

data/app/assets/stylesheets/bhf/application.css.sass

@@ -88,14 +88,6 @@ header
           +bg-gradient($b2, $b1)
           +text-shadow(#0068B3, -1)
             
-.preview_image
-  @extend .default_input
-  vertical-align: middle
-  padding: 2px
-  width: auto
-  max-width: 400px
-  max-height: 200px
-
 .content_box
   margin: 10px 20px 20px 20px
 .dl
@@ -410,6 +402,7 @@ table.data_table
     background-position: -98px 0
     cursor: move
 
+
 .default_input
   border: 1px solid transparent
   background: #FFF
@@ -427,6 +420,14 @@ table.data_table
     -moz-box-shadow: 0 1px 12px $b2
     border-color: $b2
 
+.preview_image
+  @extend .default_input
+  vertical-align: middle
+  padding: 2px
+  width: auto
+  max-width: 400px
+  max-height: 200px
+
 .search
   input[type="text"]
     @extend .default_input

data/app/controllers/bhf/application_controller.rb

@@ -1,6 +1,6 @@
 class Bhf::ApplicationController < ActionController::Base
 
-  before_filter :init_time, :check_admin_account, :setup_current_account, :load_config, :set_title
+  before_filter :init_time, :check_admin_account, :setup_current_account, :load_config, :set_title, :set_areas
 
   helper_method :current_account
   layout 'bhf/application'
@@ -33,46 +33,16 @@ class Bhf::ApplicationController < ActionController::Base
       @current_account
     end
 
-    def load_config
-      @config = Bhf::Settings.new(roles_yml(get_account_roles))
-    end
-
-    def roles_yml(roles = nil)
-      if roles.is_a?(String)
-        load_yml("/#{roles}")
-      elsif roles.is_a?(Array)
-        files = roles.each_with_object({'pages' => []}) do |r, account_roles|
-          pages = load_yml("/#{r}")['pages']
-          account_roles['pages'] += pages if pages
-        end
-        
-        merged_files = {'pages' => []}
-        files['pages'].each do |pages|
-          merged = false
-          pages.each do |page|
-            merged_files['pages'].each do |m_page|
-              if m_page.include?(page[0])
-                merged = true
-                m_page[page[0]] << page[1]
-              end
-            end
-          end
-          if !merged
-            merged_files['pages'] << pages
-          end
+    def get_account_roles(area = nil)
+      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(&:to_bhf_s)
         end
-        merged_files
-      else
-        load_yml
       end
-    end
-
-    def load_yml(suffix = nil)
-      YAML::load(IO.read("config/bhf#{suffix}.yml"))
-    end
-
-    def get_account_roles
-      return unless current_account
 
       if current_account.respond_to?(:role)
         current_account.role.is_a?(String) ? current_account.role : current_account.role.to_bhf_s
@@ -81,11 +51,27 @@ class Bhf::ApplicationController < ActionController::Base
       end
     end
 
+    def load_config
+      @config = Bhf::ConfigParser::parse(get_account_roles(params[:bhf_area]), params[:bhf_area])
+    end
 
     def set_title
       @app_title = Rails.application.class.to_s.split('::').first
       @title = Bhf::Engine.config.page_title || ("#{@app_title} &ndash; Admin").html_safe
     end
+    
+    def set_areas
+      @areas = []
+      if current_account and current_account.respond_to?(:bhf_areas)
+        current_account.bhf_areas.each do |area|
+          @areas << OpenStruct.new(
+            name: t("bhf.areas.links.#{area.to_bhf_s}", default: area.to_bhf_s),
+            selected: params[:bhf_area] == area.to_bhf_s,
+            path: main_app.bhf_path(area.to_bhf_s)
+          )
+        end
+      end
+    end
 
     def set_message(type, model = nil)
       key = model && ActiveModel::Naming.singular(model)

data/app/helpers/bhf/frontend_helper.rb

@@ -9,8 +9,14 @@ module Bhf
       if object.respond_to?(:'bhf_can_edit?', true)
         return unless object.bhf_can_edit?(options)
       end
+      
+      area = if object.respond_to?(:bhf_area, true)
+        object.bhf_area(options)
+      else
+        nil
+      end
 
-      render partial: 'bhf/helper/frontend_edit', locals: { platform_name: options[:platform_name], object: object, block: (with_output_buffer(&block) if block_given?)}
+      render partial: 'bhf/helper/frontend_edit', locals: { area: area, platform_name: options[:platform_name], object: object, block: (with_output_buffer(&block) if block_given?)}
     end
 
   end

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

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

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

@@ -8,9 +8,14 @@
       = stylesheet_link_tag css
   %body
     %header
+      
       %h1
         - logo = Rails.application.assets.find_asset('logo_bhf.png') ? 'logo_bhf.png' : 'logo_bhf.svg'
         = link_to image_tag(asset_path(logo)), main_app.root_url, :'data-no-turbolink' => true
+
+      - if @areas.any?
+        = select_tag :area_select, options_from_collection_for_select(@areas, 'path', 'name', main_app.bhf_path(params[:bhf_area]))
+
       - if @config && @config.pages.any?
         %nav
           %ul{class: ('shrink_space' if @config.pages.count > 7)}

data/lib/bhf/config_parser.rb

@@ -0,0 +1,84 @@
+module Bhf
+
+  module ConfigParser
+    
+    class << self
+      def parse(roles_array, area = nil)
+        roles_config = roles_yml(roles_array, area)
+  
+        if Bhf::Engine.config.abstract_config.any?
+    
+          tmp_pages = get_config_array(Bhf::Engine.config.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|
+                hash.merge!(abstract_platform)
+              end
+            end
+          end
+    
+          roles_config['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_config[key_2]
+                    key_2
+                  end
+                  next unless abstract_platform_key
+                  roles_config['pages'][i_1][key_1][i_2][key_2] = abstract_platform_config[abstract_platform_key].deep_merge(value.to_h)
+                end
+              end
+            end
+          end
+        end
+  
+        return Bhf::Settings.new(roles_config)
+      end
+
+
+      def get_config_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_config_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
+        end
+      end
+
+      def load_yml(suffix = nil)
+        YAML::load(IO.read("config/bhf#{suffix}.yml"))
+      end
+    
+    end
+
+  end
+end

data/lib/bhf.rb

@@ -19,6 +19,7 @@ module Bhf
     config.account_model_find_method = 'find'
     config.css = []
     config.js = []
+    config.abstract_config = []
     
     # config.bhf_logic = YAML::load(IO.read('config/bhf.yml'))
     
@@ -44,6 +45,7 @@ require 'bhf/active_record/upload'
 require 'bhf/mongoid/document'
 require 'bhf/data'
 require 'bhf/platform'
+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.6.32
+  version: 0.7.0.rc1
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,7 @@ files:
 - lib/bhf.rb
 - lib/bhf/active_record/active_record.rb
 - lib/bhf/active_record/upload.rb
+- lib/bhf/config_parser.rb
 - lib/bhf/data.rb
 - lib/bhf/form.rb
 - lib/bhf/mongoid/document.rb
@@ -227,9 +228,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 2.2.1