motion-json-api 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b00c290ef84e915cf55ea3e6f7d3a9e68a096951
-  data.tar.gz: 95b4a777808fe8751731487f047604f46648b3ad
+  metadata.gz: 7dd1b8babd9d470b1b7af3fd3106e26496a81734
+  data.tar.gz: 1cc071905c1f335c2a7c821a1b6f701e6a32f2de
 SHA512:
-  metadata.gz: 9184db4c31abc1e0646ea541d82d3f6d862fb5203f0fb6d51799ceaf16d7f75ea986b91e29d0e65fcab46a5b9f32c07a102a8069d3c9485b350f4d738a51fe6a
-  data.tar.gz: da1a3ed70b72a6af029eb7ef090dd1f03ea357cbc76e544c90404ff2f3cfbe1a8c6d462559e5af16c52fc9c7f9194f969d0ace50898e47c195cef464e2ae34fe
+  metadata.gz: 761ba2811df1c545547ba321d9788e1d06e4f33bdc49f425577d51bf62d14f8351f8f4cddd26385d1674d60134c78a2fac711f75bb19b60b99e56fdca747d3ad
+  data.tar.gz: 15c6a28c9c2abbe4b78160d207904277c66ae69641f09c561cd185eeac2c0363745cbbaebe23d2671431b1ea6b8e7c8d1e37cf4d134b5ff948e3c65bdda3707f

data/lib/motion-json-api.rb

@@ -1,8 +1,11 @@
-require 'motion-json-api/exceptions'
-require 'motion-json-api/resource'
-
-module MotionJsonApi
-  def self.parse(json)
-    Resource._object_handler(json, json.fetch("data", []), json.fetch("included", []))
+if defined?(Motion::Project::Config)
+  Motion::Project::App.setup do |app|
+    Dir.glob(File.join(File.dirname(__FILE__), "motion-json-api/**/*.rb")).each do |file|
+      app.files.unshift(file)
+    end
   end
+else
+  require 'motion-json-api/exceptions'
+  require 'motion-json-api/descendants'
+  require 'motion-json-api/resource'
 end

data/lib/motion-json-api/descendants.rb

@@ -0,0 +1,73 @@
+# Taken from https://github.com/rubymotion/motion-support/blob/master/motion/descendants_tracker.rb
+
+# Copyright (c) 2005-2013 David Heinemeier Hansson
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+module MotionJsonApi
+  # This module provides an internal implementation to track descendants
+  # which is faster than iterating through ObjectSpace.
+  module Descendants
+    @@direct_descendants = {}
+
+    class << self
+      def direct_descendants(klass)
+        @@direct_descendants[klass] || []
+      end
+
+      def descendants(klass)
+        arr = []
+        accumulate_descendants(klass, arr)
+        arr
+      end
+
+      def clear
+        @@direct_descendants.clear
+      end
+
+      # This is the only method that is not thread safe, but is only ever called
+      # during the eager loading phase.
+      def store_inherited(klass, descendant)
+        (@@direct_descendants[klass] ||= []) << descendant
+      end
+
+      private
+      def accumulate_descendants(klass, acc)
+        if direct_descendants = @@direct_descendants[klass]
+          acc.concat(direct_descendants)
+          direct_descendants.each { |direct_descendant| accumulate_descendants(direct_descendant, acc) }
+        end
+      end
+    end
+
+    def inherited(base)
+      Descendants.store_inherited(self, base)
+      super
+    end
+
+    def direct_descendants
+      Descendants.direct_descendants(self)
+    end
+
+    def descendants
+      Descendants.descendants(self)
+    end
+  end
+end

data/lib/motion-json-api/resource.rb

@@ -1,5 +1,11 @@
 module MotionJsonApi
+  def self.parse(json)
+    Resource._object_handler(json, json.fetch("data", []), json.fetch("included", []))
+  end
+
   class Resource
+    extend Descendants
+
     attr_accessor :id
     attr_accessor :attributes
     attr_accessor :relationships
@@ -37,10 +43,15 @@ module MotionJsonApi
       key = options.fetch(:as, relation).to_s
       define_method(key) do
         relationship = self.relationships.fetch(key)
+
         data = relationship.fetch("data")
-        object = _find_in_included(data["id"], data["type"])
-        payload = {"data" => object, "links" => relationship.fetch("links", {})}
-        Resource._object_handler(payload, self.top_level, self.included)
+        if data
+          object = _find_in_included(data["id"], data["type"])
+          payload = {"data" => object, "links" => relationship.fetch("links", {})}
+          Resource._object_handler(payload, self.top_level, self.included)
+        else
+          nil
+        end
       end
     end
 
@@ -78,12 +89,13 @@ module MotionJsonApi
     end
 
     def self._descendants
-      ObjectSpace.each_object(Class).select { |klass| klass < self }
+      Resource.descendants
     end
 
     def self._object_handler(object, top_level, included = nil)
       included ||= self.included || object.fetch("included", [])
-      top_level ||= self.top_level || [object["data"]].flatten
+      top_level ||= self.top_level || object["data"]
+      top_level = [top_level].flatten
 
       case object["data"]
       when Array

data/lib/motion-json-api/version.rb

@@ -1,3 +1,3 @@
 module MotionJsonApi
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-json-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Joffrey Jaffeux
@@ -63,6 +63,7 @@ files:
 - LICENSE.txt
 - README.md
 - lib/motion-json-api.rb
+- lib/motion-json-api/descendants.rb
 - lib/motion-json-api/exceptions.rb
 - lib/motion-json-api/resource.rb
 - lib/motion-json-api/version.rb