bhf 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c22c8df25b8d13141f27b60b508491c7a9e66411
-  data.tar.gz: 7da8b65db0195d05d086b693c248b8b627e58c58
+  metadata.gz: 80623fe5b6b07cd62ee45bab0bceb73eca5485cb
+  data.tar.gz: 6400c2f61f43bbd73a5b3a65aa6de928e3282947
 SHA512:
-  metadata.gz: e9cbcdbfba4e8eb190b8f6447eb491ddcad594843a2b45228b6a815e01717c90f88d3ed787c7380a6f1c96cbdf6d8fdf41d2f87729698685bfcecb93af5bdbe2
-  data.tar.gz: eb2cb0a476f88210eb77b164648ccae62b7fcfddb06117e90ff6ff8666698e49078d48efae0735d110f39f7387b19dcd72b71a95aad6dbc0c548b34f755927c1
+  metadata.gz: 3168b3b015ffd323fa0f2714bce5d1c2f44ada249c5b690cf039ce65ba49bcdd2edeca736b36bc1157262a1e5110246378850953fb54229e20d958f40a9ea19f
+  data.tar.gz: 461744d45e035492f6242fa39558aacd6c6a9050c96373e58f93a73220fd0996850107a2bf5148dda1607b9cbbe884481c8465faf1a76e068150b46d8b3e72f5

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.8.5

data/app/controllers/bhf/application_controller.rb

@@ -36,16 +36,12 @@ class Bhf::ApplicationController < ActionController::Base
       return unless current_account
       
       if area
-        if current_account.respond_to?(:bhf_area_role)
-          return current_account.bhf_area_role(area)
-        elsif current_account.respond_to?(:bhf_area_roles)
+        if current_account.respond_to?(:bhf_area_roles)
           return current_account.bhf_area_roles(area).collect(&:identifier)
         end
       end
 
-      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)
+      if current_account.respond_to?(:bhf_roles)
         current_account.bhf_roles.collect(&:identifier)
       end
     end

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.4 ruby lib
+# stub: bhf 0.8.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf"
-  s.version = "0.8.4"
+  s.version = "0.8.5"
 
   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-07-05"
+  s.date = "2014-07-06"
   s.description = "Gets you there on time"
   s.email = "anton.pawlik@gmail.com"
   s.extra_rdoc_files = [

data/lib/bhf/settings/yaml_parser.rb

@@ -9,7 +9,7 @@ module Bhf::Settings
 
       if Bhf.configuration.abstract_settings.any?
   
-        tmp_pages = get_settings_array(Bhf.configuration.abstract_settings, '/abstract')['pages']
+        tmp_pages = get_settings_array(Bhf.configuration.abstract_settings)['pages']
         abstract_platform_settings = tmp_pages.each_with_object({}) do |abstract_pages, hash|
           abstract_pages.each do |abstract_page|
             abstract_page[1].each do |abstract_platform|
@@ -39,7 +39,7 @@ module Bhf::Settings
     end
 
 
-    def get_settings_array(array, dir)
+    def get_settings_array(array, dir = nil)
       array.each_with_object({'pages' => []}) do |r, account_roles|
         pages = load_yml("#{dir}/#{r}")['pages']
         account_roles['pages'] += pages if pages
@@ -48,9 +48,7 @@ module Bhf::Settings
 
     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)
+      if roles.is_a?(Array)
         files = get_settings_array(roles, area_dir)
 
         # find the same pages and merge them

metadata

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