characterizable 0.0.11 → 0.0.12

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Andy Rossmeissl", "Seamus Abshere"]
     gem.add_dependency 'blockenspiel', '>=0.3.2'
     gem.add_dependency 'activesupport', '>=2.3.5'
-    gem.add_dependency 'to_json_fix', '>=0.0.1'
+    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.11
+0.0.12

data/characterizable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{characterizable}
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Rossmeissl", "Seamus Abshere"]
-  s.date = %q{2010-07-16}
+  s.date = %q{2010-07-21}
   s.description = %q{Characterize the relationship between "attributes" (getters/setters) of instances of a class}
   s.email = %q{seamus@abshere.net}
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ 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_runtime_dependency(%q<to_json_fix>, [">= 0.0.1"])
+      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"])

data/lib/characterizable.rb

@@ -9,11 +9,9 @@ require 'active_support/version'
   active_support/core_ext/array/wrap
   active_support/core_ext/module/aliasing
   active_support/core_ext/module/delegation
-  active_support/json
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ActiveSupport::VERSION::MAJOR == 3
-require 'to_json_fix'
 
 module Characterizable
   def self.included(klass)
@@ -125,6 +123,9 @@ module Characterizable
     delegate :characteristics, :to => :characterizable_base
   end
   
+  class CharacteristicAlreadyDefined < ArgumentError
+  end
+  
   class Base
     attr_reader :klass
     def initialize(klass)
@@ -135,6 +136,7 @@ module Characterizable
     end
     include Blockenspiel::DSL
     def has(name, options = {}, &block)
+      raise CharacteristicAlreadyDefined, "The characteristic #{name} has already been defined on #{klass}!" if characteristics.has_key?(name)
       characteristics[name] = Characteristic.new(self, name, options, &block)
       begin
         # quacks like an activemodel

data/test/test_characterizable.rb

@@ -1,5 +1,9 @@
 require 'helper'
 
+# just to see if it hurts
+require 'active_support/json'
+require 'to_json_fix'
+
 class Characterizable::Characteristic
   def hidden?
     !!options[:hidden]
@@ -370,12 +374,40 @@ class TestCharacterizable < Test::Unit::TestCase
   should 'be nice to active_support to_json for characteristics (i.e. BetterHashes)' do
     a = Automobile.new
     a.make = 'Ford'
-    assert_equal "{\"make\":\"Ford\"}", a.characteristics.to_json
+    assert_nothing_raised do
+      a.characteristics.to_json
+    end
   end
   
   should 'be nice to active_support to_json for snapshots' do
     a = Automobile.new
     a.make = 'Ford'
-    assert_equal "{\"make\":{\"trumps\":[],\"name\":\"make\",\"options\":{},\"prerequisite\":null}}", a.characteristics.effective.to_json
+    assert_nothing_raised do
+      a.characteristics.effective.to_json
+    end
+  end
+
+  should 'raise an exception if #has is called more than once in a single block' do
+    assert_raises ::Characterizable::CharacteristicAlreadyDefined do
+      class SimpleAutomobile3
+        include Characterizable
+        attr_accessor :make
+        characterize do
+          has :make
+          has :make
+        end
+      end
+    end
+  end
+  
+  should 'raise an exception if #has is called more than once in a subclass' do
+    assert_raises ::Characterizable::CharacteristicAlreadyDefined do
+      class SimpleAutomobile2 < SimpleAutomobile
+        include Characterizable
+        characterize do
+          has :make
+        end
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: characterizable
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-16 00:00:00 -05:00
+date: 2010-07-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,7 +65,7 @@ dependencies:
         - 0
         - 1
         version: 0.0.1
-  type: :runtime
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: shoulda