active_flags 0.3.3 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9294a75b725745829acd3ec8aaa51f38a7e33fcac56c0a54691e30d710aa412
-  data.tar.gz: 150a55111a05c5a9760bd0a8b5d7c3b5f84a5121ac9a20dfe4d94b75156e5d2a
+  metadata.gz: cc2b9964dd268bb5482ee832a4d1cbab56ab00c4a37ff13bf92cd56b03dbab39
+  data.tar.gz: 157e67e3132902f707ba8a849ab56807be2a989b64918658df1998884dcc9bcb
 SHA512:
-  metadata.gz: d83b4c732a65d57a6ed19338212f323ca54c91a5a51b2c583f49dd5adc7fef6525d42661ef09ab1131f65c0ef1ee55f91a470ca2ea19a826e525eec280cfd42f
-  data.tar.gz: 0c39dc87352e7fc6508d3df4588487be544c440cdaa706e33e01f57781fb77e3c4c0914df8c12fd353637541bfa1b5cd83db9d69adf22686816d4a6142aedf66
+  metadata.gz: 07d09aa9564267e89000018f120d72ab80ffee79d466b99fa7197bd96bb2193a0f53da9279bfcb09bc5b8a1931a39a00e3518007815bceefe79f6d9461449063
+  data.tar.gz: e1f6e8ed611eab07b4af1bea6c30650d1a3403fcc74a1e52a9dcd874b621d143392744e91454f0d787a37f2423311507466a3e6f24ec22e6a2cbb775840e5cc5

data/README.md

@@ -74,7 +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::Flag` instance returned by flags_as_collection, to retrieved your 'true' or 'false' value as a boolean.
 
 ## Flags as scopes
 
@@ -85,35 +87,34 @@ ActiveFlags gives you a clean and simple way to query your model based on define
 Any flag can be queried as a scope using the `flagged_as` method
 
 ```ruby
-user = User.create!(flags: { visible: true })
+user = User.create!(flags: { visible: true })
 
 User.flagged_as_visible
-# #<ActiveRecord::Relation [#<User id: 1>]> 
+# #<ActiveRecord::Relation [#<User id: 1>]> 
 
 User.flagged_as_visible(false)
-# #<ActiveRecord::Relation []>
+# #<ActiveRecord::Relation []>
 
 User.flagged_as_intelligent
-# #<ActiveRecord::Relation []>
+# #<ActiveRecord::Relation []>
 
 user.update!(flags: { intelligent: true })
 User.flagged_as_intelligent
-# #<ActiveRecord::Relation [#<User id: 1>]> 
+# #<ActiveRecord::Relation [#<User id: 1>]> 
 
 user.update!(flags: { intelligent: 'a bit' })
 User.flagged_as_intelligent('a_bit')
-# #<ActiveRecord::Relation [#<User id: 1>]> 
+# #<ActiveRecord::Relation [#<User id: 1>]> 
 ```
 
 To query flags the other way around you can use the `not_flagged_as` method
 
 ```ruby
 User.not_flagged_as_intelligent
-# or with value
+# or with value
 User.not_flagged_as_intelligent('a bit')
 ```
 
-
 ## Contributing
 https://github.com/FidMe/active_flags
 

data/app/models/active_flags/flag.rb

@@ -1,8 +1,36 @@
+require 'utils/value_stringifier'
+
 module ActiveFlags
   class Flag < ApplicationRecord
     belongs_to :subject, polymorphic: true
 
     validates :subject, :key, :value, presence: true
     validates :key, uniqueness: { scope: :subject }
+
+    after_save :notify_subject_flag_has_changed, if: proc { |flag| flag.saved_changes.key?('value') }
+    def notify_subject_flag_has_changed
+      subject.flag_has_changed(key, value) if subject&.respond_to?(:flag_has_changed)
+      true
+    end
+
+    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
   end
 end

data/lib/active_flags.rb

@@ -21,7 +21,7 @@ module ActiveFlags
       define_method(:flags) do
         hash_of_flags = {}
         flags_as_collection.each do |flag|
-          hash_of_flags[flag.key.to_sym] = flag.value
+          hash_of_flags[flag.key.to_sym] = flag.converted_value
         end
         hash_of_flags.with_indifferent_access
       end
@@ -33,15 +33,12 @@ module ActiveFlags
 
     def method_missing(method_name, *args, &block) 
       return super unless method_name.to_s.include?(prefix = ACTIVE_FLAGS_PREFIX)
-
       different_from = method_name.to_s.starts_with?('not')
       flag = method_name.to_s.gsub(different_from ? "not_#{prefix}" : prefix, '')
-      condition = { active_flags_flags: { value: stringify(args[0]) } }
+      result = joins(:flags_as_collection)
+        .where(active_flags_flags: { key: flag, value: stringify(args[0]) })
 
-      joins(:flags_as_collection)
-        .where(active_flags_flags: { key: flag })
-        .send(different_from ? 'where' : 'all')
-        .send(different_from ? 'not' : 'where', condition)
+      different_from ? where.not(id: result.pluck(:id)) : result
     end
   end
 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.3'
+  VERSION = '0.3.10'
 end

data/lib/utils/value_stringifier.rb

@@ -1,9 +1,19 @@
 def stringify(value)
-  if value.nil? || value == true
+  if value.nil? || value == true || value == 'true'
     't'
-  elsif value == false
+  elsif value == false || value == 'false'
     'f'
   else
     value
   end
 end
+
+def unstringify(value)
+  if value == 't' || value == 'true'
+    true
+  elsif value == 'f' || value == 'false' || value == nil
+    false
+  else
+    value
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_flags
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.10
 platform: ruby
 authors:
 - Nathan Huberty
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2020-09-28 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
@@ -73,7 +73,7 @@ homepage: https://github.com/FidMe/active_flags
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,8 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Easily declare flags for your models.
 test_files: []