charisma 0.3.1 → 0.3.2

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-07-05"
+  s.date = "2011-07-06"
   s.authors = ['Andy Rossmeissl', 'Seamus Abshere']
   s.email = 'andy@rossmeissl.net'
   s.homepage = 'http://github.com/brighterplanet/charisma'

data/lib/charisma/characteristic.rb

@@ -34,5 +34,18 @@ module Charisma
       @accessor = options[:display_with]
       @measurement = options[:measures]
     end
+    
+    # The subclass of <tt>Charisma::Measurement</tt> with which this curation's characteristic is measured.
+    # @return [Class]
+    def measurement_class
+      case measurement
+      when ::Class
+        measurement
+      when ::Symbol
+        "::Charisma::Measurement::#{measurement.to_s.camelize}".constantize
+      else
+        raise InvalidMeasurementError
+      end
+    end
   end
 end

data/lib/charisma/curator/curation.rb

@@ -29,7 +29,9 @@ module Charisma
       def_delegators :render, :to_s
 
       def ==(other)
-        self.value == other.value
+        a = self.value
+        b = other.respond_to?(:value) ? other.value : other
+        a == b
       end
 
       # An inspection method for more readable IRB sessions and logs.
@@ -86,20 +88,7 @@ module Charisma
       
       # Render the value using its specified measurement.
       def defer_to_measurement
-        measurement_class.new(value)
-      end
-      
-      # The subclass of <tt>Charisma::Measurement</tt> with which this curation's characteristic is measured.
-      # @return [Class]
-      def measurement_class
-        case characteristic.measurement
-        when ::Class
-          characteristic.measurement
-        when ::Symbol
-          "::Charisma::Measurement::#{characteristic.measurement.to_s.camelize}".constantize
-        else
-          raise InvalidMeasurementError
-        end
+        characteristic.measurement_class.new(value)
       end
       
       # Render the value using its <tt>#as_characteristic</tt> method.

data/lib/charisma/version.rb

@@ -1,4 +1,4 @@
 module Charisma
   # Charisma's version
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/test/test_charisma.rb

@@ -95,4 +95,8 @@ class TestCharisma < Test::Unit::TestCase
     g.characteristics[:name] = g.characteristics[:make]
     assert_equal 'Geo', g.characteristics[:name].to_s
   end
+  def test_019_compare_fixnum
+    amaroq = Spaceship.new :window_count => 8
+    assert(amaroq.characteristics == { :window_count => 8 })
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charisma
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-05 00:00:00.000000000Z
+date: 2011-07-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2155844680 !ruby/object:Gem::Requirement
+  requirement: &2154378400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155844680
+  version_requirements: *2154378400
 - !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &2155844160 !ruby/object:Gem::Requirement
+  requirement: &2154377600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155844160
+  version_requirements: *2154377600
 - !ruby/object:Gem::Dependency
   name: conversions
-  requirement: &2155843680 !ruby/object:Gem::Requirement
+  requirement: &2154376900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155843680
+  version_requirements: *2154376900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2155843140 !ruby/object:Gem::Requirement
+  requirement: &2154376460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155843140
+  version_requirements: *2154376460
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2155842600 !ruby/object:Gem::Requirement
+  requirement: &2154376040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155842600
+  version_requirements: *2154376040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155835100 !ruby/object:Gem::Requirement
+  requirement: &2154375600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155835100
+  version_requirements: *2154375600
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2155834680 !ruby/object:Gem::Requirement
+  requirement: &2154375180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155834680
+  version_requirements: *2154375180
 - !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &2155834260 !ruby/object:Gem::Requirement
+  requirement: &2154374740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155834260
+  version_requirements: *2154374740
 description: Define strategies for accessing and displaying a subset of your classes'
   attributes
 email: andy@rossmeissl.net
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2768945876583811928
+      hash: -2414637371029360902
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: