json_mapper 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/json_mapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{json_mapper}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Trond Arve Nordheim"]
-  s.date = %q{2010-08-09}
+  s.date = %q{2010-08-10}
   s.email = %q{tanordheim@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/json_mapper.rb

@@ -9,10 +9,27 @@ module JSONMapper
     base.instance_variable_set("@attributes", {})
     base.instance_variable_set("@json_data", {})
     base.extend ClassMethods
+    base.send :include, InstanceMethods
+  end
+
+  module InstanceMethods
+
+    def json_data
+      self.class.json_data
+    end
+
   end
 
   module ClassMethods
 
+    def json_data=(data)
+      @json_data[to_s] = data
+    end
+
+    def json_data
+      @json_data[to_s]
+    end
+
     def json_attribute(name, *args)
 
       source_attributes, type, options = extract_attribute_data(name, *args)
@@ -39,9 +56,9 @@ module JSONMapper
       @attributes[to_s] || []
     end
 
-    def json_data
-      @json_data[to_s] || []
-    end
+    # def json_data
+    #   @json_data[to_s] || []
+    # end
 
     def parse(data, options = {})
 
@@ -62,7 +79,8 @@ module JSONMapper
     def parse_json(json)
 
       # Set the JSON data for this instance
-      @json_data[to_s] = json
+      self.json_data = json
+      # @json_data[to_s] = json
       
       # Create a new instance of ourselves
       instance = new
@@ -229,7 +247,7 @@ module JSONMapper
 
       # If no mapping could be found and this attribute is potentially
       # self-referencing, return the current JSON data as the mapped value
-      return json_data if attribute.self_referential?
+      return self.json_data if attribute.self_referential?
 
       return nil
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json_mapper
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Trond Arve Nordheim
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 +02:00
+date: 2010-08-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency