flowlink_data 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f85858abd782c8abbc8cc23f5e5ae06dad6e7ccd
-  data.tar.gz: 1f2a112880bc727d5ee8e506a2ac2389200ff72f
+  metadata.gz: 69925cf26513fecb4c9d171e95fdbeff97f83073
+  data.tar.gz: 606610ac873e22d40503da6c6481e1bcc2e73640
 SHA512:
-  metadata.gz: 591c1843a8b82b511da748b6635624bd0a2210416a4d6a1247f8dee9c469cda61d8cbb43c03b3bb9026df537aa7731ffbd7a8843b8f47985e085f887202b9eb3
-  data.tar.gz: 9872e362b0618108c778b87d07fdc27471c864887aec6418cfa0785bfadfe23a2963818af788ca70d1a73f61e048bec8c69ffb666a012225be72c4603ba1eca4
+  metadata.gz: 062f10a60be77181135c17995fa6d4041f99f8b2fdb1d4155e232b3a35a65d0a0a7a4777be7199670fed660c511c2180adeb48c8c47aeec70453dbe0bbbf9f09
+  data.tar.gz: 37ce125cd1402571358075770623f4b96ad41b8240a13a5a3d832702a8945d1794d6c9be7526862017ab4365eaffa1dddbc58ff2690fac3d00c0acefc2fc2de1

data/lib/flowlink_data/objectbase.rb

@@ -1,5 +1,5 @@
 class FieldMethod
-  attr_accessor :method_name, :args
+  attr_reader :method_name, :args, :block
 
   def self.multi_new(methods)
     methods.map do |m|
@@ -13,11 +13,15 @@ class FieldMethod
   end
 
   def initialize(method_name, *args)
-    @method_name = method_name.to_sym
-    @args        = args.to_a.flatten
+    @method_name  = method_name.to_sym
+    @args         = args.to_a.flatten
+    @block, @args = @args.partition { |arg| arg.is_a? Proc }
+    @block = @block[0]
   end
 
   def merge(list)
+    # This will put itself into a list of other FieldMethods and overwrite
+    # an existing FM with the same name
     list.delete_if { |o_fm| o_fm.method_name == method_name }
     list << self
   end
@@ -25,6 +29,21 @@ class FieldMethod
   def to_a
     [method_name] + args
   end
+
+  def send_to(sendable)
+    # can't just splat because procs have to be treated with kids gloves >:/
+    # TODO: use #to_a and reduce cases/enforce SRP on regular arg assembley
+    case 
+    when !block && !args.empty?
+      sendable.send(method_name, *args)
+    when block && args.empty?
+      sendable.send(method_name, &block)
+    when block && !args.empty?
+      sendable.send(method_name, *args, &block)
+    when !block && args.empty?
+      sendable.send(method_name)
+    end
+  end
 end
 
 module Flowlink
@@ -37,7 +56,7 @@ module Flowlink
       defaults  = FieldMethod.multi_new(fields)
       f_methods = FieldMethod.merge(overrides, defaults)
 
-      Hash[f_methods.map { |f| [f.method_name.to_s, send(*f.to_a)] }]
+      Hash[f_methods.map { |fm| [fm.method_name.to_s, fm.send_to(self)] }]
     end
 
     alias to_message to_hash
@@ -48,8 +67,7 @@ module Flowlink
     end
 
     def fields
-      # TODO: @fields ||= self.class.fields ???
-      self.class.fields
+      @fields ||= self.class.fields
     end
   end
 end

data/lib/flowlink_data/version.rb

@@ -1,3 +1,3 @@
 module Flowlink
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flowlink_data
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Cooper LeBrun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A framework for getting Flowlink objects from other sources. For example: