document_record 0.0.14 → 0.0.17

data/lib/document_record.rb

@@ -1,28 +1,67 @@
 require 'document_hash'
+require 'bson'
 
 module DocumentRecord
   module Serializer
-    def self.dump object
-      Base64.encode64 Marshal.dump object
+    MARSHALL_VERSION = 0
+    MESSAGEPACK_VERSION = 1
+    DEFAULT_VERSION = 1
+
+    def self.dump object, options = {}
+      version = DEFAULT_VERSION
+      version = options[:force_version] if options.has_key? :force_version
+
+      binary_dump = 
+        case version 
+          when 0 then 
+            Marshal.dump object
+          when 1 then
+            object.to_hash.to_bson
+          else 
+            raise "No serialization version found: #{ version }"
+        end
+
+      unless options.has_key? :no_version and options[:no_version]
+        stamp = [68, 82, version].pack 'c2S'  # DR<version> In 4 bits
+        binary_dump.insert( 0, stamp )
+      end
+
+      Base64.encode64 binary_dump
     end
     def self.load data
-      Marshal.load Base64.decode64 data rescue nil
+      decoded = Base64.decode64 data rescue nil
+      version = 0
+
+      if decoded.start_with? "DR"  # Has version Stamp
+        version = decoded[2,2].unpack('S').pop # Gets the Version
+        decoded[0...4] = '' # Removes version stamp
+      end
+      
+      case version
+        when 0 then
+          Marshal.load decoded rescue nil
+        when 1 then
+          Hash.from_bson( StringIO.new( decoded ) )
+        else 
+          raise "Unrecognized version #{version}"
+      end
     end
   end
 
   module Base 
     extend ActiveSupport::Concern
 
-    def document_field name
+    def document_field name, options = {}
       raise "Field must exist in record in order to become a document field" unless column_names.include? name.to_s
-      @@_document_field_name = name
-      @@_index_fields ||= []
-
       class_eval do
         alias_method :regular_assign_attributes, :assign_attributes
         alias_method :regular_method_missing, :method_missing
         alias_method :regular_save, :save
 
+        @@_document_field_name = name
+        @@_schema_fields = options[:schema_fields] || []
+        @@_index_fields ||= []
+
         def read_serialized_hash_attribute field_name
           raw = read_attribute field_name
           raw && Serializer.load( raw ) || {}
@@ -61,7 +100,7 @@ module DocumentRecord
         end
 
         def touch!
-          document.touch!
+          self.document.touch!
           save
         end
 
@@ -71,15 +110,37 @@ module DocumentRecord
 
         def assign_attributes new_attributes, options
           new_attributes.each do | key, value |
-            self.send "#{key}=".to_sym, value
+            assign_key = :"#{key}="
+            method_missing assign_key, value
+            self.send assign_key, value if self.respond_to? assign_key
           end 
         end
 
         def method_missing method, *args
           if method =~ /(.*)=$/ 
-            document[$1] = args.shift
+            write_document $1, args.shift
+          else
+            read_document method.to_s
+          end
+        end
+
+        def is_schema_field? attribute
+          @@_schema_fields.include? attribute.to_sym
+        end
+
+        def read_document attribute
+          if is_schema_field? attribute
+            read_attribute attribute
+          else
+            document[attribute] || read_attribute(attribute)
+          end
+        end
+
+        def write_document attribute, value
+          if is_schema_field? attribute
+            write_attribute attribute, value
           else
-            document[method.to_s]
+            document[attribute] = value
           end
         end
 
@@ -88,17 +149,61 @@ module DocumentRecord
         end
 
         def as_json options = {}
-          ( read_serialized_hash_attribute(@@_document_field_name) || {} ).merge(super.reject{ |k, v| k === @@_document_field_name.to_s })
+          included_fields = super.select{ |k, v|
+            @@_schema_fields.include?( k.to_sym ) 
+          }.stringify_keys!
+
+          document.to_hash( stringify_keys: true ).
+            merge( included_fields ).
+            merge( method_values(options) )
+        end
+
+        def method_values options
+          {}.tap do | result | 
+            return result unless options[:methods].is_a? Array
+            options[:methods].each do | method |
+              result[method] = self.__send__(method)
+            end
+          end
+        end
+
+
+        def _deep_key_values hash = nil, path = []
+          hash = document.to_hash unless hash
+          result = []
+
+          hash.each do | k, v |
+            current = path.dup
+            
+            current << k
+            if v.is_a? Hash
+              result += _deep_key_values hash[ k ], current 
+            else
+              result += [ current.join("_"), v ]
+            end
+          end
+          result
+        end
+
+        def deep_key_values
+          Hash[*_deep_key_values]
         end
-      end  
+
+        def deep_keys
+          deep_key_values.keys
+        end
+      end
 
       column_names.each do |column|
         class_eval <<-METHOD
           def #{column}
-            document["#{column}"] || read_attribute("#{column}")
+            # document["#{column}"] || read_attribute("#{column}")
+            read_document "#{ column }"
           end
+
           def #{column}= value
-            document["#{column}"] = value
+            # document["#{column}"] = value
+            write_document "#{ column }", value
           end
         METHOD
       end

data/lib/document_record/version.rb

@@ -1,3 +1,3 @@
 module DocumentRecord
-  VERSION = "0.0.14"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: document_record
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: document_hash
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.15
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.11
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement