standardapi 5.0.0.10 → 5.0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11bb8361f273e8435fece56039550dd3b81e0354
-  data.tar.gz: bc79398e3dff4a6bee4f06b2aa2a778c725e4eed
+  metadata.gz: 7e4bd9a29e2b2aca1714dacb7fb88b4a3b68aa0a
+  data.tar.gz: 696774eaffe23e7a31c2b05fe2c4b8d05aceacbe
 SHA512:
-  metadata.gz: 10d26d53f1f7e04bd783b54c50e9479420bc91eefba5695418f085da96b10edc14396a11f9062f44eea56c6d284fee90d633e373d504683c399de1c479f753b5
-  data.tar.gz: e3ef82a580eb62192b229e997ab0af4f35a133ec6f78e558c49658edc77f33f144cf0576479664885d7e083d9f4b8c6217fd2ebc0c09b875803d02a0798bf798
+  metadata.gz: b06a888614e9e71a8fe72f2f999da46c639e7f22f306285bdf8ef48ea3031bf6604de46e0a64ba3a6a912f5eaf223314cacf48317ce96415283bd2234a6aa3c9
+  data.tar.gz: 3b4922dbe3dfa8cc26ab3a2566f87a81e1291e9b49ef68b2040344cc2753047e768f70e2799f2ca4ba5b9f8bd216fa17facfb6d4ac569aedb093c3c541d554c7

data/lib/standard_api/controller.rb

@@ -164,11 +164,7 @@ module StandardAPI
     end
     
     def required_orders
-      if model.column_names.include?('id')
-        [:id]
-      else
-        []
-      end
+      []
     end
 
     def orders

data/lib/standard_api/test_case/create_tests.rb

@@ -24,9 +24,9 @@ module StandardAPI
           view_attributes(m.reload).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
             message = "Model / Attribute: #{m.class.name}##{key}"
             if value.is_a?(BigDecimal)
-              assert_equal normalize_to_json(m, key, attrs[key.to_sym]).to_s.to_f, json[key.to_s].to_s.to_f, message
+              assert_equal_or_nil normalize_to_json(m, key, attrs[key.to_sym]).to_s.to_f, json[key.to_s].to_s.to_f, message
             else
-              assert_equal normalize_to_json(m, key, attrs[key.to_sym]), json[key.to_s], message
+              assert_equal_or_nil normalize_to_json(m, key, attrs[key.to_sym]), json[key.to_s], message
             end
           end
         end
@@ -53,7 +53,7 @@ module StandardAPI
           m.reload
           view_attributes(m).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
             message = "Model / Attribute: #{m.class.name}##{key}"
-            assert_equal normalize_attribute(m, key, attrs[key.to_sym]), value, message
+            assert_equal_or_nil normalize_attribute(m, key, attrs[key.to_sym]), value, message
           end
         end
       end

data/lib/standard_api/test_case/update_tests.rb

@@ -19,9 +19,9 @@ module StandardAPI
         view_attributes(m.reload).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
           message = "Model / Attribute: #{m.class.name}##{key}"
           if value.is_a?(BigDecimal)
-            assert_equal normalize_attribute(m, key, attrs[key.to_sym]).to_s.to_f, value.to_s.to_f, message
+            assert_equal_or_nil normalize_attribute(m, key, attrs[key.to_sym]).to_s.to_f, value.to_s.to_f, message
           else
-            assert_equal normalize_attribute(m, key, attrs[key.to_sym]), value, message
+            assert_equal_or_nil normalize_attribute(m, key, attrs[key.to_sym]), value, message
           end
         end
         assert JSON.parse(@response.body).is_a?(Hash)
@@ -58,7 +58,7 @@ module StandardAPI
         # (m.attribute_names & attrs.keys.map(&:to_s)).each do |test_key|
         view_attributes(m.reload).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
           message = "Model / Attribute: #{m.class.name}##{key}"
-          assert_equal normalize_attribute(m, key, attrs[key.to_sym]), value, message
+          assert_equal_or_nil normalize_attribute(m, key, attrs[key.to_sym]), value, message
         end
         assert JSON.parse(@response.body).is_a?(Hash)
       end

data/lib/standard_api/test_case.rb

@@ -10,6 +10,14 @@ require File.expand_path(File.join(__FILE__, '../test_case/show_tests'))
 require File.expand_path(File.join(__FILE__, '../test_case/update_tests'))
 
 module StandardAPI::TestCase
+
+  def assert_equal_or_nil(expected, *args)
+    if expected.nil?
+      assert_nil(*args)
+    else
+      assert_equal(expected, *args)
+    end
+  end
       
   def self.included(klass)
     [:filters, :orders, :includes].each do |attribute|

data/lib/standard_api/version.rb

@@ -1,3 +1,3 @@
 module StandardAPI
-  VERSION = '5.0.0.10'
-end
+  VERSION = '5.0.0.12'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 5.0.0.10
+  version: 5.0.0.12
 platform: ruby
 authors:
 - James Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails