simple_ams 0.2.5 → 0.2.6

data/lib/simple_ams/options/adapter.rb

@@ -1,9 +1,9 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
   class Adapter
     include SimpleAMS::Options::Concerns::ValueHash
 
-    alias :klass :value
+    alias klass value
   end
 end

data/lib/simple_ams/options/concerns/filterable.rb

@@ -1,44 +1,39 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
-  module Concerns
-    #works for arrays that can hold either elements or object that respond_to? :name
-    module Filterable
-      #for optimizing performance, ask only the first element
-      #other idea is to create another module just for (Name)ValueHash objects
-      def &(other_filterables)
-        other_is_object = other_filterables[0].respond_to?(:name)
+  module Concerns::Filterable
+    # for optimizing performance, ask only the first element
+    # other idea is to create another module just for (Name)ValueHash objects
+    def &(other)
+      other_is_object = (other[0].respond_to?(:name) && other[0].class != Symbol)
 
-        return self.class.new(
-          self.select{|m|
-            if other_is_object
-              other_filterables.include?(m.name)
-            else
-              other_filterables.include?(m)
-            end
-          }
-        )
-      end
-
-      #for optimizing performance, ask only the first element of self and save it as state
-      def include?(member)
-        unless defined?(@self_is_object)
-          @self_is_object = self[0].respond_to?(:name)
+      self.class.new(
+        self.select do |m|
+          if other_is_object
+            other.include?(m.name)
+          else
+            other.include?(m)
+          end
         end
+      )
+    end
 
-        if @self_is_object
-          self.any?{|s| s.name == member}
-        else
-          super
-        end
+    # for optimizing performance, ask only the first element of self and save it as state
+    def include?(member)
+      @self_is_object = self[0].respond_to?(:name) && self[0].class != Symbol unless defined?(@self_is_object)
+
+      if @self_is_object
+        any? { |s| s.name == member }
+      else
+        super
       end
+    end
 
-      def raw
-        if self[0].respond_to?(:raw)
-          self.map(&:raw)
-        else
-          self.map{|i| i}
-        end
+    def raw
+      if self[0].respond_to?(:raw)
+        map(&:raw)
+      else
+        map { |i| i }
       end
     end
   end

data/lib/simple_ams/options/concerns/mod.rb

@@ -0,0 +1,4 @@
+class SimpleAMS::Options
+  module Concerns
+  end
+end

data/lib/simple_ams/options/concerns/name_value_hash.rb

@@ -1,38 +1,37 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
-  module Concerns
-    module NameValueHash
-      attr_reader :name, :value, :options
+  module Concerns::NameValueHash
+    attr_reader :name, :value, :options
 
-      def initialize(name, value, options = {}, resource:, serializer:)
-        @name = name.is_a?(String) ? name.to_sym : name
-        if value.respond_to?(:call)
-          @volatile = true
-          _value = value.call(resource, serializer)
-          if _value.is_a?(Array) && _value.length > 1
-            @value = _value[0]
-            @options = (_value[-1] || {}).merge(options || {})
-          else
-            @value = _value
-            @options = options || {}
-          end
+    def initialize(name, value, options = {}, resource:, serializer:)
+      @name = name.is_a?(String) ? name.to_sym : name
+      if value.respond_to?(:call)
+        @volatile = true
+        computed_value = value.call(resource, serializer)
+        if computed_value.is_a?(Array) && computed_value.length > 1
+          @value = computed_value[0]
+          @options = (computed_value[-1] || {}).merge(options || {})
         else
-          @value = value
+          @value = computed_value
           @options = options || {}
         end
+      else
+        @value = value
+        @options = options || {}
       end
+    end
 
-      def raw
-        [name, value, options]
-      end
-
-      def volatile?
-        return @volatile || false
-      end
+    def raw
+      [name, value, options]
+    end
 
-      private
-        attr_writer :name, :value, :options
+    def volatile?
+      @volatile || false
     end
+
+    private
+
+    attr_writer :name, :value, :options
   end
 end

data/lib/simple_ams/options/concerns/tracked_properties.rb

@@ -1,25 +1,23 @@
 class SimpleAMS::Options
-  module Concerns
-    module TrackedProperties
-      Tracked = Struct.new(:value) do
-        def volatile?
-          return @volatile if defined?(@volatile)
-          return @volatile ||= self.value.volatile?
-        end
-      end
+  module Concerns::TrackedProperties
+    Tracked = Struct.new(:value) do
+      def volatile?
+        return @volatile if defined?(@volatile)
 
-      def initialize_tracking!
-        @tracked_properties = {}
+        @volatile ||= value.volatile?
       end
+    end
 
-      def clean_volatile_properties!
-        @tracked_properties = @tracked_properties.select{|k, v| !v.volatile?}
-      end
+    def initialize_tracking!
+      @tracked_properties = {}
+    end
 
-      def tracked(meth)
-        @tracked_properties[meth] ||= Tracked.new
-      end
+    def clean_volatile_properties!
+      @tracked_properties = @tracked_properties.reject { |_k, v| v.volatile? }
+    end
+
+    def tracked(meth)
+      @tracked_properties[meth] ||= Tracked.new
     end
   end
 end
-

data/lib/simple_ams/options/concerns/value_hash.rb

@@ -1,38 +1,37 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
-  module Concerns
-    module ValueHash
-      attr_reader :value, :options
-      alias :name :value
+  module Concerns::ValueHash
+    attr_reader :value, :options
+    alias name value
 
-      def initialize(value, options = {}, resource:, serializer:)
-        if value.respond_to?(:call)
-          @volatile = true
-          _value = value.call(resource, serializer)
-          if _value.is_a?(Array) && _value.length > 1
-            @value = _value[0]
-            @options = (_value[-1] || {}).merge(options || {})
-          else
-            @value = _value
-            @options = options || {}
-          end
+    def initialize(value, options = {}, resource:, serializer:)
+      if value.respond_to?(:call)
+        @volatile = true
+        computed_value = value.call(resource, serializer)
+        if computed_value.is_a?(Array) && computed_value.length > 1
+          @value = computed_value[0]
+          @options = (computed_value[-1] || {}).merge(options || {})
         else
-          @value = value.is_a?(String) ? value.to_sym : value
+          @value = computed_value
           @options = options || {}
         end
+      else
+        @value = value.is_a?(String) ? value.to_sym : value
+        @options = options || {}
       end
+    end
 
-      def raw
-        [value, options]
-      end
-
-      def volatile?
-        return @volatile || false
-      end
+    def raw
+      [value, options]
+    end
 
-      private
-        attr_writer :value, :options
+    def volatile?
+      @volatile || false
     end
+
+    private
+
+    attr_writer :value, :options
   end
 end

data/lib/simple_ams/options/fields.rb

@@ -1,4 +1,4 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
   class Fields < Array

data/lib/simple_ams/options/forms.rb

@@ -1,4 +1,4 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
   class Forms < Generics
@@ -9,4 +9,3 @@ class SimpleAMS::Options
     end
   end
 end
-

data/lib/simple_ams/options/generics.rb

@@ -1,11 +1,11 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
   class Generics < Array
     include SimpleAMS::Options::Concerns::Filterable
 
     def volatile?
-      self.any?(&:volatile?)
+      any?(&:volatile?)
     end
 
     class Option
@@ -13,5 +13,3 @@ class SimpleAMS::Options
     end
   end
 end
-
-

data/lib/simple_ams/options/includes.rb

@@ -1,4 +1,4 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
   class Includes < Array

data/lib/simple_ams/options/links.rb

@@ -1,4 +1,4 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
   class Links < Generics

data/lib/simple_ams/options/metas.rb

@@ -1,4 +1,4 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
   class Metas < Generics

data/lib/simple_ams/options/primary_id.rb

@@ -1,4 +1,4 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
   class PrimaryId

data/lib/simple_ams/options/relations.rb

@@ -1,4 +1,4 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
   class Relations < Array
@@ -8,27 +8,28 @@ class SimpleAMS::Options
       @relations = relations
       @includes = includes
 
-      super(relations.map{|rel| Relations::Relation.new(*rel)})
+      super(relations.map { |rel| Relations::Relation.new(*rel) })
     end
 
     def available
       return @available ||= self if includes.nil?
       return @available ||= [] if includes.empty?
 
-      @available ||= self.select{
-        |relation| includes.include?(relation.name)
-      }
+      @available ||= self.select  do |relation|
+        includes.include?(relation.name)
+      end
     end
 
     class Relation
       attr_reader :type, :name, :options, :embedded
+
       def initialize(type, name, options = {}, embedded)
         @type = type.to_sym
         @name = name.is_a?(String) ? name.to_sym : name
         @options = options
         @embedded = embedded
 
-        @many = type == :has_many ? true : false
+        @many = type == :has_many
       end
 
       alias relation name
@@ -46,7 +47,8 @@ class SimpleAMS::Options
       end
 
       private
-        attr_writer :type, :name, :options
+
+      attr_writer :type, :name, :options
     end
   end
 end

data/lib/simple_ams/options/type.rb

@@ -1,8 +1,7 @@
-require "simple_ams"
+require 'simple_ams'
 
 class SimpleAMS::Options
   class Type
     include SimpleAMS::Options::Concerns::ValueHash
   end
 end
-

data/lib/simple_ams/renderer.rb

@@ -1,59 +1,61 @@
-require "simple_ams"
+require 'simple_ams'
 
-module SimpleAMS
-  class Renderer
-    def initialize(resource, options = {})
-      @resource = resource
-      @options = SimpleAMS::Options.new(resource, injected_options: options)
-    end
+class SimpleAMS::Renderer
+  def initialize(resource, options = {})
+    @resource = resource
+    @options = SimpleAMS::Options.new(resource, injected_options: options)
+  end
 
-    #resource decorator ?
-    def document
-      @document ||= SimpleAMS::Document.new(options)
+  # resource decorator ?
+  def document
+    @document ||= SimpleAMS::Document.new(options)
+  end
+
+  def name
+    @options.name
+  end
+
+  def as_json
+    options.adapter.klass.new(document, options.adapter.options).as_json
+  end
+
+  def to_json(*_args)
+    as_json.to_json
+  end
+
+  class Collection
+    def initialize(collection, options = {})
+      @collection = collection
+      @options = SimpleAMS::Options.new(
+        collection,
+        injected_options: options.merge(_internal: is_collection)
+      )
     end
 
-    def name
-      @options.name
+    def folder
+      @folder ||= SimpleAMS::Document::Folder.new(options)
     end
 
     def as_json
-      options.adapter.klass.new(document, options.adapter.options).as_json
+      options.adapter.klass::Collection.new(folder, options.adapter.options).as_json
     end
 
-    def to_json
+    def to_json(*_args)
       as_json.to_json
     end
 
-    class Collection
-      def initialize(collection, options = {})
-        @collection = collection
-        @options = SimpleAMS::Options.new(collection, {
-          injected_options: options.merge(_internal: is_collection)
-        })
-      end
-
-      def folder
-        @folder ||= SimpleAMS::Document::Folder.new(options)
-      end
-
-      def as_json
-        options.adapter.klass::Collection.new(folder, options.adapter.options).as_json
-      end
-
-      def to_json
-        as_json.to_json
-      end
+    private
 
-      private
-        attr_reader :collection, :options
+    attr_reader :collection, :options
 
-        def is_collection
-          { is_collection: true }
-        end
+    # rubocop:disable Naming/PredicateName
+    def is_collection
+      { is_collection: true }
     end
-
-    private
-      attr_reader :resource, :options
+    # rubocop:enable Naming/PredicateName
   end
 
+  private
+
+  attr_reader :resource, :options
 end