supermodel 0.0.5 → 0.0.6

data/.gitignore

@@ -1,3 +1,4 @@
 dump.db
 test.rb
+redis_test.rb
 pkg

data/README

@@ -10,7 +10,8 @@ Supports:
   * Callbacks
   * Observers
   * Dirty (Changes)
-  * Persistance
+  * Ruby Marshalling to disk
+  * Redis
 
 Examples:
 
@@ -37,15 +38,25 @@ You can use a random ID rather than the object ID:
   t = Test.create(:name => "test")
   t.id #=> "7ee935377bb4aecc54ad4f9126"
   
-You can persist objects to disk on startup/shutdown
+You can marshal objects to disk on startup/shutdown
   
   class Test < SuperModel::Base
-    include SuperModel::Persist::Model
+    include SuperModel::Marshal::Model
   end
   
-  SuperModel::Persist.path = "dump.db"
-  SuperModel::Persist.load
+  SuperModel::Marshal.path = "dump.db"
+  SuperModel::Marshal.load
 
   at_exit {
-    SuperModel::Persist.dump
-  }
+    SuperModel::Marshal.dump
+  }
+  
+You can use Redis, you need the Redis gem installed:
+
+  require "redis"
+  class Test < SuperModel::Redis
+    attributes :name
+    indexes :name
+  end
+  
+  Test.find_or_create_by_name("foo")

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/supermodel/base.rb

@@ -57,7 +57,7 @@ module SuperModel
       # Removes all records and executes 
       # destory callbacks.
       def destroy_all
-        records.dup.each {|r| r.destroy }
+        all.each {|r| r.destroy }
       end
       
       # Removes all records without executing
@@ -74,13 +74,17 @@ module SuperModel
         rec.save && rec
       end
       
+      def find_by_attribute(name, value) #:nodoc:
+        records.find {|r| r.name == value }
+      end
+      
       def method_missing(method_symbol, *args) #:nodoc:
         method_name = method_symbol.to_s
 
         if method_name =~ /^find_by_(\w+)!/
           send("find_by_#{$1}", *args) || raise(UnknownRecord)
         elsif method_name =~ /^find_by_(\w+)/
-          records.find {|r| r.send($1) == args.first }
+          find_by_attribute($1, args.first)
         elsif method_name =~ /^find_or_create_by_(\w+)/
           send("find_by_#{$1}", *args) || create($1 => args.first)
         else
@@ -156,7 +160,9 @@ module SuperModel
     end
     
     def load(attributes) #:nodoc:
-      @attributes.merge!(attributes)
+      attributes.each {|(name, value)| 
+        self.send("#{name}=".to_sym, value) 
+      }
     end
     
     def update_attribute(name, value)

data/lib/supermodel/{persist.rb → marshal.rb}

@@ -2,7 +2,7 @@ require "tempfile"
 require "fileutils"
 
 module SuperModel
-  module Persist
+  module Marshal
     def path
       @path || raise("Provide a path")
     end
@@ -20,7 +20,7 @@ module SuperModel
       return unless File.exist?(path)
       records = []
       File.open(path, "rb") {|file|
-        records = Marshal.load(file)
+        records = ::Marshal.load(file)
       }
       records.each {|r| r.class.records << r }
       true
@@ -31,7 +31,7 @@ module SuperModel
       tmp_file = Tempfile.new("rbdump")
       tmp_file.binmode
       records  = klasses.map {|k| k.records }.flatten
-      Marshal.dump(records, tmp_file)
+      ::Marshal.dump(records, tmp_file)
       # Atomic serialization - so we never corrupt the db
       FileUtils.mv(tmp_file.path, path)
       true
@@ -41,7 +41,7 @@ module SuperModel
     
     module Model
       def self.included(base)
-        Persist.klasses << base
+        Marshal.klasses << base
       end
       
       def marshal_dump

data/lib/supermodel/redis.rb

@@ -0,0 +1,162 @@
+module SuperModel
+  class Redis < Base
+    class << self
+      def redis
+        @redis ||= ::Redis.new
+      end
+      
+      def indexes(*indexes)
+        @known_indexes = indexes.map(&:to_s)
+      end
+      
+      def known_indexes
+        @known_indexes ||= []
+      end
+      
+      def serialize(*attributes)
+        @serialized_attributes = attributes.map(&:to_s)
+      end
+      
+      def serialized_attributes
+        @serialized_attributes ||= []
+      end
+      
+      def redis_key(*args)
+        args.unshift(self.name.downcase)
+        args.join(":")
+      end
+      
+      def find(id)
+        if redis.set_member?(redis_key, id)
+          res = self.new(:id => id)
+          res.redis_get
+          res
+        else
+          raise(UnknownRecord)
+        end
+      end
+      
+      def first
+        all.first
+      end
+      
+      def last
+        all.last
+      end
+      
+      def count
+        redis.set_count(redis_key)
+      end
+      
+      def all
+        from_ids(redis.set_members(redis_key))
+      end
+      
+      def delete_all
+        raise "Not implemented"
+      end
+      
+      def find_by_attribute(key, value)
+        item_ids = redis.set_members(redis_key(key, value))
+        return if item_ids.empty?
+        res = self.new(:id => item_ids.first)
+        res.redis_get
+        res
+      end
+      
+      protected
+        def from_ids(ids)
+          ids.map do |id| 
+            res = self.new(:id => id)
+            res.redis_get
+            res
+          end
+        end
+    end
+        
+    def destroy
+      return if new?
+
+      destroy_indexes
+      redis.set_delete(self.class.redis_key, self.id)
+      
+      attributes.keys.each do |key|
+        redis.delete(redis_key(key))
+      end
+    end
+    
+    protected
+      def destroy_indexes
+        known_indexes.each do |index|
+          old_attribute = changes[index].try(:first) || send(index)
+          redis.set_delete(self.class.redis_key(index, old_attribute), id)
+        end
+      end
+      
+      def create_indexes
+        known_indexes.each do |index|
+          new_attribute = send(index)
+          redis.set_add(self.class.redis_key(index, new_attribute), id)
+        end
+      end
+    
+      def generate_id
+        redis.incr(self.class.redis_key(:uid))
+      end
+      
+      def known_indexes
+        attributes.keys & self.class.known_indexes
+      end
+      
+      def redis
+        self.class.redis
+      end
+    
+      def redis_key(*args)
+        self.class.redis_key(id, *args)
+      end
+      
+      def serialized_attributes
+        self.class.serialized_attributes
+      end
+      
+      def serialize_attribute(key, value)
+        return value unless serialized_attributes.include?(key)
+        value.to_json
+      end
+      
+      def deserialize_attribute(key, value)
+        return value unless serialized_attributes.include?(key)
+        JSON.parse(value)
+      end
+      
+      def redis_set
+        attributes.each do |(key, value)|
+          redis.set(redis_key(key), serialize_attribute(key, value))
+        end
+      end
+      
+      def redis_get
+        known_attributes.each do |key|
+          result = deserialize_attribute(key, redis.get(redis_key(key)))
+          send("#{key}=", result)
+        end
+      end
+      public :redis_get
+    
+      def create
+        self.id ||= generate_id
+        redis_set
+        create_indexes
+        redis.set_add(self.class.redis_key, self.id)
+        save_previous_changes
+      end
+      
+      def update
+        destroy_indexes
+        redis_set
+        create_indexes
+        save_previous_changes
+      end
+  end
+end

data/lib/supermodel/scriber.rb

@@ -68,7 +68,11 @@ module SuperModel
         end
       
         def record(type, data = nil)
-          ::Scriber.record(self, type, data)
+          ::Scriber.record(
+            :klass => self, 
+            :type => type, 
+            :data => data
+          )
         end
       end
     end

data/lib/supermodel.rb

@@ -22,12 +22,13 @@ module SuperModel
   class InvalidRecord < SuperModelError; end
 end
 
-$: << File.dirname(__FILE__)
+$:.unshift(File.dirname(__FILE__))
 
 require "supermodel/callbacks"
 require "supermodel/observing"
-require "supermodel/persist"
+require "supermodel/marshal"
 require "supermodel/random_id"
 require "supermodel/scriber"
 require "supermodel/validations"
-require "supermodel/base"
+require "supermodel/base"
+require "supermodel/redis"

data/supermodel.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supermodel}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
@@ -24,9 +24,10 @@ Gem::Specification.new do |s|
      "lib/supermodel.rb",
      "lib/supermodel/base.rb",
      "lib/supermodel/callbacks.rb",
+     "lib/supermodel/marshal.rb",
      "lib/supermodel/observing.rb",
-     "lib/supermodel/persist.rb",
      "lib/supermodel/random_id.rb",
+     "lib/supermodel/redis.rb",
      "lib/supermodel/scriber.rb",
      "lib/supermodel/validations.rb",
      "supermodel.gemspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: supermodel
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -39,9 +39,10 @@ files:
 - lib/supermodel.rb
 - lib/supermodel/base.rb
 - lib/supermodel/callbacks.rb
+- lib/supermodel/marshal.rb
 - lib/supermodel/observing.rb
-- lib/supermodel/persist.rb
 - lib/supermodel/random_id.rb
+- lib/supermodel/redis.rb
 - lib/supermodel/scriber.rb
 - lib/supermodel/validations.rb
 - supermodel.gemspec