bhf 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a150d40a54e77d010bc76b4a3666557abb43bdf
-  data.tar.gz: 759e4befe47a872927043a511fb73cd2bd8464fa
+  metadata.gz: dae4152f9ff30476941024292a0b3c14084e75f0
+  data.tar.gz: 7a0608945e50916118d4fa32648c55b311fa0226
 SHA512:
-  metadata.gz: ae700d5c4b7332dec3dd870e859f99fc1df6bcbf254863a1b5bbb74dd0e49746f36067453baf362e85225d84bcb097ec5b5b2ea4bcd0cb63ccb89c48240f3378
-  data.tar.gz: c7205812e3cecb943a26add9c945c87cb5202d542f4bc5da7c756e766d8ff5bacb0c09971ebc26cb89a6e8234a2e000eab5b7f1fec5ed415d39f4baae19ea7a5
+  metadata.gz: 7018abe3d2bd151236bd0bbbfc78e4f4fd8aedd717340f36498d1088b4015f5644a5fb7193a4c6509b92499427d6434f063e2924e402efa2473d18b8880b923d
+  data.tar.gz: 225e770798d889438e68a884a590c8f75eec8a021c5dfb7dbfc62ea6dc0386b9a04fee7653ec4fbca36a79a8143230abaf0e94c261053d8b51c5af7aba1eff1e

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails',        '~> 4'
 gem 'turbolinks',   '~> 2.1'
-gem 'kaminari',     '~> 0.15'
+gem 'kaminari',     '~> 0.16'
 gem 'haml-rails',   '~> 0.4'
 gem 'sass-rails',   '~> 4.0'
 

data/Gemfile.lock

@@ -1,27 +1,27 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
+    actionmailer (4.1.4)
+      actionpack (= 4.1.4)
+      actionview (= 4.1.4)
       mail (~> 2.5.4)
-    actionpack (4.1.1)
-      actionview (= 4.1.1)
-      activesupport (= 4.1.1)
+    actionpack (4.1.4)
+      actionview (= 4.1.4)
+      activesupport (= 4.1.4)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.1)
-      activesupport (= 4.1.1)
+    actionview (4.1.4)
+      activesupport (= 4.1.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.1)
-      activesupport (= 4.1.1)
+    activemodel (4.1.4)
+      activesupport (= 4.1.4)
       builder (~> 3.1)
-    activerecord (4.1.1)
-      activemodel (= 4.1.1)
-      activesupport (= 4.1.1)
+    activerecord (4.1.4)
+      activemodel (= 4.1.4)
+      activesupport (= 4.1.4)
       arel (~> 5.0.0)
-    activesupport (4.1.1)
+    activesupport (4.1.4)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -39,9 +39,9 @@ GEM
     coffee-script-source (1.7.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    docile (1.1.3)
+    docile (1.1.4)
     erubis (2.7.0)
-    execjs (2.2.0)
+    execjs (2.2.1)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
     git (1.2.7)
@@ -60,7 +60,7 @@ GEM
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
-    hashie (3.0.0)
+    hashie (3.1.0)
     highline (1.6.21)
     hike (1.2.3)
     i18n (0.6.9)
@@ -75,7 +75,7 @@ GEM
       rdoc
     json (1.8.1)
     jwt (1.0.0)
-    kaminari (0.15.1)
+    kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     mail (2.5.4)
@@ -83,7 +83,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.25.1)
     mini_portile (0.6.0)
-    minitest (5.3.4)
+    minitest (5.4.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
@@ -99,19 +99,19 @@ GEM
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.1)
-      actionmailer (= 4.1.1)
-      actionpack (= 4.1.1)
-      actionview (= 4.1.1)
-      activemodel (= 4.1.1)
-      activerecord (= 4.1.1)
-      activesupport (= 4.1.1)
+    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)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.1)
+      railties (= 4.1.4)
       sprockets-rails (~> 2.0)
-    railties (4.1.1)
-      actionpack (= 4.1.1)
-      activesupport (= 4.1.1)
+    railties (4.1.4)
+      actionpack (= 4.1.4)
+      activesupport (= 4.1.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -161,7 +161,7 @@ DEPENDENCIES
   bundler (~> 1.0)
   haml-rails (~> 0.4)
   jeweler (~> 2.0)
-  kaminari (~> 0.15)
+  kaminari (~> 0.16)
   rails (~> 4)
   rdoc (~> 3.12)
   sass-rails (~> 4.0)

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.1

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

@@ -31,15 +31,14 @@ Turbolinks.pagesCached(0);
 				var linkElem = this.linkElem;
 				var rowElem = this.linkElem.getParent('tr');
 				if (rowElem) {
-					linkElem = rowElem;
+  				rowElem.addClass('animate');
+  				setTimeout(function(){
+  					rowElem.removeClass('animate');
+  				}, 600);
 				}
-				linkElem.addClass('animate');
 				setTimeout(function(){
 					linkElem.removeClass('live_edit');
 				});
-				setTimeout(function(){
-					linkElem.removeClass('animate');
-				}, 600);
 			}
 		}
 	});
@@ -243,7 +242,6 @@ Turbolinks.pagesCached(0);
 					},
 					onSearchSuccess: function(request){
 						window.fireEvent('platformUpdate', [p.getParent()]);
-						// TODO: remove the mootools hack for request.url don't 
 						window.history.pushState({ turbolinks: true, url: request.url }, '', request.url);
 					}
 				});

data/app/assets/javascripts/bhf/classes/PlatformHelper.js

@@ -23,7 +23,7 @@ var PlatformHelper = new Class({
 			if (hidden_search) {
 				hidden_search.destroy();
 			}
-			var request = new Request.HTML({
+			var request = new Request.bhf({
 				method: 'get',
 				url: e.target.get('action'),
 				onFailure: function(){

data/app/assets/javascripts/bhf/classes/Request_bhf.js

@@ -0,0 +1,80 @@
+Request.bhf = new Class({
+	Extends: Request.HTML,
+	
+	send: function(options){
+	  var progressSupport = ('onprogress' in new Browser.Request);
+    
+		if (!this.check(options)) return this;
+
+		this.options.isSuccess = this.options.isSuccess || this.isSuccess;
+		this.running = true;
+
+		var type = typeOf(options);
+		if (type == 'string' || type == 'element') options = {data: options};
+
+		var old = this.options;
+		options = Object.append({data: old.data, url: old.url, method: old.method}, options);
+		var data = options.data, url = String(options.url), method = options.method.toLowerCase();
+
+		switch (typeOf(data)){
+			case 'element': data = document.id(data).toQueryString(); break;
+			case 'object': case 'hash': data = Object.toQueryString(data);
+		}
+
+		if (this.options.format){
+			var format = 'format=' + this.options.format;
+			data = (data) ? format + '&' + data : format;
+		}
+
+		if (this.options.emulation && !['get', 'post'].contains(method)){
+			var _method = '_method=' + method;
+			data = (data) ? _method + '&' + data : _method;
+			method = 'post';
+		}
+
+		if (this.options.urlEncoded && ['post', 'put'].contains(method)){
+			var encoding = (this.options.encoding) ? '; charset=' + this.options.encoding : '';
+			this.headers['Content-type'] = 'application/x-www-form-urlencoded' + encoding;
+		}
+
+		if (!url) url = document.location.pathname;
+
+		var trimPosition = url.lastIndexOf('/');
+		if (trimPosition > -1 && (trimPosition = url.indexOf('#')) > -1) url = url.substr(0, trimPosition);
+
+		if (this.options.noCache)
+			url += (url.indexOf('?') > -1 ? '&' : '?') + String.uniqueID();
+
+		if (data && (method == 'get' || method == 'delete')){
+			url += (url.indexOf('?') > -1 ? '&' : '?') + data;
+			data = null;
+		}
+
+		var xhr = this.xhr;
+		if (progressSupport){
+			xhr.onloadstart = this.loadstart.bind(this);
+			xhr.onprogress = this.progress.bind(this);
+		}
+
+		xhr.open(method.toUpperCase(), url, this.options.async, this.options.user, this.options.password);
+		if (this.options.user && 'withCredentials' in xhr) xhr.withCredentials = true;
+
+		xhr.onreadystatechange = this.onStateChange.bind(this);
+
+		Object.each(this.headers, function(value, key){
+			try {
+				xhr.setRequestHeader(key, value);
+			} catch (e){
+				this.fireEvent('exception', [key, value]);
+			}
+		}, this);
+
+		this.fireEvent('request');
+		this.url = url;
+		xhr.send(data);
+		if (!this.options.async) this.onStateChange();
+		else if (this.options.timeout) this.timer = this.timeout.delay(this.options.timeout, this);
+		return this;
+	}
+});
+

data/app/assets/javascripts/bhf/mootools-core-1.5.0-full-compat.js

@@ -6029,7 +6029,6 @@ var Request = this.Request = new Class({
 		}, this);
 
 		this.fireEvent('request');
-		this.url = url;
 		xhr.send(data);
 		if (!this.options.async) this.onStateChange();
 		else if (this.options.timeout) this.timer = this.timeout.delay(this.options.timeout, this);

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

@@ -1,3 +1,4 @@
+- cached_partials = {}
 - platform.pagination.template = self
 - referral_id = nil
 - if flash[:referral_entry] && referral_entry = flash[:referral_entry].clone.symbolize_keys
@@ -50,8 +51,10 @@
                   - if column.display_type == :string
                     - column_value
                   - else
-                    - # Haml::Engine.new(File.read(File.expand_path File.dirname(__FILE__)+"/../table/#{column.macro}/_#{column.display_type}.haml")).render(OpenStruct.new({column_value: column_value, object: object}))
-                    - render(partial: "bhf/table/#{column.macro}/#{column.display_type}", locals: {column_value: column_value, object: object})
+                    - partial_name = "#{column.macro}/#{column.display_type}"
+                    - cached_partials[partial_name] ||= lookup_context.find_template(partial_name, ['bhf/table'], true, [:column_value, :object])
+                    - cached_partials[partial_name].render(self, {column_value: column_value, object: object})
+                    -# render(partial: "bhf/table/#{column.macro}/#{column.display_type}", locals: {column_value: column_value, object: object})
                 = link_to value, (platform.custom_link ? custom_link : edit_link), class: ('quick_edit' if !platform.custom_link && platform.table_quick_edit)
 
             %td.action{class: ('wider' if platform.show_duplicate && !platform.hide_edit && !platform.hide_delete)}
@@ -68,7 +71,6 @@
           - unless platform.hide_create
             = link_to new_t(platform), new_entry_path(platform.name)
 
-    
       %template.quick_edit_template{type: 'text/template'}
         %tr.quick_edit_entry{id: "{object_id}_#{platform.name}"}
           - edit_link = edit_entry_path(platform.name, '{object_id}')

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.0 ruby lib
+# stub: bhf 0.9.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf"
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   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-07"
+  s.date = "2014-07-09"
   s.description = "Gets you there on time"
   s.email = "anton.pawlik@gmail.com"
   s.extra_rdoc_files = [
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/bhf/classes/PlatformHelper.js",
     "app/assets/javascripts/bhf/classes/QuickEdit.js",
     "app/assets/javascripts/bhf/classes/QuickEditStack.js",
+    "app/assets/javascripts/bhf/classes/Request_bhf.js",
     "app/assets/javascripts/bhf/classes/Setlatlng.js",
     "app/assets/javascripts/bhf/classes/showdown.js",
     "app/assets/javascripts/bhf/classes/wmd.js",
@@ -165,7 +166,7 @@ Gem::Specification.new do |s|
     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.15"])
+      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"])
@@ -176,7 +177,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rails>, ["~> 4"])
       s.add_dependency(%q<turbolinks>, ["~> 2.1"])
-      s.add_dependency(%q<kaminari>, ["~> 0.15"])
+      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"])
@@ -188,7 +189,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rails>, ["~> 4"])
     s.add_dependency(%q<turbolinks>, ["~> 2.1"])
-    s.add_dependency(%q<kaminari>, ["~> 0.15"])
+    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"])

data/config/locales/de.yml

@@ -8,7 +8,6 @@ de:
       form:
         file_field:
           select: Datei wählen
-      form:
         buttons:
           save: '%{platform_title} speichern'
           and_edit: und editieren

data/lib/bhf/active_record/base.rb

@@ -24,7 +24,7 @@ module Bhf::ActiveRecord
 
     module ClassMethods
       def bhf_default_search(search_params)
-        return self if (search_term = search_params[:text]).blank?
+        return self if (search_term = search_params['text']).blank?
         where_statement = []
         columns_hash.each_pair do |name, props|
           is_number = search_term.to_i.to_s == search_term || search_term.to_f.to_s == search_term

data/lib/bhf/mongoid/document.rb

@@ -90,7 +90,7 @@ module Bhf::Mongoid
       end
       
       def bhf_default_search(search_params)
-        return self if (search_term = search_params[:text]).blank?
+        return self if (search_term = search_params['text']).blank?
 
         arr = []
         columns_hash.each_pair do |column, props|

data/lib/bhf/platform/base.rb

@@ -34,7 +34,7 @@ module Bhf::Platform
         chain = chain.send data_source if data_source
       end
 
-      unless options[:order].blank?
+      if options[:order].present? and options[:direction].present?
         chain = chain.reorder("#{options[:order]} #{options[:direction]}")
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +187,7 @@ files:
 - app/assets/javascripts/bhf/classes/PlatformHelper.js
 - app/assets/javascripts/bhf/classes/QuickEdit.js
 - app/assets/javascripts/bhf/classes/QuickEditStack.js
+- app/assets/javascripts/bhf/classes/Request_bhf.js
 - app/assets/javascripts/bhf/classes/Setlatlng.js
 - app/assets/javascripts/bhf/classes/showdown.js
 - app/assets/javascripts/bhf/classes/wmd.js