abstracted 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d62ef34e6eda7534a240438d48bcec809a1224c
-  data.tar.gz: ef8bce56fb10fb85cea1d6fe9306b24bb61ed455
+  metadata.gz: cf6732f8f5b0d977b55623928fd4c597835d84b2
+  data.tar.gz: cb180722ccb44e23296b3f67eb0fc8e6f7d6871a
 SHA512:
-  metadata.gz: 10fc887a95b21ed69df1917c2b4c0069629c6338aac5c9139f661073de582c6a61c9d66d0498e5af30b6edffff2610033dc595e42283e3bf027a145d0f93357f
-  data.tar.gz: 57599f9c9a0eb24561c980c656b9aec3a700112cfb3ff2e08c7ada46fbc3252bb273a9f9d00fd069748cb846676b4b0ab79fd232afe4c1e68ce22d833eb7de1e
+  metadata.gz: 4f255f1c62b45a3ebf1089d23aaf53d977c8216930b017737140a7965539f040db7f821aa030dab57efc336f8aac7fa4978e19e83cf32762b49b1891bc38c69d
+  data.tar.gz: d6c6aae54640fd64f6b4a15514b02390e7c10c091fec8dfb56a830ea4264f51cf86b1d767eecf8572bb8bf4199e72d29c285fc347b34313bc012e9c010eebbef

data/app/controllers/abstract_resources_controller.rb

@@ -7,11 +7,12 @@ class AbstractResourcesController < ApplicationController
   self.responder = ::AbstractedResponder
   respond_to :html, :xml, :js, :json
 
+  before_action :authenticate_user!
+
   include PrintControl
   include ResourceControl
   include ParentControl
 
-  before_filter :authenticate_user!
   before_action :set_fab_button_options
   before_action :set_variant_template
   after_action :verify_authorized

data/app/controllers/concerns/print_control.rb

@@ -107,8 +107,9 @@ module PrintControl
   def display_print_result
     params[:print][:output_type] ||= 'html'
     case params[:print][:output_type].downcase
-    when 'html'; render params[:print][:view_template_path], layout: 'print'
-    when 'pdf'; render action: :new, status: :unprocessable_entity
+      # when 'html'; render params[:print][:view_template_path], layout: 'print'
+    when 'html';  render "stock_items/print/_stock_items_list", layout: 'print'
+      when 'pdf';   render action: :new, status: :unprocessable_entity
     end
   end
 

data/app/controllers/concerns/resource_control.rb

@@ -107,7 +107,7 @@ module ResourceControl
   def resources_url options={}
     r=request.path
     options = case params[:action]
-      when 'create','update','delete','destroy'; ""
+      when 'create','update','delete','destroy'; {}
       else resource_options(options)
     end
     return "%s%s" % [r,options] if r.match "#{resource.class.to_s.tableize}$"
@@ -134,6 +134,10 @@ module ResourceControl
     else
       # search
       r = _search options
+
+      # filter
+      r = _filter r, options
+
       # sort
       r = _sort r, options
 
@@ -155,6 +159,15 @@ module ResourceControl
     end
   end
 
+  #
+  # filter - it at all
+  #
+  def _filter r, options
+    return r if params[:f].blank?
+    return resource_class.filter r, params[:f], options if resource_class.respond_to? :filter
+    r
+  end
+
   #
   # sort - it at all
   #

data/app/helpers/abstract_resources_helper.rb

@@ -123,6 +123,7 @@ module AbstractResourcesHelper
     #
     # lnk = parent? ? (parent_url + "/#{resource_name}") : "/#{resource_name}"
     # lnk += options.empty? ? "" : "?" + options.collect{ |k,v| "#{k}=#{v}" }.join("&")
+    options = resources if resources.class == Hash 
     opt = {}
     opt.merge!(options) if options.class==Hash
     opt[:controller] ||= resource_class.table_name

data/app/models/abstract_resource.rb

@@ -36,6 +36,56 @@ class AbstractResource < ActiveRecord::Base
     lot.where id: population
   end
 
+
+    #
+    # filter the lot on filter
+    #
+    # filter => { updated_at: [ '<', '11-11-2011'], material: { eq: 'alu%'}}
+    #
+    def self.filter(lot, filter, options={})
+      filter.clone.each do |fld,v|
+        if v.is_a? Array
+          k = v.shift
+          lot = filter_proc lot, fld, k, v
+        elsif v.is_a? Hash
+          v.each do |k,val|
+            lot = filter_proc lot, fld, k, val
+          end
+        elsif v.is_a? String
+          lot = lot.where( "? = ?", fld, v )
+        else
+          raise "filter valueset '#{v}' not recognised?!"
+        end
+      end
+      lot
+    end
+
+    def self.filter_proc lot, fld, k, v
+      tbl = self.arel_table
+      case k.to_sym
+      when :lt, :lteq, :eq, :gteq, :gt, :matches
+        raise "Exactly one value allowed in filter [lt|eq|gt][|eq]!" if [v].flatten.size > 1
+        lot = lot.where tbl[fld].send k.to_sym, [v].flatten.shift
+      when :not_eq_any, :not_eq_all, :eq_any, :eq_all, :gteq_any, :gteq_all, :gt_any, :gt_all, :lt_any, :lt_all, :lteq_any, :lteq_all
+        raise "At least one value required in filter [|not][lt|eq|gt][_any|_all]!" if [v].flatten.size < 1
+        lot = lot.where tbl[fld].send k, [v].flatten
+      when :between, :not_between
+        raise "Exactly two values allowed in filter [not_]between!" if [v].flatten.size != 2
+        lot = lot.where tbl[fld].send k, [v].flatten
+      when :in, :in_any, :in_all, :not_in, :not_in_any, :not_in_all
+        lot = lot.where tbl[fld].send k, [v].flatten
+      when :matches_any, :matches_all, :does_not_match, :does_not_match_any, :does_not_match_all
+        lot = lot.where tbl[fld].send k, [v].flatten
+      when :matches_regexp, :does_not_match_regexp
+        raise "filter [does_not_]match[es]_regexp is not supported"
+      when :when, :concat
+        raise "filter [when|concat] is not supported"
+      else
+        raise "filter key '#{k}' not recognised?!"
+      end
+      lot
+    end
+
   # depreciated ------------ 12/3/2016
   #
   # ancestry related methods - find them on AncestryAbstractResource

data/lib/abstracted/version.rb

@@ -1,3 +1,3 @@
 module Abstracted
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstracted
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Walther H Diechmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails