flowlink_data 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69925cf26513fecb4c9d171e95fdbeff97f83073
-  data.tar.gz: 606610ac873e22d40503da6c6481e1bcc2e73640
+  metadata.gz: 69d8e2a66fab063ec164838c1cf7ad92f3964397
+  data.tar.gz: 36ca7c3a8bd7bcee4ecf24962d22e4a2cb95825d
 SHA512:
-  metadata.gz: 062f10a60be77181135c17995fa6d4041f99f8b2fdb1d4155e232b3a35a65d0a0a7a4777be7199670fed660c511c2180adeb48c8c47aeec70453dbe0bbbf9f09
-  data.tar.gz: 37ce125cd1402571358075770623f4b96ad41b8240a13a5a3d832702a8945d1794d6c9be7526862017ab4365eaffa1dddbc58ff2690fac3d00c0acefc2fc2de1
+  metadata.gz: 2a7a5217646e72f552e4568e122a9fa33cfd0db5c823afa198c9ccc777d1cfe31de3f2b2cd2a807ee8055bb7633bbcd544ddddcd20c7336b07962dba12378a2f
+  data.tar.gz: aaa29d3eeb819ddc98ca89795c8fb082c99f680c360942bdf57603659fef670d6df2d49d6f20b55d41481925b1b79493905737f45c83794e376a763a71aba37e

data/lib/flowlink_data/field_method.rb

@@ -0,0 +1,58 @@
+module Flowlink
+  # Represents a property of a domain object. For example, a price in a product.
+  # If you need to change how one of these is handled in a specific product,
+  # then you can use it as a #new argument for a class which inherits from
+  # Flowlink::ObjectBase, and invokes super in .initialize
+  class FieldMethod
+    attr_reader :method_name, :args, :block
+
+    def self.multi_new(methods)
+      methods.map do |m|
+        m = [m].flatten
+        FieldMethod.new(m.shift, m)
+      end
+    end
+
+    def self.merge(overrides, original)
+      overrides.inject(original) { |a, e| e.merge(a) }
+    end
+
+    def initialize(method_name, *args)
+      @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 ==(other)
+      return false unless other.is_a?(self.class)
+      to_a == other.to_a
+    end
+
+    def merge(list) # rename to #override, #hard_merge, or add #override alias?
+      # 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
+
+    def to_a
+      [method_name] + args + (@block.nil? ? [] : [@block])
+    end
+
+    def send_to(sendable)
+      # we can't splat procs, so this is necessary
+      # TODO: use #to_a and reduce cases/enforce SRP on regular arg assembler
+      case
+      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)
+      when !block && !args.empty?
+        sendable.send(method_name, *args)
+      end
+    end
+  end
+end

data/lib/flowlink_data/objectbase.rb

@@ -1,62 +1,24 @@
-class FieldMethod
-  attr_reader :method_name, :args, :block
-
-  def self.multi_new(methods)
-    methods.map do |m|
-      m = [m].flatten
-      FieldMethod.new(m.shift, m)
-    end
-  end
-
-  def self.merge(overrides, original)
-    overrides.inject(original) { |a, e| e.merge(a) }
-  end
-
-  def initialize(method_name, *args)
-    @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
-
-  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
+require_relative '../field_method'
 
 module Flowlink
   class ObjectBase
-    # Base class for any Flowlink objects. Child classes should implement
+    # Base class for any Flowlink objects. Children should implement
     # self.fields internally.
 
-    def to_hash(*overrides)
-      overrides = FieldMethod.multi_new(overrides)
-      defaults  = FieldMethod.multi_new(fields)
-      f_methods = FieldMethod.merge(overrides, defaults)
+    attr_accessor :f_methods
+
+    def initialize(*overrides)
+      unless overrides.flatten!.all? { |arg| arg.is_a?(FieldMethod) }
+        # using array arguments isn't supported anymore
+        fail ArgumentError, 'Arguments need to be FieldMethods'
+      end
+
+      defaults   = FieldMethod.multi_new(fields)
+      @f_methods = FieldMethod.merge(overrides, defaults)
+    end
 
-      Hash[f_methods.map { |fm| [fm.method_name.to_s, fm.send_to(self)] }]
+    def to_hash
+      Hash[@f_methods.map { |fm| [fm.method_name.to_s, fm.send_to(self)] }]
     end
 
     alias to_message to_hash

data/lib/flowlink_data/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flowlink_data
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Cooper LeBrun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A framework for getting Flowlink objects from other sources. For example:
@@ -25,6 +25,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/flowlink_data.rb
+- lib/flowlink_data/field_method.rb
 - lib/flowlink_data/objectbase.rb
 - lib/flowlink_data/product.rb
 - lib/flowlink_data/version.rb