bhf 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e139d42c13e532be354afb05c64be8e5a359591d
-  data.tar.gz: 55c4e11f88af4ba1feaecf006f28a4ea0c2381f3
+  metadata.gz: 89824fe418339127cfa805a2a783b0257246325a
+  data.tar.gz: e7dcdce38b1f9decf65762548388f943483a5eb2
 SHA512:
-  metadata.gz: c6a469b74c74b4774f97d2d4af434dd0b918a182fbc43ead45616b1e51781a65eb882a415acb33d3606b13a3257f53e65e3bdc41420c282c1744b0fe52a903d3
-  data.tar.gz: 74ba1450fe6e16c07b85561b81a87bffbdd801cbd77807c4708c92288c7e504495404f925b0c0eb8bc0f0a9dc69c0239e068352d362a0bccc77144f77942e3cd
+  metadata.gz: ac49b229ffb4f1a076c58d81b5f82be0d2b5483a428593b78ca540d8e3f4cbcdea5b2f324218cb3a83c25847d6e281ede8005097146ae89ea538b45c6ae18f4d
+  data.tar.gz: db8a47b44d37f1c5f8d73d0fd5186f1f0c909cf86f54c2359f8cdbc6605aacf8be45e94ccd4dfbf677e735533d2954fbf574fc2591a02d6c2b06c71f2bee7695

data/Gemfile

@@ -1,16 +1,16 @@
 source 'http://rubygems.org'
 
-gem 'rails',        '~> 4'
-gem 'turbolinks',   '~> 2.1'
-gem 'kaminari',     '~> 0.16'
-gem 'haml-rails',   '~> 0.4'
-gem 'sass-rails',   '~> 4.0'
+gem 'rails',        '>= 4.2'
+gem 'turbolinks',   '~> 2'
+gem 'kaminari',     '~> 0'
+gem 'haml-rails',   '~> 0'
+gem 'sass-rails',   '~> 5'
 
 
 group :development do
-  gem 'shoulda',    '~> 3.5'
-  gem 'rdoc',       '~> 3.12'
-  gem 'bundler',    '~> 1.0'
-  gem 'jeweler',    '~> 2.0'
-  gem 'simplecov',  '~> 0.8'
+  gem 'shoulda',    '~> 3'
+  gem 'rdoc',       '~> 3'
+  gem 'bundler',    '~> 1'
+  gem 'jeweler',    '~> 2'
+  gem 'simplecov',  '~> 0'
 end

data/Gemfile.lock

@@ -1,69 +1,86 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.1.4)
-      actionpack (= 4.1.4)
-      actionview (= 4.1.4)
-      mail (~> 2.5.4)
-    actionpack (4.1.4)
-      actionview (= 4.1.4)
-      activesupport (= 4.1.4)
-      rack (~> 1.5.2)
+    actionmailer (4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.0)
+      actionview (= 4.2.0)
+      activesupport (= 4.2.0)
+      rack (~> 1.6.0)
       rack-test (~> 0.6.2)
-    actionview (4.1.4)
-      activesupport (= 4.1.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.4)
-      activesupport (= 4.1.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.0)
+      activesupport (= 4.2.0)
+      globalid (>= 0.3.0)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activerecord (4.1.4)
-      activemodel (= 4.1.4)
-      activesupport (= 4.1.4)
-      arel (~> 5.0.0)
-    activesupport (4.1.4)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
-    arel (5.0.1.20140414130214)
+    addressable (2.3.7)
+    arel (6.0.0)
     builder (3.2.2)
-    coffee-rails (4.0.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.1)
+    coffee-script-source (1.9.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.1.5)
     erubis (2.7.0)
-    execjs (2.2.1)
-    faraday (0.9.0)
+    execjs (2.3.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    git (1.2.7)
-    github_api (0.11.3)
+    git (1.2.9.1)
+    github_api (0.12.3)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
+      hashie (>= 3.3)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6.3)
       oauth2
-    haml (4.0.5)
+    globalid (0.3.3)
+      activesupport (>= 4.1.0)
+    haml (4.0.6)
       tilt
-    haml-rails (0.5.3)
+    haml-rails (0.8.2)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
+      html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    hashie (3.2.0)
-    highline (1.6.21)
+    hashie (3.4.0)
+    highline (1.7.1)
     hike (1.2.3)
-    i18n (0.6.11)
+    html2haml (2.0.0)
+      erubis (~> 2.7.0)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
+    i18n (0.7.0)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -73,98 +90,108 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (1.0.0)
-    kaminari (0.16.1)
+    json (1.8.2)
+    jwt (1.3.0)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    mini_portile (0.6.0)
-    minitest (5.4.0)
+    loofah (2.0.1)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.4.3)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    polyglot (0.3.5)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.0)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.4)
-      actionmailer (= 4.1.4)
-      actionpack (= 4.1.4)
-      actionview (= 4.1.4)
-      activemodel (= 4.1.4)
-      activerecord (= 4.1.4)
-      activesupport (= 4.1.4)
+    rails (4.2.0)
+      actionmailer (= 4.2.0)
+      actionpack (= 4.2.0)
+      actionview (= 4.2.0)
+      activejob (= 4.2.0)
+      activemodel (= 4.2.0)
+      activerecord (= 4.2.0)
+      activesupport (= 4.2.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.4)
-      sprockets-rails (~> 2.0)
-    railties (4.1.4)
-      actionpack (= 4.1.4)
-      activesupport (= 4.1.4)
+      railties (= 4.2.0)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.5)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.1)
+      loofah (~> 2.0)
+    railties (4.2.0)
+      actionpack (= 4.2.0)
+      activesupport (= 4.2.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    sass (3.2.19)
-    sass-rails (4.0.3)
+    ruby_parser (3.6.4)
+      sexp_processor (~> 4.1)
+    sass (3.4.12)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
+    sexp_processor (4.4.5)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
     shoulda-context (1.2.1)
-    shoulda-matchers (2.6.1)
+    shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    simplecov (0.8.2)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sprockets (2.11.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    turbolinks (2.2.2)
+    turbolinks (2.5.3)
       coffee-rails
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0)
-  haml-rails (~> 0.4)
-  jeweler (~> 2.0)
-  kaminari (~> 0.16)
-  rails (~> 4)
-  rdoc (~> 3.12)
-  sass-rails (~> 4.0)
-  shoulda (~> 3.5)
-  simplecov (~> 0.8)
-  turbolinks (~> 2.1)
+  bundler (~> 1)
+  haml-rails (~> 0)
+  jeweler (~> 2)
+  kaminari (~> 0)
+  rails (>= 4.2)
+  rdoc (~> 3)
+  sass-rails (~> 5)
+  shoulda (~> 3)
+  simplecov (~> 0)
+  turbolinks (~> 2)

data/VERSION

@@ -1 +1 @@
-0.9.8
+0.9.9

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

@@ -65,11 +65,13 @@ Turbolinks.pagesCached(0);
 
 	var updateElementsAfterQuickEditSuccess = function(eventNames, linkElem, json){
 		var parent = linkElem.getParent('.quick_edit_block');
-		var entryTemplate = parent.getElement('.quick_edit_template');
-		var newEntryInjectArea = parent.getElement('.quick_edit_inject');
-		var relation = parent.getElement('.relation');
 		var entry = linkElem.getParent('.quick_edit_entry');
-		var parsedTemplate;
+		var entryTemplate, newEntryInjectArea, relation, parsedTemplate;
+		if (parent) {
+			entryTemplate = parent.getElement('.quick_edit_template');
+			newEntryInjectArea = parent.getElement('.quick_edit_inject');
+			relation = parent.getElement('.relation');
+		}
 		if ( ! entry) {
 			entry = parent.getElement('.quick_edit_active');
 		}
@@ -113,7 +115,6 @@ Turbolinks.pagesCached(0);
 			if (newEntryInjectArea) {
 				newEntryInjectArea.fireEvent('quickEditEntryRemoved');
 			}
-			
 		}
 	};
 		

data/app/controllers/bhf/entries_controller.rb

@@ -110,8 +110,10 @@ class Bhf::EntriesController < Bhf::ApplicationController
       @platform.columns.each_with_object(extra_data) do |column, hash|
         column_value = @object.send(column.name)
         unless column.macro == :column && column_value.blank?
-          p = "bhf/table/#{column.macro}/#{column.display_type}"
-          hash[column.name] = render_to_string partial: p, locals: {object: @object, column_value: column_value, link: false, add_quick_link: false}
+          with_format :html do
+            p = "bhf/table/#{column.macro}/#{column.display_type}"
+            hash[column.name] = render_to_string partial: p, locals: {object: @object, column_value: column_value, link: false, add_quick_link: false}
+          end
         end
       end
     end
@@ -138,7 +140,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
     def manage_many_to_many
       return unless params[:has_and_belongs_to_many]
       params[:has_and_belongs_to_many].each_pair do |relation, ids|
-        reflection = @model.reflections[relation.to_sym]
+        reflection = @model.reflections[relation]
 
         next unless ids.any?
         relation_array = @object.send(relation)

data/app/views/bhf/entries/{_form.haml → _form.html.haml}

@@ -16,11 +16,11 @@
     .node
       .label
       .input
-        - unless @object.class.bhf_embedded?
+        - unless (f.object.new_record? && @platform.hide_create) || (!f.object.new_record? && @platform.hide_edit)
           = f.submit t('bhf.helpers.form.buttons.save', platform_title: @platform.title_singular)
-        - unless @platform.hide_edit
-          = f.submit t('bhf.helpers.form.buttons.and_edit'), name: :return_to_edit, class: 'alt_button'
-        - unless @platform.hide_create
-          = f.submit t('bhf.helpers.form.buttons.and_add'), name: :return_to_new, class: 'alt_button'
+          - unless @platform.hide_edit
+            = f.submit t('bhf.helpers.form.buttons.and_edit'), name: :return_to_edit, class: 'alt_button'
+          - unless @platform.hide_create
+            = f.submit t('bhf.helpers.form.buttons.and_add'), name: :return_to_new, class: 'alt_button'
         
-        = link_to t('bhf.helpers.entry.cancel'), params[:return_to] ? params[:return_to] : page_path(@platform.page_name), class: 'cancel'
+        = link_to t('bhf.helpers.entry.cancel'), params[:return_to] ? params[:return_to] : page_path(@platform.page_name), class: 'cancel', data: ( {no_turbolink: true} if params[:return_to])

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.9.8 ruby lib
+# stub: bhf 0.9.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf"
-  s.version = "0.9.8"
+  s.version = "0.9.9"
 
   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-17"
+  s.date = "2015-02-25"
   s.description = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user. Easy integratable and highly configurable and agnostic. Works with ActiveRecord and Mongoid."
   s.email = "anton.pawlik@gmail.com"
   s.extra_rdoc_files = [
@@ -69,66 +69,66 @@ Gem::Specification.new do |s|
     "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",
-    "app/views/bhf/application/index.haml",
-    "app/views/bhf/entries/_form.haml",
-    "app/views/bhf/entries/_validation_errors.haml",
-    "app/views/bhf/entries/edit.haml",
-    "app/views/bhf/entries/new.haml",
-    "app/views/bhf/entries/show.haml",
-    "app/views/bhf/form/belongs_to/_radio.haml",
-    "app/views/bhf/form/belongs_to/_select.haml",
-    "app/views/bhf/form/belongs_to/_static.haml",
-    "app/views/bhf/form/column/_array.haml",
-    "app/views/bhf/form/column/_boolean.haml",
-    "app/views/bhf/form/column/_date.haml",
-    "app/views/bhf/form/column/_hash.haml",
-    "app/views/bhf/form/column/_mappin.haml",
-    "app/views/bhf/form/column/_markdown.haml",
-    "app/views/bhf/form/column/_multiple_fields.haml",
-    "app/views/bhf/form/column/_number.haml",
-    "app/views/bhf/form/column/_paperclip.haml",
-    "app/views/bhf/form/column/_password.haml",
-    "app/views/bhf/form/column/_static.haml",
-    "app/views/bhf/form/column/_string.haml",
-    "app/views/bhf/form/column/_text.haml",
-    "app/views/bhf/form/column/_wysiwyg.haml",
-    "app/views/bhf/form/embeds_many/_static.haml",
-    "app/views/bhf/form/embeds_one/_static.haml",
-    "app/views/bhf/form/has_and_belongs_to_many/_check_box.haml",
-    "app/views/bhf/form/has_and_belongs_to_many/_static.haml",
-    "app/views/bhf/form/has_many/_static.haml",
-    "app/views/bhf/form/has_one/_static.haml",
-    "app/views/bhf/helper/_definition_item.haml",
-    "app/views/bhf/helper/_field_errors.haml",
-    "app/views/bhf/helper/_flash.haml",
-    "app/views/bhf/helper/_frontend_edit.haml",
-    "app/views/bhf/helper/_info.haml",
-    "app/views/bhf/helper/_node.haml",
-    "app/views/bhf/helper/_reflection_node.haml",
-    "app/views/bhf/pages/_platform.haml",
-    "app/views/bhf/pages/_search.haml",
-    "app/views/bhf/pages/show.haml",
-    "app/views/bhf/table/belongs_to/_default.haml",
-    "app/views/bhf/table/column/_array.haml",
-    "app/views/bhf/table/column/_boolean.haml",
-    "app/views/bhf/table/column/_date.haml",
-    "app/views/bhf/table/column/_empty.haml",
-    "app/views/bhf/table/column/_extern_link.haml",
-    "app/views/bhf/table/column/_file.haml",
-    "app/views/bhf/table/column/_hash.haml",
-    "app/views/bhf/table/column/_image.haml",
-    "app/views/bhf/table/column/_number.haml",
-    "app/views/bhf/table/column/_paperclip.haml",
-    "app/views/bhf/table/column/_primary_key.haml",
-    "app/views/bhf/table/column/_string.haml",
-    "app/views/bhf/table/column/_text.haml",
-    "app/views/bhf/table/embeds_many/_default.haml",
-    "app/views/bhf/table/embeds_one/_default.haml",
-    "app/views/bhf/table/has_and_belongs_to_many/_default.haml",
-    "app/views/bhf/table/has_many/_default.haml",
-    "app/views/bhf/table/has_one/_default.haml",
+    "app/views/bhf/_footer.html.haml",
+    "app/views/bhf/_user.html.haml",
+    "app/views/bhf/application/index.html.haml",
+    "app/views/bhf/entries/_form.html.haml",
+    "app/views/bhf/entries/_validation_errors.html.haml",
+    "app/views/bhf/entries/edit.html.haml",
+    "app/views/bhf/entries/new.html.haml",
+    "app/views/bhf/entries/show.html.haml",
+    "app/views/bhf/form/belongs_to/_radio.html.haml",
+    "app/views/bhf/form/belongs_to/_select.html.haml",
+    "app/views/bhf/form/belongs_to/_static.html.haml",
+    "app/views/bhf/form/column/_array.html.haml",
+    "app/views/bhf/form/column/_boolean.html.haml",
+    "app/views/bhf/form/column/_date.html.haml",
+    "app/views/bhf/form/column/_hash.html.haml",
+    "app/views/bhf/form/column/_mappin.html.haml",
+    "app/views/bhf/form/column/_markdown.html.haml",
+    "app/views/bhf/form/column/_multiple_fields.html.haml",
+    "app/views/bhf/form/column/_number.html.haml",
+    "app/views/bhf/form/column/_paperclip.html.haml",
+    "app/views/bhf/form/column/_password.html.haml",
+    "app/views/bhf/form/column/_static.html.haml",
+    "app/views/bhf/form/column/_string.html.haml",
+    "app/views/bhf/form/column/_text.html.haml",
+    "app/views/bhf/form/column/_wysiwyg.html.haml",
+    "app/views/bhf/form/embeds_many/_static.html.haml",
+    "app/views/bhf/form/embeds_one/_static.html.haml",
+    "app/views/bhf/form/has_and_belongs_to_many/_check_box.html.haml",
+    "app/views/bhf/form/has_and_belongs_to_many/_static.html.haml",
+    "app/views/bhf/form/has_many/_static.html.haml",
+    "app/views/bhf/form/has_one/_static.html.haml",
+    "app/views/bhf/helper/_definition_item.html.haml",
+    "app/views/bhf/helper/_field_errors.html.haml",
+    "app/views/bhf/helper/_flash.html.haml",
+    "app/views/bhf/helper/_frontend_edit.html.haml",
+    "app/views/bhf/helper/_info.html.haml",
+    "app/views/bhf/helper/_node.html.haml",
+    "app/views/bhf/helper/_reflection_node.html.haml",
+    "app/views/bhf/pages/_platform.html.haml",
+    "app/views/bhf/pages/_search.html.haml",
+    "app/views/bhf/pages/show.html.haml",
+    "app/views/bhf/table/belongs_to/_default.html.haml",
+    "app/views/bhf/table/column/_array.html.haml",
+    "app/views/bhf/table/column/_boolean.html.haml",
+    "app/views/bhf/table/column/_date.html.haml",
+    "app/views/bhf/table/column/_empty.html.haml",
+    "app/views/bhf/table/column/_extern_link.html.haml",
+    "app/views/bhf/table/column/_file.html.haml",
+    "app/views/bhf/table/column/_hash.html.haml",
+    "app/views/bhf/table/column/_image.html.haml",
+    "app/views/bhf/table/column/_number.html.haml",
+    "app/views/bhf/table/column/_paperclip.html.haml",
+    "app/views/bhf/table/column/_primary_key.html.haml",
+    "app/views/bhf/table/column/_string.html.haml",
+    "app/views/bhf/table/column/_text.html.haml",
+    "app/views/bhf/table/embeds_many/_default.html.haml",
+    "app/views/bhf/table/embeds_one/_default.html.haml",
+    "app/views/bhf/table/has_and_belongs_to_many/_default.html.haml",
+    "app/views/bhf/table/has_many/_default.html.haml",
+    "app/views/bhf/table/has_one/_default.html.haml",
     "app/views/kaminari/bhf/_gap.html.haml",
     "app/views/kaminari/bhf/_next_page.html.haml",
     "app/views/kaminari/bhf/_page.html.haml",
@@ -167,39 +167,39 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 4"])
-      s.add_runtime_dependency(%q<turbolinks>, ["~> 2.1"])
-      s.add_runtime_dependency(%q<kaminari>, ["~> 0.16"])
-      s.add_runtime_dependency(%q<haml-rails>, ["~> 0.4"])
-      s.add_runtime_dependency(%q<sass-rails>, ["~> 4.0"])
-      s.add_development_dependency(%q<shoulda>, ["~> 3.5"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_development_dependency(%q<simplecov>, ["~> 0.8"])
+      s.add_runtime_dependency(%q<rails>, [">= 4.2"])
+      s.add_runtime_dependency(%q<turbolinks>, ["~> 2"])
+      s.add_runtime_dependency(%q<kaminari>, ["~> 0"])
+      s.add_runtime_dependency(%q<haml-rails>, ["~> 0"])
+      s.add_runtime_dependency(%q<sass-rails>, ["~> 5"])
+      s.add_development_dependency(%q<shoulda>, ["~> 3"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3"])
+      s.add_development_dependency(%q<bundler>, ["~> 1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2"])
+      s.add_development_dependency(%q<simplecov>, ["~> 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 4"])
-      s.add_dependency(%q<turbolinks>, ["~> 2.1"])
-      s.add_dependency(%q<kaminari>, ["~> 0.16"])
-      s.add_dependency(%q<haml-rails>, ["~> 0.4"])
-      s.add_dependency(%q<sass-rails>, ["~> 4.0"])
-      s.add_dependency(%q<shoulda>, ["~> 3.5"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_dependency(%q<simplecov>, ["~> 0.8"])
+      s.add_dependency(%q<rails>, [">= 4.2"])
+      s.add_dependency(%q<turbolinks>, ["~> 2"])
+      s.add_dependency(%q<kaminari>, ["~> 0"])
+      s.add_dependency(%q<haml-rails>, ["~> 0"])
+      s.add_dependency(%q<sass-rails>, ["~> 5"])
+      s.add_dependency(%q<shoulda>, ["~> 3"])
+      s.add_dependency(%q<rdoc>, ["~> 3"])
+      s.add_dependency(%q<bundler>, ["~> 1"])
+      s.add_dependency(%q<jeweler>, ["~> 2"])
+      s.add_dependency(%q<simplecov>, ["~> 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 4"])
-    s.add_dependency(%q<turbolinks>, ["~> 2.1"])
-    s.add_dependency(%q<kaminari>, ["~> 0.16"])
-    s.add_dependency(%q<haml-rails>, ["~> 0.4"])
-    s.add_dependency(%q<sass-rails>, ["~> 4.0"])
-    s.add_dependency(%q<shoulda>, ["~> 3.5"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0"])
-    s.add_dependency(%q<simplecov>, ["~> 0.8"])
+    s.add_dependency(%q<rails>, [">= 4.2"])
+    s.add_dependency(%q<turbolinks>, ["~> 2"])
+    s.add_dependency(%q<kaminari>, ["~> 0"])
+    s.add_dependency(%q<haml-rails>, ["~> 0"])
+    s.add_dependency(%q<sass-rails>, ["~> 5"])
+    s.add_dependency(%q<shoulda>, ["~> 3"])
+    s.add_dependency(%q<rdoc>, ["~> 3"])
+    s.add_dependency(%q<bundler>, ["~> 1"])
+    s.add_dependency(%q<jeweler>, ["~> 2"])
+    s.add_dependency(%q<simplecov>, ["~> 0"])
   end
 end
 

data/lib/bhf/mongoid/document.rb

@@ -68,7 +68,7 @@ module Bhf::Mongoid
         c = {}
         relations.each do |key, meta|
           next if meta.macro == :embedded_in
-          c[key.to_sym] = Reflection.new(meta)
+          c[key] = Reflection.new(meta)
         end
         c
       end

data/lib/bhf/platform/pagination.rb

@@ -74,12 +74,15 @@ module Bhf::Platform
       platform_params[:per_page] = load_offset
       
       direction = plus ? 'more' : 'less'
+      
+      parsed_paramas = {
+        bhf_area: template.params[:bhf_area],
+        page: template.params[:page]
+      }.merge(platform.name.to_sym => platform_params)
       template.link_to(
         I18n.t("bhf.pagination.load_#{direction}"),
-        template.page_path(
-          platform.page_name,
-          template.params.merge(platform.name => platform_params)
-        ), attributes.merge(class: "load_#{direction}")
+        template.page_path(platform.page_name, parsed_paramas),
+        attributes.merge(class: "load_#{direction}")
       )
     end
 

metadata

@@ -1,155 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 description: A simple to use Rails-Engine-Gem that offers an admin interface for trusted
   user. Easy integratable and highly configurable and agnostic. Works with ActiveRecord
   and Mongoid.
@@ -210,66 +210,66 @@ files:
 - 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
-- app/views/bhf/application/index.haml
-- app/views/bhf/entries/_form.haml
-- app/views/bhf/entries/_validation_errors.haml
-- app/views/bhf/entries/edit.haml
-- app/views/bhf/entries/new.haml
-- app/views/bhf/entries/show.haml
-- app/views/bhf/form/belongs_to/_radio.haml
-- app/views/bhf/form/belongs_to/_select.haml
-- app/views/bhf/form/belongs_to/_static.haml
-- app/views/bhf/form/column/_array.haml
-- app/views/bhf/form/column/_boolean.haml
-- app/views/bhf/form/column/_date.haml
-- app/views/bhf/form/column/_hash.haml
-- app/views/bhf/form/column/_mappin.haml
-- app/views/bhf/form/column/_markdown.haml
-- app/views/bhf/form/column/_multiple_fields.haml
-- app/views/bhf/form/column/_number.haml
-- app/views/bhf/form/column/_paperclip.haml
-- app/views/bhf/form/column/_password.haml
-- app/views/bhf/form/column/_static.haml
-- app/views/bhf/form/column/_string.haml
-- app/views/bhf/form/column/_text.haml
-- app/views/bhf/form/column/_wysiwyg.haml
-- app/views/bhf/form/embeds_many/_static.haml
-- app/views/bhf/form/embeds_one/_static.haml
-- app/views/bhf/form/has_and_belongs_to_many/_check_box.haml
-- app/views/bhf/form/has_and_belongs_to_many/_static.haml
-- app/views/bhf/form/has_many/_static.haml
-- app/views/bhf/form/has_one/_static.haml
-- app/views/bhf/helper/_definition_item.haml
-- app/views/bhf/helper/_field_errors.haml
-- app/views/bhf/helper/_flash.haml
-- app/views/bhf/helper/_frontend_edit.haml
-- app/views/bhf/helper/_info.haml
-- app/views/bhf/helper/_node.haml
-- app/views/bhf/helper/_reflection_node.haml
-- app/views/bhf/pages/_platform.haml
-- app/views/bhf/pages/_search.haml
-- app/views/bhf/pages/show.haml
-- app/views/bhf/table/belongs_to/_default.haml
-- app/views/bhf/table/column/_array.haml
-- app/views/bhf/table/column/_boolean.haml
-- app/views/bhf/table/column/_date.haml
-- app/views/bhf/table/column/_empty.haml
-- app/views/bhf/table/column/_extern_link.haml
-- app/views/bhf/table/column/_file.haml
-- app/views/bhf/table/column/_hash.haml
-- app/views/bhf/table/column/_image.haml
-- app/views/bhf/table/column/_number.haml
-- app/views/bhf/table/column/_paperclip.haml
-- app/views/bhf/table/column/_primary_key.haml
-- app/views/bhf/table/column/_string.haml
-- app/views/bhf/table/column/_text.haml
-- app/views/bhf/table/embeds_many/_default.haml
-- app/views/bhf/table/embeds_one/_default.haml
-- app/views/bhf/table/has_and_belongs_to_many/_default.haml
-- app/views/bhf/table/has_many/_default.haml
-- app/views/bhf/table/has_one/_default.haml
+- app/views/bhf/_footer.html.haml
+- app/views/bhf/_user.html.haml
+- app/views/bhf/application/index.html.haml
+- app/views/bhf/entries/_form.html.haml
+- app/views/bhf/entries/_validation_errors.html.haml
+- app/views/bhf/entries/edit.html.haml
+- app/views/bhf/entries/new.html.haml
+- app/views/bhf/entries/show.html.haml
+- app/views/bhf/form/belongs_to/_radio.html.haml
+- app/views/bhf/form/belongs_to/_select.html.haml
+- app/views/bhf/form/belongs_to/_static.html.haml
+- app/views/bhf/form/column/_array.html.haml
+- app/views/bhf/form/column/_boolean.html.haml
+- app/views/bhf/form/column/_date.html.haml
+- app/views/bhf/form/column/_hash.html.haml
+- app/views/bhf/form/column/_mappin.html.haml
+- app/views/bhf/form/column/_markdown.html.haml
+- app/views/bhf/form/column/_multiple_fields.html.haml
+- app/views/bhf/form/column/_number.html.haml
+- app/views/bhf/form/column/_paperclip.html.haml
+- app/views/bhf/form/column/_password.html.haml
+- app/views/bhf/form/column/_static.html.haml
+- app/views/bhf/form/column/_string.html.haml
+- app/views/bhf/form/column/_text.html.haml
+- app/views/bhf/form/column/_wysiwyg.html.haml
+- app/views/bhf/form/embeds_many/_static.html.haml
+- app/views/bhf/form/embeds_one/_static.html.haml
+- app/views/bhf/form/has_and_belongs_to_many/_check_box.html.haml
+- app/views/bhf/form/has_and_belongs_to_many/_static.html.haml
+- app/views/bhf/form/has_many/_static.html.haml
+- app/views/bhf/form/has_one/_static.html.haml
+- app/views/bhf/helper/_definition_item.html.haml
+- app/views/bhf/helper/_field_errors.html.haml
+- app/views/bhf/helper/_flash.html.haml
+- app/views/bhf/helper/_frontend_edit.html.haml
+- app/views/bhf/helper/_info.html.haml
+- app/views/bhf/helper/_node.html.haml
+- app/views/bhf/helper/_reflection_node.html.haml
+- app/views/bhf/pages/_platform.html.haml
+- app/views/bhf/pages/_search.html.haml
+- app/views/bhf/pages/show.html.haml
+- app/views/bhf/table/belongs_to/_default.html.haml
+- app/views/bhf/table/column/_array.html.haml
+- app/views/bhf/table/column/_boolean.html.haml
+- app/views/bhf/table/column/_date.html.haml
+- app/views/bhf/table/column/_empty.html.haml
+- app/views/bhf/table/column/_extern_link.html.haml
+- app/views/bhf/table/column/_file.html.haml
+- app/views/bhf/table/column/_hash.html.haml
+- app/views/bhf/table/column/_image.html.haml
+- app/views/bhf/table/column/_number.html.haml
+- app/views/bhf/table/column/_paperclip.html.haml
+- app/views/bhf/table/column/_primary_key.html.haml
+- app/views/bhf/table/column/_string.html.haml
+- app/views/bhf/table/column/_text.html.haml
+- app/views/bhf/table/embeds_many/_default.html.haml
+- app/views/bhf/table/embeds_one/_default.html.haml
+- app/views/bhf/table/has_and_belongs_to_many/_default.html.haml
+- app/views/bhf/table/has_many/_default.html.haml
+- app/views/bhf/table/has_one/_default.html.haml
 - app/views/kaminari/bhf/_gap.html.haml
 - app/views/kaminari/bhf/_next_page.html.haml
 - app/views/kaminari/bhf/_page.html.haml