attribution 0.6.0 → 0.6.1

data/attribution.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "attribution"
-  gem.version       = "0.6.0"
+  gem.version       = "0.6.1"
   gem.authors       = ["Paul Barry"]
   gem.email         = ["mail@paulbarry.com"]
   gem.description   = %q{Add attributes to Ruby objects}

data/lib/attribution/version.rb

@@ -1,3 +1,3 @@
 module Attribution
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/attribution.rb

@@ -10,6 +10,9 @@ module Attribution
   end
 
   def initialize(attributes={})
+    self.class.attribute_names.each do |attr|
+      instance_variable_set("@#{attr}", nil)
+    end
     self.attributes = attributes
   end
 
@@ -21,18 +24,17 @@ module Attribution
   end
   alias_method :to_h, :attributes
 
-  def to_json
-    to_h.to_json
-  end
-
   def attributes=(attributes)
-    if attributes
-      attributes = JSON.parse(attributes) if attributes.is_a?(String)
-      attributes.each do |k,v|
-        setter = "#{k}="
-        if respond_to?(setter)
-          send(setter, v)
-        end
+    attributes = case attributes
+    when String then JSON.parse(attributes)
+    when Hash then attributes
+    else {}
+    end.with_indifferent_access
+
+    attributes.each do |k,v|
+      setter = "#{k}="
+      if respond_to?(setter)
+        send(setter, v)
       end
     end
   end

data/test/attribution_test.rb

@@ -218,5 +218,6 @@ class AttributionTest < Test::Unit::TestCase
   def test_to_json_should_only_include_attibutes
     book = Book.new(id: 1, foo: 'bar')
     assert_equal nil, JSON.parse(book.to_json)['foo']
+    assert JSON.parse(book.to_json).key?('title'), 'to_json sohuld include attributes that have no value assigned to them'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attribution
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport