representable 0.0.1 → 0.0.2

data/README.rdoc

@@ -56,11 +56,8 @@ The cool thing with object-oriented representations is: you can treat them just
     # ...
     
     def sort_items
-      items.sort! do |a,b|
-        a.name <=> b.name
-      end
+      items.sort! { |a, b| a.name <=> b.name }
     end
-  end
 
 
 == Generating Representations

data/lib/representable/bindings/json_bindings.rb

@@ -47,9 +47,9 @@ module Representable
       
       def update_json(hash, value)
         if array?
-          hash.merge! ({accessor => value.collect {|v| v.to_json(:wrap => false)}}) # hier name=> wech.
+          hash.merge! ({accessor => value.collect {|v| v.to_hash(:wrap => false)}}) # hier name=> wech.
         else
-          hash.merge! value.to_json
+          hash.merge! value.to_hash
         end
       end
 

data/lib/representable/json.rb

@@ -28,7 +28,7 @@ module Representable
         data = ::JSON[data] if data.is_a?(String) # DISCUSS: #from_json sometimes receives a string (in nestings).
         data ||= {}
         
-        data = data[representation_name] unless options[:wrap] == false
+        data = data[representation_name.to_s] unless options[:wrap] == false
         
         create_from_json.tap do |inst|
           refs = representable_attrs.map {|attr| JSON.binding_for_definition(attr) }
@@ -48,18 +48,23 @@ module Representable
     end
     
     module InstanceMethods # :nodoc:
-      # Returns a Nokogiri::XML object representing this object.
-      def to_json(options={})
-        attributes = {}.tap do |root|
+      def to_hash(options={})
+        hash = {}.tap do |attrs|
           refs = self.class.representable_attrs.map {|attr| JSON.binding_for_definition(attr) }
           
           refs.each do |ref|
             value = public_send(ref.accessor) # DISCUSS: eventually move back to Ref.
-            ref.update_json(root, value) if value
+            ref.update_json(attrs, value) if value
           end
         end
         
-        options[:wrap] == false ? attributes : {self.class.representation_name => attributes}
+        # DISCUSS: where to wrap?
+        options[:wrap] == false ? hash : {self.class.representation_name => hash}
+      end
+      
+      # Returns a Nokogiri::XML object representing this object.
+      def to_json(options={})
+        to_hash(options).to_json
       end
     end
   end # Xml

data/lib/representable/version.rb

@@ -1,3 +1,3 @@
 module Representable
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/json_test.rb

@@ -30,12 +30,18 @@ module JsonTest
         band = Band.from_json({:band => {:name => "Bombshell Rocks"}}.to_json)
         assert_equal "Bombshell Rocks", band.name
       end
+      
+      it "#from_json accepts hash, too" do
+        band = Band.from_json({"band" => {"name" => "Bombshell Rocks"}})
+        assert_equal "Bombshell Rocks", band.name
+      end
+      
     
       it "#to_json serializes correctly" do
         band = Band.new
         band.name = "Cigar"
         
-        assert_equal "{\"band\"=>{\"name\"=>\"Cigar\"}}", band.to_json.to_s
+        assert_equal '{"band":{"name":"Cigar"}}', band.to_json
       end
     end
     
@@ -54,7 +60,7 @@ module JsonTest
         cd = CD.new
         cd.songs = ["Out in the cold", "Microphone"]
         
-        assert_equal "{\"cd\"=>{\"songs\"=>[\"Out in the cold\", \"Microphone\"]}}", cd.to_json.to_s
+        assert_equal '{"cd":{"songs":["Out in the cold","Microphone"]}}', cd.to_json
       end
     end
   end
@@ -81,7 +87,7 @@ module JsonTest
           label = Label.new; label.name = "Fat Wreck"
           album = Album.new; album.label = label
           
-          assert_equal "{\"album\"=>{\"label\"=>{\"name\"=>\"Fat Wreck\"}}}", album.to_json.to_s
+          assert_equal '{"album":{"label":{"name":"Fat Wreck"}}}', album.to_json
         end
       end
     end
@@ -122,9 +128,8 @@ module JsonTest
         cd = Compilation.new
         cd.bands = [Band.new("Diesel Boy"), Band.new("Bad Religion")]
         
-        assert_equal "{\"compilation\"=>{\"bands\"=>[{\"name\"=>\"Diesel Boy\"}, {\"name\"=>\"Bad Religion\"}]}}", cd.to_json.to_s
+        assert_equal '{"compilation":{"bands":[{"name":"Diesel Boy"},{"name":"Bad Religion"}]}}', cd.to_json
       end
     end
-      
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 +02:00
+date: 2011-06-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency