standardapi 5.0.0.14 → 5.0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4095b09787b11d959aa9b8fa93b622c00a4ea17
-  data.tar.gz: 52d6e190c82940c32497ddf56faadea89d726bd4
+  metadata.gz: 33ac07bfd36c0394f555e511042e85e56ce2efe7
+  data.tar.gz: 692696c513d7c666c4f14cf4ead1dc4d7613dbb6
 SHA512:
-  metadata.gz: e0bf2507e1cde35d75cf02ba964dbe46b67e7d203dec4e2ec057d1361f378112dd5bbf2b3c4e68b76f565680ecdf80c62bf96e014ae6839b30a4d00c253a2cea
-  data.tar.gz: c0b9fcad3f525a0495df22d05f1d81e8112497cc67da4bc8ac7f0f8c40d228811d80940678a86753c2ffbefa77a3d82cbc19f6a60058c2c42f8bcfe3891666fd
+  metadata.gz: e1adac840d149b4b69705cde887df45f70a7bc79e133a1078b0627a3ecb90618daeaaac13a4d11e6df5c289d68d56ed13d448f7cf5f9ba5bf2202c9e91befc1d
+  data.tar.gz: c4356b1cab6d8c995b84661a6cf223398f596eccc05cf07b00f03f22f62703c50e96072f9705a4df901e2429b80be0f39af20be9563e472e7cdfedb9cb15a3ef

data/lib/standard_api/test_case.rb

@@ -1,4 +1,6 @@
 require 'active_support/test_case'
+require 'rails-controller-testing'
+Rails::Controller::Testing.install
 
 require File.expand_path(File.join(__FILE__, '../test_case/calculate_tests'))
 require File.expand_path(File.join(__FILE__, '../test_case/create_tests'))
@@ -152,41 +154,37 @@ module StandardAPI::TestCase
     end
 
     def include_filter_tests
-      model.instance_variable_get('@filters').each do |filter|
-        next if filter[1].is_a?(Proc) # Custom filter
-        next if model.reflect_on_association(filter[0]) # TODO: Relation Filter Tests
-        next if !model.respond_to?(filter[0])
-
-        define_method("test_model_filter_#{filter[0]}") do
+      model.attribute_names.each do |filter|
+        define_method("test_model_filter_#{filter}") do
           m = create_model
-          value = m.send(filter[0])
+          value = m.send(filter)
 
           assert_predicate = -> (predicate) {
-            get :index, params: {where: predicate}, format: 'json'
+            get "/#{controller_class.controller_path}.json", params: { where: predicate, format: 'json' }
             assert_equal model.filter(predicate).order('id ASC').to_sql, assigns(plural_name).to_sql
           }
 
           # TODO: Test array
-          case model.columns_hash[filter[0].to_s].type
+          case model.columns_hash[filter.to_s].type
           when :jsonb, :json # JSON
-            assert_predicate.call({ filter[0] => value })
+            assert_predicate.call({ filter => value })
           else
             case value
             when Array
-              assert_predicate.call({ filter[0] => value }) # Overlaps
-              assert_predicate.call({ filter[0] => value[0] }) # Contains
+              assert_predicate.call({ filter => value }) # Overlaps
+              assert_predicate.call({ filter => value[0] }) # Contains
             else
-              assert_predicate.call({ filter[0] => value }) # Equality
-              assert_predicate.call({ filter[0] => { gt: value } }) # Greater Than
-              assert_predicate.call({ filter[0] => { greater_than: value } })
-              assert_predicate.call({ filter[0] => { lt: value } }) # Less Than
-              assert_predicate.call({ filter[0] => { less_than: value } })
-              assert_predicate.call({ filter[0] => { gte: value } }) # Greater Than or Equal To
-              assert_predicate.call({ filter[0] => { gteq: value } })
-              assert_predicate.call({ filter[0] => { greater_than_or_equal_to: value } })
-              assert_predicate.call({ filter[0] => { lte: value } }) # Less Than or Equal To
-              assert_predicate.call({ filter[0] => { lteq: value } })
-              assert_predicate.call({ filter[0] => { less_than_or_equal_to: value } })
+              assert_predicate.call({ filter => value }) # Equality
+              assert_predicate.call({ filter => { gt: value } }) # Greater Than
+              assert_predicate.call({ filter => { greater_than: value } })
+              assert_predicate.call({ filter => { lt: value } }) # Less Than
+              assert_predicate.call({ filter => { less_than: value } })
+              assert_predicate.call({ filter => { gte: value } }) # Greater Than or Equal To
+              assert_predicate.call({ filter => { gteq: value } })
+              assert_predicate.call({ filter => { greater_than_or_equal_to: value } })
+              assert_predicate.call({ filter => { lte: value } }) # Less Than or Equal To
+              assert_predicate.call({ filter => { lteq: value } })
+              assert_predicate.call({ filter => { less_than_or_equal_to: value } })
             end
           end
         end

data/lib/standard_api/version.rb

@@ -1,3 +1,3 @@
 module StandardAPI
-  VERSION = '5.0.0.14'
+  VERSION = '5.0.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 5.0.0.14
+  version: 5.0.0.15
 platform: ruby
 authors:
 - James Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails