standardapi 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bae8ab8cb0e9504d2a04105b232912be7d2e800d
-  data.tar.gz: 0685d8c1c8cde8f423bc29b20443226297090814
+  metadata.gz: f892bfaae15d0e0561eedcf89269ff98d18f2044
+  data.tar.gz: c9e734b482f12719dae0b6da8d384aadf64ac02c
 SHA512:
-  metadata.gz: 3c677a3aea24f4d7f1409fd149571954a705bdc50d163131be72fe27602c85d9554498b194ad0c4635fdeb55d1b9fb91c87d96edc166630eb608f808c8827053
-  data.tar.gz: 0bf6e349cd22b92126e6d0fc15057299b36ad296349618496755bce7d1c1ff09a2f8269eba65d93781ecff74d752556c317b2b18f294706e04fd936f19ecf471
+  metadata.gz: 3c749360b6a4ceb688dbb0914bccf1c0d4680304a682e1fd57bd7a221552a8731ae3c93fd5f15de2ea6f4f46ae0c1101cc8ca652392553d795799e1f9d873061
+  data.tar.gz: 548a8a618e9769b88ba0bab84e921ab0fdd4e36a8c04b3f7cc8958f1927c3e689c29b512f6398402e247363ed4b5090e4c5a7840ef9282c794516ae0d8541e68

data/README.md

@@ -15,7 +15,7 @@ API access to, or in the ApplicationController, giving all inherited controller
 access.
 
     class ApplicationController < ActiveController::Base
-        include StandardAPI
+        include StandardAPI::Controller
 
     end
 

data/lib/standard_api/test_case/create_tests.rb

@@ -79,10 +79,20 @@ module StandardAPI
                 end
               else
                 m = assigns(:record).send(included).first.try(:reload)
+
+                m_json = if m && m.has_attribute?(:id)
+                  json[included.to_s].find { |x| x['id'] == normalize_to_json(m, :id, m.id) }
+                elsif m
+                  json[included.to_s].find { |x| x.keys.all? { |key| x[key] == normalize_to_json(m, key, m[key]) } }
+                else
+                  nil
+                end
+
                 view_attributes(m).each do |key, value|
                   message = "Model / Attribute: #{m.class.name}##{key}"
-                  assert_equal normalize_to_json(m, key, value), json[included.to_s][0][key.to_s], message
+                  assert_equal m_json[key.to_s], normalize_to_json(m, key, value)
                 end
+
               end
             end
           end

data/lib/standard_api/test_case/index_tests.rb

@@ -56,10 +56,20 @@ module StandardAPI
               end
             else
               m = assigns(:records).first.send(included).first.try(:reload)
+
+              m_json = if m && m.has_attribute?(:id)
+                json[included.to_s].find { |x| x['id'] == normalize_to_json(m, :id, m.id) }
+              elsif m
+                json[included.to_s].find { |x| x.keys.all? { |key| x[key] == normalize_to_json(m, key, m[key]) } }
+              else
+                nil
+              end
+
               view_attributes(m).each do |key, value|
                 message = "Model / Attribute: #{m.class.name}##{key}"
-                assert_equal json[included.to_s][0][key.to_s], normalize_to_json(m, key, value), message
+                assert_equal m_json[key.to_s], normalize_to_json(m, key, value)
               end
+
             end
           end
         end

data/lib/standard_api/test_case/show_tests.rb

@@ -30,10 +30,20 @@ module StandardAPI
             end
           else
             m = assigns(:record).send(included).first.try(:reload)
+            
+            m_json = if m && m.has_attribute?(:id)
+              json[included.to_s].find { |x| x['id'] == normalize_to_json(m, :id, m.id) }
+            elsif m
+              json[included.to_s].find { |x| x.keys.all? { |key| x[key] == normalize_to_json(m, key, m[key]) } }
+            else
+              nil
+            end
+
             view_attributes(m).each do |key, value|
               message = "Model / Attribute: #{m.class.name}##{key}"
-              assert_equal normalize_to_json(m, key, value), json[included.to_s][0][key.to_s], message
+              assert_equal m_json[key.to_s], normalize_to_json(m, key, value)
             end
+            
           end
         end
       end

data/lib/standard_api/test_case/update_tests.rb

@@ -65,10 +65,19 @@ module StandardAPI
               end
             else
               m = assigns(:record).send(included).first.try(:reload)
+              m_json = if m && m.has_attribute?(:id)
+                json[included.to_s].find { |x| x['id'] == normalize_to_json(m, :id, m.id) }
+              elsif m
+                json[included.to_s].find { |x| x.keys.all? { |key| x[key] == normalize_to_json(m, key, m[key]) } }
+              else
+                nil
+              end
+
               view_attributes(m).each do |key, value|
                 message = "Model / Attribute: #{m.class.name}##{key}"
-                assert_equal normalize_to_json(assigns(:record), key, value), json[included.to_s][0][key.to_s], message
+                assert_equal m_json[key.to_s], normalize_to_json(m, key, value)
               end
+
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - James Bracy