mystique 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e2821f43b65346ff984fd7ea046244d322529b7f6c03f3493f40db4120d7bf9
-  data.tar.gz: ac9ad25b4a6f0b5058a4bbc7058967a059774498947793bb438b3af524b26f34
+  metadata.gz: 0c4b41e5e88082dcc7d1409113cfa6fa93e744d181085d1a95d5206eb35c47ca
+  data.tar.gz: ace4c3b4da4d88494a6ae354f79a13d143f3aa7245e5088a2672e95274503ed6
 SHA512:
-  metadata.gz: fedd40c256cc88bd394f601efd63fdf54d319a2e6eb9f95fb0df1698aa38945483a33802a81e2db10be8ce9bfc26b331a460d87a71b57509316c1d502ecde6b9
-  data.tar.gz: 5cfe5ec34b74395e944f7ce26dfe0f24a7bf258ee6972598af5e96796afa9969da9bffb48339aa12083df3c05fa98f85218bfd31744419cfab7ff8cb6f0681f7
+  metadata.gz: 1b2f71369a89bc564ccf0633726ffe4bde00dad7fe066c585b346770bd3aabfeb999b33d02cfe253cf6fc8cbb982dec9eded199cc69bd66344dd35d6903db346
+  data.tar.gz: 726e814f716fce77558ba71ae09d3a776803742cfe0b0287e30d1a1a818d6af6dae2c547aa1304b6d813a98fa780c23ff38cb9f8f929ac0bc80ac7fa96b60593

data/lib/mystique.rb

@@ -12,7 +12,7 @@ module Mystique
   def present(object, with: nil, context: nil, &block)
     begin
       presenter_class = presenter_class_for(object, with)
-      presenter_class.present(object, context, &block)
+      presenter_class.for(object, context, &block)
     rescue NameError
       return object
     end
@@ -22,12 +22,17 @@ module Mystique
     return to_enum(:present_collection, collection, context: context, &block) unless block_given?
 
     collection.each do |element|
-      block.call present(element, context: context)
+      case block.arity
+      when 2
+        block.call( present(element, context: context), element )
+      else
+        block.call(present(element, context: context))
+      end
     end
   end
 
   def presenter_class_for(object, with)
-    if with.respond_to?(:present)
+    if with.respond_to?(:for)
       with
     else
       StringPlus.constantize("#{with || object.class}Presenter")

data/lib/mystique/presenter.rb

@@ -7,7 +7,7 @@ module Mystique
       @__context__ = context || self.class.context || NullContext
     end
 
-    def self.present(object, context=nil)
+    def self.for(object, context=nil)
       self.new(object, context).tap do |presenter|
         yield presenter if block_given?
       end
@@ -31,21 +31,37 @@ module Mystique
 
     def method_missing(method, *args, &block)
       return target.send(method, *args, &block) if method.to_s.start_with?("to_")
-      format( target.send(method, *args, &block) )
+
+      value = target.send(method, *args, &block)
+
+      case
+      when formatted_method?(method)
+        format( value )
+      when presented_method?(method)
+        Mystique.present(value, context: context)
+      else
+        value
+      end
+    end
+
+    def formatted_method?(method)
+      __formatted_methods__.include?(method)
+    end
+
+    def presented_method?(method)
+      __presented_methods__.include?(method)
     end
 
     def format(value)
-      result = case
-               when __formats__.keys.include?(value)
+      result = if __formats__.keys.include?(value)
                  __formats__[value]
-               when __regex_formats__.any? { |regex, _| value =~ regex}
+               elsif __regex_formats__.any? { |regex, _| value =~ regex}
                  __regex_formats__.select { |regex, _| value =~ regex}.first.last
-               when __class_formats__.any? { |klass, _| value.is_a?(klass)}
+               elsif __class_formats__.any? { |klass, _| value.is_a?(klass)}
                  __class_formats__.select { |klass, _| value.is_a?(klass)}.first.last
                else
                  value
                end
-
       Mystique.present(Callable(result).call(value, context))
     end
 
@@ -54,13 +70,46 @@ module Mystique
       @__context__
     end
 
-    def self.format(matcher, value=nil, &block)
+    def self.apply_format(matcher, value=nil, &block)
       __formats__[matcher] = block_given? ? block : value
     end
 
+    def self.format(matcher)
+      if matcher.is_a?(Symbol)
+        __formatted_methods__ << matcher
+      end
+    end
+
+    def self.present(matcher)
+      if matcher.is_a?(Symbol)
+        __presented_methods__ << matcher
+      end
+    end
+
+    def self.format_and_present(matcher)
+      format_method(method)
+      present_method(method)
+    end
+
+    def self.__presented_methods__
+      @__presented_methods__ ||= []
+    end
+
+    def self.__formatted_methods__
+      @__formatted_methods__ ||= []
+    end
+
+    def __presented_methods__
+      self.class.__presented_methods__
+    end
+
+    def __formatted_methods__
+      self.class.__formatted_methods__
+    end
+
     def self.format_multiple(*matchers, &block)
       matchers.each do |matcher|
-        format(matcher, &block)
+        apply_format(matcher, &block)
       end
     end
 

data/lib/mystique/version.rb

@@ -1,3 +1,3 @@
 module Mystique
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mystique
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Federico Iachetti
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler