real_savvy 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c3eb21fb475cd2006eeaeff541e57edba481c6
-  data.tar.gz: 3e9c22f823cb9e87dc86677df7d6c33215b95db3
+  metadata.gz: 652be299d2ea9f3028126a7e3f0d8be72ba69735
+  data.tar.gz: 9308a23ee4e072d315562f2ad6e470212907276d
 SHA512:
-  metadata.gz: 6d417e599280f1bcea965a7da684ae7c1f55952d88592f52098140d02d9c97f4521fa6b76c08b10f737b06057dd51c178dc6298b1cf0661b8ee30f4cbde14b5d
-  data.tar.gz: 792908183863481ff23f39fce1707c55ce92d8f16bb3a77f17816105d98ef9abaf5b67af55352761eefe7a65cb4f5a14c4982d1d9975c52f29e498948662c435
+  metadata.gz: 0f9033d41e6e25da94b3a5fd2643077367760278e2a9c2b827a01b89013f81f9b8716ecf0878048ed0f73b23b3d59c60bf354ffbf3bfe20ae2b72fd7b4c77ca3
+  data.tar.gz: 05f024c4368bd03e42f478ba94fcc51afbce7f2ccf71eebb34135bb684f9a699cdcd986d13e4c3ed2f05054154fe7b6e52740027dcebf126b4ae0d9f71eaac41

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    real_savvy (0.0.6)
+    real_savvy (0.0.7)
       faraday (>= 0.8.0)
       faraday_middleware (>= 0.8.0)
       jwt (>= 1.0.0)

data/lib/real_savvy/document.rb

@@ -5,16 +5,6 @@ class RealSavvy::Document
 
   attr_reader :document
 
-  TYPE_TO_RESOURCE = {
-    'properties' => RealSavvy::Resource::Property,
-    'listings' => RealSavvy::Resource::Property,
-    'collections' => RealSavvy::Resource::Collection,
-    'saved_searches' => RealSavvy::Resource::SavedSearch,
-    'users' => RealSavvy::Resource::User,
-  }.tap do |lookup|
-    lookup.default = RealSavvy::Resource::Base
-  end.freeze
-
   def initialize(document, status: nil)
     @document = document
     @status = status
@@ -27,7 +17,7 @@ class RealSavvy::Document
   alias results data
 
   def result
-    data[0]
+    data
   end
 
   def included
@@ -55,6 +45,10 @@ class RealSavvy::Document
   end
 
   def self.process_resources(resources, document=nil)
-    ::RealSavvy.safe_wrap(resources).map { |object| TYPE_TO_RESOURCE[object['type']].new(object, document)  }
+    if resources.is_a?(Array)
+      resources.map { |object| RealSavvy::Resource.new(object, document)  }
+    elsif resources
+      RealSavvy::Resource.new(resources, document)
+    end
   end
 end

data/lib/real_savvy/jwt/abstract_token.rb

@@ -4,7 +4,7 @@ module RealSavvy
       # In order of access level
       SCOPE_VERBS = %w{public read write admin}.freeze
 
-      attr_reader :scopes, :user, :site, :token, :header
+      attr_reader :scopes, :user, :site, :token, :header, :claims
 
       def initialize(token)
         @token = token
@@ -98,20 +98,24 @@ module RealSavvy
         Base64.urlsafe_encode64(share_token_json, padding: false)
       end
 
+      def short_token
+        @token.split('.')[1]
+      end
+
       private
 
-      attr_reader :claims, :audience, :subject
+      attr_reader :audience, :subject
 
       def retrieve_claims
         raise NotImplementedError, "subclass did not define #retrieve_claims"
       end
 
       def retrieve_audience
-        @audience = ::RealSavvy::JWT::Config.retrieve_audience(claims) if claims
+        @audience = ::RealSavvy::JWT::Config.retrieve_audience(self) if claims && claims['aud']
       end
 
       def retrieve_subject
-        @subject = ::RealSavvy::JWT::Config.retrieve_subject(claims) if claims
+        @subject = ::RealSavvy::JWT::Config.retrieve_subject(self) if claims && claims['sub']
       end
 
       def retrieve_site

data/lib/real_savvy/jwt/share_token.rb

@@ -2,10 +2,6 @@ module RealSavvy
   module JWT
     class ShareToken < AbstractToken
 
-      def short_token
-        @token.split('.')[1]
-      end
-
       private
 
       def retrieve_claims

data/lib/real_savvy/jwt/token.rb

@@ -26,7 +26,7 @@ module RealSavvy
       end
 
       def validate_token
-        ::RealSavvy::JWT::Config.validate_token(token)
+        ::RealSavvy::JWT::Config.validate_token(self)
       end
     end
   end

data/lib/real_savvy/resource.rb

@@ -1,6 +1,83 @@
-module RealSavvy::Resource
+require 'set'
+require 'real_savvy/attributes'
+require 'real_savvy/links'
 
-end
+class RealSavvy::Resource
+  attr_reader :json, :document
+
+  def initialize(json, document)
+    @json = json
+    @document = document
+  end
+
+  def hash
+    {id: id, type: type}.to_json.hash
+  end
+
+  def id
+    json['id']
+  end
+
+  def type
+    json['type']
+  end
+
+  def attributes
+    @attributes ||= RealSavvy::Attributes.new(json['attributes'] || {})
+  end
+
+  def links
+    @links ||= RealSavvy::Links.new(json['links'] || {})
+  end
+
+  def meta
+    @meta ||= RealSavvy::Meta.new(json['meta'] || {})
+  end
+
+  def relationships
+    self
+  end
 
-require 'real_savvy/resource/base'
-Dir[File.dirname(__FILE__) + '/resource/*.rb'].each {|file| require file }
+  def inspect
+    json.inspect
+  end
+
+  private
+
+  def objects_lookup
+    document&.objects_lookup || {}
+  end
+
+  def loaded_relationships
+    @loaded_relationships ||= {}
+  end
+
+  def has_relationship(relationship)
+    possible_relation_ship = json['relationships']&.[](relationship.to_s)
+    possible_relation_ship && possible_relation_ship.length > 0
+  end
+
+  def build_relationship(relationship)
+    relationship_raw = json['relationships']&.[](relationship.to_s)&.[]('data')
+    relationship_processed = ::RealSavvy::Document.process_resources(relationship_raw)
+  end
+
+  def load_relationship_with_lookup(relationship)
+    loaded_relationships[relationship] ||= begin
+                                             relationship_object = build_relationship(relationship)
+                                             if relationship_object.is_a?(Array)
+                                               relationship_object.map { |resource| objects_lookup[resource.hash] || resource }
+                                             else
+                                               objects_lookup[relationship_object.hash] || relationship_object
+                                             end
+                                           end
+  end
+
+  def method_missing(m, *args, &block)
+    if has_relationship(m)
+      load_relationship_with_lookup(m)
+    else
+      super
+    end
+  end
+end

data/lib/real_savvy/version.rb

@@ -1,3 +1,3 @@
 module RealSavvy
-  VERSION = [0,0,7]
+  VERSION = [0,0,8]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: real_savvy
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ryan Rauh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -138,7 +138,6 @@ files:
 - README.md
 - bin/console
 - bin/setup
-- client.rb
 - lib/real_savvy.rb
 - lib/real_savvy/adapter.rb
 - lib/real_savvy/adapter/agent.rb
@@ -178,11 +177,6 @@ files:
 - lib/real_savvy/links.rb
 - lib/real_savvy/meta.rb
 - lib/real_savvy/resource.rb
-- lib/real_savvy/resource/base.rb
-- lib/real_savvy/resource/collection.rb
-- lib/real_savvy/resource/property.rb
-- lib/real_savvy/resource/saved_search.rb
-- lib/real_savvy/resource/user.rb
 - lib/real_savvy/version.rb
 - real_savvy.gemspec
 homepage: http://rubygems.org/gems/realsavvy

data/client.rb

@@ -1,38 +0,0 @@
-require 'real_savvy/connection'
-require 'real_savvy/concern'
-require 'real_savvy/adapter'
-
-Dir[File.dirname(__FILE__) + '/adapaters/*.rb'].each {|file| require file }
-
-class RealSavvy::Client
-  def initialize(token:, logger: nil)
-    @token = token
-    @logger = logger
-  end
-
-  def connection
-    @connection ||= RealSavvy::Connection.new(client: self)
-  end
-
-  def logger
-    @logger
-  end
-
-  def logging?
-    !!@logging
-  end
-
-  def token
-    @token
-  end
-
-  def properties
-    resource_adapaters[:properties] ||= RealSavvy::Adapter::Property.new(connection: connection)
-  end
-
-  private
-
-  def resource_adapaters
-    @resource_adapaters ||= {}
-  end
-end

data/lib/real_savvy/resource/base.rb

@@ -1,95 +0,0 @@
-require 'set'
-require 'real_savvy/attributes'
-require 'real_savvy/links'
-
-class RealSavvy::Resource::Base
-  attr_reader :json, :document
-
-  def initialize(json, document)
-    @json = json
-    @document = document
-  end
-
-  def hash
-    {id: id, type: type}.to_json.hash
-  end
-
-  def id
-    json['id']
-  end
-
-  def type
-    json['type']
-  end
-
-  def attributes
-    @attributes ||= RealSavvy::Attributes.new(json['attributes'] || {})
-  end
-
-  def links
-    @links ||= RealSavvy::Links.new(json['links'] || {})
-  end
-
-  def meta
-    @meta ||= RealSavvy::Meta.new(json['meta'] || {})
-  end
-
-  def relationships
-    self
-  end
-
-  def inspect
-    json.inspect
-  end
-
-  def self.relationships
-    @relationships ||= {}
-  end
-
-  def self.has_one relationship
-    relationships[relationship.to_s] ||= {}
-    relationships[relationship.to_s].merge!(single: true)
-  end
-
-  def self.belongs_to relationship
-    has_one relationship
-  end
-
-  # Do nothing default behavior
-  def self.has_many relationship
-
-  end
-
-  private
-
-  def objects_lookup
-    document&.objects_lookup || {}
-  end
-
-  def loaded_relationships
-    @loaded_relationships ||= {}
-  end
-
-  def has_relationship(relationship)
-    possible_relation_ship = json['relationships']&.[](relationship.to_s)
-    possible_relation_ship && possible_relation_ship.length > 0
-  end
-
-  def build_relationship(relationship)
-    relationship_raw = json['relationships']&.[](relationship.to_s)&.[]('data')
-    relationship_processed = ::RealSavvy::Document.process_resources(relationship_raw)
-  end
-
-  def load_relationship_with_lookup(relationship)
-    loaded_relationships[relationship] ||= build_relationship(relationship).map { |resource| objects_lookup[resource.hash] || resource }
-    self.class.relationships[relationship.to_s]&.[](:single) ? loaded_relationships[relationship].first : loaded_relationships[relationship]
-  end
-
-  def method_missing(m, *args, &block)
-    if has_relationship(m)
-      load_relationship_with_lookup(m)
-    else
-      super
-    end
-  end
-end

data/lib/real_savvy/resource/collection.rb

@@ -1,4 +0,0 @@
-class RealSavvy::Resource::Collection < RealSavvy::Resource::Base
-  belongs_to :user
-  belongs_to :site
-end

data/lib/real_savvy/resource/property.rb

@@ -1,3 +0,0 @@
-class RealSavvy::Resource::Property < RealSavvy::Resource::Base
-
-end

data/lib/real_savvy/resource/saved_search.rb

@@ -1,4 +0,0 @@
-class RealSavvy::Resource::SavedSearch < RealSavvy::Resource::Base
-  belongs_to :user
-  belongs_to :site
-end

data/lib/real_savvy/resource/user.rb

@@ -1,3 +0,0 @@
-class RealSavvy::Resource::User < RealSavvy::Resource::Base
-
-end