abstracted 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 513a8bc84b158cd7bb649f5285a1dc0fe78355ac
-  data.tar.gz: 0b83926221a0c3ffd888981cd91e3ad7f889ecd7
+  metadata.gz: d37fdc45795f03804da74023540c393d8c32ba21
+  data.tar.gz: 9012ecedbe89d88d7d2781e0a40aede77812a61e
 SHA512:
-  metadata.gz: 577b3ae9339f08e18654b069c3fe58de050bac967b4f2fdbd6fdbc77df5215d96ed6a8609141dcaa5135554ee792f6294a9ceee983ae4c4563c1afbd72f79ef6
-  data.tar.gz: 236c8bd7c3592f877a011e3a382dc3ba1fc1c9477fdc4d80bbbc3cb866bd34ffb362565a0c6ffcd3b86e68c6c949fd28928527dc80ee440e6b8ec1cd9903a469
+  metadata.gz: dddd1bd9e1c72f6678403b1215c87899793c1883cb4c90ca167ef3e376fab018179a59e1d31ebe05ac61910b1808cdc9e5f8f9d0f9c9991e95c3fe586d04dff2
+  data.tar.gz: 68dc19fe35faef2c45e616e01c45aee3d528cee4f6964a9c1f382f99f1d8b4758d928f6ef76dfd78b81ebccdc17fd7a41aaee5412bb1851c45e6590cb4ec4cd3

data/app/assets/javascripts/pagescrolling.js.coffee

@@ -8,19 +8,20 @@ pageUrl = ''
 contxt = null
 scrollTimeout = false
 
-@evalPageNumber = (url) ->
-  try
-    pn = url
-      .split('?')[1]
-      .split('&')
-      .filter (el,i,array) ->
-        if el.match /^page/
-          return el
-      .join('')
-      .split('=')[1]
-    parseInt(pn)
-  catch error
-    pn = 0
+@evalPageNumber = (elem) ->
+  if elem
+    try
+      pn = elem[0].href
+        .split('?')[1]
+        .split('&')
+        .filter (el,i,array) ->
+          if el.match /^page/
+            return el
+        .join('')
+        .split('=')[1]
+      parseInt(pn)
+    catch error
+      pn = 0
 
 #
 # setVariables prepares for a great scrolling experience
@@ -29,8 +30,8 @@ scrollTimeout = false
   navPaginator = $('nav.pagination')
   try
     pageUrl = navPaginator.find('a[rel=next]')[0].href.replace( '?', '.js?scrolling=true&')
-    lastPage = evalPageNumber navPaginator.find('span.last a')[0].href
-    nextPage = evalPageNumber navPaginator.find('a[rel=next]')[0].href
+    lastPage = evalPageNumber navPaginator.find('span.last a')
+    nextPage = evalPageNumber navPaginator.find('a[rel=next]')
     contxt = $(elem)
     if nextPage > 1
       nextPage = 1

data/app/controllers/abstract_resources_controller.rb

@@ -241,7 +241,7 @@ class AbstractResourcesController < ApplicationController
   def resource
     @resource ||= (_id.nil? ? new_resource : resource_class.find(_id) )
     return @resource if @resource.nil?
-    @resource.current_user = current_user || nil if @resource.respond_to? :current_user
+    @resource.current_user = (current_user || nil) if @resource.respond_to? :current_user
     @resource
   rescue Exception => e
     scoop_from_error e

data/app/helpers/abstract_resources_helper.rb

@@ -128,6 +128,10 @@ module AbstractResourcesHelper
     opt[:controller] ||= resource_class.table_name
     opt[:action] ||= :index
     url_for opt
+  rescue
+    #
+    # return the root_url if no route was found!
+    root_url
   end
 
   #
@@ -508,7 +512,8 @@ module AbstractResourcesHelper
   # does a resource_class and action based translation of title on a page
   #
   def show_page_title
-    t '%s.%s.title' % [ resource_class.table_name, params[:action] ]
+    # t '%s.%s.title' % [ resource_class.table_name, params[:action] ]
+    t '%s.%s.title' % [ params[:controller], params[:action] ]
   end
 
   #

data/app/views/abstract_resources/index.html.haml

@@ -1,6 +1,7 @@
-.row
-	.col.s12
-		%h3= render partial: 'title'
+= render partial: 'title'
+-# .row
+-# 	.col.s12
+-# 		%h3= yield :title
 
 .row
 	.col.s12

data/app/views/layouts/_navigation.html.haml

@@ -1,8 +1,9 @@
+/ fisk
 %nav.top-nav
   .container
     .nav-wrapper
-      = link_to root_url, id: "logo-container", class: "page-title right" do
-        = yield :title
+      = link_to resources_url, id: "logo-container", class: "page-title right" do
+        = content_for?(:title) ? yield(:title) : 'wheelstore.space'
     /
     / perhaps incorporate https://github.com/mblode/burger
     /

data/lib/abstracted/version.rb

@@ -1,3 +1,3 @@
 module Abstracted
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstracted
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails