charisma 0.1.2 → 0.2.0

data/charisma.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name = 'charisma'
   s.version = Charisma::VERSION
   s.platform = Gem::Platform::RUBY
-  s.date = "2011-04-29"
+  s.date = "2011-05-11"
   s.authors = ['Andy Rossmeissl', 'Seamus Abshere']
   s.email = 'andy@rossmeissl.net'
   s.homepage = 'http://github.com/brighterplanet/charisma'

data/lib/charisma.rb

@@ -4,7 +4,6 @@ require 'active_support/version'
   active_support/inflector/methods
   active_support/core_ext/class/attribute_accessors
   active_support/core_ext/string/output_safety
-  active_support/core_ext/module/delegation
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3

data/lib/charisma/base/class_methods.rb

@@ -3,7 +3,7 @@ module Charisma
     module ClassMethods
       def self.extended(base)
         base.send :class_variable_set, :@@characterization, Characterization.new
-        base.send :cattr_reader, :characterization
+        base.send :cattr_reader, :characterization, :instance_reader => false
       end
       def characterize(&blk)
         Blockenspiel.invoke(blk, characterization) if block_given?

data/lib/charisma/curator.rb

@@ -1,38 +1,37 @@
+require 'forwardable'
 module Charisma
   class Curator
-    attr_reader :subject
+    attr_reader :subject, :characteristics
     
     def initialize(subject)
+      @characteristics = {}.extend LooseEquality
       @subject = subject
-    end
-        
-    def [](key)
-      if value = subject.send(key)
-        Curation.new value, subject.class.characterization[key]
+      subject.class.characterization.keys.each do |key|
+        if value = subject.send(key)
+          self[key] = value
+        end
       end
     end
-        
-    def keys
-      subject.class.characterization.keys.select do |key|
-        !!subject.send(key)
-      end
+    
+    def []=(key, value)
+      characteristics[key] = Curation.new value, subject.class.characterization[key]
     end
-
-    def slice(*only_keys)
-      only_keys.inject({}) do |memo, key|
-        if curation = self[key]
-          memo[key] = curation
-        end
-        memo
-      end
+    
+    def inspect
+      "<Charisma:Curator #{keys.length} known characteristic(s)>"
     end
     
-    def to_hash
-      subject.class.characterization.keys.inject({}) do |memo, key|
-        if curation = self[key]
-          memo[key] = curation
+    def to_s; inspect end
+    
+    extend Forwardable
+    delegate [:[], :keys, :slice, :==] => :characteristics
+    
+    module LooseEquality
+      def ==(other)
+        return false unless keys.sort == other.keys.sort
+        keys.all? do |k|
+          self[k] == other[k]
         end
-        memo        
       end
     end
   end

data/lib/charisma/curator/curation.rb

@@ -1,26 +1,38 @@
+require 'delegate'
 module Charisma
   class Curator
-    class Curation
-      attr_reader :value, :characteristic
+    class Curation < Delegator
+      extend Forwardable
+      attr_accessor :value
+      attr_reader :characteristic
       
-      def initialize(value, characteristic)
-        @value = value
+      def initialize(value, characteristic = nil)
         @characteristic = characteristic
+        establish_units_methods if characteristic && characteristic.measurement
+        self.value = value
       end
       
-      delegate :to_s, :units, :u, :to => :render
-      
-      def method_missing(*args)
-        begin
-          render.send(*args)
-        rescue NoMethodError
-          super
-        end
+      delegate [:to_s] => :render
+
+      def inspect
+        "<Charisma::Curator::Curation for :#{characteristic.name} (use #to_s to render value of #{value.class})>"
       end
       
+      # Delegator methods
+      def __getobj__; value end
+      def __setobj__(obj); self.value = obj end
+      
       private
       
+      def establish_units_methods
+        self.class.delegate [:u, :units] => :render
+        if conversions = Conversions.conversions[units.to_sym]
+          self.class.delegate conversions.keys => :render
+        end
+      end
+      
       def render
+        return value unless characteristic
         if characteristic.proc
           render_proc
         elsif characteristic.accessor
@@ -43,11 +55,15 @@ module Charisma
       end
       
       def defer_to_measurement
+        measurement_class.new(value)
+      end
+      
+      def measurement_class
         case characteristic.measurement
         when Class
-          characteristic.measurement.new(value)
+          characteristic.measurement
         when Symbol
-          "Charisma::Measurement::#{characteristic.measurement.to_s.camelize}".constantize.new(value)
+          "Charisma::Measurement::#{characteristic.measurement.to_s.camelize}".constantize
         else
           raise InvalidMeasurementError
         end

data/lib/charisma/version.rb

@@ -1,3 +1,3 @@
 module Charisma
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/test/test_charisma.rb

@@ -42,14 +42,21 @@ class TestCharisma < Test::Unit::TestCase
     assert_equal '1,000', Charisma::NumberHelper.delimit(1_000)
   end
   def test_010_characteristics_slice
-    spaceship = Spaceship.new :name => 'Amaroq'
-    assert_equal 'Amaroq', spaceship.characteristics.slice(:name)[:name].to_s
+    spaceship = Spaceship.new :name => 'Amaroq', :window_count => 2, :size => 10
+    assert_equal '10 m', spaceship.characteristics.slice(:size, :window_count)[:size].to_s
+    assert_equal nil, spaceship.characteristics.slice(:size, :window_count)[:name]
+    assert_equal 2, spaceship.characteristics.slice(:size, :window_count).values.length
   end
   def test_011_associated_object_methods
     planet = Planet.create :name => 'Pluto'
     spaceship = Spaceship.new :destination => planet
     assert_equal BigDecimal('1.31e+1_022'), spaceship.characteristics[:destination].mass
   end
+  def test_011_characteristic_arithmetic
+    amaroq = Spaceship.new :window_count => 8
+    geo = Spaceship.new :window_count => 6
+    assert_equal 2, amaroq.characteristics[:window_count] - geo.characteristics[:window_count]
+  end
   def test_012_missing_characteristics_come_back_as_nil
     spaceship = Spaceship.new :name => 'Amaroq'
     assert_equal nil, spaceship.characteristics[:size]
@@ -57,14 +64,13 @@ class TestCharisma < Test::Unit::TestCase
   def test_013_characteristics_keys
     spaceship = Spaceship.new :name => 'Amaroq'
     assert_equal [:name].sort_by { |k| k.to_s }, spaceship.characteristics.keys.sort_by { |k| k.to_s }
-    spaceship.weight = 1_000_000
-    assert_equal [:name, :weight].sort_by { |k| k.to_s }, spaceship.characteristics.keys.sort_by { |k| k.to_s }
   end
   def test_014_characterization_keys
     assert_equal [:destination, :fuel, :make, :name, :size, :weight, :window_count].sort_by { |k| k.to_s }, Spaceship.characterization.keys.sort_by { |k| k.to_s }
   end
-  def test_015_to_hash_preserving_curation
-    spaceship = Spaceship.new :name => 'Amaroq'
-    assert_equal 'Amaroq', spaceship.characteristics.to_hash[:name].to_s
+  def test_015_characteristic_equality
+    amaroq = Spaceship.new :window_count => 8
+    buster = Spaceship.new :window_count => 8
+    assert_equal amaroq.characteristics, buster.characteristics
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: charisma
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -04:00
+date: 2011-05-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency