haveapi 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8579fbd8dd467b3248bba5d3cd8cbb46c889621b
-  data.tar.gz: 12fa89e290d89ea301123f66ca86e6bfc19c4785
+  metadata.gz: f07a08da63c6a6971d962f5de898151b8f1526e8
+  data.tar.gz: 82a118d577b0f0c21585282b6e72733e8dac8857
 SHA512:
-  metadata.gz: f406e97a08f0ae4c4b0fb6dab2114a36208f8ef6190f5480b9a86765dc97005ddf866402674164ae96d36f989e6ea40ed5f6e2e75d56a442751cf2e4e9613c0f
-  data.tar.gz: 2f5d0ebae55c055ac725097260b2fecbea6903b74d7927fc723186e6bacf708376a6cce978bea15c6594c44302e6d7547bc226f8a46f5d863417a9d7cc989a8c
+  metadata.gz: babc460201bfb5cff7adfab5017a70570f69c0b484e898b3ca62c2d1c016a1cde2c93c2369edadfc0de2c9ec1a8a392b89c2eb1288863b938fb551e411d54850
+  data.tar.gz: 8f1bea4fc43b85ff52374ac37cab28af42e7a1be75210fafe458f84a6a6f0503495f0b2921596c50b221430150362a33afc63f1a200ab2def908f236db482891

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Mon Apr 18 2016 - version 0.5.3
+- ActiveRecord.ar_parse_includes: ignore not existing associations
+- Paginable: remove default values for limit and offset parameters
+
 * Thu Mar 03 2016 - version 0.5.2
 - Fix ActiveRecord dependency
 - Require json

data/haveapi.gemspec

@@ -5,7 +5,7 @@ require 'haveapi/version'
 Gem::Specification.new do |s|
   s.name        = 'haveapi'
   s.version     = HaveAPI::VERSION
-  s.date        = '2016-03-03'
+  s.date        = '2016-04-18'
   s.summary     =
   s.description = 'Framework for creating self-describing APIs'
   s.authors     = 'Jakub Skokan'

data/lib/haveapi/actions/paginable.rb

@@ -2,11 +2,9 @@ module HaveAPI::Actions
   module Paginable
     def self.included(action)
       action.input do
-        integer :offset, label: 'Offset', desc: 'The offset of the first object',
-                default: 0
-        integer :limit, label: 'Limit', desc: 'The number of objects to retrieve',
-                default: 25
+        integer :offset, label: 'Offset', desc: 'The offset of the first object'
+        integer :limit, label: 'Limit', desc: 'The number of objects to retrieve'
       end
     end
   end
-end
+end

data/lib/haveapi/model_adapters/active_record.rb

@@ -43,7 +43,21 @@ module HaveAPI::ModelAdapters
         # in an array of symbols and hashes.
         def ar_parse_includes(raw)
           return @ar_parsed_includes if @ar_parsed_includes
-          @ar_parsed_includes = ar_inner_includes(raw)
+          @ar_parsed_includes = ar_inner_includes(raw).select do |inc|
+            # Drop associations that are not registered in the AR:
+            #   The API resource may have associations that are not based on
+            #   associations in AR.
+            if inc.is_a?(::Hash)
+              inc.each_key do |k|
+                next(false) unless self.class.model.reflections.has_key?(k)
+              end
+
+            else
+              next(false) unless self.class.model.reflections.has_key?(inc)
+            end
+
+            true
+          end
         end
 
         # Called by ar_parse_includes for recursion purposes.

data/lib/haveapi/version.rb

@@ -1,4 +1,4 @@
 module HaveAPI
   PROTOCOL_VERSION = '1.0'
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: haveapi
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Jakub Skokan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all