resourcify 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9fdba8888dc484edfca49f3cf1b66efe1b25a65
-  data.tar.gz: f4e8ddcb1e5fdd383406f262ef39fd80f84445c6
+  metadata.gz: cd846f2eb7e3ed0e419e5ebe8f4b772c57dd1ae7
+  data.tar.gz: 9d1e197f470244f5f60c39a78b116236a487a7e6
 SHA512:
-  metadata.gz: 2c1c8cb94ebb2c13afcf86bb02f56b7ff7c7e288a077ad38e850175ba76f26aa62548763ae2da538d1483b12759be1ca671980d122a7eb3705bd26273b764a41
-  data.tar.gz: 1e87d2cbf8051934f92d016b042aa3ddacc63860bc52a931100546e5d7f9b35b24abf20c8c3d6124ca24d7d0da331433bc4e5a237a33607259ea2dd7ee2053f9
+  metadata.gz: 8bb1ff9385382650f9fcd1042129d8dda4f5e436e80d95c5d37ecd9e1adb27a881f661bb1ef81d090038af23c810643252fa8b6b997dc854c49350b773e1b3e8
+  data.tar.gz: afb5c6b95b7761a51d8436601f54f48e21fa8a7a2660c271305caf6b1d597ce65901a417f6060c48df3be0d88ed3d223730eee2d61786ae5f58668956155058c

data/README.md

@@ -12,7 +12,7 @@ The resourcify gem currently depends on [Pundit](https://github.com/elabs/pundit
 Include the gem in your Gemfile:
 
 ```ruby
-gem 'resourcify'
+gem 'resourcify', '0.1.4'
 ```
 
 ## Usage
@@ -31,6 +31,14 @@ class PostsController < ApplicationController
   # Include the resourcify module
   resourcify
   
+end
+```
+```ruby
+class PostsController < ApplicationController
+  # Include the resourcify module with preferred actions as an array
+  # Valid actions are: :index, :create, :show, :udpate, :destroy
+  resourcify actions: [:index, :show]
+  
 end
 ```
 

data/lib/resourcify/controller/actions/index.rb

@@ -2,14 +2,16 @@ module Controller::Actions
   module Index
     def index
       authorize _RC.new
-
-      @records = policy_scope(_RC.includes(belongs_tos))
+      
+      @records = _RC.includes(belongs_tos)
 
       # apply filter_by if present
       if @records.respond_to? "filter_by"
         @records = @records.filter_by(params.except(:controller, :action, :page, :size))
       end
 
+      @records = policy_scope(@records)
+      
       response.headers['_meta_total'] = @records.count.to_s
 
       page = params[:page] || 1

data/lib/resourcify/controller/base.rb

@@ -17,7 +17,7 @@ module Controller
         @error[:type]    = 'RecordNotFound'
         @error[:message] = 'Sorry, the record was not found.'
         
-        render json: @error
+        render json: @error, status: 404
       end
    
       def user_not_authorized

data/lib/resourcify/model/filter_by.rb

@@ -2,32 +2,62 @@ module Model
   module FilterBy
     def filter_by(filters = {})
       records = self
-      column_names = self.column_names
-      simple_ops = { eq: '=', lt: '<', gt: '>', lte: '<=', gte: '>=' }
-      filters.select { |e| column_names.include?(e.split('.').first) }.each do |key, value|
-        next if value.blank?
-        
-        field, operator = key.split('.')
-        operator = (operator)? operator.to_sym : :eq
+      columns_hash = self.columns_hash
 
-        if simple_ops[operator]
-          records = records.where("#{field} #{simple_ops[operator]} ?", value)
-        elsif operator == :ne
-          records = records.where.not("#{field} = ?", value)
-        elsif operator == :in
-          records = records.where("#{field} IN (?)", value.split(','))
-        elsif operator == :nin
-          records = records.where.not("#{field} IN (?)", value.split(','))
-        elsif operator == :like
-          if ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
-            records = records.where("#{field} ILIKE ?", "%#{value}%")
-          else
-            records = records.where("#{field} LIKE ?", "%#{value}%")
-          end
+      def sanitize_value(field, value)
+        field_type = columns_hash[field].type
+        if field_type == :datetime || field_type == :date
+          value = Time.parse(value).to_s(:db)
+        end
+        value
+      end
+      
+      def query_params(q)
+        ops = { eq: '=', lt: '<', gt: '>', lte: '<=', gte: '>=', ne: '!='}
+        field, op, value = q[:name], (q[:op] || 'eq').to_sym, q[:value]
+
+        if ops[op]
+          ["#{field} #{ops[op]} ?", sanitize_value(field, value)]
+        elsif op == :in
+          vals = value.split(',')
+          vals = vals.map { |e| sanitize_value(field, e) }
+          ["#{field} IN (?)", vals]
+        elsif op == :nin
+          vals = value.split(',')
+          vals = vals.map { |e| sanitize_value(field, e) }
+          ["#{field} NOT IN (?)", vals]
+        elsif op == :between
+          vals = value.split('||')
+          query_string = '(' + vals.map { |e| "(#{field} >= ? AND #{field} <= ?)" }.join(' OR ') + ')'
+          vals = vals.map { |e| e.split('|') }.flatten
+          vals = vals.map { |e| sanitize_value(field, e) }
+          vals.unshift(query_string)
+          vals
+        elsif op == :like
+          like_key = (ActiveRecord::Base.connection.adapter_name == "PostgreSQL")? 'ILIKE' : 'LIKE'
+          vals = value.split('|').map { |val| "%#{val}%" }
+          query_string = '(' + vals.map { |e| "#{field} #{like_key} ?" }.join(' OR ') + ')'
+          vals.unshift(query_string)
+          vals
         else
-          records = records.where("#{field} = ?", value)
+          ["#{field} = ?", sanitize_value(field, value)]
         end
       end
+
+      filters.map do |key, value|
+        name, op = key.to_s.split('.')
+        { name: name, op: op, value: value }
+      end.group_by do |q|
+        q[:name]
+      end.select do |key|
+        columns_hash.include? key
+      end.map do |key, value|
+        qparams = value.map { |e| query_params(e) }
+        qstring = qparams.map { |e| e.first }.join(' OR ')
+        qparams.map { |e| e[1..-1] }.flatten(1).unshift(qstring)
+      end.each do |qparam|
+        records = records.where(*qparam)
+      end
       
       records
     end

data/lib/resourcify/version.rb

@@ -1,3 +1,3 @@
 module Resourcify
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resourcify
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Stephen Baidu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,7 +124,8 @@ files:
 - test/resourcify_test.rb
 - test/test_helper.rb
 homepage: https://github.com/stephenbaidu/resourcify
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []