bhf 0.4.2.2 → 0.4.2.3

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

@@ -3,5 +3,5 @@
     %p= reflection_title(f, field)
   .input
     = input
-    = render :partial => 'bhf/helper/field_errors', :locals => {:f => f, :field => field.reflection.name}
-    = render :partial => 'bhf/helper/info', :locals => {:info => field.info}
+    = render partial: 'bhf/helper/field_errors', locals: {f: f, field: field.reflection.name}
+    = render partial: 'bhf/helper/info', locals: {info: field.info}

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

@@ -1,11 +1,11 @@
 - platform.pagination.template = self
-%table{:id => "#{platform.name}_platform", :class => (platform.custom_columns? ? :custom_columns : :default_columns)}
+%table{id: "#{platform.name}_platform", class: (platform.custom_columns? ? :custom_columns : :default_columns)}
   %caption
     %h4= platform.title
     %p.info= platform.pagination.info platform
-    %p.create= link_to new_t(platform), new_bhf_entry_path(platform.name), :class => :alt_button
+    %p.create= link_to new_t(platform), new_bhf_entry_path(platform.name), class: :alt_button
     - unless platform.custom_partial
-      = render :partial => 'search', :locals => {:platform => platform} if platform.search?
+      = render partial: 'search', locals: {platform: platform} if platform.search?
 
   - unless platform.custom_partial
     %thead
@@ -13,7 +13,7 @@
         - if platform.sortable
           %th.drag
         - platform.columns.each do |column|
-          %th{:class => "#{column.field.macro} #{column.field.display_type} #{order_class(column.name, platform.name)}"}
+          %th{class: "#{column.field.macro} #{column.field.display_type} #{order_class(column.name, platform.name)}"}
             - column_name = platform.model.human_attribute_name(column.name)
             - # TODO: link only if column.name is a database column
             - #   column_names = platform.model.column_names
@@ -23,33 +23,33 @@
 
     %tfoot
       %tr
-        %td{:colspan => platform.columns_count}
+        %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_bhf_entries_path(platform.name)}
       - if platform.objects.any?
         - platform.objects.each do |object|
           - edit_link = edit_bhf_entry_path(platform.name, object)
-          %tr{:id => "#{object.id}_#{platform.name}"}
+          %tr{id: "#{object.id}_#{platform.name}"}
             - if platform.sortable
               %td.drag
                 %span.handle  
             -# TODO: external link partial from anpex
             - platform.columns.each do |column|
-              %td{:class => "#{column.field.macro} #{column.field.display_type}", :'data-column-name' => column.name}
+              %td{class: "#{column.field.macro} #{column.field.display_type}", :'data-column-name' => column.name}
                 - a = if column.field.display_type != :boolean && object.send(column.name).blank?
                   - ' '
                 - else
-                  - render(:partial => "bhf/pages/macro/#{column.field.macro}/#{column.field.display_type}", :locals => {:column => column, :object => object})
-                = link_to_if !has_link?(column.field.overwrite_display_type), a.html_safe, edit_link, :class => 'quick_edit'
+                  - render(partial: "bhf/pages/macro/#{column.field.macro}/#{column.field.display_type}", locals: {column: column, object: object})
+                = link_to_if !has_link?(column.field.overwrite_display_type), a.html_safe, edit_link, class: 'quick_edit'
 
             %td.action
-              = link_to edit_t(platform), edit_link, :class => 'edit'
-              = link_to delete_t(platform), bhf_entry_path(platform.name, object), :method => :delete, :remote => true, :class => :delete, :confirm => t('bhf.helpers.promts.confirm')
+              = link_to edit_t(platform), edit_link, class: 'edit'
+              = link_to delete_t(platform), bhf_entry_path(platform.name, object), method: :delete, remote: true, class: :delete, confirm: t('bhf.helpers.promts.confirm')
       - else
-        %td.no_entries{:colspan => platform.columns_count}
-          = t 'bhf.pagination.info', :name_zero => platform.title, :count => 0
+        %td.no_entries{colspan: platform.columns_count}
+          = t 'bhf.pagination.info', name_zero: platform.title, count: 0
           = link_to new_t(platform), new_bhf_entry_path(platform.name)
 
 - if platform.custom_partial
-  = render :partial => "bhf/pages/#{platform.custom_partial}", :locals => {}
+  = render partial: "bhf/pages/#{platform.custom_partial}", locals: {}

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

@@ -1,16 +1,16 @@
-= form_for platform.name, :html => {:method => :get, :class => :search} do |f|
+= form_for platform.name, html: {method: :get, class: :search} do |f|
   - p = params[platform.name]
   = f.fields_for :search do |s|
     - if platform.search_field?
-      = s.text_field :text, :value => get_value([:search, :text], p), :placeholder => t('bhf.helpers.searchform.placeholder')
+      = s.text_field :text, value: get_value([:search, :text], p), placeholder: t('bhf.helpers.searchform.placeholder')
 
     - if p && p[:search].is_a?(Hash)
       - p[:search].each do |key, value|
-        = s.hidden_field key, :value => value, :id => nil, :class => (:hidden_search if key == 'text')
+        = s.hidden_field key, value: value, id: nil, class: (:hidden_search if key == 'text')
 
     - if platform.custom_search
-      = render :partial => platform.custom_search, :locals => { :platform => platform, :f => f, :s => s, :p => p }
+      = render partial: platform.custom_search, locals: { platform: platform, f: f, s: s, p: p }
 
-  = f.hidden_field :per_page, :value => get_value(:per_page, p)
-  = f.hidden_field :order, :value => get_value(:order, p)
-  = f.hidden_field :direction, :value => get_value(:direction, p)
+  = f.hidden_field :per_page, value: get_value(:per_page, p)
+  = f.hidden_field :order, value: get_value(:order, p)
+  = f.hidden_field :direction, value: get_value(:direction, p)

data/app/views/bhf/pages/macro/belongs_to/_default.haml

@@ -1,2 +1,2 @@
 - ref_object = object.send(column.name)
-= ref_object.blank? ? t('bhf.helpers.entry.empty', :count => 1) : ref_object.to_bhf_s
+= ref_object.blank? ? t('bhf.helpers.entry.empty', count: 1) : ref_object.to_bhf_s

data/app/views/bhf/pages/macro/column/_date.haml

@@ -1 +1 @@
-= l(object.send(column.name), :format => :short)
+= l(object.send(column.name), format: :short)

data/app/views/bhf/pages/macro/column/_text.haml

@@ -1 +1 @@
-= sanitize(object.send(column.name), :tags => %w(strong em))
+= sanitize(object.send(column.name), tags: %w(strong em))

data/app/views/bhf/pages/macro/embeds_many/_default.haml

@@ -1 +1 @@
-= render :partial => 'bhf/pages/macro/has_many/default', :locals => {:ref_objects => object.send(column.name)}
+= render partial: 'bhf/pages/macro/has_many/default', locals: {ref_objects: object.send(column.name)}

data/app/views/bhf/pages/macro/embeds_one/_default.haml

@@ -1 +1 @@
-= render :partial => 'bhf/pages/macro/has_one/default', :locals => {:ref_object => object.send(column.name)}
+= render partial: 'bhf/pages/macro/has_one/default', locals: {ref_object: object.send(column.name)}

data/app/views/bhf/pages/macro/has_and_belongs_to_many/_default.haml

@@ -1 +1 @@
-= render :partial => 'bhf/pages/macro/has_many/default', :locals => {:ref_objects => object.send(column.name)}
+= render partial: 'bhf/pages/macro/has_many/default', locals: {ref_objects: object.send(column.name)}

data/app/views/bhf/pages/macro/has_many/_default.haml

@@ -1,2 +1,2 @@
 - ref_objects ||= object.send(column.name)
-= ref_objects.blank? ? t('bhf.helpers.entry.empty', :count => 2) : ref_objects.collect(&:to_bhf_s).join(', ')
+= ref_objects.blank? ? t('bhf.helpers.entry.empty', count: 2) : ref_objects.collect(&:to_bhf_s).join(', ')

data/app/views/bhf/pages/macro/has_one/_default.haml

@@ -1,2 +1,2 @@
 - ref_object ||= object.send(column.name)
-= ref_object.blank? ? t('bhf.helpers.entry.empty', :count => 1) : ref_object.to_bhf_s
+= ref_object.blank? ? t('bhf.helpers.entry.empty', count: 1) : ref_object.to_bhf_s

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

@@ -1,3 +1,3 @@
 - # %h2= t('bhf.pages.headline')
 - @platforms.each do |platform|
-  .platform= render :partial => 'platform', :locals => {:platform => platform}
+  .platform= render partial: 'platform', locals: {platform: platform}

data/app/views/kaminari/bhf/_next_page.html.haml

@@ -1,2 +1,2 @@
-= link_to_unless current_page.last?, t('bhf.pagination.next_label'), url, :remote => remote do |name|
+= link_to_unless current_page.last?, t('bhf.pagination.next_label'), url, remote: remote do |name|
   %span= name

data/app/views/kaminari/bhf/_page.html.haml

@@ -1,2 +1,2 @@
-= link_to_unless page.current?, page, url, :remote => remote, :class => 'page_number' do |name|
+= link_to_unless page.current?, page, url, remote: remote, class: 'page_number' do |name|
   %em= name

data/app/views/kaminari/bhf/_prev_page.html.haml

@@ -1,2 +1,2 @@
-= link_to_unless current_page.first?, t('bhf.pagination.previous_label'), url, :remote => remote do |name|
+= link_to_unless current_page.first?, t('bhf.pagination.previous_label'), url, remote: remote do |name|
   %span= name

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

@@ -1,27 +1,26 @@
 !!!
-%html{:lang => I18n.locale}
+%html{lang: I18n.locale}
   %head
-    %meta{:charset => 'utf-8'}
+    %meta{charset: 'utf-8'}
     %title= @title
-    = csrf_meta_tag
-    %link{:href => '/favicon.ico', :rel => 'icon', :type => 'image/x-icon'}
-    - ([:bhf] + Bhf::Engine.config.css.to_a).each do |css|
+    %link{href: '/favicon.ico', rel: 'icon', type: 'image/x-icon'}
+    - (['bhf/application'] + Bhf::Engine.config.css.to_a).each do |css|
       = stylesheet_link_tag css
-    = javascript_include_tag 'bhf'
-    =# javascript_include_tag 'bhf/mootools-core-1.3.2-full-compat-yc.js', 'bhf/mootools-more-1.3.2.1.js', 'bhf/mootools_rails_driver-0.4.1.js', 'bhf/class/BrowserUpdate', 'bhf/class/Ajaxify', 'bhf/class/AjaxEdit', 'bhf/class/MooEditable', 'bhf/class/Datepicker', 'bhf/class/MultipleFields', 'bhf/class/ArrayFields', 'bhf/bhf_application'
+    = javascript_include_tag 'bhf/application'
+
   %body
     %header
-      %h1= link_to image_tag('/images/logo_bhf.png'), root_url
+      %h1= link_to image_tag('logo_bhf.png'), root_url
       - 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)
+              %li{class: ('active' if @page == page)}
+                = link_to t("bhf.pages.navigation.#{page}", default: page.capitalize), bhf_page_path(page)
 
     #content
       #main
-        = render :partial => 'bhf/helper/flash', :locals => {:flash => flash}
+        = render partial: 'bhf/helper/flash', locals: {flash: flash}
         = yield
 
     %footer

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

@@ -2,6 +2,6 @@
 %button.alt_button.open= t('bhf.quick_edit.buttons.open')
 = yield
 .button.group
-  %button.save{:class => ('create' if @object.new_record?)}= @object.new_record? ? t('bhf.quick_edit.buttons.create') : t('bhf.quick_edit.buttons.save')
+  %button.save{class: ('create' if @object.new_record?)}= @object.new_record? ? t('bhf.quick_edit.buttons.create') : t('bhf.quick_edit.buttons.save')
   - unless @object.new_record?
-    %button.save_and_next{:title => t('bhf.quick_edit.buttons.save_and_next')}= t('bhf.quick_edit.buttons.save_and_next')
+    %button.save_and_next{title: t('bhf.quick_edit.buttons.save_and_next')}= t('bhf.quick_edit.buttons.save_and_next')

data/config/routes.rb

@@ -1,14 +1,14 @@
 Rails.application.routes.draw do
   
-  namespace :bhf, :path => Bhf::Engine.config.mount_at do
-    root :to => 'application#index'
+  namespace :bhf, path: Bhf::Engine.config.mount_at do
+    root to: 'application#index'
     
-    get 'page/:page', :to => 'pages#show', :as => :page
+    get 'page/:page', to: 'pages#show', as: :page
     
     scope ':platform' do
-      resources :entries, :except => [:index, :show] do
-        resources :embed_entries, :except => [:index, :show], :as => :embed
-        put :sort, :on => :collection
+      resources :entries, except: [:index, :show] do
+        resources :embed_entries, except: [:index, :show], as: :embed
+        put :sort, on: :collection
       end
     end
 

data/lib/bhf/active_record/upload.rb

@@ -35,7 +35,7 @@ module Bhf
       module ClassMethods
         def setup_upload(settings)
           self.bhf_upload_settings = settings.each_with_object([]) do |s, obj|
-            obj << {:path => '', :name => :file}.merge(s)
+            obj << {path: '', name: :file}.merge(s)
           end
         end
       end

data/lib/bhf/form.rb

@@ -24,7 +24,7 @@ module Bhf
           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}")+' '+
+        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)
       end

data/lib/bhf/i18n.rb

@@ -9,17 +9,17 @@ module Bhf
             default = options.delete(:default)
           
             [locale, :en].each do |lookup_locale|
-              translation_found, translation = attempt_translation(text, options.merge(:locale => lookup_locale))
+              translation_found, translation = attempt_translation(text, options.merge(locale: lookup_locale))
               return translation if translation_found
             end
           
             # Ensure 'translation missing' return is exactly the default behaviour
-            translate_without_fallback(text, options.merge(:default => default))
+            translate_without_fallback(text, options.merge(default: default))
           end
         
           def attempt_translation(text, options = {})
             puts "Attempting translation of '#{text}' with locale '#{options[:locale]}'." if options[:debug]
-            translation = translate_without_fallback(text, options.merge(:raise => true))
+            translation = translate_without_fallback(text, options.merge(raise: true))
             translation_found = options[:locale]
           rescue I18n::MissingTranslationData
             translation_found = nil

data/lib/bhf/mongoid/document.rb

@@ -81,7 +81,7 @@ module Bhf
         
         def except(key)
           if key == :order || key == :sort
-            #order_by.extras(:sort => []) #TODO: drop default_scope criteria
+            #order_by.extras(sort: []) #TODO: drop default_scope criteria
           end
           self
         end
@@ -96,7 +96,7 @@ module Bhf
           return if (search_term = search_params[:text]).blank?
           
           # TODO: add mongoid search
-          return where(:name => /^antp/i)
+          return where(name: /^antp/i)
           #return where("this.nick == 'antpaw'")
         end
 

data/lib/bhf/pagination.rb

@@ -9,7 +9,7 @@ module Kaminari
       end
 
       def to_s(locals = {}) #:nodoc:
-        @template.render :partial => "kaminari/#{@theme}#{self.class.name.demodulize.underscore}", :locals => @options.merge(locals)
+        @template.render partial: "kaminari/#{@theme}#{self.class.name.demodulize.underscore}", locals: @options.merge(locals)
       end
 
       def page_url_for(page)
@@ -43,9 +43,9 @@ module Bhf
       platform_params = template.params[platform.name] || {}
 
       links = if !(page_links = template.paginate(platform.objects, {
-        :theme => 'bhf',
-        :param_name => [platform.name, 'page'],
-        :params => template.params
+        theme: 'bhf',
+        param_name: [platform.name, 'page'],
+        params: template.params
       })).blank?
         "#{load_more(platform)} #{page_links}"
       elsif platform.objects.num_pages == 1 && platform.objects.size > @offset_to_add
@@ -53,7 +53,7 @@ module Bhf
       end
 
       if links
-        template.content_tag(:div, links.html_safe, {:class => 'pagination'})
+        template.content_tag(:div, links.html_safe, {class: 'pagination'})
       end
     end
 
@@ -62,17 +62,17 @@ module Bhf
 
       if collection.respond_to?(:num_pages) and collection.num_pages > 1
         I18n.t('bhf.pagination.info.default', {
-          :name => platform.title,
-          :count => collection.total_count,
-          :offset_start => collection.offset_value + 1,
-          :offset_end => collection.offset_value + collection.length
+          name: platform.title,
+          count: collection.total_count,
+          offset_start: collection.offset_value + 1,
+          offset_end: collection.offset_value + collection.length
         })
       else
         I18n.t('bhf.pagination.info', {
-          :name_zero => platform.title,
-          :name_singular => platform.title_singular,
-          :name_plural => platform.title,
-          :count => collection.size
+          name_zero: platform.title,
+          name_singular: platform.title_singular,
+          name_plural: platform.title,
+          count: collection.size
         })
       end.html_safe
     end
@@ -96,7 +96,7 @@ module Bhf
         template.bhf_page_path(
           platform.page_name,
           template.params.merge(platform.name => platform_params)
-        ), attributes.merge(:class => "load_#{direction}")
+        ), attributes.merge(class: "load_#{direction}")
       )
     end
 

data/lib/bhf/platform.rb

@@ -15,12 +15,12 @@ module Bhf
       @collection = get_collection
 
       t_model_path = "activerecord.models.#{model.model_name.downcase}"
-      model_name = I18n.t(t_model_path, :count => 2, :default => @name.pluralize.capitalize)
-      @title = I18n.t("bhf.platforms.#{@name}.title", :count => 2, :default => model_name)
-      model_name = I18n.t(t_model_path, :count => 1, :default => @name.singularize.capitalize)
-      @title_singular = I18n.t("bhf.platforms.#{@name}.title", :count => 1, :default => model_name)
-      model_name = I18n.t(t_model_path, :count => 0, :default => @name.singularize.capitalize)
-      @title_zero = I18n.t("bhf.platforms.#{@name}.title", :count => 0, :default => model_name)
+      model_name = I18n.t(t_model_path, count: 2, default: @name.pluralize.capitalize)
+      @title = I18n.t("bhf.platforms.#{@name}.title", count: 2, default: model_name)
+      model_name = I18n.t(t_model_path, count: 1, default: @name.singularize.capitalize)
+      @title_singular = I18n.t("bhf.platforms.#{@name}.title", count: 1, default: model_name)
+      model_name = I18n.t(t_model_path, count: 0, default: @name.singularize.capitalize)
+      @title_zero = I18n.t("bhf.platforms.#{@name}.title", count: 0, default: model_name)
 
       @page_name = page_name
       @user = user
@@ -157,10 +157,10 @@ module Bhf
           obj << (
             @collection.select{ |field| attr_name == field.name }[0] ||
             Bhf::Data::AbstractField.new({
-              :name => attr_name,
-              :form_type => form_options(:types, attr_name) || attr_name,
-              :display_type => table_options(:types, attr_name) || attr_name,
-              :info => I18n.t("bhf.platforms.#{@name}.infos.#{attr_name}", :default => '')
+              name: attr_name,
+              form_type: form_options(:types, attr_name) || attr_name,
+              display_type: table_options(:types, attr_name) || attr_name,
+              info: I18n.t("bhf.platforms.#{@name}.infos.#{attr_name}", default: '')
             })
           )
         end
@@ -172,19 +172,19 @@ module Bhf
         model.columns_hash.each_pair do |name, props|
           next if name == sortable
           all[name] = Bhf::Data::Field.new(props, {
-            :overwrite_type => form_options(:types, name),
-            :overwrite_display_type => table_options(:types, name),
-            :info => I18n.t("bhf.platforms.#{@name}.infos.#{name}", :default => '')
+            overwrite_type: form_options(:types, name),
+            overwrite_display_type: table_options(:types, name),
+            info: I18n.t("bhf.platforms.#{@name}.infos.#{name}", default: '')
           }, model.bhf_primary_key)
         end
 
         # TODO: test polymorphic
         model.reflections.each_pair do |name, props|
           all[name.to_s] = Bhf::Data::Reflection.new(props, {
-            :overwrite_type => form_options(:types, name),
-            :overwrite_display_type => table_options(:types, name),
-            :info => I18n.t("bhf.platforms.#{@name}.infos.#{name}", :default => ''),
-            :link => form_options(:links, name)
+            overwrite_type: form_options(:types, name),
+            overwrite_display_type: table_options(:types, name),
+            info: I18n.t("bhf.platforms.#{@name}.infos.#{name}", default: ''),
+            link: form_options(:links, name)
           })
 
           fk = all[name.to_s].reflection.primary_key_name

data/lib/bhf/view_helpers.rb

@@ -11,7 +11,7 @@ module Bhf
           return unless object.bhf_can_edit?(options)
         end
 
-        render :partial => 'bhf/helper/frontend_edit', :locals => { :platform_name => options[:platform_name], :object => object }
+        render partial: 'bhf/helper/frontend_edit', locals: { platform_name: options[:platform_name], object: object }
       end
 
     end