mtrack 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bfca617210cbd6c56886b4eb185dc4fd6953204
-  data.tar.gz: d3af2f661de85f44e958ec5090515b40c032bd44
+  metadata.gz: a37d3a4f84c29d88e6e624fe0e011b5b2c22355e
+  data.tar.gz: 46ac0e28e8b2098ba8c2fe4407360364f70891fb
 SHA512:
-  metadata.gz: a186ed9e60cd1dec8355f127ae9b5b19000804726b169b0e23baa49c5a2e4610dfd6d13d0a2abe676c5bd4ec375dbe2f5487b448cc5468a7490b6a72d3d7e49a
-  data.tar.gz: 57a5be4b178c3215f3ea0d58cb4632be748be4b2cc2453193aff60b5c53890090af23154f28f4b964309e467eadea1eb29bace8319df13c5011deeb9499aedc3
+  metadata.gz: 5fd6379634adcb84748ae9f1be5d6a4ca108ba9f798677f8e86da330466ecaab6990f6ad3c2032bd20921a90b8146f2857eaabc17b3702df72cdaf49a35fa7a9
+  data.tar.gz: d831966d9765c6b61c50e9faece76b8b1e02ee16e21f3890a9a200a0f91079e16533239c8a29471671735e16fbada3ddf97965774dbbcf479ae22b1852d4886f

data/lib/mtrack/core.rb

@@ -8,6 +8,15 @@ module MTrack
   # it will extend Modules and Classes that include a Module that is tracking
   # methods and Classes that inherit from a Class that is tracking methods.
   module Core
+    class << self
+      private
+
+      ##
+      # Initializes a State variable on the Class or Module that extended Core.
+      def extended(submodule)
+        submodule.instance_eval { @__mtrack__ ||= State.new }
+      end
+    end
 
     ##
     # call-seq:
@@ -35,22 +44,15 @@ module MTrack
     def included(submodule)
       state = @__mtrack__
       submodule.instance_eval do
-        if @__mtrack__.nil?
-          @__mtrack__ = State.new(state)
-          extend Core
-        else
-          @__mtrack__.add_super_state state
-        end
+        extend Core
+        @__mtrack__.add_super_state state
       end
     end
 
     ##
     # Sets this state as a super-state of the Class that has inherited from the
     # current Class.
-    def inherited(subclass)
-      state = @__mtrack__
-      subclass.instance_eval { @__mtrack__ = State.new(state) }
-    end
+    alias_method :inherited, :included
 
     ##
     # Allows method +name+ to be displayed on #tracked_methods once again after
@@ -73,26 +75,5 @@ module MTrack
       @__mtrack__.delete_tracked name
       @__mtrack__.add_undefined name
     end
-
-    ##
-    # call-seq:
-    #   track_methods_with_block(group_name) {|| ... } => set
-    #
-    # All the methods defined within the block will be tracked under the
-    # +group_name+ parameter.
-    #
-    # Returns a set containing the methods that were defined within the block.
-    def track_methods_with_block(group_name, &b)
-      old_methods = public_instance_methods(false)
-
-      begin
-        module_eval(&b)
-      ensure
-        tracked = (public_instance_methods(false) - old_methods).map(&:to_sym).to_set
-        @__mtrack__[group_name].merge_tracked tracked unless tracked.empty?
-      end
-
-      tracked
-    end
   end
 end

data/lib/mtrack/module_mixin.rb

@@ -1,7 +1,6 @@
 require "set"
 
 require "mtrack/core"
-require "mtrack/state"
 
 module MTrack
 
@@ -9,6 +8,55 @@ module MTrack
   # Provides the #track_methods method to all Classes and Modules by being mixed
   # into the +Module+ class.
   module ModuleMixin
+    class << self
+      private
+
+      ##
+      # call-seq:
+      #   newly_defined_methods(mod, old_methods) => set
+      #
+      # Calculates the difference between +mod+'s currently defined public
+      # methods and +old_methods+.
+      #
+      # Returns a set with the result.
+      def newly_defined_methods(mod, old_methods)
+        (mod.public_instance_methods(false) - old_methods).map(&:to_sym).to_set
+      end
+
+      ##
+      # call-seq:
+      #   save_tracked_methods(mod, group_name, tracked)
+      #
+      # Saves +tracked+ methods for +mod+ under a +group_name+.
+      def save_tracked_methods(mod, group_name, tracked)
+        mod.instance_variable_get(:@__mtrack__)[group_name].merge_tracked tracked unless tracked.empty?
+      end
+
+      ##
+      # call-seq:
+      #   track_methods_for(mod, group_name) => set
+      #   track_methods_for(mod, group_name) {|| ... } => set
+      #
+      # Sets up an MTrack::State instance for +mod+.
+      #
+      # If a block is provided all the methods defined within the block will be
+      # tracked under the +group_name+ parameter.
+      #
+      # Returns a set containing the methods that were defined within the block.
+      def track_methods_for(mod, group_name, &b)
+        old_methods = mod.public_instance_methods false
+
+        begin
+          mod.module_eval &b if block_given?
+        ensure
+          tracked = newly_defined_methods(mod, old_methods)
+          save_tracked_methods(mod, group_name, tracked)
+        end
+
+        tracked
+      end
+    end
+
     private
 
     ##
@@ -22,8 +70,7 @@ module MTrack
     # If a block is provided all the methods defined within the block will be
     # tracked under the optional +group_name+ parameter.
     #
-    # Returns a set containing the methods that were defined within the block or
-    # an empty set otherwise.
+    # Returns a set containing the methods that were defined within the block.
     #
     #   class C
     #     track_methods do
@@ -33,10 +80,8 @@ module MTrack
     #     end
     #   end  #=> #<Set: {:method_1, :method_2, :method_3}>
     def track_methods(group_name = nil, &b)
-      @__mtrack__ ||= State.new
       extend Core
-      return track_methods_with_block(group_name, &b) if block_given?
-      Set.new
+      ModuleMixin.send(:track_methods_for, self, group_name, &b)
     end
   end
 end

data/lib/mtrack/state.rb

@@ -10,16 +10,12 @@ module MTrack
 
     ##
     # call-seq:
-    #   new(super_state = nil) => new_state
+    #   new() => new_state
     #
-    # Creates a new State instance. An optional +super_state+ parameter can be
-    # passed that will be added to #super_states.
-    #
-    #   super_state = MTrack::State.new
-    #   sub_state = MTrack::State.new(super_state)
-    def initialize(super_state = nil)
+    # Creates a new State instance.
+    def initialize()
       self.groups = {}
-      self.super_states = super_state ? Set[super_state] : Set.new
+      self.super_states = Set.new
       self.undefined = Set.new
     end
 

data/lib/mtrack/version.rb

@@ -20,5 +20,5 @@
 module MTrack
 
   # Current version of MTrack.
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/lib/mtrack/state_spec.rb

@@ -50,7 +50,7 @@ describe MTrack::State do
     end
 
     context "with super state" do
-      subject { described_class.new sample_state }
+      subject { described_class.new.tap {|s| s.add_super_state sample_state } }
 
       it "has super state's tracked methods" do
         expect(sample_state.tracked(:con_1)).to match_array(sample_group[:con_1][:tracked])
@@ -61,7 +61,12 @@ describe MTrack::State do
     end
 
     context "with multiple super states" do
-      subject { described_class.new(sample_state).tap {|s| s.add_super_state sample_state_2 } }
+      subject do
+        described_class.new.tap do |s|
+          s.add_super_state sample_state
+          s.add_super_state sample_state_2
+        end
+      end
 
       it "merges tracked methods from all super states" do
         expect(subject.tracked(:con_1)).to match_array(sample_group[:con_1][:tracked])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mtrack
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Gabriel de Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies: []
 description: MTrack extends the functionality of modules and classes and enables them
   to define public methods within groups. These methods can then be queried back even