charisma 0.3.0 → 0.3.1

data/README.markdown

@@ -116,7 +116,7 @@ end
 ```
 ``` ruby
 class Length < Charisma::Measurement # Don't need to inherit if you want to DIY
-  units :meters => 'm' 
+  units :metres => 'm' 
 end
 ```
 ``` irb

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

data/lib/charisma.rb

@@ -16,7 +16,6 @@ require 'charisma/base/class_methods'
 require 'charisma/characteristic'
 require 'charisma/characterization'
 require 'charisma/measurement'
-require 'charisma/measurement/length'
 require 'charisma/curator'
 require 'charisma/curator/curation'
 require 'charisma/number_helper'
@@ -36,4 +35,4 @@ module Charisma
   end
 end
 
-Conversions.register :meters, :feet, 3.2808399
+Conversions.register :metres, :feet, 3.2808399

data/lib/charisma/curator.rb

@@ -41,8 +41,8 @@ module Charisma
     # (see #inpsect)
     def to_s; inspect end
     
-    extend Forwardable
-    delegate [:[], :keys, :slice, :==, :each] => :characteristics
+    extend ::Forwardable
+    def_delegators :characteristics, :[], :keys, :slice, :==, :each
     
     # Loose equality for Hashlike objects
     #

data/lib/charisma/curator/curation.rb

@@ -5,8 +5,8 @@ module Charisma
     #
     # Implements the Delegator pattern, with uncaught methods delegated to the characteristic's computed value.
     # (Undocumented below is that <tt>#to_s</tt> is specifically delegated to <tt>#render</tt>.)
-    class Curation < Delegator
-      extend Forwardable
+    class Curation < ::Delegator
+      extend ::Forwardable
       
       # The computed value of the characteristic
       attr_accessor :value
@@ -26,7 +26,11 @@ module Charisma
         self.value = value
       end
       
-      delegate [:to_s] => :render
+      def_delegators :render, :to_s
+
+      def ==(other)
+        self.value == other.value
+      end
 
       # An inspection method for more readable IRB sessions and logs.
       def inspect
@@ -47,9 +51,9 @@ module Charisma
       
       # If this curation deals with a measured characteristic, this method will delegate <tt>#u</tt>, <tt>#units</tt>, and appropriate unit-name methods to <tt>#render</tt>.
       def establish_units_methods
-        self.class.delegate [:u, :units] => :render
+        self.class.def_delegators :render, :u, :units
         if conversions = Conversions.conversions[units.to_sym]
-          self.class.delegate conversions.keys => :render
+          self.class.def_delegators :render, *conversions.keys
         end
       end
       
@@ -89,10 +93,10 @@ module Charisma
       # @return [Class]
       def measurement_class
         case characteristic.measurement
-        when Class
+        when ::Class
           characteristic.measurement
-        when Symbol
-          "Charisma::Measurement::#{characteristic.measurement.to_s.camelize}".constantize
+        when ::Symbol
+          "::Charisma::Measurement::#{characteristic.measurement.to_s.camelize}".constantize
         else
           raise InvalidMeasurementError
         end

data/lib/charisma/measurement.rb

@@ -3,6 +3,11 @@ module Charisma
   #
   # @abstract An actual measurement class should inherit from this and use <tt>#units</tt> to define units.
   class Measurement
+    autoload :Length, 'charisma/measurement/length'
+    autoload :Mass, 'charisma/measurement/mass'
+    autoload :Speed, 'charisma/measurement/speed'
+    autoload :Time, 'charisma/measurement/time'
+    
     # The quantity of the measured value
     attr_reader :value
     

data/lib/charisma/measurement/length.rb

@@ -1,8 +1,8 @@
 module Charisma
   class Measurement
-    # Length, in meters.
+    # Length, in metres.
     class Length < Measurement
-      units :meters => 'm'
+      units :metres => 'm'
     end
   end
 end

data/lib/charisma/measurement/speed.rb

@@ -1,8 +1,8 @@
 module Charisma
   class Measurement
-    # Speed, in meters per second
+    # Speed, in metres per second
     class Speed < Measurement
-      units :meters_per_second => 'm/s'
+      units :metres_per_second => 'm/s'
     end
     # Velocity is an SI-accepted alias for speed
     Velocity = Speed

data/lib/charisma/version.rb

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

data/test/test_charisma.rb

@@ -6,7 +6,7 @@ class TestCharisma < Test::Unit::TestCase
     assert_equal 'Amaroq', spaceship.characteristics[:name].to_s
   end
   def test_002_measured_attribute
-    spaceship = Spaceship.new :size => 10 # meters
+    spaceship = Spaceship.new :size => 10 # metres
     assert_equal '10 m', spaceship.characteristics[:size].to_s
   end
   def test_003_classified_attribute

metadata

@@ -1,117 +1,114 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: charisma
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Andy Rossmeissl
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-02 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-05 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2155844680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155844680
+- !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2155844160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155844160
+- !ruby/object:Gem::Dependency
   name: conversions
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2155843680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155843680
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2155843140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155843140
+- !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2155842600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155842600
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2155835100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155835100
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2155834680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2155834680
+- !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2155834260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-description: Define strategies for accessing and displaying a subset of your classes' attributes
+  version_requirements: *2155834260
+description: Define strategies for accessing and displaying a subset of your classes'
+  attributes
 email: andy@rossmeissl.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
+files:
 - .document
 - .gitignore
 - Gemfile
@@ -135,37 +132,33 @@ files:
 - lib/charisma/version.rb
 - test/helper.rb
 - test/test_charisma.rb
-has_rdoc: true
 homepage: http://github.com/brighterplanet/charisma
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -405120809897582198
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2768945876583811928
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Curate your rich Ruby objects' attributes
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_charisma.rb