method_found 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bc50110082afd5058e16422c320e7b48ca7ea75
-  data.tar.gz: 154aa54df987957c7b405ac9f669546a69790f33
+  metadata.gz: 5170324feef4ea0010c3934edbac271307fedd1d
+  data.tar.gz: fade9008001c4fce5121f64dfad3086e9a4764be
 SHA512:
-  metadata.gz: 3ccf3e88a3726c8c709b0df1c479952d85f08e787e2d1cf218eeef2a59f1f62128dbc27e534fb13c214b55f0c0c7644b418ec66d7502247316fe209c11f544b0
-  data.tar.gz: 2bb0be7f5e689e5aec743de2dc90d5bbb0bcf534ff76207afede9373eac35ae52073fcd63951859d4e656f7c227f646dc98fc12837fdf6689188db1311f035ba
+  metadata.gz: 1b6607f908acf0a62cd15c67903f5c5acbd2d5bec5b5b8f2e20eca93f45f4e670ade5181762816207ed9824b86cb7eceaac95f5b393455fe4cf49f922861ddd6
+  data.tar.gz: ed308bf21a68260776231d450a1d57ba565861d1e9065fc844f32130ccb8043f96edc2333d9cb415e9051acd6beb81bd724328209e20b8244d594543bba69c6f

data/README.md

@@ -14,7 +14,7 @@ Intercept `method_missing` and do something useful with it.
 Add to your Gemfile:
 
 ```ruby
-gem 'method_found', '~> 0.1.4'
+gem 'method_found', '~> 0.1.5'
 ```
 
 And bundle it.

data/lib/method_found.rb

@@ -3,6 +3,7 @@ require "securerandom"
 require "method_found/version"
 require "method_found/builder"
 require "method_found/interceptor"
+require "method_found/attribute_methods"
 
 module MethodFound
   def self.new(*args, &block)

data/lib/method_found/attribute_interceptor.rb

@@ -43,31 +43,49 @@ attribute name or set of attribute names.
 =end
   class AttributeInterceptor < Interceptor
     def initialize(prefix: '', suffix: '')
-      @prefix, @suffix = prefix, suffix
-      regex_ = regex
-      attribute_matcher = proc do |method_name|
-        (matches = regex_.match(method_name)) && attributes.include?(matches[1]) && matches[1]
-      end
-      attribute_matcher.define_singleton_method :inspect do
-        regex_.inspect
-      end
+      @regex = /\A(?:#{Regexp.escape(prefix)})(.*)(?:#{Regexp.escape(suffix)})\z/
+      @method_missing_target = method_missing_target = "#{prefix}attribute#{suffix}"
+      @method_name = "#{prefix}%s#{suffix}"
 
-      super attribute_matcher do |_, attr_name, *arguments, &block|
-        send("#{prefix}attribute#{suffix}", attr_name, *arguments, &block)
+      super to_proc do |_, attr_name, *args, &block|
+        send(method_missing_target, attr_name, *args, &block)
       end
     end
 
-    def regex
-      /\A(?:#{Regexp.escape(@prefix)})(.*)(?:#{Regexp.escape(@suffix)})\z/.freeze
-    end
-
     def define_attribute_methods(*attr_names)
-      prefix, suffix = @prefix, @suffix
+      handler = @method_missing_target
       attr_names.each do |attr_name|
-        define_method "#{@prefix}#{attr_name}#{@suffix}".freeze do |*arguments, &block|
-          send("#{prefix}attribute#{suffix}".freeze, attr_name, *arguments, &block)
+        define_method method_name(attr_name) do |*arguments, &block|
+          send(handler, attr_name, *arguments, &block)
         end
       end
     end
+
+    def alias_attribute(new_name, old_name)
+      handler = method_name(old_name)
+      define_method method_name(new_name) do |*arguments, &block|
+        send(handler, *arguments, &block)
+      end
+    end
+
+    def to_proc
+      regex = @regex
+      proc do |method_name|
+        (matches = regex.match(method_name)) &&
+          (method_name != :attributes) &&
+          respond_to?(:attributes) &&
+          (attributes.keys & matches.captures).first
+      end
+    end
+
+    def inspect
+      "<#{self.class.name}: #{@regex.inspect}>"
+    end
+
+    private
+
+    def method_name(attr_name)
+      @method_name % attr_name
+    end
   end
 end

data/lib/method_found/attribute_methods.rb

@@ -3,6 +3,9 @@ require "method_found/attribute_interceptor"
 module MethodFound
 =begin
 
+Re-implementation of ActiveModel::AttributeMethods from Rails using
+{MethodFound::Interceptor} modules instead of class variables.
+
 @example
   class Person < Struct.new(:attributes)
     include MethodFound::AttributeMethods
@@ -45,22 +48,29 @@ module MethodFound
 =end
   module AttributeMethods
     def self.included(base)
+      base.include(AttributeInterceptor.new)
       base.instance_eval do
-        def attribute_method_affix(prefix: '', suffix: '')
-          include(AttributeInterceptor.new(prefix: prefix, suffix: suffix))
+        def attribute_method_prefix(*prefixes)
+          prefixes.each { |prefix| include AttributeInterceptor.new(prefix: prefix) }
+        end
+
+        def attribute_method_suffix(*suffixes)
+          suffixes.each { |suffix| include AttributeInterceptor.new(suffix: suffix) }
         end
 
-        def attribute_method_suffix(suffix)
-          include(AttributeInterceptor.new(suffix: suffix))
+        def attribute_method_affix(*affixes)
+          affixes.each { |affix| include AttributeInterceptor.new(prefix: affix[:prefix], suffix: affix[:suffix]) }
         end
 
-        def attribute_method_prefix(prefix)
-          include(AttributeInterceptor.new(prefix: prefix))
+        def define_attribute_methods(*attr_names)
+          ancestors.each do |ancestor|
+            ancestor.define_attribute_methods(*attr_names) if ancestor.is_a?(AttributeInterceptor)
+          end
         end
 
-        def define_attribute_methods(*attributes)
+        def alias_attribute(new_name, old_name)
           ancestors.each do |ancestor|
-            ancestor.define_attribute_methods(*attributes) if ancestor.is_a?(AttributeInterceptor)
+            ancestor.alias_attribute(new_name, old_name) if ancestor.is_a?(AttributeInterceptor)
           end
         end
       end

data/lib/method_found/builder.rb

@@ -27,9 +27,9 @@ Creates set of interceptors to include into a class.
 
     # @yield Yields builder as context to block, to allow calling builder
     #   methods to create interceptors in included class.
-    def initialize(&block)
+    def initialize
       @interceptors = []
-      instance_eval &block
+      super
     end
 
     def intercept(*args, &block)

data/lib/method_found/version.rb

@@ -1,3 +1,3 @@
 module MethodFound
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: method_found
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-06 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler