bagman 0.0.3 → 0.0.5

data/Changelog.md

@@ -1,3 +1,12 @@
+# 0.0.5
+
+- Fixed long standing bug where the bag would become something like `'{"serialised":"bag"}': null` [lachie]
+
+# 0.0.4
+
+- Was never pushed for some reason!
+- `uncast` field type uses `:defaults`. [whalec]
+
 # 0.0.3
 
 - Added `bag_field` class method to `Bagman::Document`s. This allows for adding adhoc accessors for conveniently accessing verbatim bag values. [lachie]

data/lib/bagman/bag.rb

@@ -13,6 +13,7 @@ module Bagman
       instance_eval(&blk)
     end
 
+
     alias :fields :columns
 
 
@@ -55,6 +56,7 @@ module Bagman
           write_attribute(index_name, value)
         end
 
+
         self.bag[name] = if s = options[:serialize]
                            s[value]
                          elsif value.is_a? Date
@@ -68,9 +70,15 @@ module Bagman
 
     def uncast_bag_field(name, type, options, &blk)
       name = name.to_s
+      if default = options[:default]
+        default_generator = "__#{name}_default"
+        target_class.send :define_method, default_generator do
+          default.dup
+        end
+      end
 
       target_class.send :define_method, name do
-        self.bag[name]
+        self.bag[name] || (default_generator && send(default_generator))
       end
 
       target_class.send :define_method, "#{name}=" do |value|

data/lib/bagman/document.rb

@@ -11,24 +11,40 @@ module Bagman
       before_save :serialize_bag
     end
 
+
     def bag
       @bag ||= decode_or_initialize_bag
     end
 
 
     def bag=(bag)
-      @bag = AngryHash[bag]
+      case bag
+      when NilClass
+        @bag = AngryHash.new
+      when String
+        @bag = decode_or_initialize_bag(bag)
+      else
+        @bag = AngryHash[bag]
+      end.tap {
+        mixin_top_level_mixin
+      }
+    end
+
+
+    def decode_or_initialize_bag(bag_string=nil)
+      begin
+        bag_string ||= read_attribute('bag')
+        AngryHash[ ActiveSupport::JSON.decode( bag_string ) ]
+      rescue
+        initialize_bag(AngryHash.new)
+      end.tap {|bag|
+        mixin_top_level_mixin(bag)
+      }
     end
 
 
-    def decode_or_initialize_bag
-       begin
-         AngryHash[ ActiveSupport::JSON.decode( read_attribute('bag') ) ]
-       rescue
-         initialize_bag(AngryHash.new)
-       end.tap {|h|
-         h.extend self.class.bag.top_level_mixin
-       }
+    def mixin_top_level_mixin(hash=@bag)
+      hash.extend self.class.bag.top_level_mixin unless hash.__angry_hash_extension # XXX angry hash should have an API for this
     end
 
 
@@ -45,6 +61,7 @@ module Bagman
       if @bag
         encrypt_crypto_pocket
         write_attribute(:bag, ActiveSupport::JSON.encode(@bag))
+        @bag = nil
       end
     end
 

data/lib/bagman/version.rb

@@ -1,3 +1,3 @@
 module Bagman
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bagman
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Lachie Cox
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 Z
+date: 2011-09-10 00:00:00 Z
 dependencies: []
 
 description: We built Bagman for a project. We wanted fast prototyping and development, and some level of escape from the schema on relational databases.