storext-override 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c93086218e4ca329cb9a62bd6bf697103bd06f7
-  data.tar.gz: 30a40760d63e45e8b36b1605e4d297c9ac90a4d9
+  metadata.gz: c0d6e6fc1337b4b96e0fc1cbd39bf5700033dcf6
+  data.tar.gz: cde3e28318a214bc3f091380cc87294edd4f5f6a
 SHA512:
-  metadata.gz: c5d6a41c869423a68741834136e2b1af63c28f5d30ca8713a8b19222db42a7127ea6d3ebb40fc25f2e564c472deb5882af1ad129c850a862eae62f3aeaf653e0
-  data.tar.gz: a8ce92acdf8f7d1689f1913f1aa243211e770793785bac7d2b59a0022349522a504a209b370c840e2362202769e79794960dde9ddf88b180b2d784d6cdeaae43
+  metadata.gz: 8c529752d04d17454ed87c5765f970c5457a310a66872943b82905dad5edfa59860ce310b4a8ee7ca1039f7ad6ecbedd71a378a03cee28b06c9babd5511c7d2e
+  data.tar.gz: 840240376d10ed1be22affa0eebcb19a539cb0f1ca512067e8c5c50537be85eb441da0114fdc89c4d5ea79bd1c78d5c244cf883f78e871340f8a12a778d48e4f

data/lib/storext/override.rb

@@ -6,13 +6,25 @@ module Storext
     extend ActiveSupport::Concern
 
     included do
-      include Storext.model
+      include Storext.model unless self.respond_to? :storext_options
+    end
+
+    def storext_override_discard_value?(attr)
+      send(:"#{attr}_without_parent_default").blank? &&
+        self.class.override_options[:ignore_override_if_blank]
     end
 
     module ClassMethods
-      def storext_override(association_name, column_name, opts = {})
-        origin_class = if opts[:class]
-                         opts[:class]
+
+      attr_accessor :override_options
+
+      def storext_override(association_name, column_name, override_options = {})
+        self.override_options = {
+                                  ignore_override_if_blank: false
+                                }.merge(override_options)
+
+        origin_class = if override_options[:class]
+                         override_options[:class]
                        else
                          association =
                            storext_overrider_find_association(association_name)
@@ -81,7 +93,7 @@ module Storext
         ivar = "@override_#{attr}"
 
         define_method :"override_#{attr}=" do |bool|
-          if [0, '0', false].include?(bool)
+          if [0, '0', false].include?(bool) || storext_override_discard_value?(attr)
             destroy_key(column_name, attr)
             instance_variable_set(ivar, false)
           else

data/lib/storext/override/version.rb

@@ -1,5 +1,5 @@
 module Storext
   module Override
-    VERSION = "0.2.0"
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storext-override
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - G5
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Mimic and be able to override another Storext model