active_flags 0.3.5 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c45ce9a931f85cd77d1f988795270597a0277f4433be52a07b5b3e033690bc82
-  data.tar.gz: 0fd586a0f683c6e3c44f595be67856e661f698c5cefac4dd4e873d3941f06a80
+  metadata.gz: 714938aa39fae0199c5739e87be506f232d4cb349cc608f5a3de7b5d0e7adec5
+  data.tar.gz: 15e6c6147ecacacd4ca849e8e732d513a06008c3cb28967d369e92a72c98b86a
 SHA512:
-  metadata.gz: 76278b47e78467575b32bb903a445086b031e833c07aa2997d8b8eed8afd65636c96b4a03fd990df19868a2346bec023b44680eda53e43e9fdf9106c2970c72e
-  data.tar.gz: 53defe812363a6ae685ab1a4308984b2df806e692aa4ed1f5443d6bdba92805515a9e05abe041788a381a7faeb45f862c85b822833b699a319eecc539de3cc0f
+  metadata.gz: bf78a1bad08cb4e58ce47e5aff8028125c60aea3b3efc9b1a385206e05b45cb8475336b1a443924f1aa74052daa0ae282e03fd30cbb9640efd7b89ca3687679b
+  data.tar.gz: 26a223bb2bc02d6d7d4033542b26f636a7a94551a3117862b6676171a36d291661a70c4369fb26f8846e9d63ab63e9eb7e001c6229dcecf4ba029eaf107d623a

data/README.md

@@ -74,9 +74,9 @@ user.update!(flags: { visible: true, active: true, diet: 'vegan', power: 'super
 ```
 
 To access your flags, you now have 2 ways.
-Either as a hash, with the `flags` method or as an ActiveFlag::Flags collection with the `flags_as_collection` method.
+Either as a hash, with the `flags` method or as an ActiveFlag::Flag collection with the `flags_as_collection` method.
 
-Note: You can call `converted_value` on an `ActiveFlag::Flags` instance returned by flags_as_collection, to retrieved your 'true' or 'false' value as a boolean.
+Note: You can call `converted_value` on an `ActiveFlag::Flag` instance returned by flags_as_collection, to retrieved your 'true' or 'false' value as a boolean.
 
 ## Flags as scopes
 

data/app/models/active_flags/flag.rb

@@ -7,6 +7,22 @@ module ActiveFlags
     validates :subject, :key, :value, presence: true
     validates :key, uniqueness: { scope: :subject }
 
+    def removing_duplicated_needed?
+      ActiveFlags::Flag.where(subject: subject, key: key).any?
+    end
+
+    def removing_duplicated_flags!
+      return false unless removing_duplicated_needed?
+      grouped = ActiveFlags::Flag
+        .where(subject_id: subject_id, subject_type: subject_type, key: key)
+        .group_by { |model| [model.key, model.subject_id, model.subject_type] }
+      grouped.values.each do |duplicates|
+        duplicates.shift
+        duplicates.each(&:destroy)
+      end
+      true
+    end
+
     def converted_value
       self.value = unstringify(value)
     end

data/lib/active_flags/handler/flag_builder.rb

@@ -8,8 +8,8 @@ module ActiveFlags
 
       def save
         flag = ActiveFlags::Flag.find_or_initialize_by(subject: @resource, key: @flag_attributes[:key])
+        flag.removing_duplicated_flags!
         flag.update!(value: @flag_attributes[:value])
-
         @resource.flags_as_collection << flag
       end
     end

data/lib/active_flags/version.rb

@@ -1,3 +1,3 @@
 module ActiveFlags
-  VERSION = '0.3.5'
+  VERSION = '0.3.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_flags
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.8
 platform: ruby
 authors:
 - Nathan Huberty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 description: Easily declare flags for your models.
 email:
 - nathan.huberty@orange.fr
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Easily declare flags for your models.