bhf 0.6.30 → 0.6.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 799326468be0d0f6abcbd773a103d94644a9ee10
-  data.tar.gz: a93de495134d9fa3a33fb33ff6db4d9ba6091b52
+  metadata.gz: 976dfde5e8a7c82ea3f5e4b3a7cace53307756ae
+  data.tar.gz: 53f47faee8b830cf8dff6f3a23a48377ac407d32
 SHA512:
-  metadata.gz: 867becd951a4a69892e2e935d0488b1c065a6a992edf7d359156fc4e7737a9c26f09743871b4a7b866bb41afc9a0b8936e8d55f4a62ef59987c55aac29b9f28a
-  data.tar.gz: 202e122942238df3ba1144564ee6d2e7c1e4d620f6ab6a9fb6ff1680972cac568127baa597442e691d3d32698198c93aad42a184a0413f6354fbcfbd6ee38d51
+  metadata.gz: a63f014fc74e673aa2fde205cc903b3ff710227925f2809e4e238c751ac97e4d12de801ea2dd78eff035b3b8ada57e7541537c89f11e7dd12528ead7fd7428a0
+  data.tar.gz: 1f15c6a9dd2bc8f255db56d90a2027ccb3691ae8a5a368f9a9bd8491be87bede76e34b1c03d2397e277cb3ebb5ab840ac47e414c4e64c022862daaa1bd32acbb

data/lib/bhf/pagination.rb

@@ -1,16 +1,3 @@
-Kaminari::Helpers::Tag.class_eval do
-  def page_url_for(page)
-    if @param_name.is_a?(Array)
-      @params[@param_name[0]] = (@params[@param_name[0]] || {}).merge(@param_name[1] => (page <= 1 ? nil : page))
-      return @template.url_for @params
-    end
-    
-    @template.url_for @params.merge(@param_name => (page <= 1 ? nil : page))
-  end
-end
-# TODO: check for support here https://github.com/amatsuda/kaminari/pull/491
-
-
 module Bhf
 
   class Pagination
@@ -28,7 +15,7 @@ module Bhf
 
       links = if !(page_links = template.paginate(platform.objects, {
         theme: 'bhf',
-        param_name: [platform.name, 'page'],
+        param_name: "#{platform.name}[page]",
         params: template.params
       })).blank?
         "#{load_more(platform)} #{page_links}"

data/lib/bhf.rb

@@ -29,9 +29,6 @@ module Bhf
     end
     
     initializer 'bhf.hooks' do
-      if defined?(::I18n)
-        ::I18n.send :include, Bhf::I18nTranslationFallbackHelper
-      end
       if defined?(::ActiveRecord)
         ::ActiveRecord::Base.send :include, Bhf::ActiveRecord::Object
       end
@@ -42,7 +39,6 @@ module Bhf
   end
 end
 
-require 'bhf/i18n'
 require 'bhf/active_record/active_record'
 require 'bhf/active_record/upload'
 require 'bhf/mongoid/document'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.6.30
+  version: 0.6.31
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -207,7 +207,6 @@ files:
 - lib/bhf/active_record/upload.rb
 - lib/bhf/data.rb
 - lib/bhf/form.rb
-- lib/bhf/i18n.rb
 - lib/bhf/mongoid/document.rb
 - lib/bhf/pagination.rb
 - lib/bhf/platform.rb

data/lib/bhf/i18n.rb

@@ -1,38 +0,0 @@
-# TODO: get rid of this
-module Bhf
-  module I18nTranslationFallbackHelper
-    def self.included(base) 
-      base.module_eval do
-        class << self
-          def translate_with_fallback(text, options = {})
-            return translate_without_fallback(text, options) unless text.to_s.split('.')[0] == 'bhf'
-
-            default = options.delete(:default)
-          
-            [locale, :en].each do |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))
-          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_found = options[:locale]
-          rescue I18n::MissingTranslationData
-            translation_found = nil
-            translation = "translation missing: #{options[:locale]}, #{text}"
-          ensure
-            return translation_found, translation
-          end
-          
-          alias_method_chain :translate, :fallback
-          alias_method :t, :translate_with_fallback
-        end
-      end 
-    end
-  end
-end