well-actually 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c826e95643c9ec3ec3eb2b326ab2317a7d13c791
-  data.tar.gz: 0c9b711fdf5c097b2fd7494cd16ab5f7a9bfb0a5
+  metadata.gz: c9d3cbd45c8bd9beb62542631fb22dd7ee23a0ea
+  data.tar.gz: bf57eeccaff8abaf0422d223d8fddd0625786c71
 SHA512:
-  metadata.gz: 96826dbee1d0cc607cb5f2d523e985999f80ac79735e77b04666ab45583acb7eab3df059d64da5045625cf86bea2f6246250530ff55736f7ec5d1764d2183409
-  data.tar.gz: e0c0032189ca07bd2401e9858c4ac0abdb6bd3d508c21111eebd87d865499088a26ae39b62448ddf61823b77c6beada47725de636e06b2eafba14337eb6b1c22
+  metadata.gz: 3dbca6039c04b91e1c6c98da262291f33d98afa6f502be08cab79a38f7570e8951d681e3691dc29ec60c7a2aaf4feacfbdbdf2917d61df852dcfd5d3d0362b08
+  data.tar.gz: 6535a3575c0994f6a19227b4cb69bb10c6b0acf2a7102a1a34b42de521992ef354e00b85edd6acc3410faf223e80ed98679d7c6135b3c440d530d46eda823750

data/.gitignore

@@ -10,3 +10,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+*.gem

data/README.md

@@ -1,5 +1,7 @@
 ## Installation
 
+Is tested with pure ruby classes and classes that inherit from ActiveRecord::Base, rails >= 4 supported.
+
 Add this line to your application's Gemfile:
 
 ```ruby
@@ -12,12 +14,14 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install well_actually
+    $ gem install well-actually
 
 ## Usage
 ```ruby
 Dog < ActiveRecord::Base
   extend WellActually
+  # overwrite or overwrites option can be a symbol or an array of symbol, earlier takes precedence over later
+  # attributes must be an array of symbols
   well_actually overwrite: :overwrite, attributes: [:name, :show, :birthday]
 end
 

data/lib/well_actually/mounter.rb

@@ -1,20 +1,21 @@
 module WellActually
   class Mounter
-    attr_reader :klass, :overwrite, :attributes
+    attr_reader :klass, :overwrites, :attributes
 
     BLANK_RE = defined?(String::BLANK_RE) ? String::BLANK_RE : /\A[[:space:]]*\z/
 
-    def initialize(klass:, overwrite:, attributes:)
-      raise ArgumentError.new("overwrite must be a symbol") unless overwrite.is_a?(Symbol)
+    def initialize(klass:, overwrites: nil, overwrite: nil, attributes:)
+      overwrites = overwrite || overwrites
+      raise ArgumentError.new("overwrite must be a symbol or an array of symbols") unless overwrites.is_a?(Symbol) || (overwrites.is_a?(Array) && overwrites.all?{|a| a.is_a?(Symbol)})
       raise ArgumentError.new("attributes must be an array of symbols") unless attributes.is_a?(Array) && attributes.all?{|a| a.is_a?(Symbol)}
       @klass = klass
-      @overwrite = overwrite
+      @overwrites = overwrites
       @attributes = attributes.uniq
     end
 
     def mount
       klass.class_variable_set(:@@well_actually_attributes, attributes.map{|_attr| _attr.to_s})
-      klass.class_variable_set(:@@well_actually_overwrite, overwrite)
+      klass.class_variable_set(:@@well_actually_overwrites, [*overwrites])
 
       klass.send(:define_singleton_method, :well_actually_attributes) do
         self.class_variable_get(:@@well_actually_attributes)
@@ -24,12 +25,20 @@ module WellActually
         self.class.well_actually_attributes
       end
 
-      klass.send(:define_singleton_method, :well_actually_overwrite) do
-        self.class_variable_get(:@@well_actually_overwrite)
+      klass.send(:define_singleton_method, :well_actually_overwrites) do
+        self.class_variable_get(:@@well_actually_overwrites)
       end
 
-      klass.send(:define_method, :well_actually_overwrite) do
-        self.public_send(self.class.well_actually_overwrite)
+      klass.send(:define_method, :well_actually_overwrites) do
+        self.class.well_actually_overwrites.map do |overwrite|
+          self.public_send(overwrite)
+        end.reduce({}) do |result, overwrite|
+          result.merge(overwrite || {}) do |key, v1, v2|
+            v1 = nil unless self.well_actually_overwrite_value_check(key, v1)
+            v2 = nil unless self.well_actually_overwrite_value_check(key, v2)
+            v1.nil? ? v2 : v1
+          end
+        end
       end
 
       klass.send(:define_method, :well_actually?) do
@@ -51,10 +60,14 @@ module WellActually
       end
 
       klass.send(:define_method, :well_actually_overwrite_safe) do
-        (self.well_actually_overwrite || {}).select do |key, value|
-          self.well_actually_attributes.include?(key) && !value.nil? && (!value.is_a?(String) || !value.match(BLANK_RE))
+        (self.well_actually_overwrites || {}).select do |key, value|
+          self.well_actually_overwrite_value_check(key, value)
         end
       end
+
+      klass.send(:define_method, :well_actually_overwrite_value_check) do |key, value|
+        self.well_actually_attributes.include?(key) && !value.nil? && (!value.is_a?(String) || !value.match(BLANK_RE))
+      end
     end
   end
 end

data/lib/well_actually/version.rb

@@ -1,3 +1,3 @@
 module WellActually
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: well-actually
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andrew Rove
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler