supermodel 0.1.0 → 0.1.2

data/.gitignore

@@ -2,3 +2,4 @@ dump.db
 test.rb
 redis_test.rb
 pkg
+lib/supermodel/cassandra.rb

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/lib/supermodel/base.rb

@@ -11,15 +11,16 @@ module SuperModel
       end
       
       def records
-        @records ||= []
+        @records ||= {}
       end
       
       def find_by_attribute(name, value) #:nodoc:
-        records.find {|r| r.send(name) == value }
+        item = records.values.find {|r| r.send(name) == value }
+        item && item.dup
       end
       
       def raw_find(id) #:nodoc:
-        find_by_attribute(:id, id) || raise(UnknownRecord)
+        records[id] || raise(UnknownRecord)
       end
       
       # Find record by ID, or raise.
@@ -30,12 +31,12 @@ module SuperModel
       alias :[] :find
     
       def first
-        item = records[0]
+        item = records.values[0]
         item && item.dup
       end
       
       def last
-        item = records[-1]
+        item = records.values[-1]
         item && item.dup
       end
       
@@ -44,7 +45,7 @@ module SuperModel
       end
     
       def all
-        records.dup
+        records.values.dup
       end
       
       def update(id, atts)
@@ -72,7 +73,7 @@ module SuperModel
       #   create(:name => "foo", :id => 1)
       def create(atts = {})
         rec = self.new(atts)
-        rec.save && rec
+        rec.save! && rec
       end
       
       def method_missing(method_symbol, *args) #:nodoc:
@@ -91,7 +92,7 @@ module SuperModel
     end
     
     attr_accessor :attributes
-    attr_writer :new_record
+    attr_writer   :new_record
     
     def known_attributes
       self.class.known_attributes + self.attributes.keys.map(&:to_s)
@@ -192,10 +193,6 @@ module SuperModel
         super
       end
     end
-        
-    def raw_destroy
-      self.class.records.delete(self)
-    end
     
     def destroy
       raw_destroy
@@ -215,8 +212,12 @@ module SuperModel
         object_id
       end
       
+      def raw_destroy
+        self.class.records.delete(self.id)
+      end
+      
       def raw_create
-        self.class.records << self.dup
+        self.class.records[self.id] = self.dup
       end
       
       def create
@@ -262,6 +263,6 @@ module SuperModel
     include ActiveModel::Conversion
     include ActiveModel::Serializers::JSON
     include ActiveModel::Serializers::Xml
-    include Dirty, Observing, Validations, Callbacks
+    include Dirty, Observing, Callbacks, Validations
   end
 end

data/lib/supermodel/marshal.rb

@@ -18,11 +18,19 @@ module SuperModel
     def load
       return unless path
       return unless File.exist?(path)
-      records = []
-      File.open(path, "rb") {|file|
-        records = ::Marshal.load(file)
-      }
-      records.each {|r| r.class.records << r }
+      data = []
+      File.open(path, "rb") do |file|
+        begin
+          data = ::Marshal.load(file)
+        rescue
+          # Lots of errors can occur during
+          # marshaling - such as EOF etc
+          return false
+        end
+      end
+      data.each do |klass, records| 
+        klass.marshal_records(records)
+      end
       true
     end
   
@@ -30,8 +38,11 @@ module SuperModel
       return unless path
       tmp_file = Tempfile.new("rbdump")
       tmp_file.binmode
-      records  = klasses.map {|k| k.records }.flatten
-      ::Marshal.dump(records, tmp_file)
+      data = klasses.inject({}) {|hash, klass|
+        hash[klass] = klass.marshal_records
+        hash
+      }
+      ::Marshal.dump(data, tmp_file)
       # Atomic serialization - so we never corrupt the db
       FileUtils.mv(tmp_file.path, path)
       true
@@ -41,6 +52,7 @@ module SuperModel
     
     module Model
       def self.included(base)
+        base.extend ClassMethods
         Marshal.klasses << base
       end
       
@@ -53,6 +65,13 @@ module SuperModel
         # isn't setup properly
         @attributes = atts
       end
+      
+      module ClassMethods
+        def marshal_records(records = nil)
+          @records = records if records
+          @records
+        end
+      end
     end
   end
 end

data/lib/supermodel/redis.rb

@@ -87,19 +87,19 @@ module SuperModel
       def id
         super.try(:to_i)
       end
-      
-      def raw_destroy
-        return if new?
+    
+      protected      
+        def raw_destroy
+          return if new?
 
-        destroy_indexes
-        redis.set_delete(self.class.redis_key, self.id)
+          destroy_indexes
+          redis.set_delete(self.class.redis_key, self.id)
       
-        attributes.keys.each do |key|
-          redis.delete(redis_key(key))
+          attributes.keys.each do |key|
+            redis.delete(redis_key(key))
+          end
         end
-      end
-    
-      protected
+      
         def destroy_indexes
           indexed_attributes.each do |index|
             old_attribute = changes[index].try(:first) || send(index)

data/supermodel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supermodel}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2010-02-16}
+  s.date = %q{2010-03-11}
   s.description = %q{In memory DB using ActiveModel}
   s.email = %q{info@eribium.org}
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/maccman/supermodel}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{In memory DB using ActiveModel}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: supermodel
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -9,19 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +00:00
+date: 2010-03-11 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta
         version: 3.0.0.beta
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: In memory DB using ActiveModel
 email: info@eribium.org
 executables: []
@@ -60,18 +70,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: In memory DB using ActiveModel