standardapi 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f892bfaae15d0e0561eedcf89269ff98d18f2044
-  data.tar.gz: c9e734b482f12719dae0b6da8d384aadf64ac02c
+  metadata.gz: 61260c1422929988e5901869095a597b5b8df66b
+  data.tar.gz: 3e056ce5197af2755862368afb6ec75fbfd202d6
 SHA512:
-  metadata.gz: 3c749360b6a4ceb688dbb0914bccf1c0d4680304a682e1fd57bd7a221552a8731ae3c93fd5f15de2ea6f4f46ae0c1101cc8ca652392553d795799e1f9d873061
-  data.tar.gz: 548a8a618e9769b88ba0bab84e921ab0fdd4e36a8c04b3f7cc8958f1927c3e689c29b512f6398402e247363ed4b5090e4c5a7840ef9282c794516ae0d8541e68
+  metadata.gz: 3832b69251900970b8eaab0b4960581b09c0889278fb77968c2305c52384eafc3f320061fdced9f8fbece289f230cda0b5d0ef72fd4a7cd0e0f4e87400e60d83
+  data.tar.gz: cd87f79b7107332b2189c8bf12428aae328ebfa4a64e7dc20aac43d5a06fa176c69ca385f8a9288efc9b5808280e31e1fb6174a51adf8f108020de6bfb2cbeb3

data/lib/standard_api/controller.rb

@@ -21,8 +21,7 @@ module StandardAPI
     end  
 
     def index
-      @records = resources.limit(params[:limit]).offset(params[:offset]).sort(orders)
-      instance_variable_set("@#{model.model_name.plural}", @records)
+      instance_variable_set("@#{model.model_name.plural}", resources.limit(params[:limit]).offset(params[:offset]).sort(orders))
     end
 
     def calculate
@@ -37,20 +36,17 @@ module StandardAPI
     end
 
     def show
-      @record = resources.find(params[:id])
-      instance_variable_set("@#{model.model_name.singular}", @record)
+      instance_variable_set("@#{model.model_name.singular}", resources.find(params[:id]))
     end
 
     def create
-      @record = model.new(model_params)
-      instance_variable_set("@#{model.model_name.singular}", @record)
-      render :show, status: @record.save ? :created : :bad_request
+      instance_variable_set("@#{model.model_name.singular}", model.new(model_params))
+      render :show, status: instance_variable_get("@#{model.model_name.singular}").save ? :created : :bad_request
     end
 
     def update
-      @record = resources.find(params[:id])
-      instance_variable_set("@#{model.model_name.singular}", @record)
-      render :show, status: @record.update_attributes(model_params) ? :ok : :bad_request
+      instance_variable_set("@#{model.model_name.singular}", resources.find(params[:id]))
+      render :show, status: instance_variable_get("@#{model.model_name.singular}").update_attributes(model_params) ? :ok : :bad_request
     end
 
     def destroy

data/lib/standard_api/test_case/create_tests.rb

@@ -34,6 +34,7 @@ module StandardAPI
 
           json = JSON.parse(response.body)
           assert json.is_a?(Hash)
+
           m = assigns(singular_name).reload
           view_attributes(m).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
             message = "Model / Attribute: #{m.class.name}##{key}"
@@ -70,15 +71,15 @@ module StandardAPI
             includes.each do |included|
               assert json.key?(included.to_s), "#{included.inspect} not included in response"
 
-              association = assigns(:record).class.reflect_on_association(included)
+              association = assigns(singular_name).class.reflect_on_association(included)
               next if !association
 
               if ['belongs_to', 'has_one'].include?(association.macro.to_s)
-                view_attributes(assigns(:record).send(included)) do |key, value|
-                  assert_equal json[included.to_s][key.to_s], normalize_to_json(assigns(:record), key, value)
+                view_attributes(assigns(singular_name).send(included)) do |key, value|
+                  assert_equal json[included.to_s][key.to_s], normalize_to_json(assigns(singular_name), key, value)
                 end
               else
-                m = assigns(:record).send(included).first.try(:reload)
+                m = assigns(singular_name).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) }

data/lib/standard_api/test_case/index_tests.rb

@@ -26,13 +26,13 @@ module StandardAPI
         orders.each do |order|
           @controller.instance_variable_set('@orders', nil) # Hack for dealing with caching / multiple request per controller life
           get :index, order: order, format: 'json'
-          assert_equal model.sort(order).to_sql, assigns(:records).to_sql
+          assert_equal model.sort(order).to_sql, assigns(plural_name).to_sql
          end
       end
 
       test '#index.json params[:offset]' do
         get :index, offset: 13, format: 'json'
-        assert_equal model.offset(13).to_sql, assigns(:records).to_sql
+        assert_equal model.offset(13).to_sql, assigns(plural_name).to_sql
       end
 
       test '#index.json params[:include]' do
@@ -45,17 +45,17 @@ module StandardAPI
           includes.each do |included|
             assert json.key?(included.to_s), "#{included.inspect} not included in response"
 
-            association = assigns(:records).first.class.reflect_on_association(included)
+            association = assigns(plural_name).first.class.reflect_on_association(included)
             next if !association
 
             if ['belongs_to', 'has_one'].include?(association.macro.to_s)
-              m = assigns(:records).first.send(included)
+              m = assigns(plural_name).first.send(included)
               view_attributes(m) do |key, value|
                 message = "Model / Attribute: #{m.class.name}##{key}"
                 assert_equal json[included.to_s][key.to_s], normalize_to_json(m, key, value), message
               end
             else
-              m = assigns(:records).first.send(included).first.try(:reload)
+              m = assigns(plural_name).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) }

data/lib/standard_api/test_case/show_tests.rb

@@ -21,15 +21,15 @@ module StandardAPI
         includes.each do |included|
           assert json.key?(included.to_s), "#{included.inspect} not included in response"
 
-          association = assigns(:record).class.reflect_on_association(included)
+          association = assigns(singular_name).class.reflect_on_association(included)
           next if !association
 
           if ['belongs_to', 'has_one'].include?(association.macro.to_s)
-            view_attributes(assigns(:record).send(included)) do |key, value|
+            view_attributes(assigns(singular_name).send(included)) do |key, value|
               assert_equal json[included.to_s][key.to_s], value
             end
           else
-            m = assigns(:record).send(included).first.try(:reload)
+            m = assigns(singular_name).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) }

data/lib/standard_api/test_case/update_tests.rb

@@ -55,16 +55,16 @@ module StandardAPI
           includes.each do |included|
             assert json.key?(included.to_s), "#{included.inspect} not included in response"
 
-            association = assigns(:record).class.reflect_on_association(included)
+            association = assigns(singular_name).class.reflect_on_association(included)
             next if !association
 
             if ['belongs_to', 'has_one'].include?(association.macro.to_s)
-              view_attributes(assigns(:record).send(included)) do |key, value|
-                message = "Model / Attribute: #{assigns(:record).send(included).class.name}##{key}"
+              view_attributes(assigns(singular_name).send(included)) do |key, value|
+                message = "Model / Attribute: #{assigns(singular_name).send(included).class.name}##{key}"
                 assert_equal json[included.to_s][key.to_s], value, message
               end
             else
-              m = assigns(:record).send(included).first.try(:reload)
+              m = assigns(singular_name).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

data/lib/standard_api/views/application/index.json.jbuilder

@@ -1,3 +1 @@
-records = @records if !records
-
-json.array! records, partial: model_partial(model), as: :record, includes: includes
+json.array! instance_variable_get("@#{model.model_name.plural}"), partial: model_partial(model), as: :record, includes: includes

data/lib/standard_api/views/application/show.json.jbuilder

@@ -1,3 +1 @@
-record = @record if !record
-
-json.partial! model_partial(model), record: record, includes: includes
+json.partial! model_partial(model), record: instance_variable_get("@#{model.model_name.singular}"), includes: includes

metadata

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