characterizable 0.0.14 → 0.0.15

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/characterizable.gemspec

@@ -1,63 +1,63 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{characterizable}
-  s.version = "0.0.14"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Andy Rossmeissl", "Seamus Abshere"]
-  s.date = %q{2010-08-13}
-  s.description = %q{Characterize the relationship between "attributes" (getters/setters) of instances of a class}
-  s.email = %q{seamus@abshere.net}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "characterizable.gemspec",
-     "lib/characterizable.rb",
-     "test/helper.rb",
-     "test/test_characterizable.rb"
-  ]
-  s.homepage = %q{http://github.com/seamusabshere/characterizable}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Characterize instances of a class}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_characterizable.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<blockenspiel>, [">= 0.3.2"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_development_dependency(%q<to_json_fix>, [">= 0.0.1"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<blockenspiel>, [">= 0.3.2"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_dependency(%q<to_json_fix>, [">= 0.0.1"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<blockenspiel>, [">= 0.3.2"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-    s.add_dependency(%q<to_json_fix>, [">= 0.0.1"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-  end
-end
-
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{characterizable}
+  s.version = "0.0.15"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Andy Rossmeissl", "Seamus Abshere"]
+  s.date = %q{2010-08-15}
+  s.description = %q{Characterize the relationship between "attributes" (getters/setters) of instances of a class}
+  s.email = %q{seamus@abshere.net}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "characterizable.gemspec",
+     "lib/characterizable.rb",
+     "test/helper.rb",
+     "test/test_characterizable.rb"
+  ]
+  s.homepage = %q{http://github.com/seamusabshere/characterizable}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Characterize instances of a class}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_characterizable.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<blockenspiel>, [">= 0.3.2"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_development_dependency(%q<to_json_fix>, [">= 0.0.1"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+    else
+      s.add_dependency(%q<blockenspiel>, [">= 0.3.2"])
+      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+      s.add_dependency(%q<to_json_fix>, [">= 0.0.1"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<blockenspiel>, [">= 0.3.2"])
+    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
+    s.add_dependency(%q<to_json_fix>, [">= 0.0.1"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+  end
+end
+

data/lib/characterizable.rb

@@ -8,7 +8,6 @@ require 'active_support/version'
   active_support/core_ext/object/blank
   active_support/core_ext/array/wrap
   active_support/core_ext/module/aliasing
-  active_support/core_ext/module/delegation
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3
@@ -74,14 +73,14 @@ module Characterizable
     def _take_snapshot
       target.characterizable_base.characteristics.each do |_, c|
         if c.known?(target)
-          #if c.effective?(target)
+          if c.effective?(target)
             self[c.name] = c.value(target)
-          #elsif !c.untrumped?(target)
-          #  trumped_keys.push c.name
-          #elsif !c.revealed?(target)
-          #  wasted_keys.push c.name
-          #  lacking_keys.push c.prerequisite
-          #end
+          elsif !c.untrumped?(target)
+            trumped_keys.push c.name
+          elsif !c.revealed?(target)
+            wasted_keys.push c.name
+            lacking_keys.push c.prerequisite
+          end
         end
       end
     end
@@ -99,7 +98,7 @@ module Characterizable
       @lacking_keys ||= Array.new
     end
     def effective
-      target.characterizable_base.characteristics.select { |_, c| c.known?(self) }
+      target.characterizable_base.characteristics.select { |_, c| c.effective?(self) }
     end
     def potential
       target.characterizable_base.characteristics.select { |_, c| c.potential?(self) }
@@ -120,11 +119,15 @@ module Characterizable
       self.characterizable_base ||= Characterizable::Base.new self
       Blockenspiel.invoke block, characterizable_base
     end
-    delegate :characteristics, :to => :characterizable_base
+    def characteristics
+      characterizable_base.characteristics
+    end
   end
   
   class CharacteristicAlreadyDefined < ArgumentError
   end
+  class CyclicalTrumping < ArgumentError
+  end
   
   class Base
     attr_reader :klass
@@ -166,6 +169,11 @@ module Characterizable
       @prerequisite = options.delete(:prerequisite)
       @options = options
       Blockenspiel.invoke block, self if block_given?
+      trumps.each do |trump|
+        if c = characteristics[trump] and c.trumps.include? name
+          raise CyclicalTrumping, "On #{base.klass}, '#{c.name}' and '#{name}' trump each other"
+        end
+      end
     end
     def to_json(*)
       { :name => name, :trumps => trumps, :prerequisite => prerequisite, :options => options }.to_json
@@ -174,9 +182,11 @@ module Characterizable
       "<Characterizable::Characteristic name=#{name.inspect} trumps=#{trumps.inspect} prerequisite=#{prerequisite.inspect} options=#{options.inspect}>"
     end
     def trumped_by
-      @_trumped_by ||= characteristics.select { |_, c| c.trumps.include? name }
+      characteristics.select { |_, c| c.trumps.include? name }
+    end
+    def characteristics
+      base.characteristics
     end
-    delegate :characteristics, :to => :base
     def value(target)
       case target
       when Hash

data/test/test_characterizable.rb

@@ -410,4 +410,19 @@ class TestCharacterizable < Test::Unit::TestCase
       end
     end
   end
+
+  # this used to cause infinite loops
+  should 'not let two characteristics trump each other' do
+    assert_raises ::Characterizable::CyclicalTrumping do
+      class Universe
+        include Characterizable
+        attr_accessor :matter
+        attr_accessor :antimatter
+        characterize do
+          has :matter, :trumps => :antimatter
+          has :antimatter, :trumps => :matter
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: characterizable
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 -05:00
+date: 2010-08-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: blockenspiel
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 3
@@ -36,9 +39,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -50,9 +55,11 @@ dependencies:
   name: to_json_fix
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 0
         - 0
@@ -64,9 +71,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -102,23 +111,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Characterize instances of a class