abstracted 0.3.3 → 0.3.4

data/app/assets/javascripts/triggers.coffee

@@ -9,26 +9,14 @@ $(App).on 'app:modal:open', ->
   App.trigger('app:pageload')
 
 $(App).on 'app:pageload', ->
-  page = new App.Materialize()
-  page.prepare()
-  sweet = new App.SweetAlert()
-  sweet.prepare()
+  App.page.prepare()
+  App.sweet.prepare()
   if $('table.resources_table')
-    rl = new App.ResourcesList($('form'))
-    rl.prepare()
-  rs = new App.ResourceForm()
-  rs.prepare()
-  fab = new App.fabDelete()
-  fab.prepare()
+    App.resourceslist.prepare()
+    App.ps.scrollTable('table.resources_table')
+  App.resourceform.prepare()
+  App.fab.prepare()
 
-#
-# PageOnChange really just calls a pageload - as of now 19-06-15
-# fixed elements like SELECT's, Materialized's elements, et al.
-#
-# @pageOnChange = () ->
-#   console.log 'page changed '
-#   pageOnLoad()
-#
-# call the App.pageload
-$(document).on 'page:change', ->
-  App.pageload()
+# $(App).on 'app:pageunload', ->
+#   if App.ps && App.ps.scrollTimeout
+#     clearTimeout App.ps.scrollTimeout

data/app/assets/stylesheets/abstract_resources.css

@@ -6,5 +6,6 @@
  *= require sweetalert
  * require materialize-tags/dist/css/materialize-tags.css
  *= require selectize/dist/css/selectize.css
+ *= require balloon.min.css
  * require_tree .
  */

data/app/assets/stylesheets/balloon.min.css

@@ -0,0 +1 @@
+[data-balloon]{position:relative}[data-balloon]::before{opacity:0;pointer-events:none;transition:all .18s ease-out;background:rgba(17,17,17,0.9);border-radius:4px;color:#fff;content:attr(data-balloon);font-size:12px;padding:.5em 1em;position:absolute;white-space:nowrap;z-index:10}[data-balloon]::after{background:no-repeat url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="36px" height="12px"><path fill="rgba(17,17,17,0.9)" transform="rotate(0)" d="M2.658,0.000 C-13.615,0.000 50.938,0.000 34.662,0.000 C28.662,0.000 23.035,12.002 18.660,12.002 C14.285,12.002 8.594,0.000 2.658,0.000 Z"/></svg>');background-size:100% auto;width:18px;height:6px;opacity:0;pointer-events:none;transition:all .18s ease-out;content:'';position:absolute;z-index:10}[data-balloon]:hover::before,[data-balloon]:hover::after{opacity:1;pointer-events:auto}[data-balloon][data-balloon-pos="up"]::before{bottom:100%;left:50%;margin-bottom:11px;transform:translate3d(-50%, 10px, 0);transform-origin:top}[data-balloon][data-balloon-pos="up"]::after{bottom:100%;left:50%;margin-bottom:5px;transform:translate3d(-50%, 10px, 0);transform-origin:top}[data-balloon][data-balloon-pos="up"]:hover::before{transform:translate3d(-50%, 0, 0)}[data-balloon][data-balloon-pos="up"]:hover::after{transform:translate3d(-50%, 0, 0)}[data-balloon][data-balloon-pos='down']::before{left:50%;margin-top:11px;top:100%;transform:translate3d(-50%, -10px, 0)}[data-balloon][data-balloon-pos='down']::after{background:no-repeat url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="36px" height="12px"><path fill="rgba(17,17,17,0.9)" transform="rotate(180 18 6)" d="M2.658,0.000 C-13.615,0.000 50.938,0.000 34.662,0.000 C28.662,0.000 23.035,12.002 18.660,12.002 C14.285,12.002 8.594,0.000 2.658,0.000 Z"/></svg>');background-size:100% auto;width:18px;height:6px;left:50%;margin-top:5px;top:100%;transform:translate3d(-50%, -10px, 0)}[data-balloon][data-balloon-pos='down']:hover::before{transform:translate3d(-50%, 0, 0)}[data-balloon][data-balloon-pos='down']:hover::after{transform:translate3d(-50%, 0, 0)}[data-balloon][data-balloon-pos='left']::before{margin-right:11px;right:100%;top:50%;transform:translate3d(10px, -50%, 0)}[data-balloon][data-balloon-pos='left']::after{background:no-repeat url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="12px" height="36px"><path fill="rgba(17,17,17,0.9)" transform="rotate(-90 18 18)" d="M2.658,0.000 C-13.615,0.000 50.938,0.000 34.662,0.000 C28.662,0.000 23.035,12.002 18.660,12.002 C14.285,12.002 8.594,0.000 2.658,0.000 Z"/></svg>');background-size:100% auto;width:6px;height:18px;margin-right:5px;right:100%;top:50%;transform:translate3d(10px, -50%, 0)}[data-balloon][data-balloon-pos='left']:hover::before{transform:translate3d(0, -50%, 0)}[data-balloon][data-balloon-pos='left']:hover::after{transform:translate3d(0, -50%, 0)}[data-balloon][data-balloon-pos='right']::before{left:100%;margin-left:11px;top:50%;transform:translate3d(-10px, -50%, 0)}[data-balloon][data-balloon-pos='right']::after{background:no-repeat url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="12px" height="36px"><path fill="rgba(17,17,17,0.9)" transform="rotate(90 6 6)" d="M2.658,0.000 C-13.615,0.000 50.938,0.000 34.662,0.000 C28.662,0.000 23.035,12.002 18.660,12.002 C14.285,12.002 8.594,0.000 2.658,0.000 Z"/></svg>');background-size:100% auto;width:6px;height:18px;left:100%;margin-left:5px;top:50%;transform:translate3d(-10px, -50%, 0)}[data-balloon][data-balloon-pos='right']:hover::before{transform:translate3d(0, -50%, 0)}[data-balloon][data-balloon-pos='right']:hover::after{transform:translate3d(0, -50%, 0)}[data-balloon][data-balloon-length='small']::before{white-space:normal;width:80px}[data-balloon][data-balloon-length='medium']::before{white-space:normal;width:150px}[data-balloon][data-balloon-length='large']::before{white-space:normal;width:260px}[data-balloon][data-balloon-length='xlarge']::before{white-space:normal;width:380px}@media screen and (max-width: 768px){[data-balloon][data-balloon-length='xlarge']::before{white-space:normal;width:90vw}}[data-balloon][data-balloon-length='fit']::before{white-space:normal;width:100%}

data/app/controllers/abstract_resources_controller.rb

@@ -104,11 +104,9 @@ class AbstractResourcesController < ApplicationController
   #
   # build an array of the resource - particular to <SELECT>
   def set_parents
-    unless (resource_class.respond_to?( 'arraying') && resource? )
-      @parents = []
-    else
-      @parents = resource_class.arraying({ order: 'name'}, resource.possible_parents)
-    end
+    @parents = []
+    return @parents unless resource_class.respond_to? :roots #( 'arraying') && resource? )
+    @parents = resource_class.arraying({ order: 'name'}, resource.possible_parents)
   rescue Exception => e
     scoop_from_error e
   end
@@ -315,13 +313,14 @@ class AbstractResourcesController < ApplicationController
   #
   # returns the url for the resource - like /users/1
   def resource_url options={}
-    options = resource_options(options)
-    action= case params[:action]
-      when 'show'; '/%s' % resource.id
-      when 'edit'; '/%s/edit' % resource.id
-      else ''
-      end
-    parent? ? ("%s/%s%s%s" % [parent_url,resource_name,action,options]) : ("/%s%s%s" % [resource_name,action,options])
+    r=request.path
+    id=params[:id]
+    options = case params[:action]
+      when 'create','update','delete','destroy'; ""
+      else resource_options(options)
+    end
+    return "%s%s" % [r,options] if r.match "#{resource.class.to_s.tableize}\/#{id}$"
+    "%s%s" % [ r.split("/#{params[:action]}")[0], options]
   rescue Exception => e
     scoop_from_error e
   end
@@ -330,11 +329,13 @@ class AbstractResourcesController < ApplicationController
   #
   # returns the url for the resources - /employees or /employees/1/events
   def resources_url options={}
-    options = resource_options(options)
-    r = "%s_path" % resource_name
-    d,a,r = send(r).split("/")
-    a = a =~ /admin/ ? [ '/',a, parent_url ].join("/") : parent_url
-    [ a, r  ].join("/").gsub /\/\//,'/'
+    r=request.path
+    options = case params[:action]
+      when 'create','update','delete','destroy'; ""
+      else resource_options(options)
+    end
+    return "%s%s" % [r,options] if r.match "#{resource.class.to_s.tableize}$"
+    "%s%s%s" % [ r.split( resource.class.to_s.tableize)[0],resource.class.to_s.tableize, options]
   rescue Exception => e
     scoop_from_error e
   end
@@ -342,7 +343,8 @@ class AbstractResourcesController < ApplicationController
   #
   # parent_url returns the parent url - /employees/1
   def parent_url options={}
-    parent? ? ( "/%s/%s" % [ @parent.class.table_name, @parent.id ] ) : ""
+    parent? ? url_for(@parent) : ""
+    # parent? ? ( "/%s/%s" % [ @parent.class.table_name, @parent.id ] ) : ""
   rescue Exception => e
     scoop_from_error e
   end
@@ -405,7 +407,7 @@ class AbstractResourcesController < ApplicationController
     end
 
     def resource_options options
-      options.merge! params.except( "id", "controller", "action" )
+      options.merge! params.except( "id", "controller", "action", "utf8", "_method", "authenticity_token" )
       options = (options.empty? ? "" : "?" + options.collect{ |k,v| "#{k}=#{v}" }.join("&"))
     end
 
@@ -558,7 +560,7 @@ class AbstractResourcesController < ApplicationController
     #
 
     def scoop_from_error e
-      raise e if Rails.env=='development'
+      raise e if %w{ test development }.include? Rails.env
       logger.debug "AbstractResourcesController##{params[:action]}: #{e.class}"
       a_url = root_path
 

data/app/helpers/abstract_resources_helper.rb

@@ -199,8 +199,8 @@ module AbstractResourcesHelper
 
   # return a link to delete a row
   def show_resource_delete_icon item, url, lbl='name'
-    link_to item, class: 'delete_link', data: { url: url, name: "#{item.send lbl }", id: "#{item.id}", remove: "#tr-#{item.class.to_s}-#{item.id}" } do
-      content_tag :i, 'delete', class: 'material-icons small', title: "#{t('.delete')}"
+    link_to item, class: 'delete_link', data: { balloon: t("balloons.delete" ), balloon_pos: "left", url: url, name: "#{item.send lbl }", id: "#{item.id}", remove: "#tr-#{item.class.to_s}-#{item.id}" } do
+      content_tag :i, 'delete', class: 'material-icons small'
     end
     # = link_to account, class: 'delete_link', data: { url: '/admin/accounts', name: "#{account.name}", id: "#{account.id}", remove: "#tr-#{account.id}" } do
     #   %i.material-icons.small{ title: "#{t('.delete')}"} delete

data/app/models/abstract_resource.rb

@@ -35,21 +35,24 @@ class AbstractResource < ActiveRecord::Base
     lot.where id: population
   end
 
-  def self.arrange_array(options={}, hash=nil)
-    hash ||= arrange(options)
-
-    arr = []
-    hash.each do |node, children|
-      arr << node
-      arr += arrange_array(options, children) unless children.nil?
-    end
-    arr
-  end
-
-  def possible_parents
-   prtns = self.arrange_array(:order => 'name')
-   return new_record? ? prtns : prtns - subtree
-  end
+  # depreciated ------------ 12/3/2016
+  # 
+  # ancestry related methods - find them on AncestryAbstractResource
+  # def self.arrange_array(options={}, hash=nil)
+  #   hash ||= arrange(options)
+  #
+  #   arr = []
+  #   hash.each do |node, children|
+  #     arr << node
+  #     arr += arrange_array(options, children) unless children.nil?
+  #   end
+  #   arr
+  # end
+  #
+  # def possible_parents
+  #  prtns = self.arrange_array(:order => 'name')
+  #  return new_record? ? prtns : prtns - subtree
+  # end
 
   def resource_name
    self.class.to_s.underscore.pluralize
@@ -57,7 +60,7 @@ class AbstractResource < ActiveRecord::Base
 
   #
   # include Exceptions
-  include PrintEngine
+  include PrintEngine unless Rails.env=='test'
   #
   #
   #
@@ -67,16 +70,9 @@ class AbstractResource < ActiveRecord::Base
   # end
   #
   # # implement on relevant models
-  def default_record_template
-    'accounts/record.html.haml'
-  end
-
-  def self.default_list_template
-    'list.html.haml'
-  end
-
-  def self.default_label_template
-    'label.html.haml'
+  def find_template paper="A4"
+    raise 'you have to implement "def find_template(paper)" on your Model'
+    # 'label.html.haml'
   end
   #
   # def print_label options={}
@@ -94,13 +90,14 @@ class AbstractResource < ActiveRecord::Base
   def print_record(options={})
     params = {}
     params[:context] = options[:context]
+    template = options[:template]
     options = options[:params]
     params[:print_job] = {}
     params[:print_job][:download] = options[:download] || false
     params[:print_job][:print_driver] = options[:print_driver] || :pdf
     params[:print_job][:print_format] = options[:print_format] || 'sheet'
     params[:print_job][:paper] = options[:paper] || "A4"
-    params[:print_job][:view_template_path] = options[:template] || (options[:paper]!="A4" ? self.send("default_#{options[:paper]}_template") : default_record_template)
+    params[:print_job][:view_template_path] = template || self.find_template( options[:paper] )
     params[:printer_name] = options[:printer_name]
     params[:user] = options[:user]
     pj = self.class.print [self], params
@@ -108,12 +105,16 @@ class AbstractResource < ActiveRecord::Base
   #
   def self.print_list(options={})
     params = {}
+    params[:context] = options[:context]
+    template = options[:template]
+    options = options[:params]
     params[:print_job] = {}
     params[:print_job][:download] = options[:download] || false
     params[:print_job][:print_driver] = options[:print_driver] || :pdf
     params[:print_job][:print_format] = options[:print_format] || 'list'
     params[:print_job][:paper] = options[:paper] || "A4"
-    params[:print_job][:view_template_path] = options[:template] || self.default_list_template
+    params[:print_job][:view_template_path] = template || self.find_template( options[:paper] )
+
     params[:printer_name] = options[:printer_name]
     params[:user] = options[:user]
     self.print options[:resources], params

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

@@ -3,26 +3,44 @@
 -# 	.col.s12
 -# 		%h3= yield :title
 
-.row
-	.col.s12
-		%form.form-inline{ action: resources_url( resources, controller: params[:controller]), method: "get"}
-			.form-group.col.s12
-				%label{ for: "q" }
-				%input.search-list.form-control{ style: "width: 100%", type: "text", id: "q", name: "q", placeholder: t('search_placeholder'), value: "#{params[:q] || ''}" }
-				.collection{ style: "border: 0px"}
-					%a.search-list.btn.btn-primary{ type: "submit"}= t('search_button_text')
-					- if resources.respond_to? :total_count
-						%span.blue-grey-text{style: "margin-top: 6px"}
-							= t("#{resources_name}.posts", size: resources.total_count)
-				-#
-				-# = link_to t( resource_class.to_s + '.new'), new_resource_url, class: 'btn btn-success'
+.row{ style: "margin-top: 20px"}
+	.col.s12.m12.l12
+		%form#list-search-form.form-inline{ action: resources_url( resources, controller: params[:controller]), method: "get"}
+			- if resources.respond_to? :total_count
+				%label
+					%span.blue-grey-text{style: "margin-top: 6px"}
+						= t("#{resources_name}.posts", size: resources.total_count)
+				%br
+			%input.search-list.form-control{ style: "width: 75%", type: "text", id: "q", name: "q", placeholder: t("#{params[:controller]}.search_placeholder"), value: "#{params[:q] || ''}" }
+			%a.search-list.btn.btn-primary{ type: "submit"}= t('search_button_text')
+
+			-# .form-group
+			-# 	-# %label{ for: "q" }
+			-# 	%input.search-list.form-control{ type: "text", id: "q", name: "q", placeholder: t("#{params[:controller]}.search_placeholder"), value: "#{params[:q] || ''}" }
+			-# 	.collection{ style: "border: 0px"}
+			-# 		%a.search-list.btn.btn-primary{ type: "submit"}= t('search_button_text')
+			-# 		- if resources.respond_to? :total_count
+			-# 			%span.blue-grey-text{style: "margin-top: 6px"}
+			-# 				= t("#{resources_name}.posts", size: resources.total_count)
 
 .row
 	.col.s12
 		 
 .row
 	.col.s12
-		%table.bordered.responsive-table.striped.hoverable.page.resources_table
+		%table.bordered.responsive-table.striped.hoverable.page.resources_table{ id: "#{resource_name}_table_list"}
 			= render partial: resources_name
 
 = build_fab_button build_fab_options( resource, fab_button_options.merge!( action: params[:action] ))
+
+:coffeescript
+
+	$ ->
+		# console.log 'calling scrollTable ' + $('table.resources_table')[0].id
+		# if App.ps
+		# 	if App.ps.scrollTimeout
+		# 		clearTimeout App.ps.scrollTimeout
+		# 	if App.ps.lastPage > App.ps.nextPage
+		# 		App.shared.callToast 'Der er mere end én side resultater - scroll ned for at se flere!'
+		#
+		# App.ps.scrollTable('table.resources_table')

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

@@ -3,5 +3,6 @@
 		%h3= render partial: 'title'
 - @disabled = true
 = render 'form'
-= build_fab_button build_fab_options( resource, fab_button_options.merge!( action: params[:action] ))
-= render partial: 'show' 
+- unless params[:format] == 'js'
+	= build_fab_button build_fab_options( resource, fab_button_options.merge!( action: params[:action] ))
+= render partial: 'show'

data/lib/abstracted/version.rb

@@ -1,3 +1,3 @@
 module Abstracted
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/exceptions.rb

@@ -57,5 +57,7 @@ module Exceptions
   class ExcludedInstanceAllreadyGoneError < OxenStandardError; end
   class IncludedInstanceAllreadyHereError < OxenStandardError; end
 
+  class MovingFileFailedError < OxenStandardError; end
+
 
 end

data/spec/controllers/abstract_resources_controller_spec.rb

@@ -18,27 +18,166 @@ require 'rails_helper'
 # is no simpler way to get a handle on the object needed for the example.
 # Message expectations are only used when there is no simpler way to specify
 # that an instance is receiving a specific message.
-RSpec.describe "nested requests", :type => :request do
+# RSpec.describe "nested requests", :type => :request do
+#
+#   describe "GET #index" do
+#     it "gets all posts" do
+#       get "/posts"
+#       expect(assigns(:posts)).not_to eq([])
+#     end
+#
+#     it "gets all posts to a user" do
+#       user = User.create(login: 'fisk')
+#       post = Post.create(user: user, title: 'fisk')
+#       get user_posts_path(user_id: user.id)
+#       expect(@controller.parent?).to eq true
+#       expect(@controller.resources_url).to eq "/users/1/posts"
+#       expect(@controller.resources.first).to eq (post)
+#     end
+#
+#   end
+#
+# end
+RSpec.describe "testing resource_url - for nested requests", type: :request do
+  describe "nested other ACTION" do
+    it "/users/1/print" do
+      user = User.create! id: 1, login: "test"
+      get "/users/1/print"
+      expect(@controller.resource_url).to eq("/users/1?ids=[\"1\"]")
+    end
+    it "/users/1/posts/1print" do
+      user = User.create! id: 1, login: "test"
+      post = Post.create! id: 1, user_id: user.id, title: "test"
+      get "/users/1/posts/1/print"
+      expect(@controller.resource_url).to eq("/users/1/posts/1?user_id=1&ids=[\"1\"]")
+    end
+    it "/admin/users/1/posts/1/print" do
+      user = User.create! id: 1, login: "test"
+      post = Post.create! id: 1, user_id: user.id, title: "test"
+      get "/admin/users/1/posts/1/print"
+      expect(@controller.resource_url).to eq("/admin/users/1/posts/1?user_id=1&ids=[\"1\"]")
+    end
+    it "/admin/users/1/edit" do
+      user = User.create! id: 1, login: "test"
+      get "/admin/users/1/edit"
+      expect(@controller.resource_url).to eq("/admin/users/1")
+    end
+  end
+  describe "nested EDIT" do
+    it "/users/1/posts/1/edit" do
+      user = User.create! id: 1, login: "test"
+      post = Post.create! id: 1, user_id: user.id, title: "test"
+      get "/users/1/posts/1/edit"
+      expect(@controller.resource_url).to eq("/users/1/posts/1?user_id=1")
+    end
+    it "/admin/users/1/edit" do
+      user = User.create! id: 1, login: "test"
+      get "/admin/users/1/edit"
+      expect(@controller.resource_url).to eq("/admin/users/1")
+    end
+    it "/users/1/edit" do
+      user = User.create! id: 1, login: "test"
+      get "/users/1/edit"
+      expect(@controller.resource_url).to eq("/users/1")
+    end
+    it "/admin/users/1/edit?q=mx" do
+      user = User.create! id: 1, login: "test"
+      get "/admin/users/1/edit?q=mx"
+      expect(@controller.resource_url).to eq("/admin/users/1?q=mx")
+    end
+  end
+  describe "nested GET" do
+    it "/users/1/posts/1" do
+      user = User.create! id: 1, login: "test"
+      post = Post.create! id: 1, user_id: user.id, title: "test"
+      get "/users/1/posts/1"
+      expect(@controller.resource_url).to eq("/users/1/posts/1?user_id=1")
+    end
+    it "/admin/users/1" do
+      user = User.create! id: 1, login: "test"
+      get "/admin/users/1"
+      expect(@controller.resource_url).to eq("/admin/users/1")
+    end
+    it "/users/1" do
+      user = User.create! id: 1, login: "test"
+      get "/users/1"
+      expect(@controller.resource_url).to eq("/users/1")
+    end
+    it "/admin/users/1?q=mx" do
+      user = User.create! id: 1, login: "test"
+      get "/admin/users/1?q=mx"
+      expect(@controller.resource_url).to eq("/admin/users/1?q=mx")
+    end
+  end
+end
 
-  describe "GET #index" do
-    it "gets all posts" do
-      get "/posts"
-      expect(assigns(:posts)).not_to eq([])
+RSpec.describe "testing resources_url - for nested requests", type: :request do
+  describe "nested EDIT" do
+    it "/users/1/posts/1/edit" do
+      user = User.create! id: 1, login: "test"
+      post = Post.create! id: 1, user_id: user.id, title: "test"
+      get "/users/1/posts/1/edit"
+      expect(@controller.resources_url).to eq("/users/1/posts?user_id=1")
+
+    end
+    it "/admin/users/1/edit" do
+      user = User.create! id: 1, login: "test"
+      get "/admin/users/1/edit"
+      expect(@controller.resources_url).to eq("/admin/users")
     end
+    it "/users/1/edit" do
+      user = User.create! id: 1, login: "test"
+      get "/users/1/edit"
+      expect(@controller.resources_url).to eq("/users")
+    end
+    it "/admin/users/1/edit?q=mx" do
+      user = User.create! id: 1, login: "test"
+      get "/admin/users/1/edit?q=mx"
+      expect(@controller.resources_url).to eq("/admin/users?q=mx")
+    end
+  end
+  describe "nested GET" do
+    it "/users/1/posts" do
+      user = User.create! id: 1, login: "test"
+      get "/users/1/posts"
+      expect(@controller.resources_url).to eq("/users/1/posts?user_id=1&ids=[]&perpage=20&page=1")
 
-    it "gets all posts to a user" do
-      user = User.create(login: 'fisk')
-      post = Post.create(user: user, title: 'fisk')
-      get user_posts_path(user_id: user.id)
-      expect(@controller.parent?).to eq true
-      expect(@controller.resources_url).to eq "/users/1/posts"
-      expect(@controller.resources.first).to eq (post)
     end
+    it "/users/1/posts/1" do
+      user = User.create! id: 1, login: "test"
+      post = Post.create! id: 1, user_id: user.id, title: "test"
+      get "/users/1/posts/1"
+      expect(@controller.resources_url).to eq("/users/1/posts?user_id=1")
 
+    end
+    it "/admin/users" do
+      get "/admin/users"
+      expect(@controller.resources_url).to eq("/admin/users?ids=[]&perpage=20&page=1")
+    end
+    it "/admin/users/1" do
+      user = User.create! id: 1, login: "test"
+      get "/admin/users/1"
+      expect(@controller.resources_url).to eq("/admin/users")
+    end
+    it "/users/1" do
+      user = User.create! id: 1, login: "test"
+      get "/users/1"
+      expect(@controller.resources_url).to eq("/users")
+    end
+    it "/admin/users/1?q=mx" do
+      user = User.create! id: 1, login: "test"
+      get "/admin/users/1?q=mx"
+      expect(@controller.resources_url).to eq("/admin/users?q=mx")
+    end
   end
-
 end
 
+
+# RSpec.describe Admin::UsersController, type: :controller do
+#
+#
+# end
+
 RSpec.describe UsersController, type: :controller do
 
 
@@ -61,178 +200,179 @@ RSpec.describe UsersController, type: :controller do
   # in order to pass any filters (e.g. authentication) defined in
   # UsersController. Be sure to keep this updated too.
   let(:valid_session) { {} }
+  #
+  # describe "GET #index" do
+  #   it "assigns all users as @resources" do
+  #     user = User.create! valid_attributes
+  #     get :index, {}, valid_session
+  #     expect(assigns(:resources)).to eq([user])
+  #   end
+  # end
+  #
+  # describe "GET #show" do
+  #   it "assigns the requested user as @resource" do
+  #     user = User.create! valid_attributes
+  #     get :show, {:id => user.to_param}, valid_session
+  #     expect(assigns(:resource)).to eq(user)
+  #   end
+  # end
+  #
+  #
+  # describe "GET #new" do
+  #   it "assigns a new user as @resource" do
+  #     get :new, {}, valid_session
+  #     expect(assigns(:resource)).to be_a_new(User)
+  #   end
+  # end
+  #
+  # describe "GET #edit" do
+  #   it "assigns the requested user as @resource" do
+  #     user = User.create! valid_attributes
+  #     get :edit, {:id => user.to_param}, valid_session
+  #     expect(assigns(:resource)).to eq(user)
+  #   end
+  # end
+  #
+  # describe "POST #create" do
+  #   context "with valid params" do
+  #     it "creates a new User" do
+  #       expect {
+  #         post :create, {:user => valid_attributes}, valid_session
+  #       }.to change(User, :count).by(1)
+  #     end
+  #
+  #     it "assigns a newly created user as @resource" do
+  #       post :create, {:user => valid_attributes}, valid_session
+  #       expect(assigns(:resource)).to be_a(User)
+  #       expect(assigns(:resource)).to be_persisted
+  #     end
+  #
+  #     it "redirects to the list of users, as @resources" do
+  #       post :create, {:user => valid_attributes}, valid_session
+  #       expect(response).to redirect_to(users_url)
+  #     end
+  #   end
+  #
+  #   # with Rails 4.x strong_parameters and Responders, forms with invalid attributes
+  #   # will silently fail - thus depriving haxors any idea of the issues
+  #   #
+  #   # context "with invalid params" do
+  #   #   it "assigns a newly created but unsaved user as @user" do
+  #   #     post :create, {:user => invalid_attributes}, valid_session
+  #   #     expect(assigns(:resource)).to be_a_new(User)
+  #   #   end
+  #   #
+  #   #   it "re-renders the 'new' template" do
+  #   #     post :create, {:user => invalid_attributes}, valid_session
+  #   #     expect(response).to render_template("new")
+  #   #   end
+  #   # end
+  # end
+  #
+  # describe "PUT #update" do
+  #   context "with valid params" do
+  #     let(:new_attributes) {
+  #       { login: 'mil'}
+  #     }
+  #
+  #     it "updates the requested @resource" do
+  #       user = User.create! valid_attributes
+  #       put :update, {:id => user.to_param, :user => new_attributes}, valid_session
+  #       user.reload
+  #       expect(user.login).to eq('mil')
+  #     end
+  #
+  #     it "assigns the requested user as @resource" do
+  #       user = User.create! valid_attributes
+  #       put :update, {:id => user.to_param, :user => valid_attributes}, valid_session
+  #       expect(assigns(:resource)).to eq(user)
+  #     end
+  #
+  #     it "redirects to list of users" do
+  #       user = User.create! valid_attributes
+  #       put :update, {:id => user.to_param, :user => valid_attributes}, valid_session
+  #       expect(response).to redirect_to(users_url)
+  #     end
+  #   end
+  #
+  #   # with Rails 4.x strong_parameters and Responders, forms with invalid attributes
+  #   # will silently fail - thus depriving haxors any idea of the issues
+  #   #
+  #   context "with invalid params" do
+  #     it "assigns the user as @resource" do
+  #       user = User.create! valid_attributes
+  #       put :update, {:id => user.to_param, :user => invalid_attributes}, valid_session
+  #       expect(assigns(:resource)).to eq(user)
+  #     end
+  #   #
+  #   #   it "re-renders the 'edit' template" do
+  #   #     user = User.create! valid_attributes
+  #   #     put :update, {:id => user.to_param, :user => invalid_attributes}, valid_session
+  #   #     expect(response).to render_template("edit")
+  #   #   end
+  #   end
+  # end
+  #
+  # describe "DELETE #destroy" do
+  #   it "destroys the requested user" do
+  #     user = User.create! valid_attributes
+  #     expect {
+  #       delete :destroy, {:id => user.to_param}, valid_session
+  #     }.to change(User, :count).by(-1)
+  #   end
+  #
+  #   it "redirects to the users list" do
+  #     user = User.create! valid_attributes
+  #     delete :destroy, {:id => user.to_param}, valid_session
+  #     expect(response).to redirect_to(users_url)
+  #   end
+  # end
 
-  describe "GET #index" do
-    it "assigns all users as @resources" do
-      user = User.create! valid_attributes
-      get :index, {}, valid_session
-      expect(assigns(:resources)).to eq([user])
-    end
-  end
-
-  describe "GET #show" do
-    it "assigns the requested user as @resource" do
-      user = User.create! valid_attributes
-      get :show, {:id => user.to_param}, valid_session
-      expect(assigns(:resource)).to eq(user)
-    end
-  end
-
-
-  describe "GET #new" do
-    it "assigns a new user as @resource" do
-      get :new, {}, valid_session
-      expect(assigns(:resource)).to be_a_new(User)
-    end
-  end
-
-  describe "GET #edit" do
-    it "assigns the requested user as @resource" do
-      user = User.create! valid_attributes
-      get :edit, {:id => user.to_param}, valid_session
-      expect(assigns(:resource)).to eq(user)
-    end
-  end
-
-  describe "POST #create" do
-    context "with valid params" do
-      it "creates a new User" do
-        expect {
-          post :create, {:user => valid_attributes}, valid_session
-        }.to change(User, :count).by(1)
-      end
 
-      it "assigns a newly created user as @resource" do
-        post :create, {:user => valid_attributes}, valid_session
-        expect(assigns(:resource)).to be_a(User)
-        expect(assigns(:resource)).to be_persisted
-      end
+  describe "inherited methods to verify resources, classes and names"  do
 
-      it "redirects to the list of users, as @resources" do
-        post :create, {:user => valid_attributes}, valid_session
-        expect(response).to redirect_to(users_url)
-      end
-    end
 
-    # with Rails 4.x strong_parameters and Responders, forms with invalid attributes
-    # will silently fail - thus depriving haxors any idea of the issues
+    # it "any action should respond to parent?" do
+    #   get :index
+    #   expect(@controller.parent?).to eq(false)
+    # end
     #
-    # context "with invalid params" do
-    #   it "assigns a newly created but unsaved user as @user" do
-    #     post :create, {:user => invalid_attributes}, valid_session
-    #     expect(assigns(:resource)).to be_a_new(User)
-    #   end
+    # it "any action should respond to resource" do
+    #   get :new
+    #   expect(@controller.resource).not_to eq(nil)
+    # end
     #
-    #   it "re-renders the 'new' template" do
-    #     post :create, {:user => invalid_attributes}, valid_session
-    #     expect(response).to render_template("new")
-    #   end
+    # it "index action should respond to resources" do
+    #   get :index
+    #   expect(@controller.resources).not_to eq(nil)
     # end
-  end
-
-  describe "PUT #update" do
-    context "with valid params" do
-      let(:new_attributes) {
-        { login: 'mil'}
-      }
-
-      it "updates the requested @resource" do
-        user = User.create! valid_attributes
-        put :update, {:id => user.to_param, :user => new_attributes}, valid_session
-        user.reload
-        expect(user.login).to eq('mil')
-      end
-
-      it "assigns the requested user as @resource" do
-        user = User.create! valid_attributes
-        put :update, {:id => user.to_param, :user => valid_attributes}, valid_session
-        expect(assigns(:resource)).to eq(user)
-      end
-
-      it "redirects to list of users" do
-        user = User.create! valid_attributes
-        put :update, {:id => user.to_param, :user => valid_attributes}, valid_session
-        expect(response).to redirect_to(users_url)
-      end
-    end
-
-    # with Rails 4.x strong_parameters and Responders, forms with invalid attributes
-    # will silently fail - thus depriving haxors any idea of the issues
     #
-    context "with invalid params" do
-      it "assigns the user as @resource" do
-        user = User.create! valid_attributes
-        put :update, {:id => user.to_param, :user => invalid_attributes}, valid_session
-        expect(assigns(:resource)).to eq(user)
-      end
+    # it "any action should respond to resource_class" do
+    #   get :new
+    #   expect(@controller.resource_class).to eq(User)
+    # end
     #
-    #   it "re-renders the 'edit' template" do
-    #     user = User.create! valid_attributes
-    #     put :update, {:id => user.to_param, :user => invalid_attributes}, valid_session
-    #     expect(response).to render_template("edit")
-    #   end
-    end
-  end
-
-  describe "DELETE #destroy" do
-    it "destroys the requested user" do
-      user = User.create! valid_attributes
-      expect {
-        delete :destroy, {:id => user.to_param}, valid_session
-      }.to change(User, :count).by(-1)
-    end
-
-    it "redirects to the users list" do
-      user = User.create! valid_attributes
-      delete :destroy, {:id => user.to_param}, valid_session
-      expect(response).to redirect_to(users_url)
-    end
-  end
-
-
-  describe "inherited methods to verify resources, classes and names"  do
-
-    it "any action should respond to parent?" do
-      get :index
-      expect(@controller.parent?).to eq(false)
-    end
-
-    it "any action should respond to resource" do
-      get :new
-      expect(@controller.resource).not_to eq(nil)
-    end
-
-    it "index action should respond to resources" do
-      get :index
-      expect(@controller.resources).not_to eq(nil)
-    end
-
-    it "any action should respond to resource_class" do
-      get :new
-      expect(@controller.resource_class).to eq(User)
-    end
-
-    it "any action should respond to resource_name" do
-      get :new
-      expect(@controller.resource_name).to eq('users')
-    end
-
-    it "any action should respond to parent_class" do
-      get :new
-      expect(@controller.parent_class).to eq(NilClass)
-    end
-
-    it "should return a url on the resource" do
-      user = User.create! valid_attributes
-      response = get :show, {:id => user.to_param, murky: '2'}, valid_session
-      expect(@controller.resource_url).to eq "/users/#{user.id}?murky=2"
-    end
-
-    it "should return a url on the resources" do
-      user = User.create! valid_attributes
-      get :index, {:id => user.to_param}, valid_session
-      expect(@controller.resources_url).to eq "/users"
-    end
+    # it "any action should respond to resource_name" do
+    #   get :new
+    #   expect(@controller.resource_name).to eq('users')
+    # end
+    #
+    # it "any action should respond to parent_class" do
+    #   get :new
+    #   expect(@controller.parent_class).to eq(NilClass)
+    # end
+    #
+    # it "should return a url on the resource" do
+    #   user = User.create! valid_attributes
+    #   response = get :show, {:id => user.to_param, murky: '2'}, valid_session
+    #   expect(@controller.resource_url).to eq "/users/#{user.id}?murky=2"
+    # end
+    #
+    # it "should return a url on the resources" do
+    #   user = User.create! valid_attributes
+    #   get :index, {:id => user.to_param}, valid_session
+    #   expect(@controller.resources_url).to eq "/users"
+    # end
 
   end