material 0.2.21 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae59554fed28abb2569c2b32b6bbca5575d60c5af44a7e5830007d8ef49c357
-  data.tar.gz: 1bf61511f2eb3064d965c1c3a5be255087159d99dddcecbfb7f0d4f90e9b5a66
+  metadata.gz: f1c068082b23728d7529c57e25c8219de1622454fc4c0fb3d003d5edc579620b
+  data.tar.gz: 63289acc7d4808c010117e421b59c8503dc409ad212d3affc33da6296bf50bd2
 SHA512:
-  metadata.gz: 025bb61f457490ad7022ec151cde12440c9dfc6b1cb6c1c75796004b3b53b5e7a96a94c538c327c4fb744fa6480aaadd16fc16e98297c3cae5cf4dcbcd8df90f
-  data.tar.gz: 8b35d548680cacbcea1e2c7ed8faf23193e064011d02add633cf84c53f8a2d559a39bc0486b102ea1ef00f97c3aa64c2d42099fd90a7fd2add5a821c22d4a688
+  metadata.gz: 68a519e6a5af1e0bb0bbdaaa83267de587bdfca0d4c65415e77ed3f68823eab5720f0e59694079a91fcf3eb1d56d02c07e66dfb431062892df908f99418c26d2
+  data.tar.gz: 7b54cf5e1fc6ac7daec66628bcd23cb6954611031ec933bc14633abb6cdeeb573f3dcb5c6503aa2ee9ad6cb0bd456bbc63abd80af66406d8f2c9e0d49d7864fc

data/lib/material/base.rb

@@ -4,20 +4,27 @@ module Material
   class Base < Spicerack::AttributeObject
     extend ActiveSupport::NumberHelper
 
+    include Conjunction::Junction
+    suffixed_with "Material"
+
     include Material::Components
     include Material::Core
     include Material::Display
     include Material::Text
     include Material::Site
-    include Material::For
     include Material::Format
     include Material::Attributes
 
     register_component :list_item_style
 
-    def self.for(object)
-      material_class = material_class_for(object, "Material")
-      material_class.new(object) if material_class.present?
+    class << self
+      def for(object)
+        for_class(object)&.new(object)
+      end
+
+      def for_class(object)
+        object.try(:conjugate!, self)
+      end
     end
 
     def to_source_model

data/lib/material/concerns/collection.rb

@@ -30,7 +30,7 @@ module Material
       ary = super
       return ary if ary.empty?
 
-      material_class = self.class.material_class_for(ary.first, "Material")
+      material_class = ary.first.try(:conjugate, Material::Base)
       material_class.nil? ? ary : ary.map(&material_class.method(:new))
     end
   end

data/lib/material/list.rb

@@ -2,11 +2,13 @@
 
 module Material
   class List < Collectible::CollectionBase
+    include Conjunction::Junction
+    suffixed_with "List"
+
     include Material::Components
     include Material::Display
     include Material::Text
     include Material::Site
-    include Material::For
     include Material::Pagination
     include Material::Mount
     include Material::Collection
@@ -14,8 +16,20 @@ module Material
 
     class << self
       def for(object)
-        material_class = material_class_for(object, "List")
-        material_class.new if material_class.present?
+        klass = for_class(object.respond_to?(:first) ? object.first : object)
+        materialize(object, klass) if klass.present?
+      end
+
+      def for_class(object)
+        object.try(:conjugate!, self)
+      end
+
+      private
+
+      def materialize(object, klass)
+        return klass.new(object) if object.present? && !object.is_a?(Class)
+
+        klass.new
       end
     end
 

data/lib/material/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Material
-  VERSION = "0.2.21"
+  VERSION = "0.2.22"
 end

data/lib/material.rb

@@ -4,14 +4,13 @@ require "active_support"
 require "active_support/core_ext"
 require "active_support/number_helper"
 
-require "spicerack"
+require "spicery"
 
 require_relative "material/concerns/components"
 require_relative "material/concerns/core"
 require_relative "material/concerns/display"
 require_relative "material/concerns/text"
 require_relative "material/concerns/site"
-require_relative "material/concerns/for"
 require_relative "material/concerns/pagination"
 require_relative "material/concerns/mount"
 require_relative "material/concerns/collection"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.22
 platform: ruby
 authors:
 - Eric Garside
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,12 +25,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.1
 - !ruby/object:Gem::Dependency
-  name: spicerack
+  name: spicery
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.20.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.20.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -58,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +120,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.20.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -158,7 +130,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.20.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -168,7 +140,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.20.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -178,7 +150,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.20.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -213,7 +185,6 @@ files:
 - lib/material/concerns/components.rb
 - lib/material/concerns/core.rb
 - lib/material/concerns/display.rb
-- lib/material/concerns/for.rb
 - lib/material/concerns/format.rb
 - lib/material/concerns/mount.rb
 - lib/material/concerns/pagination.rb

data/lib/material/concerns/for.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-# Build materials from objects based either an explicit definition or an optimistic lookup
-module Material
-  module For
-    extend ActiveSupport::Concern
-
-    class_methods do
-      def material_class_for(object, subtype)
-        method = "#{subtype.downcase}_class".to_sym
-        object_class = object.is_a?(Class) ? object : object.class
-        lookup(object, method) || lookup(object_class, method) || "#{object_class.name}#{subtype}".safe_constantize
-      end
-
-      private
-
-      def lookup(object, lookup_name)
-        object.public_send(lookup_name) if object.respond_to?(lookup_name)
-      end
-    end
-  end
-end