gibbler 0.7.1 → 0.7.2

data/CHANGES.txt

@@ -1,6 +1,14 @@
 GIBBLER, CHANGES
 
 
+#### 0.7.2 (2009-12-08) #################################
+
+* FIXED: Gibbler::Complex no longer includes the '@' for instance
+  variable names used in digest calculation. 
+* ADDED: Gibbler::Complex support for specifying which fields
+  to use in digest calculation. 
+
+
 #### 0.7.1 (2009-10-09) #################################
 
 * FIXED: Gibbler::Complex now sorts instance variables before processing. 

data/gibbler.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "gibbler"
   s.rubyforge_project = "gibbler"
-	s.version = "0.7.1"
+	s.version = "0.7.2"
 	s.summary = "Gibbler: Git-like hashes for Ruby objects"
 	s.description = s.summary
 	s.author = "Delano Mandelbaum"

data/lib/gibbler/aliases.rb

@@ -6,6 +6,8 @@ module Gibbler
   module Object
     alias :digest           :gibbler
     alias :changed?         :gibbled?
+    alias :digest_fields    :gibbler_fields
+    
     # The cache is in the Attic.
     def    digest_cache;     gibbler_cache;  end
   end

data/lib/gibbler.rb

@@ -1,3 +1,10 @@
+unless defined?(GIBBLER_LIB_HOME)
+  GIBBLER_LIB_HOME = File.expand_path File.dirname(__FILE__) 
+end
+
+%w{attic}.each do |dir|
+  $:.unshift File.join(GIBBLER_LIB_HOME, '..', '..', dir, 'lib')
+end
 
 require 'thread'
 require 'attic'
@@ -8,7 +15,7 @@ require 'digest/sha1'
 # "Hola, Tanneritos"
 #
 module Gibbler
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
   
   require 'gibbler/mixins'
   
@@ -92,6 +99,11 @@ module Gibbler
       obj.send :alias_method, :__gibbler_cache, :gibbler_cache
     end
     
+    def self.gibbler_fields
+    end
+    def gibbler_fields
+    end
+    
     # Calculates a digest for the current object instance. 
     # Objects that are a kind of Hash or Array are processed
     # recursively. The length of the returned String depends 
@@ -231,15 +243,42 @@ module Gibbler
     def self.included(obj)
       obj.extend Attic
       obj.attic :gibbler_cache
+      obj.class_eval do
+        @__gibbler_fields = []
+        def self.gibbler_fields
+          @__gibbler_fields
+        end
+        def self.gibbler *fields
+          @__gibbler_fields = *fields
+        end
+        def self.inherited(obj)
+          obj.extend Attic
+          obj.attic :gibbler_cache
+          fields = @__gibbler_fields.clone
+          obj.class_eval do
+            @__gibbler_fields = fields
+          end
+        end
+      end
+    end
+    
+    def gibbler_fields
+      f = self.class.gibbler_fields
+      if f.empty?
+        f = instance_variables.sort.collect { |n|
+          n.to_s[1..-1].to_sym # remove the '@'
+        }
+      end
+      f
     end
     
     # Creates a digest for the current state of self. 
     def __gibbler(h=self)
       klass = h.class
       d = []
-      gibbler_debug :ivars, instance_variables.sort
-      instance_variables.sort.each do |n|
-        value = instance_variable_get(n)
+      gibbler_debug :gibbler_fields, gibbler_fields
+      gibbler_fields.each do |n|
+        value = instance_variable_get("@#{n}")
         d << '%s:%s:%s' % [value.class, n, value.__gibbler]
       end
       d = d.join(':').__gibbler
@@ -359,17 +398,12 @@ module Gibbler
     # Creates a digest for the current state of self. 
     def __gibbler(h=self)
       klass = h.class
-      d, idx = [], 0
-      shorts = ['String', 'Fixnum', 'Symbol']
-      h.each do |v| # Some Array-like classes don't have each_with_index
-        if shorts.member?(v.class.to_s) 
-          d << '%s:%s:%s:%s' % [v.class, idx, v.to_s.size, v.to_s]
-        else
-          d << '%s:%s:%s' % [v.class, idx, v.__gibbler]
-        end
-        idx += 1
+      d, index = [], 0
+      h.each do |value| 
+        d << '%s:%s:%s' % [value.class, index, value.__gibbler]
+        index += 1
       end
-      d = d.join(':')
+      d = d.join(':').__gibbler
       a = Gibbler.digest '%s:%s:%s' % [klass, d.size, d]
       gibbler_debug klass, a, [klass, d.size, d]
       a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gibbler
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -05:00
+date: 2009-12-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency