charisma 0.3.3 → 0.3.4

data/README.markdown

@@ -147,6 +147,10 @@ irb(main):001:0> Foo.new(:size => 10).characteristics[:size].feet
  => 32.808399000000003
 ```
 
+## JSON
+
+Charisma now provides `#as_json` for characteristics---convert to actual JSON with your favorite JSON library's `#to_json`.
+
 ## Copyright
 
 Copyright (c) 2011 Andy Rossmeissl. See LICENSE for details.

data/Rakefile

@@ -18,6 +18,11 @@ require 'rake'
 require 'bueller'
 Bueller::Tasks.new
 
+task :start_coverage do
+  SimpleCov.start
+end
+task :coverage => [:start_coverage, :test]
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -25,13 +30,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
 require 'rake/rdoctask'

data/charisma.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'bueller'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rcov'
+  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'supermodel'
 end
 

data/lib/charisma/curator.rb

@@ -23,17 +23,17 @@ module Charisma
       end
     end
 
-    # The hashed wrapped by the curator that actually stores the computed characteristics'
+    # The special hash wrapped by the curator that actually stores the computed characteristics.
     def characteristics
-      return @characteristics unless @characteristics.nil?
+      return @characteristics if @characteristics
 
-      @characteristics = ::Hash.new do |h, key|
+      hsh = Hash.new do |_, key|
         if characterization = subject.class.characterization[key]
           Curation.new nil, characterization
         end
       end
-      @characteristics.extend LooseEquality
-      @characteristics
+      hsh.extend LooseEquality
+      @characteristics = hsh
     end
     
     # Store a late-defined characteristic, with a Charisma wrapper.
@@ -51,13 +51,13 @@ module Charisma
     # (see #inpsect)
     def to_s; inspect end
     
-    # Provide a hash of display-friendly presentations of the computed characteristics' values.
+    # Provide a hash of the plain values (dropping presentation information).
     #
-    # This is just a convenience method for a common use case, namely injecting a hash with the display-friendly presentations.
+    # Previous versions of leap returned a hash of display-friendly representations; this was rather surprising and not especially useful.
     # @return [Hash]
     def to_hash
       characteristics.inject({}) do |memo, (k, v)|
-        memo[k] = v.to_s
+        memo[k] = v.value
         memo
       end
     end

data/lib/charisma/curator/curation.rb

@@ -26,7 +26,7 @@ module Charisma
         self.value = value
       end
       
-      def_delegators :render, :to_s
+      def_delegators :render_string, :to_s
 
       def ==(other)
         a = self.value
@@ -57,18 +57,29 @@ module Charisma
         characteristic.try(:measurement_class).try(:unit_abbreviation)
       end
       
+      # Render a JSON-like object for later conversion to JSON
+      def as_json(*)
+        if characteristic.measurement
+          characteristic.measurement_class.new(value).as_json
+        elsif value.respond_to? :as_json
+          value.as_json
+        else
+          value
+        end
+      end
+
       private
       
       # If this curation deals with a measured characteristic, this method will delegate appropriate unit-name methods like <tt>#kilograms</tt> to <tt>#render</tt>.
       def establish_units_methods
         if characteristic and characteristic.measurement and conversions = Conversions.conversions[units.to_sym]
-          self.class.def_delegators :render, *conversions.keys
+          self.class.def_delegators :render_string, *conversions.keys
         end
       end
       
       # Provide a display-friendly presentation of the computed characteristic's value.
       # @return [String]
-      def render
+      def render_string
         return value unless characteristic
         if characteristic.proc
           render_proc

data/lib/charisma/measurement.rb

@@ -52,6 +52,16 @@ module Charisma
         super
       end
     end
+
+    # Provide a hash form
+    def to_hash
+      { :value => value, :units => units.to_s }
+    end
+
+    # Provide a hash for later conversion to JSON
+    def as_json
+      to_hash
+    end
     
     class << self
       # Define the units used with this measurement.

data/lib/charisma/version.rb

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

data/test/support/planet.rb

@@ -17,4 +17,8 @@ class Planet < SuperModel::Base
       raise "unknown"
     end
   end
+
+  def as_json
+    { :name => name }
+  end
 end

data/test/test_charisma.rb

@@ -127,7 +127,7 @@ class TestCharisma < Test::Unit::TestCase
   
   def test_020_to_hash
     spaceship = Spaceship.new :name => 'Amaroq', :window_count => 2, :size => 10
-    assert_equal({:name => 'Amaroq', :window_count => '2 windows', :size => '10 m'}, spaceship.characteristics.to_hash)
+    assert_equal({:name => 'Amaroq', :window_count => 2, :size => 10}, spaceship.characteristics.to_hash)
   end
   
   def test_021_dup
@@ -144,4 +144,12 @@ class TestCharisma < Test::Unit::TestCase
     assert_equal nil, spaceship.characteristics[:name].units
     assert_equal :hollagrams, spaceship.characteristics[:weight].units
   end
+  
+  def test_023_json
+    planet = Planet.create :name => 'Pluto'
+    spaceship = Spaceship.new :weight => 100, :window_count => 3, :destination => planet
+    assert_equal({:value => 100, :units => 'hollagrams'}, spaceship.characteristics[:weight].as_json)
+    assert_equal 3, spaceship.characteristics[:window_count].as_json
+    assert_equal({:name => 'Pluto'}, spaceship.characteristics[:destination].as_json)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charisma
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-29 00:00:00.000000000Z
+date: 2011-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2158256360 !ruby/object:Gem::Requirement
+  requirement: &2164435900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158256360
+  version_requirements: *2164435900
 - !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &2158255680 !ruby/object:Gem::Requirement
+  requirement: &2164435100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158255680
+  version_requirements: *2164435100
 - !ruby/object:Gem::Dependency
   name: conversions
-  requirement: &2158250620 !ruby/object:Gem::Requirement
+  requirement: &2164434200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2158250620
+  version_requirements: *2164434200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158250040 !ruby/object:Gem::Requirement
+  requirement: &2164432560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158250040
+  version_requirements: *2164432560
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2158249400 !ruby/object:Gem::Requirement
+  requirement: &2164385780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158249400
+  version_requirements: *2164385780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2158248760 !ruby/object:Gem::Requirement
+  requirement: &2164382980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158248760
+  version_requirements: *2164382980
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2158248140 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &2164381740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158248140
+  version_requirements: *2164381740
 - !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &2158247460 !ruby/object:Gem::Requirement
+  requirement: &2164379660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158247460
+  version_requirements: *2164379660
 description: Define strategies for accessing and displaying a subset of your classes'
   attributes
 email: andy@rossmeissl.net
@@ -151,9 +151,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4326195820228354583
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Curate your rich Ruby objects' attributes
@@ -176,3 +173,4 @@ test_files:
 - test/support/spaceship_fuel.rb
 - test/support/spaceship_make.rb
 - test/test_charisma.rb
+has_rdoc: