bhf 0.7.16 → 0.8.0

data/config/locales/de.yml

@@ -2,9 +2,14 @@ de:
   bhf:
     helpers:
       boolean:
-        a: ja
-        b: nein
+        'true': 'ja'
+        'false': 'nein'
       link: Link ⬀
+      form:
+        buttons:
+          save: '%{platform_name} speichern'
+          and_edit: und editieren
+          and_add: und anlegen
       searchform:
         placeholder: Suche
       promts:
@@ -60,7 +65,7 @@ de:
     footer:
       state: 'Seite wurde in ~%{time} Sekunden erstellt'
       copy: 'Gemacht von <a href="http://twitter.com/antpaw">@antpaw</a> mit <a href="http://rubyonrails.org">Rails</a> und <a href="http://mootools.net">MooTools</a>'
-      info: 'Mehr Information auf <a href="http://github.com/antpaw/bhf">GitHub</a>'
+      info: 'Mehr Information auf <a href="http://antpaw.github.io/bhf">GitHub</a>'
 
   activerecord:
     notices:

data/config/locales/en.yml

@@ -5,9 +5,14 @@ en:
       page_title: "%{area} – %{title} – Admin"
     helpers:
       boolean:
-        a: yes
-        b: no
+        'true': 'yes'
+        'false': 'no'
       link: Link ⬀
+      form:
+        buttons:
+          save: 'Save %{platform_name}'
+          and_edit: and edit
+          and_add: and add another
       searchform:
         placeholder: Search
       promts:
@@ -68,7 +73,7 @@ en:
     footer:
       state: 'Page rendered in ~%{time} seconds'
       copy: 'Made by <a href="http://twitter.com/antpaw">@antpaw</a> with <a href="http://rubyonrails.org">Rails</a> and <a href="http://mootools.net">MooTools</a>'
-      info: 'More information on <a href="http://github.com/antpaw/bhf">GitHub</a>'
+      info: 'More information on <a href="http://http://antpaw.github.io/bhf">GitHub</a>'
 
   attributes:
     _id: 'id'

data/lib/bhf.rb

@@ -6,29 +6,24 @@ require 'bhf/active_record/active_record'
 require 'bhf/mongoid/document'
 require 'bhf/data'
 require 'bhf/platform'
-require 'bhf/config_parser'
+require 'bhf/settings_parser'
 require 'bhf/settings'
 require 'bhf/pagination'
 require 'bhf/form'
 
 
 module Bhf
+  def self.configuration
+    @configuration ||= Bhf::Configuration.new
+  end
+  def self.configure
+    yield configuration
+  end
+  
   class Engine < Rails::Engine
     
     isolate_namespace Bhf
     
-    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.helper' do
       ActiveSupport.on_load :action_controller do
         helper Bhf::FrontendHelper
@@ -45,4 +40,19 @@ module Bhf
     end
   end
   PAPERCLIP_IMAGE_TYPES = ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif']
+  
+  class Configuration
+    include ActiveSupport::Configurable
+
+    config_accessor(:on_login_fail)             { :root_url           }
+    config_accessor(:logout_path)               { :logout_path        }
+    config_accessor(:session_auth_name)         { :is_admin           }
+    config_accessor(:session_account_id)        { :admin_account_id   }
+    config_accessor(:account_model)             { 'User'              }
+    config_accessor(:account_model_find_method) { 'find'              }
+    config_accessor(:css)                       { ['bhf/application'] }
+    config_accessor(:js)                        { ['bhf/application'] }
+    config_accessor(:abstract_config)           { []                  }
+  end
+  
 end

data/lib/bhf/data.rb

@@ -12,7 +12,7 @@ module Bhf
         @overwrite_display_type = props[:display_type]
         @info = props[:info]
         @macro = :column
-        @link = props[:link].downcase.to_sym unless props[:link].blank?
+        @link = props[:link] unless props[:link].blank?
       end
     end
 
@@ -99,7 +99,7 @@ module Bhf
       def initialize(reflection, options = {})
         @reflection = reflection
         @info = options[:info]
-        @link = options[:link].downcase.to_sym unless options[:link].blank?
+        @link = options[:link] unless options[:link].blank?
 
         @overwrite_type = options[:overwrite_type].to_sym if options[:overwrite_type]
         @overwrite_display_type = options[:overwrite_display_type].to_sym if options[:overwrite_display_type]

data/lib/bhf/form.rb

@@ -18,15 +18,16 @@ module Bhf
 
       def many_to_many_check_box(obj, ref_name, params)
         mm = :has_and_belongs_to_many
+        id_string = obj.send(obj.class.bhf_primary_key).to_s
         checked = if params[mm] && params[mm][ref_name]
-          params[mm][ref_name][obj.id.to_s] != ''
+          params[mm][ref_name][id_string] != ''
         else
           object.send(ref_name).include?(obj)
         end
 
-        hidden_field_tag("#{mm}[#{ref_name}][#{obj.id}]", '', id: "hidden_has_and_belongs_to_many_#{ref_name}_#{obj.id}")+' '+
-        check_box_tag("#{mm}[#{ref_name}][#{obj.id}]", obj.id, checked)+' '+
-        label_tag("#{mm}_#{ref_name}_#{obj.id}", obj.to_bhf_s)
+        hidden_field_tag("#{mm}[#{ref_name}][#{id_string}]", '', id: "hidden_#{mm}_#{ref_name}_#{id_string}")+' '+
+        check_box_tag("#{mm}[#{ref_name}][#{id_string}]", id_string, checked)+' '+
+        label_tag("#{mm}_#{ref_name}_#{id_string}", obj.to_bhf_s)
       end
 
     end

data/lib/bhf/mongoid/document.rb

@@ -9,7 +9,7 @@ module Bhf
 
         def initialize(mongoid_field)
           @name = mongoid_field.name
-          @type = mongoid_field.type.to_s.downcase.to_sym
+          @type = mongoid_field.type.to_s.downcase.gsub('mongoid::', '').to_sym
           @type = :primary_key if @type == :'bson::objectid'
         end
       end
@@ -141,7 +141,6 @@ module Bhf
 
         def bhf_find_embed(parent_id, ref_id)
           get_embedded_parent parent_id do |parent, meta|
-            # :forced_nil_inverse?, :foreign_key, :foreign_key_check, :foreign_key_setter, :index, :indexed?, :inspect, :inverses, :inverse, :inverse_class_name, :inverse_class_name?, :inverse_foreign_key, :inverse_klass, :inverse_metadata, :inverse_of, :inverse_of?, :inverse_setter, :inverse_type, :inverse_type_setter
             key_name = if meta.inverse_of?
               meta.inverse_of
             else

data/lib/bhf/platform.rb

@@ -4,7 +4,7 @@ module Bhf
     attr_accessor :pagination
     attr_reader :name, :objects, :page_name, :title, :title_zero, :title_singular
 
-    def initialize(options, page_name, user = nil)
+    def initialize(options, page_name, config, user = nil)
       @objects = []
 
       if options.is_a?(String)
@@ -12,6 +12,8 @@ module Bhf
       end
       @name = options.keys[0]
       @data = options.values[0] || {}
+      @user = user
+      @settings = config
       @collection = get_collection
 
       t_model_path = "activerecord.models.#{model.model_name.to_s.downcase}"
@@ -24,31 +26,6 @@ module Bhf
 
       @model = model
       @page_name = page_name
-      @user = user
-    end
-
-    def search?
-      table_options(:search) != false
-    end
-    
-    def table_hide?
-      table_options(:hide) == true || model.bhf_embedded?
-    end
-    
-    def search_field?
-      table_options(:search_field) != false
-    end
-    
-    def custom_search
-      table_options(:custom_search)
-    end
-
-    def custom_columns?
-      table_options(:columns).is_a?(Array)
-    end
-    
-    def user_scope?
-      @user && table_options(:user_scope)
     end
 
     def prepare_objects(options, paginate_options = nil)
@@ -92,7 +69,7 @@ module Bhf
     end
 
     def columns
-      default_attrs(table_options(:display) || table_options(:columns), @collection[0..5]).
+      default_attrs(table_columns, @collection[0..5]).
       each_with_object([]) do |field, obj|
         obj << Bhf::Data::Column.new(field)
       end
@@ -122,6 +99,34 @@ module Bhf
       false
     end
 
+    def search?
+      table_options(:search) != false
+    end
+    
+    def table_hide?
+      table_options(:hide) == true || model.bhf_embedded?
+    end
+    
+    def search_field?
+      table_options(:search_field) != false
+    end
+    
+    def custom_search
+      table_options(:custom_search)
+    end
+
+    def table_columns
+      table_options(:display) || table_options(:columns)
+    end
+    
+    def custom_columns?
+      table_columns.is_a?(Array)
+    end
+    
+    def user_scope?
+      @user && table_options(:user_scope)
+    end
+
     def table
       @data['table']
     end
@@ -157,7 +162,7 @@ module Bhf
     end
 
     def hide_create
-      table_options('hide_create') || table_options('hide_new')
+      table_options('hide_create') || table_options('hide_new') || table_options('hide_add')
     end
 
     def show_duplicate
@@ -165,7 +170,7 @@ module Bhf
     end
 
     def hide_delete
-      table_options 'hide_delete'
+      table_options('hide_delete') || table_options('hide_destroy')
     end
     
     def custom_link
@@ -179,6 +184,10 @@ module Bhf
     def return_to
       form_options 'return_to'
     end
+    
+    def to_s
+      @name
+    end
 
     private
 
@@ -207,7 +216,7 @@ module Bhf
               display_type: table_options(:types, attr_name) || attr_name,
               show_type: show_options(:types, attr_name) || table_options(:types, attr_name) || attr_name,
               info: I18n.t("bhf.platforms.#{@name}.infos.#{attr_name}", default: ''),
-              link: form_options(:links, attr_name)
+              link: (@settings.find_platform(form_options(:links, attr_name), @user, false) if @settings && form_options(:links, attr_name))
             })
           )
         end
@@ -232,7 +241,7 @@ module Bhf
             overwrite_display_type: table_options(:types, name),
             overwrite_show_type: show_options(:types, name) || table_options(:types, name),
             info: I18n.t("bhf.platforms.#{@name}.infos.#{name}", default: ''),
-            link: form_options(:links, name)
+            link: (@settings.find_platform(form_options(:links, name), @user, false) if @settings && form_options(:links, name))
           })
 
           fk = all[name.to_s].reflection.foreign_key

data/lib/bhf/settings.rb

@@ -11,7 +11,7 @@ module Bhf
         end
       end.flatten!
       if t.nil?
-        raise Exception.new("No Bhf Pages found")
+        raise Exception.new("No bhf pages found")
       end
       if t.uniq.length != t.length
         raise Exception.new("Platforms with identical names: '#{t.detect{ |e| t.count(e) > 1 }}'")
@@ -39,13 +39,14 @@ module Bhf
       nil
     end
 
-    def find_platform(platform_name, current_account = nil)
+    def find_platform(platform_name, current_account = nil, config = nil)
       pages.each do |page|
         content_for_page(page).each do |platform|
-          bhf_platform = Bhf::Platform.new(platform, page, current_account)
-          return bhf_platform if bhf_platform.name == platform_name
+          bhf_platform = Bhf::Platform.new(platform, page, config == nil ? self : config, current_account)
+          return bhf_platform if bhf_platform.name.to_s == platform_name.to_s
         end
       end
+      nil
     end
 
   end

data/lib/bhf/{config_parser.rb → settings_parser.rb}

@@ -1,14 +1,14 @@
 module Bhf
 
-  module ConfigParser
+  module SettingsParser
     
     class << self
       def parse(roles_array, area = nil)
         roles_config = roles_yml(roles_array, area)
   
-        if Bhf::Engine.config.bhf.abstract_config.any?
+        if Bhf.configuration.abstract_config.any?
     
-          tmp_pages = get_config_array(Bhf::Engine.config.bhf.abstract_config, '/abstract')['pages']
+          tmp_pages = get_config_array(Bhf.configuration.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|
@@ -70,7 +70,7 @@ module Bhf
           end
           merged_files
         else
-          load_yml
+          load_yml(area.present? ? "/#{area}/bhf" : nil)
         end
       end
 

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

@@ -1,17 +1,13 @@
-module Bhf
-  class Engine < Rails::Engine
-    
-    # config.bhf.css << 'bhf'
-    # config.bhf.js << 'bhf'
-    # config.bhf.abstract_config << 'abstract'
-
-    # config.bhf.on_login_fail = :root_url
-    # config.bhf.logout_path = :logout_path
-    
-    # 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
+Bhf.configure do |config|
+  # config.css << 'bhf'
+  # config.js << 'bhf'
+  # config.abstract_config << 'abstract'
+  
+  # config.on_login_fail = :root_url
+  # config.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'
 end

data/test/database.yml

@@ -0,0 +1,9 @@
+mysql:
+  adapter: mysql
+  host: 127.0.0.1
+  database: bhf_test
+  username: root
+  password: 
+  encoding: utf8
+  pool: 5
+  timeout: 5000

data/test/test_helper.rb

@@ -0,0 +1,55 @@
+ENV["RAILS_ENV"] = "test"
+
+require 'test/unit'
+require 'rubygems'
+require 'yaml'
+require 'active_record'
+require 'mysql'
+
+require 'app/models/bhf/widget.rb'
+
+def bhf_widget( fixture_name )
+  id = @@fixtures['bhf_widget'][ fixture_name.to_s ][ 'id' ]
+  Bhf::Widget.find( id )
+end
+
+def load_schema
+  config = YAML::load( IO.read( File.dirname(__FILE__) + '/database.yml') )
+
+  # Manually initialize the database
+  conn = Mysql.real_connect( config['mysql']['host'], config['mysql']['username'], config['mysql']['password'] )
+  conn.query( "CREATE DATABASE IF NOT EXISTS #{config['mysql']['database']}" )
+  
+  ActiveRecord::Base.establish_connection( config['mysql'] )
+  ActiveRecord::Base.connection()
+  
+  load(File.dirname(__FILE__) + "/../lib/rails/generators/bhf/templates/schema.rb")
+
+  @@fixtures = {}
+  
+  load_fixture( 'bhf_widget' )
+end
+
+def load_fixture( table )
+  @@fixtures[ table ] = {}
+  fixture = YAML::load( IO.read( File.dirname(__FILE__) + "/fixtures/#{table}.yml") )
+  @@fixtures[ table ] = fixture
+
+  klass = class_eval table.titleize.gsub(/ /, '::')
+
+  fixture.each do |record_name, record|
+    record.each do |column, value|
+      if ( match = column.match(/(.*)_id/) )
+        fixture_reference = "bhf_" + match[1].pluralize
+        if value.is_a? Symbol
+          r = class_eval "#{fixture_reference}( '#{value}' )"
+          record[ column ] = r.id
+        end
+      end
+    end
+      
+    r = klass.create( record )
+    @@fixtures[ table ][ record_name ][ 'id' ] = r.id
+  end
+
+end