storext-override 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c83c83640824e13b8e307bb8afb861182e26a128
-  data.tar.gz: 85b084bd733ca57e118fe4922549f6aa71a228dd
+  metadata.gz: b6c050186d5d8471b780a86cd84015ef73c91e59
+  data.tar.gz: f40b396043d031e38b788936f01459bae9df03f9
 SHA512:
-  metadata.gz: 2e5dbff6348d395536cafb1d0c752bfc5f3d1715a29c446c2f168e300821207e2e450a31c12251594e9d993e83ec2032a0eb77822dbe15da370a704937464101
-  data.tar.gz: 0abd9931c9ca371f5ef76376a67092183aef6c59c2e5f222262dfa31739f982ad34e549a752a600e8f27a37135d0ba384acf44245ed2bf3a66c8d7f6ecda2ee8
+  metadata.gz: 249516b1136e3e6e878923b9b94b97b2fd9665c4043769aa05b95a88f20745427aaee526e929fb1d136b418e738303cf140659a5df1fc375eeb2e0b8e09168ff
+  data.tar.gz: 4595bb92ac01adc8e3e83089b638398a448a70c591a930e173d46cabe8d0308dbacd834f7fc69a9bccd45252de05ce1e2e109d8dd693f0cbe86ebec9cafacbdf

data/lib/storext/override.rb

@@ -18,7 +18,7 @@ module Storext
         storext_definitions = association_class.storext_definitions
         storext_definitions.each do |attr, attr_definition|
           if attr_definition[:column] == column_name
-            storext_overrider_define_reader(
+            storext_overrider_accessor(
               association_name,
               column_name,
               attr,
@@ -36,7 +36,7 @@ module Storext
         end
       end
 
-      def storext_overrider_define_reader(association_name, column_name, attr, attr_definition)
+      def storext_overrider_accessor(association_name, column_name, attr, attr_definition)
         self.store_attribute(
           column_name,
           attr,
@@ -44,9 +44,55 @@ module Storext
           attr_definition[:opts].reject { |k,v| k == :default },
         )
 
-        define_method attr do |*args|
-          super(*args) || send(association_name).send(attr)
+        storext_overrider_define_override_control(column_name, attr)
+        storext_overrider_define_reader(association_name, column_name, attr)
+        storext_overrider_define_writer(column_name, attr)
+      end
+
+      def storext_overrider_define_reader(association_name, column_name, attr)
+        define_method :"#{attr}_with_parent_default" do |*args|
+          if storext_has_key?(column_name, attr)
+            send(:"#{attr}_without_parent_default", *args)
+          else
+            send(association_name).send(attr)
+          end
+        end
+        alias_method_chain :"#{attr}", :parent_default
+      end
+
+      def storext_overrider_define_writer(column_name, attr)
+        define_method :"#{attr}_with_override_control=" do |*args|
+          if instance_variable_get("@override_#{attr}") == false
+            destroy_key(column_name, attr)
+          else
+            send(:"#{attr}_without_override_control=", *args)
+          end
+        end
+        alias_method_chain :"#{attr}=", :override_control
+      end
+
+      def storext_overrider_define_override_control(column_name, attr)
+        ivar = "@override_#{attr}"
+
+        define_method :"override_#{attr}=" do |bool|
+          if [0, '0', false].include?(bool)
+            destroy_key(column_name, attr)
+            instance_variable_set(ivar, false)
+          else
+            instance_variable_set(ivar, true)
+          end
         end
+
+        define_method :"override_#{attr}" do
+          value = instance_variable_get(ivar)
+          if value.nil?
+            storext_has_key?(column_name, attr)
+          else
+            value
+          end
+        end
+
+        alias_method "override_#{attr}?", :"override_#{attr}"
       end
     end
 

data/lib/storext/override/version.rb

@@ -1,5 +1,5 @@
 module Storext
   module Override
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storext-override
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - G5
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mimic and be able to override another Storext model