standardapi 5.0.0.3 → 5.0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95b8156eb29862ad327ce11d49a4991e3f6b1c4d
-  data.tar.gz: cb2829d52583507520c82f5dce5ebc3578b84239
+  metadata.gz: 1ffafde0be5ac4af61ae465486cc2b425ee97274
+  data.tar.gz: 90e2e0e35898cee9bb550c2378f8708166512f06
 SHA512:
-  metadata.gz: 8f84451e96a06a5950ee99bd5fb93f3a90c1ddb9eafac3dd2319619a21d30590c37d22f2a3a355ba9c032b436244267837ed4dc292852c3e24d683f95a8f6e28
-  data.tar.gz: a090714604a263d66564644b4ecf9ef5cf0fbacff189ce58c6f58f72675778b94a4e00ab3af22f0d67e9bfdbcdbbae7c687929d49916efe6f70810fcc66d3f81
+  metadata.gz: a080f851a213f0759fe8d9554e65588135169a5f99ca72ee52239917c8082f9420490b17d5cb2d3f5df41e0c50babb33c7ac56ac23a50fffe0cc99ce5b67ba7d
+  data.tar.gz: 3bef590610082ecf5de5042b16e16dc4e5b558de7cfd65f0426e8a12b54119793497695acaa9819cde7bdf77303c625540a2c3f87da8c2521a3a5cfb4bcce410

data/lib/standard_api/controller.rb

@@ -146,9 +146,39 @@ module StandardAPI
     def includes
       @includes ||= StandardAPI::Includes.normalize(params[:include])
     end
+    
+    def required_orders
+      if model.column_names.include?('id')
+        [:id]
+      else
+        []
+      end
+    end
 
     def orders
-      @orders ||= StandardAPI::Orders.sanitize(params[:order], model_orders)
+      exluded_required_orders = required_orders.map(&:to_s)
+      
+      case params[:order]
+      when Hash, ActionController::Parameters
+        exluded_required_orders -= params[:order].keys.map(&:to_s)
+      when Array
+        params[:order].flatten.each do |v|
+          case v
+          when Hash, ActionController::Parameters
+            exluded_required_orders -= v.keys.map(&:to_s)
+          when String
+            exluded_required_orders.delete(v)
+          end
+        end
+      when String
+        exluded_required_orders.delete(params[:order])
+      end
+      
+      if !exluded_required_orders.empty?
+        params[:order] = exluded_required_orders.unshift(params[:order])
+      end
+      
+      @orders ||= StandardAPI::Orders.sanitize(params[:order], model_orders | required_orders)
     end
 
     def excludes

data/lib/standard_api/route_helpers.rb

@@ -1,13 +1,18 @@
 module StandardAPI
   module RouteHelpers
     
-    # Shorthand for adding resources.
+    # StandardAPI wrapper for ActionDispatch::Routing::Mapper::Resources#resources
+    #
+    # Includes the following routes
+    #   
+    #   GET /schema
+    #   GET /calculate
     #
     # For example
     #
     #   standard_resources :views
     #
-    # Is equivilent to:
+    # is equivilent to:
     #
     #   resources :api_keys do
     #     get :schema, on: :collection
@@ -19,8 +24,36 @@ module StandardAPI
       resources(*resources, options) do
         get :schema, on: :collection
         get :calculate, on: :collection
+        block.call if block
       end
     end
-    
+
+    # StandardAPI wrapper for ActionDispatch::Routing::Mapper::Resources#resource
+    #
+    # Includes the following routes
+    #   
+    #   GET /schema
+    #   GET /calculate
+    #
+    # For example:
+    #
+    #   standard_resource :account
+    #
+    # is equivilent to:
+    #
+    #   resource :account do
+    #     get :schema, on: :collection
+    #     get :calculate, on: :collection
+    #   end
+    def standard_resource(*resource, &block)
+      options = resource.extract_options!.dup
+      
+      resource(*resource, options) do
+        get :schema, on: :collection
+        get :calculate, on: :collection
+        block.call if block
+      end
+    end
+
   end
-end
+end

data/lib/standard_api/test_case.rb

@@ -13,7 +13,7 @@ module StandardAPI::TestCase
   def self.included(klass)
     begin
       controller_class_name = klass.name.gsub(/Test$/, '')
-      controller_class = controller_class_name.constantize 
+      controller_class_name.constantize 
     rescue NameError => e
       raise e if e.message != "uninitialized constant #{controller_class_name}"
     end
@@ -48,6 +48,25 @@ module StandardAPI::TestCase
       end
     end
   end
+  
+  def supports_format(format)
+    count = controller_class.view_paths.count do |path|
+      !Dir.glob("#{path.instance_variable_get(:@path)}/{#{model.name.underscore},application}/**/*.#{format}*").empty?
+    end
+    
+    count > 0
+  end
+  
+  def required_orders
+    controller_class.new.send(:required_orders)
+  end
+  
+  def controller_class
+    controller_class_name = self.class.name.gsub(/Test$/, '')
+    controller_class_name.constantize 
+  rescue NameError => e
+    raise e if e.message != "uninitialized constant #{controller_class_name}"
+  end
 
   def model
     self.class.model
@@ -67,7 +86,7 @@ module StandardAPI::TestCase
     
   def create_webmocks(attributes)
     attributes.each do |attribute, value|
-      validators = self.class.model.validators_on(attribute)
+      self.class.model.validators_on(attribute)
     end
   end
 
@@ -120,7 +139,7 @@ module StandardAPI::TestCase
 
           assert_predicate = -> (predicate) {
             get :index, params: {where: predicate}, format: 'json'
-            assert_equal model.filter(predicate).to_sql, assigns(plural_name).to_sql
+            assert_equal model.filter(predicate).order('id ASC').to_sql, assigns(plural_name).to_sql
           }
 
           # TODO: Test array
@@ -152,9 +171,9 @@ module StandardAPI::TestCase
 
     def model=(val)
       @model = val
-      filters = val.attribute_names
-      orders = val.attribute_names
-      includes = val.reflect_on_all_associations.map(&:name)
+      self.filters = val.attribute_names
+      self.orders = val.attribute_names
+      self.includes = val.reflect_on_all_associations.map(&:name)
       @model
     end
 

data/lib/standard_api/test_case/calculate_tests.rb

@@ -4,7 +4,7 @@ module StandardAPI
       extend ActiveSupport::Testing::Declarative
 
       test '#calculate.json' do
-        m = create_model
+        create_model
         selects = [{ count: :id}, { maximum: :id }, { minimum: :id }, { average: :id }]
 
         get :calculate, params: {select: selects}, format: :json
@@ -14,7 +14,7 @@ module StandardAPI
 
       test '#calculate.json params[:where]' do
         m1 = create_model
-        m2 = create_model
+        create_model
 
         selects = [{ count: :id}, { maximum: :id }, { minimum: :id }, { average: :id }]
         predicate = { id: { gt: m1.id } }

data/lib/standard_api/test_case/create_tests.rb

@@ -73,6 +73,8 @@ module StandardAPI
       end
       
       test '#create.html with invalid attributes renders edit action' do
+        return unless supports_format(:html)
+
         trait = FactoryGirl.factories[singular_name].definition.defined_traits.any? { |x| x.name.to_s == 'invalid' }
 
         if !trait
@@ -126,7 +128,7 @@ module StandardAPI
 
                 view_attributes(m).each do |key, value|
                   message = "Model / Attribute: #{m.class.name}##{key}"
-                  assert_equal m_json[key.to_s], normalize_to_json(m, key, value)
+                  assert_equal m_json[key.to_s], normalize_to_json(m, key, value), message
                 end
 
               end

data/lib/standard_api/test_case/index_tests.rb

@@ -12,7 +12,7 @@ module StandardAPI
 
       test '#index.json params[:limit]' do
         get :index, params: { limit: 1 }, format: :json
-        assert_equal model.limit(1).to_sql, assigns(plural_name).to_sql
+        assert_equal model.limit(1).sort(required_orders).to_sql, assigns(plural_name).to_sql
       end
 
       test '#index.json params[:where]' do
@@ -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, params: { order: order }, format: :json
-          assert_equal model.sort(order).to_sql, assigns(plural_name).to_sql
+          assert_equal model.sort(order).sort(required_orders).to_sql, assigns(plural_name).to_sql
          end
       end
 
       test '#index.json params[:offset]' do
         get :index, params: { offset: 13 }, format: :json
-        assert_equal model.offset(13).to_sql, assigns(plural_name).to_sql
+        assert_equal model.offset(13).sort(required_orders).to_sql, assigns(plural_name).to_sql
       end
 
       test '#index.json params[:include]' do
@@ -83,7 +83,7 @@ module StandardAPI
         m = create_model
         @controller.current_mask[plural_name] = { id: m.id }
         get :index, format: :json
-        assert_equal model.where(id: m.id).to_sql, assigns(plural_name).to_sql
+        assert_equal model.where(id: m.id).sort(required_orders).to_sql, assigns(plural_name).to_sql
         @controller.current_mask.delete(plural_name)
       end
     end

data/lib/standard_api/test_case/show_tests.rb

@@ -40,7 +40,7 @@ module StandardAPI
 
             view_attributes(m).each do |key, value|
               message = "Model / Attribute: #{m.class.name}##{key}"
-              assert_equal m_json[key.to_s], normalize_to_json(m, key, value)
+              assert_equal m_json[key.to_s], normalize_to_json(m, key, value), message
             end
             
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 5.0.0.3
+  version: 5.0.0.4
 platform: ruby
 authors:
 - James Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails