jsonapionify 0.11.10 → 0.11.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Nzg2ZGJhNjcxNmEzOTJmYWI4MjlkODQ5YjhhZWZkYWY5MjlkMTUyNQ==
+    NGNhMGNhNzcwZDMxOGZkYTA3MzBhZWIzNDhiZDlhODEyNjUwYzZkMw==
   data.tar.gz: !binary |-
-    YzE3OWY1MTA0ODhiZGZiNmZkMjcwYTZkMGRiZjFmY2ZlNjE0NmVhNQ==
+    MzFmOWY1MDZkODE2ODU4NGZjYjYzNmQ3ZWIyNmJhNGQ4ZWFjNTExMA==
 SHA512:
   metadata.gz: !binary |-
-    ODE4MDFiZDFmOTlmNzBiOGU3ZDVlOTQ0YTE3NmMzYmU0Y2ZiM2EwNGIxMzcz
-    OTNlYWZlNDEzNmI5ZjBkNTdiNTBmNzNiYWIwZGUxNGMzZmJmNzE2NzQ1ZDc4
-    MzkyYTE3MWM4MDU5ODdkYmMwYjQ2ZWEyNTY5Yzc5ODU1MjgxZGY=
+    N2MzN2UyZjYzYjMwMjE4NTdmYjFjMTgyYzdjNDA0NDUwNTlmMDliOWQ0ZDUy
+    MTk2MTBhZjA0MWNkNThiMDhjZmVhYTRiNzBlYmNkOGE3ZWY2OWZkZGM1ZmNj
+    ODVmMzFlNGRmMDJmYTQ0ZWJlZjNmOTM5YTFhYjYyYTJjZmVhYjU=
   data.tar.gz: !binary |-
-    ZmU0NjY3YzU0ZDUyZjA0ZDY1NWM2N2NhZjQyZWY4NmJlODQ3OTI1ZjBiYTJl
-    NjAwMjM3OTgyZDU0OGQwMDM4YzZjNjYyODEzMWU2MDA5N2YwMjYxZjMwNjUx
-    MDk5YWViNTIxZTBjZTE0NDdkZmM4NWMxMTEzYTJkNzY3MjQ4NjM=
+    ODI2NWRiMWZhMTYxMWIzNmQwOTg4MmRlMTI0MjJhZDljNTM0NzNmZTY5Y2Zm
+    MjA4OGJlOTFkZDA5M2U5ZTkyMWU0NzgzNGI1OWVhMWEyYmRkNjM2ZTI3YjJj
+    NTdkMjM3ZWZhYThhY2Y2MTRmMWVlZGIzZDU3ZmQ0ZjJkZGMzNTE=

data/lib/jsonapionify/api/base/resource_definitions.rb

@@ -1,6 +1,5 @@
 module JSONAPIonify::Api
   module Base::ResourceDefinitions
-
     def self.extended(klass)
       klass.class_eval do
         extend JSONAPIonify::InheritedAttributes
@@ -54,10 +53,9 @@ module JSONAPIonify::Api
         else
           block
         end
-      const_name                        = name.to_s.camelcase + 'Resource'
+      const_name = name.to_s.camelcase + 'Resource'
       remove_const(const_name) if const_defined? const_name, false
       name
     end
-
   end
 end

data/lib/jsonapionify/api/resource/defaults/options.rb

@@ -1,31 +1,28 @@
 module JSONAPIonify::Api
   module Resource::Defaults::Options
+    def self.scope_is_active_record? scope
+      return false unless defined?(ActiveRecord)
+      scope < ActiveRecord::Base
+    rescue NoMethodError, ArgumentError, TypeError
+      false
+    end
+
     extend ActiveSupport::Concern
     included do
       id :id
       scope { self.type.classify.constantize }
       collection do |scope, context|
-        if defined?(ActiveRecord) && scope.is_a?(Class) && scope < ActiveRecord::Base
-          scope.all
-        else
-          scope
-        end
+        Resource::Defaults::Options.scope_is_active_record?(scope) ? scope.all : scope
       end
 
       instance do |scope, key|
-        if defined?(ActiveRecord) && scope.is_a?(Class) && scope < ActiveRecord::Base
-          scope.find_by! id_attribute => key
-        else
-          raise NotImplementedError, 'instance not implemented'
-        end
+        raise NotImplementedError, 'instance not implemented' unless Resource::Defaults::Options.scope_is_active_record?(scope)
+        scope.find_by! id_attribute => key
       end
 
       new_instance do |scope|
-        if defined?(ActiveRecord) && scope.is_a?(Class) && scope < ActiveRecord::Base
-          scope.new
-        else
-          raise NotImplementedError, 'scope not implemented'
-        end
+        raise NotImplementedError, 'new_instance not implemented' unless scope.respond_to?(:new)
+        scope.new
       end
 
       before do |context|

data/lib/jsonapionify/version.rb

@@ -1,3 +1,3 @@
 module JSONAPIonify
-  VERSION = "0.11.10"
+  VERSION = "0.11.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapionify
 version: !ruby/object:Gem::Version
-  version: 0.11.10
+  version: 0.11.11
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport