traitr 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a70000928ed720a84d8e3917407c987746e00b2
-  data.tar.gz: eaa7da7e08396b1943446e3fc3ad3e9e319cb6cc
+  metadata.gz: 3ed989bf89f57b2646ce63d1e3bf8622adb9b174
+  data.tar.gz: fe0731743fb6c9c74bbc4a831dcf768d8a7302b6
 SHA512:
-  metadata.gz: 49ff026c248777c002fb8f743c54eff1fc4e4f56d3984599a712d60cb35c60836137a1fc3ac555ed60379f926c643983fb3236a504ab88b3437d957a9453d648
-  data.tar.gz: 1f258d37b1e7be543bf8b0aa0bb44348664737b3b654bfa46405ddb87cf2c0689f84ecdd0964872a80eae67012c9111c2f12c0c548622c3d30ffe45e56853d88
+  metadata.gz: 496b42da0b8f2b876302e6f039b2e42ef137ab193fceb5671cfb08f825ad1c7f4c5b25682388689fcf710dc2637a5a3d8b16b7cc42af1470eb911d87966e5548
+  data.tar.gz: f4adb687f50cd4c6820274244ee3aec07a5a476698968aa543c99d68f72275213369d5077b9448939803207a99ba23882039eac15c8b76645b564cb1421e1336

data/lib/traitor/config.rb

@@ -1,15 +1,29 @@
 module Traitor
   class Config
-    def self.configure_for_rails!
-      Traitor.instance_variable_set(:@save_method, :save)
-      Traitor.instance_variable_set(:@save_kwargs, {validate: false})
-      Traitor.instance_variable_set(:@build_kwargs, {without_protection: true})
-    end
+    @save_method  = nil
+    @save_kwargs  = {}
+    @build_kwargs = {}
+
+    class << self
+      attr_accessor :save_method, :save_kwargs, :build_kwargs
+
+      def configure_for_rails!
+        @save_method  = :save
+        @save_kwargs  = { validate: false }
+        @build_kwargs = { without_validation: true }
+      end
+
+      def configure_safe_for_rails!
+        @save_method  = :save
+        @save_kwargs  = {}
+        @build_kwargs = {}
+      end
 
-    def self.configure_safe_for_rails!
-      Traitor.instance_variable_set(:@save_method, :save)
-      Traitor.instance_variable_set(:@save_kwargs, {})
-      Traitor.instance_variable_set(:@build_kwargs, {})
+      def reset!
+        @save_method = nil
+        @save_kwargs = {}
+        @build_kwargs = {}
+      end
     end
   end
 end

data/lib/traitor.rb

@@ -3,66 +3,91 @@ require 'traitor/find_definitions'
 require 'traitor/error'
 
 module Traitor
+  BLOCK_KEYS = [:after_build, :after_create]
+
   @trait_library = {}
   @block_library = {}
-
-  @save_method = nil
-  @save_kwargs = {}
-  @build_kwargs = {}
-
   @class_cache = {}
   @trait_cache = {}
 
-  class << self
-    attr_writer :save_method, :save_kwargs, :build_kwargs
-  end
-
   def self.reset!
     @trait_library = {}
+    @block_library = {}
     @class_cache = {}
     @trait_cache = {}
   end
 
-  def self.define(klass, **traits, &block)
-    if @trait_library.include? klass
-      @trait_library[klass].merge!(traits)
-    else
-      @trait_library[klass] = traits
+  def self.define(klass, **traits)
+    @trait_library[klass] ||= {}
+
+    (traits.keys & BLOCK_KEYS).each do |block_type|
+      block = traits.delete block_type
+      @block_library[klass] ||= {class: {}, traits: {}}
+      @block_library[klass][:class][block_type] = block
     end
-    @block_library[klass] = block if block_given?
+
+    traits.each do |trait, attributes|
+      (attributes.keys & BLOCK_KEYS).each do |block_type|
+        block = attributes.delete block_type
+        @block_library[klass] ||= {class: {}, traits: {}}
+        @block_library[klass][:traits][trait] ||= {}
+        @block_library[klass][:traits][trait][block_type] = block
+      end
+    end
+
+    @trait_library[klass].merge!(traits)
   end
 
   ##
   # build an instance of an object using the defined traits and attributes,
   # and then save it.
   ##
-  def self.create(klass, *traits, **attributes, &block)
-    raise Traitor::Error.new("Cannot call Traitor.create until you have configured Traitor.save_method!") unless @save_method
-    record = build(klass, *traits, **attributes, &block)
-    record.public_send(@save_method, **@save_kwargs)
-    yield(record, at: :create) if block_given?
-    run_class_block(klass, record, :build)
+  def self.create(klass, *traits, **attributes)
+    save_method = Traitor::Config.save_method
+    raise Traitor::Error.new("Cannot call Traitor.create until you have configured Traitor.save_method .") unless save_method
+
+    record = build(klass, *traits, **attributes)
+
+    if (save_kwargs = Traitor::Config.save_kwargs).any? # assignment intentional
+      record.public_send(save_method, **save_kwargs)
+    else
+      record.public_send(save_method)
+    end
+
+    call_blocks(klass, :after_create, record, *traits)
     record
   end
 
   ##
   # build an instance of an object using the defined traits and attributes.
   ##
-  def self.build(klass, *traits, **attributes, &block)
+  def self.build(klass, *traits, **attributes)
     attributes = get_attributes_from_traits(klass, traits).merge(attributes)
-    record = convert_to_class(klass).new(attributes, **@build_kwargs)
-    yield(record, at: :build) if block_given?
-    run_class_block(klass, record, :build)
+
+    record = if (build_kwargs = Traitor::Config.build_kwargs).any? # assignment intentional
+      convert_to_class(klass).new(attributes, **build_kwargs)
+    else
+      convert_to_class(klass).new(attributes)
+    end
+
+    call_blocks(klass, :after_build, record, *traits)
     record
   end
 
   # private methods
 
-  def self.run_class_block(klass, record, at)
-    class_block = @block_library[klass]
-    class_block.call(record, at: at) if class_block
+  def self.call_blocks(klass, trigger, record, *traits)
+    return unless @block_library[klass]
+    [].tap do |blocks|
+      blocks << @block_library[klass][:class][trigger]
+      traits.each do |trait|
+        if @block_library[klass][:traits][trait]
+          blocks << @block_library[klass][:traits][trait][trigger]
+        end
+      end
+    end.compact.each { |block| block.call(record) }
   end
-  private_class_method :run_class_block
+  private_class_method :call_blocks
 
   def self.convert_to_class(klass)
     @class_cache[klass] ||= Object.const_get(camelize(klass))
@@ -85,16 +110,15 @@ module Traitor
     # use late resolution on lambda values by calling them here as part of constructing a new hash
     Hash[
       @trait_cache[cache_key].map do |attribute, value|
-        [attribute, value.is_a?(Proc) ? value.call : value]
+        [attribute, value.is_a?(Proc) && ![:after_build, :after_create].include?(attribute) ? value.call : value]
       end
     ]
   end
   private_class_method :get_attributes_from_traits
 
-  # simplified from Rails.
   def self.camelize(term)
     string = term.to_s
-    string = string.sub(/^[a-z\d]*/) { |match| match.capitalize }
+    string[0] = string[0].upcase
     string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
     string.gsub!('/'.freeze, '::'.freeze)
     string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traitr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Zach Lome
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler