simple_ams 0.1.0 → 0.1.1

data/lib/simple_ams/options.rb

@@ -7,7 +7,7 @@ module SimpleAMS
     attr_reader :resource, :allowed_options, :injected_options
 
     #injected_options is always a Hash object
-    def initialize(resource, injected_options: {}, allowed_options: nil)
+    def initialize(resource = nil, injected_options: {}, allowed_options: nil)
       @resource = resource
       @injected_options = injected_options || {}
       @_internal = @injected_options[:_internal] || {}
@@ -15,6 +15,13 @@ module SimpleAMS
     end
     alias collection resource
 
+    #performance enchancement method for non-polymorphic collections
+    def with_resource(resource)
+      @resource = resource
+
+      return self
+    end
+
     def relation_options_for(relation_name)
       return _relation_options[relation_name] || {}
     end
@@ -22,22 +29,15 @@ module SimpleAMS
     def primary_id
       return @primary_id if defined?(@primary_id)
 
-      _options = injected_options.fetch(:primary_id, nil)
-      _options = allowed_options.fetch(:primary_id, nil) unless _options
-
-      return @primary_id ||= PrimaryId.new(*_options)
+      return @primary_id = array_of_value_hash_for(PrimaryId, :primary_id)
     end
 
     def type
       return @type if defined?(@type)
 
-      _options = injected_options.fetch(:type, nil)
-      _options = allowed_options.fetch(:type, nil) unless _options
-
-      return @type ||= Type.new(*_options)
+      return @type = array_of_value_hash_for(Type, :type)
     end
 
-    #that's handful
     def name
       @name ||= injected_options[:name] || allowed_options[:name] || type.name
     end
@@ -46,86 +46,49 @@ module SimpleAMS
     def fields
       return @fields if defined?(@fields)
 
-      injected = injected_options.fetch(:fields, nil)
-
-      if injected.nil?
-        return @fields = Fields.new(allowed_options.fetch(:fields).uniq)
-      else
-        return @fields = Fields.new(options_for(
-          injected: Fields.new(injected_options.fetch(:fields, nil)),
-          allowed: Fields.new(allowed_options.fetch(:fields).uniq)
-        ).uniq)
-      end
+      return @fields = array_of_items_for(Fields, :fields)
     end
 
     def includes
       return @includes if defined?(@includes)
 
-      injected = injected_options.fetch(:includes, nil)
-
-      if injected.nil?
-        return @includes = Includes.new(allowed_options.fetch(:includes).uniq)
-      else
-        return @includes = Includes.new(options_for(
-          injected: Includes.new(injected_options.fetch(:includes, nil)),
-          allowed: Includes.new(allowed_options.fetch(:includes).uniq)
-        ).uniq)
-      end
+      return @includes = array_of_items_for(Includes, :includes)
     end
 
     #TODO: correctly loop over injected relations, although should be a rarely used feature
     def relations
-      return @relations if defined?(@relations) #||= options_for(
+      return @relations if defined?(@relations)
 
       relations = injected_options.fetch(:relations, nil)
       relations = allowed_options.fetch(:relations, []) if relations.nil?
 
-      return @relations = relations.map{|rel| Relation.new(*rel)}.select{
-          |relation| includes.include?(relation.name)
-        }
+      return @relations = Relations.new(relations, includes)
     end
 
-    #TODO: add method-based links, should boost performance
     def links
       return @links if defined?(@links)
 
-      injected = injected_options.fetch(:links, nil)
-      if injected
-        injected = Links.new(
-          injected.map{|l| Links::Link.new(*l.flatten, resource: resource)}
-        )
-      end
-
-      allowed = Links.new(
-        allowed_options.fetch(:links).map{|l| Links::Link.new(*l, resource: resource)}
-      )
-
-      return @links = Links.new(options_for(
-        #TODO: correctly loop over injected properties
-        injected: injected,
-        allowed: allowed,
-      ).uniq{|link| link.name})
+      return @links = array_of_name_value_hash_for(Links, Links::Link, :links)
     end
 
-    #TODO: add method-based metas, should boost performance
     def metas
       return @metas if defined?(@metas)
 
-      injected = injected_options.fetch(:metas, nil)
-      if injected
-        injected = Metas.new(
-          injected.map{|l| Metas::Meta.new(*l.flatten, resource: resource)}
-        )
-      end
-      allowed = Metas.new(
-        allowed_options.fetch(:metas).map{|l| Metas::Meta.new(*l, resource: resource)}
-      )
+      return @metas = array_of_name_value_hash_for(Metas, Metas::Meta, :metas)
+    end
 
-      return @metas = Metas.new(options_for(
-        #TODO: correctly loop over injected properties
-        injected: injected,
-        allowed: allowed,
-      ).uniq{|meta| meta.name})
+    def forms
+      return @forms if defined?(@forms)
+
+      return @forms = array_of_name_value_hash_for(Forms, Forms::Form, :forms)
+    end
+
+    def generics
+      return @generics if defined?(@generics)
+
+      return @generics = array_of_name_value_hash_for(
+        Generics, Generics::Option, :generics
+      )
     end
 
     #TODO: handle case of proc
@@ -134,21 +97,26 @@ module SimpleAMS
 
       _serializer = injected_options.fetch(:serializer, serializer_class)
 
-      return @serializer = _serializer.new.extend(
-        SimpleAMS::Methy.of(
-          expose.merge({
-            object: resource
-          })
-        )
-      )
+      return @serializer = instantiated_serializer_for(_serializer)
     end
 
-    def adapter
-      return @adapter if defined?(@adapter)
+    def adapter(_serializer: nil)
+      return @adapter if defined?(@adapter) && _serializer.nil?
+      serializer = _serializer || serializer
 
-      @adapter = Adapter.new(*injected_options.fetch(:adapter, [nil]))
-      @adapter = Adapter.new(*allowed_options.fetch(:adapter, [nil])) if @adapter.value.nil?
-      @adapter = Adapter.new(SimpleAMS::Adapters::AMS) if @adapter.value.nil?
+      @adapter = Adapter.new(*injected_options.fetch(:adapter, [nil]), {
+        resource: resource, serializer: serializer
+      })
+      if @adapter.value.nil?
+        @adapter = Adapter.new(*allowed_options.fetch(:adapter, [nil]), {
+          resource: resource, serializer: serializer
+        })
+      end
+      if @adapter.value.nil?
+        @adapter = Adapter.new(SimpleAMS::Adapters::AMS, {
+          resource: resource, serializer: serializer
+        })
+      end
 
       return @adapter
     end
@@ -180,7 +148,8 @@ module SimpleAMS
 
       #TODO: Do we need that merge ?
       _injected_options = @injected_options.fetch(:collection, {}).merge({
-        serializer: collection_serializer_class
+        serializer: collection_serializer_class,
+        adapter: adapter(_serializer: collection_serializer_class).raw
       })
       _allowed_options = @allowed_options.fetch(:collection).options
 
@@ -219,13 +188,54 @@ module SimpleAMS
 
     private
       attr_reader :_internal
-=begin
-      def is_collection?
-        _internal[:is_collection] == true
+
+      #TODO: add method-based links, should boost performance
+      def array_of_name_value_hash_for(collection_klass, item_klass, name)
+        injected = injected_options.fetch(name, nil)
+        if injected
+          injected = collection_klass.new(
+            injected.map{|l| item_klass.new(*l.flatten, {
+              resource: resource, serializer: serializer
+            })}
+          )
+        end
+
+        allowed = collection_klass.new(
+          allowed_options.fetch(name).map{|l| item_klass.new(*l, {
+            resource: resource, serializer: serializer
+          })}
+        )
+
+        return collection_klass.new(priority_options_for(
+          #TODO: correctly loop over injected properties
+          injected: injected,
+          allowed: allowed,
+        ).uniq{|item| item.name})
       end
-=end
 
-      def options_for(allowed:, injected:)
+      def array_of_value_hash_for(klass, name)
+        _options = injected_options.fetch(name, nil)
+        _options = allowed_options.fetch(name, nil) unless _options
+
+        return klass.new(*_options, {
+          resource: resource, serializer: serializer
+        })
+      end
+
+      def array_of_items_for(klass, name)
+        injected = injected_options.fetch(name, nil)
+
+        if injected.nil?
+          return klass.new(allowed_options.fetch(name).uniq)
+        else
+          return klass.new(priority_options_for(
+            injected: klass.new(injected_options.fetch(name, nil)),
+            allowed: klass.new(allowed_options.fetch(name).uniq)
+          ).uniq)
+        end
+      end
+
+      def priority_options_for(allowed:, injected:)
         if not injected.nil?
           allowed = injected.class.new(
             injected.map{|s| s.is_a?(Hash) ? s.keys.first : s}
@@ -235,6 +245,12 @@ module SimpleAMS
         return allowed
       end
 
+=begin
+      def options_for(allowed:, injected:)
+        (allowed || []).concat(injected || [])
+      end
+=end
+
       def _relation_options
         return @_relation_options if defined?(@_relation_options)
 
@@ -255,7 +271,7 @@ module SimpleAMS
             field.is_a?(Hash)
           }.find{|field_hash|
             field_hash.keys.first.to_s == relation.name.to_s
-          } 
+          }
 
           #.. while here just nil will work (pick default fields from serializer)
           fields_value = fields_value[relation.name] if fields_value
@@ -275,9 +291,21 @@ module SimpleAMS
           _serializer_class = self.collection_serializer_class
         end
 
-        _allowed_options = _serializer_class&.options
+        if _serializer_class.respond_to?(:simple_ams?)
+          return _serializer_class&.options
+        else
+          raise "#{_serializer_class} does not respond to SimpleAMS methods, did you include the DSL module?"
+        end
+      end
 
-        return _allowed_options
+      def instantiated_serializer_for(serializer_klass)
+        serializer_klass.new.extend(
+          SimpleAMS::Methy.of(
+            expose.merge({
+              object: resource
+            })
+          )
+        )
       end
 
       def infer_serializer

data/lib/simple_ams/version.rb

@@ -1,3 +1,3 @@
 module SimpleAMS
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/simple_ams.rb

@@ -5,6 +5,7 @@ require "simple_ams/document"
 require "simple_ams/dsl"
 require "simple_ams/adapters"
 require "simple_ams/adapters/ams"
+require "simple_ams/adapters/jsonapi"
 require "simple_ams/renderer"
 
 require "simple_ams/options"
@@ -16,14 +17,19 @@ require "simple_ams/options/fields"
 require "simple_ams/options/includes"
 require "simple_ams/options/links"
 require "simple_ams/options/metas"
+require "simple_ams/options/forms"
+require "simple_ams/options/generics"
 require "simple_ams/options/primary_id"
 require "simple_ams/options/type"
-require "simple_ams/options/relation"
+require "simple_ams/options/relations"
 
+require "simple_ams/document/primary_id"
 require "simple_ams/document/fields"
 require "simple_ams/document/relations"
 require "simple_ams/document/links"
 require "simple_ams/document/metas"
+require "simple_ams/document/forms"
+require "simple_ams/document/generics"
 
 module SimpleAMS
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_ams
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Filippos Vasilakis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-26 00:00:00.000000000 Z
+date: 2018-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,10 +112,14 @@ files:
 - lib/simple_ams.rb
 - lib/simple_ams/adapters.rb
 - lib/simple_ams/adapters/ams.rb
+- lib/simple_ams/adapters/jsonapi.rb
 - lib/simple_ams/document.rb
 - lib/simple_ams/document/fields.rb
+- lib/simple_ams/document/forms.rb
+- lib/simple_ams/document/generics.rb
 - lib/simple_ams/document/links.rb
 - lib/simple_ams/document/metas.rb
+- lib/simple_ams/document/primary_id.rb
 - lib/simple_ams/document/relations.rb
 - lib/simple_ams/dsl.rb
 - lib/simple_ams/methy.rb
@@ -125,11 +129,13 @@ files:
 - lib/simple_ams/options/concerns/name_value_hash.rb
 - lib/simple_ams/options/concerns/value_hash.rb
 - lib/simple_ams/options/fields.rb
+- lib/simple_ams/options/forms.rb
+- lib/simple_ams/options/generics.rb
 - lib/simple_ams/options/includes.rb
 - lib/simple_ams/options/links.rb
 - lib/simple_ams/options/metas.rb
 - lib/simple_ams/options/primary_id.rb
-- lib/simple_ams/options/relation.rb
+- lib/simple_ams/options/relations.rb
 - lib/simple_ams/options/type.rb
 - lib/simple_ams/renderer.rb
 - lib/simple_ams/version.rb

data/lib/simple_ams/options/relation.rb

@@ -1,31 +0,0 @@
-require "simple_ams"
-
-class SimpleAMS::Options
-  class Relation
-    attr_reader :type, :name, :options
-    def initialize(type, name, options = {})
-      @type = type.to_sym
-      @name = name.is_a?(String) ? name.to_sym : name
-      @options = options
-
-      @many = type == :has_many ? true : false
-    end
-
-    alias relation name
-
-    def raw
-      [type, name, options]
-    end
-
-    def collection?
-      @many
-    end
-
-    def single?
-      !array
-    end
-
-    private
-      attr_writer :type, :name, :options
-  end
-end