enough_fields 0.0.1 → 0.0.2

data/README.md

@@ -26,6 +26,7 @@ EnoughFields won't do ANYTHING unless you tell it to explicitly. Append to <code
 The notifier of enough_fields is a wrap of "uniform_notifier":https://github.com/flyerhzm/uniform_notifier
 
 The code above will enable all six of the EnoughFields notification systems:
+
 * <code>EnoughFields.enable</code>: enable EnoughFields plugin/gem, otherwise do nothing
 * <code>EnoughFields.alert</code>: pop up a JavaScript alert in the browser
 * <code>EnoughFields.enough_fields_logger</code>: log to the EnoughFields log file (Rails.root/log/enough_fields.log)
@@ -39,6 +40,7 @@ Growl Support
 -------------
 
 To get Growl support up-and-running for EnoughFields, follow the steps below:
+
 * Install the ruby-growl gem: <code>gem install ruby-growl</code>
 * Open the Growl preference pane in Systems Preferences
 * Click the "Network" tab
@@ -55,6 +57,7 @@ XMPP/Jabber Support
 -------------------
 
 To get XMPP support up-and-running for EnoughFields, follow the steps below:
+
 * Install the xmpp4r gem: <code>gem install xmpp4r</code>
 * Make both the enough_fields and the recipient account add each other as contacts.
   This will require you to manually log into both accounts, add each other

data/lib/enough_fields.rb

@@ -66,6 +66,7 @@ module EnoughFields
 
     def end_request
       Thread.current[:monit_set] = nil
+      @notifications = nil
     end
 
     def notification?

data/lib/enough_fields/attribute_value.rb

@@ -1,23 +1,28 @@
 module EnoughFields
   class AttributeValue
     attr_reader :klass, :field, :call_stack
-    attr_writer :call_stack
+    attr_writer :call_stack, :used
 
     def initialize(value, klass, field, call_stack)
       @value = value
       @klass = klass
-      @field = field
+      @field = field.to_sym
       @call_stack = call_stack
+      @used = false
     end
 
     def to_value
       @value
     end
 
+    def used?
+      @used == true
+    end
+
     def eql?( other )
-    self.klass == other.klass &&
-    self.field == other.field &&
-    self.call_stack == other.call_stack
+      self.klass == other.klass &&
+      self.field == other.field &&
+      self.call_stack == other.call_stack
     end
 
     def hash

data/lib/enough_fields/attributes.rb

@@ -13,7 +13,7 @@ module EnoughFields
 
         hash = super
         hash.each do |key, value|
-          next if key.is_a? Array
+          next if key.is_a?(Array) || [:_id, :_type].include?(key.to_sym)
           attribute_value = AttributeValue.new(value, @klass, key, caller.find_all { |c| c.index Rails.root })
           hash[ key ] = attribute_value
           Thread.current[:monit_set] << attribute_value
@@ -26,7 +26,7 @@ module EnoughFields
       return super unless Thread.current[:monit_set]
 
       if super && super.is_a?(AttributeValue)
-        super.call_stack = nil
+        super.used = true
         super.to_value
       else
         super

data/lib/enough_fields/monit_set.rb

@@ -1,19 +1,32 @@
 require 'set'
 
 module EnoughFields
+  class Result
+    attr_accessor :field, :used
+
+    def initialize(field, used)
+      @field = field
+      @used = used
+    end
+
+    def used?
+      used == true
+    end
+  end
+
   class MonitSet < Set
 
     def check_notifications
       results = {}
       self.each do |attribute_value|
-        if attribute_value.call_stack
-          results[ [attribute_value.call_stack, attribute_value.klass] ] ||= []
-          results[ [attribute_value.call_stack, attribute_value.klass] ] << attribute_value.field
-        end
+        results[ [attribute_value.call_stack, attribute_value.klass] ] ||= []
+        results[ [attribute_value.call_stack, attribute_value.klass] ] << Result.new(attribute_value.field, attribute_value.used?)
       end
-      results.each do |call_stack_klass, fields|
+      results.each do |call_stack_klass, results|
         call_stack, klass = *call_stack_klass
-        EnoughFields.add_notification(call_stack, klass, fields)
+        if results.find { |result| !result.used? }
+          EnoughFields.add_notification(call_stack, klass, results.find_all { |result| result.used? }.collect(&:field))
+        end
       end
     end
   end

data/lib/enough_fields/notification.rb

@@ -9,7 +9,7 @@ module EnoughFields
     end
 
     def full_notice
-      "add .only(#{(@klass.fields.keys - @fields).inspect}) for\n#{@call_stack.join("\n")}"
+      "add .only(:#{@fields.join(", :")}) for\n#{@call_stack.join("\n")}"
     end
 
     def notify_inline

data/lib/enough_fields/version.rb

@@ -1,3 +1,3 @@
 module EnoughFields
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/enough_fields/enough_fields_spec.rb

@@ -19,7 +19,9 @@ describe EnoughFields do
     EnoughFields.growl = true
     EnoughFields.start_request
     Thread.current[:monit_set] = EnoughFields::MonitSet.new
-    p User.all.collect(&:email)
+    p User.all.collect {|user| [user.email, user.login]}
+
+    p User.only(:email).collect(&:email)
     # User.all.to_a
     if EnoughFields.notification?
       EnoughFields.perform_out_of_channel_notifications

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: enough_fields
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Richard Huang