simple_enum-multiple 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e9969e388df1b2c1e70c98b9f694b72d5d2b36c
-  data.tar.gz: a7af8fb9462ec663495f6b2e1e22f7bc4eb43dff
+  metadata.gz: 07e1154c47e72d096a9024f7b7a76168f3f64a93
+  data.tar.gz: abb32b7b26d2e5197d33d8489b101e9a65731b72
 SHA512:
-  metadata.gz: d0190923aa93a44de691d83a584810665a9b3a6e44de789d8a645b1e4251d781b11e352f19215aaa662424bfd246c734cfc8dc6548554ccdf0ad2a44112de7c3
-  data.tar.gz: 158173da755c512d0da9b495d310db92f78f8bd52404989d0fa9a44249df9ade746e19ae5bc7e1f1cddf97425fc2fc22d4f8abf10d192237b923b136701cb1e1
+  metadata.gz: 741ea605c0d38593a4bec573cd62111cb3224c52b1d2941b1acf21af519eaeab0f1b0eb76b84b5aa421c47090346c607c02878a4c30e568076962a7c67698268
+  data.tar.gz: 0cab34b53652fb823e57f9cb5791d06331acff9b6d23285fdae468adc5afa30bd7ffb045f715da368dc0cf8838a6051a4824252ec3125f219db1a09674f7e99d

data/lib/simple_enum/multiple/accessors/join_table_accessor.rb

@@ -18,33 +18,29 @@ module SimpleEnum
           remote_key = self.remote_key = name.singularize.foreign_key
 
           klass.class_eval do
-            attr_accessor source
+            define_attribute_method source
 
-            define_method :"#{source}_changed?" do
-              instance_variable_get(:"@#{source}") !=
-                instance_variable_get(:"@#{source}_was")
-            end
-
-            define_method :"#{source}_was" do
-              instance_variable = instance_variable_get(:"@#{source}_was")
+            define_method source do
+              instance_variable = instance_variable_get(:"@#{source}")
               return instance_variable if instance_variable
               sql = table.where(table[foreign_key].eq(self.id))
                 .project(table[remote_key])
                 .to_sql
               original_cds = ActiveRecord::Base.connection.send(:select, sql).rows.map(&:first).map(&:to_i)
-              instance_variable_set(:"@#{source}_was", original_cds)
+              instance_variable_set(:"@#{source}", original_cds)
             end
 
-            define_method source do
+            define_method :"#{source}=" do |current_cds|
               instance_variable = instance_variable_get(:"@#{source}")
-              return instance_variable if instance_variable
-              instance_variable_set(:"@#{source}", send(:"#{source}_was").dup)
+              send("#{source}_will_change!") unless current_cds == instance_variable
+              instance_variable_set(:"@#{source}", current_cds.select(&:present?).map(&:to_i))
             end
 
             define_method :"update_#{source}!" do
               return unless send(:"#{source}_changed?")
               original_cds = send(:"#{source}_was")
-              current_cds = send(source).select(&:present?).map(&:to_i)
+              current_cds = send(source)
+
 
               # if any enum been removed
               if (original_cds - current_cds).any?

data/lib/simple_enum/multiple/version.rb

@@ -1,5 +1,5 @@
 module SimpleEnum
   module Multiple
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_enum-multiple
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Theo Li