characterizable 0.0.15 → 0.0.16

data/Rakefile

@@ -12,7 +12,6 @@ begin
     gem.authors = ["Andy Rossmeissl", "Seamus Abshere"]
     gem.add_dependency 'blockenspiel', '>=0.3.2'
     gem.add_dependency 'activesupport', '>=2.3.5'
-    gem.add_development_dependency 'to_json_fix', '>=0.0.1'
     gem.add_development_dependency "shoulda", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/characterizable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{characterizable}
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl", "Seamus Abshere"]
@@ -45,18 +45,15 @@ Gem::Specification.new do |s|
     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

@@ -32,8 +32,8 @@ module Characterizable
       def to_hash
         Hash.new.replace self
       end
-      def to_json(*)
-        to_hash.to_json
+      def as_json(*)
+        to_hash
       end
       def reject(&block)
         inject(Characterizable::BetterHash.new) do |memo, ary|
@@ -65,19 +65,19 @@ module Characterizable
   end
   
   class Snapshot < BetterHash
-    attr_reader :target
-    def initialize(target)
-      @target = target
+    attr_reader :universe
+    def initialize(universe)
+      @universe = universe
       _take_snapshot
     end
     def _take_snapshot
-      target.characterizable_base.characteristics.each do |_, c|
-        if c.known?(target)
-          if c.effective?(target)
-            self[c.name] = c.value(target)
-          elsif !c.untrumped?(target)
+      universe.characterizable_base.characteristics.each do |_, c|
+        if c.known?(universe)
+          if c.effective?(universe)
+            self[c.name] = c.value(universe)
+          elsif c.trumped?(universe)
             trumped_keys.push c.name
-          elsif !c.revealed?(target)
+          elsif !c.revealed?(universe)
             wasted_keys.push c.name
             lacking_keys.push c.prerequisite
           end
@@ -85,7 +85,7 @@ module Characterizable
       end
     end
     def []=(key, value)
-      target.expire_snapshot!
+      universe.expire_snapshot!
       super
     end
     def wasted_keys
@@ -98,19 +98,19 @@ module Characterizable
       @lacking_keys ||= Array.new
     end
     def effective
-      target.characterizable_base.characteristics.select { |_, c| c.effective?(self) }
+      universe.characterizable_base.characteristics.select { |_, c| c.effective?(self) }
     end
     def potential
-      target.characterizable_base.characteristics.select { |_, c| c.potential?(self) }
+      universe.characterizable_base.characteristics.select { |_, c| c.potential?(self) }
     end
     def wasted
-      target.characterizable_base.characteristics.slice(*wasted_keys)
+      universe.characterizable_base.characteristics.slice(*wasted_keys)
     end
     def lacking
-      target.characterizable_base.characteristics.slice(*(lacking_keys - wasted_keys))
+      universe.characterizable_base.characteristics.slice(*(lacking_keys - wasted_keys))
     end
     def trumped
-      target.characterizable_base.characteristics.slice(*trumped_keys)
+      universe.characterizable_base.characteristics.slice(*trumped_keys)
     end
   end
   
@@ -126,8 +126,6 @@ module Characterizable
   
   class CharacteristicAlreadyDefined < ArgumentError
   end
-  class CyclicalTrumping < ArgumentError
-  end
   
   class Base
     attr_reader :klass
@@ -169,50 +167,49 @@ 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
+    def as_json(*)
+      { :name => name, :trumps => trumps, :prerequisite => prerequisite, :options => options }
     end
     def inspect
       "<Characterizable::Characteristic name=#{name.inspect} trumps=#{trumps.inspect} prerequisite=#{prerequisite.inspect} options=#{options.inspect}>"
     end
-    def trumped_by
-      characteristics.select { |_, c| c.trumps.include? name }
-    end
     def characteristics
       base.characteristics
     end
-    def value(target)
-      case target
+    def value(universe)
+      case universe
       when Hash
-        target[name]
+        universe[name]
       else
-        target.send name if target.respond_to?(name)
+        universe.send name if universe.respond_to?(name)
       end
     end
-    def known?(target)
-      !value(target).nil?
+    def known?(universe)
+      not value(universe).nil?
     end
-    def potential?(target)
-      !known?(target) and revealed? target and untrumped? target
+    def potential?(universe)
+      not known?(universe) and revealed? universe and not trumped? universe
     end
-    def effective?(target)
-      known?(target) and revealed? target and untrumped? target
+    def effective?(universe, ignoring = nil)
+      known?(universe) and revealed? universe and not trumped? universe, ignoring
     end
-    def untrumped?(target)
-      return true if trumped_by.empty?
-      trumped_by.none? do |_, c|
-        c.effective? target
+    def trumped?(universe, ignoring = nil)
+      characteristics.each do |_, other|
+        if other.trumps.include? name and not ignoring == other.name
+          if trumps.include? other.name
+            # special case: mutual trumping. current characteristic is trumped if its friend is otherwise effective and it is not otherwise effective
+            return true if other.effective? universe, name and not effective? universe, other.name
+          else
+            return true if other.effective? universe
+          end
+        end
       end
+      false
     end
-    def revealed?(target)
+    def revealed?(universe)
       return true if prerequisite.nil?
-      characteristics[prerequisite].effective? target
+      characteristics[prerequisite].effective? universe
     end
     include Blockenspiel::DSL
     def reveals(other_name, other_options = {}, &block)

data/test/test_characterizable.rb

@@ -2,7 +2,6 @@ require 'helper'
 
 # just to see if it hurts
 require 'active_support/json'
-require 'to_json_fix'
 
 class Characterizable::Characteristic
   def hidden?
@@ -50,6 +49,16 @@ class SimpleAutomobile
   end
 end
 
+class Universe
+  include Characterizable
+  attr_accessor :matter
+  attr_accessor :antimatter
+  characterize do
+    has :matter, :trumps => :antimatter
+    has :antimatter, :trumps => :matter
+  end
+end
+
 class TestCharacterizable < Test::Unit::TestCase
   should "let you define the effective characteristics of a class" do
     assert_nothing_raised do
@@ -410,19 +419,31 @@ 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
+  
+  should "have mutual trumping cancel itself out instead of causing an infinite loop" do
+    a = Universe.new
+    assert_equal [], a.characteristics.effective.keys
+    assert_equal [:matter, :antimatter], a.characteristics.potential.keys
+    assert_equal [], a.characteristics.wasted.keys
+    assert_equal [], a.characteristics.lacking.keys
+    assert_equal [], a.characteristics.trumped.keys
+    a.matter = :foo
+    assert_equal [:matter], a.characteristics.effective.keys
+    assert_equal [], a.characteristics.potential.keys
+    assert_equal [], a.characteristics.wasted.keys
+    assert_equal [], a.characteristics.lacking.keys
+    assert_equal [], a.characteristics.trumped.keys
+    a.antimatter = :bar
+    assert_equal [:matter, :antimatter], a.characteristics.effective.keys
+    assert_equal [], a.characteristics.potential.keys
+    assert_equal [], a.characteristics.wasted.keys
+    assert_equal [], a.characteristics.lacking.keys
+    assert_equal [], a.characteristics.trumped.keys
+    a.matter = nil
+    assert_equal [:antimatter], a.characteristics.effective.keys
+    assert_equal [], a.characteristics.potential.keys
+    assert_equal [], a.characteristics.wasted.keys
+    assert_equal [], a.characteristics.lacking.keys
+    assert_equal [], a.characteristics.trumped.keys
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: characterizable
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: false
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -51,26 +51,10 @@ dependencies:
         version: 2.3.5
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: to_json_fix
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
-  type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,7 +64,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: Characterize the relationship between "attributes" (getters/setters) of instances of a class
 email: seamus@abshere.net
 executables: []