supermodel 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/supermodel.rb

@@ -9,13 +9,12 @@ require "active_support/core_ext/module/attr_accessor_with_default"
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/module/aliasing"
 require "active_support/core_ext/object/blank"
-require "active_support/core_ext/object/misc"
 require "active_support/core_ext/object/try"
 require "active_support/core_ext/object/to_query"
+require "active_support/json"
 
 require "active_model"
 
-
 module SuperModel
   class SuperModelError < StandardError; end
   class UnknownRecord < SuperModelError; end
@@ -24,6 +23,8 @@ end
 
 $:.unshift(File.dirname(__FILE__))
 
+require "supermodel/ext/array"
+
 require "supermodel/association"
 require "supermodel/callbacks"
 require "supermodel/observing"

data/lib/supermodel/base.rb

@@ -27,7 +27,7 @@ module SuperModel
       
       def find_all_by_attribute(name, value) #:nodoc:
         items = records.values.select {|r| r.send(name) == value }
-        collection.new(items)
+        collection.new(items.deep_dup)
       end
       
       def raw_find(id) #:nodoc:
@@ -60,7 +60,11 @@ module SuperModel
       end
     
       def all
-        collection.new(records.values)
+        collection.new(records.values.deep_dup)
+      end
+      
+      def select(&block)
+        collection.new(records.values.select(&block).deep_dup)
       end
       
       def update(id, atts)
@@ -183,9 +187,16 @@ module SuperModel
     end
     
     def load(attributes) #:nodoc:
-      attributes.each {|(name, value)| 
+      attributes.each do |(name, value)| 
         self.send("#{name}=".to_sym, value) 
-      }
+      end
+    end
+    
+    def reload
+      return self if new?
+      item = self.class.find(id)
+      load(item.attributes)
+      return self
     end
     
     def update_attribute(name, value)

data/lib/supermodel/ext/array.rb

@@ -0,0 +1,7 @@
+class Array
+  unless defined?(deep_dup)
+    def deep_dup
+      Marshal.load(Marshal.dump(self))
+    end
+  end
+end

data/lib/supermodel/redis.rb

@@ -5,8 +5,12 @@ module SuperModel
         base.class_eval do
           class_inheritable_array :indexed_attributes
           self.indexed_attributes = []
+          
           class_inheritable_array :serialized_attributes
           self.serialized_attributes = []
+          
+          class_inheritable_hash :redis_options
+          self.redis_options = {}
         end
       end
       
@@ -19,7 +23,7 @@ module SuperModel
       end
       
       def redis
-        @redis ||= ::Redis.new
+        @redis ||= ::Redis.connect(redis_options)
       end
       
       def indexes(*indexes)
@@ -56,17 +60,21 @@ module SuperModel
       end
       
       def exists?(id)
-        redis.set_member?(redis_key, id.to_s)
+        redis.sismember(redis_key, id.to_s)
       end
       
       def count
-        redis.set_count(redis_key)
+        redis.scard(redis_key)
       end
       
       def all
         from_ids(redis.sort(redis_key))
       end
       
+      def select
+        raise "Not implemented"
+      end
+      
       def delete_all
         raise "Not implemented"
       end
@@ -94,13 +102,8 @@ module SuperModel
         end
     end
     
-    module InstanceMethods
-      # Redis integers are stored as strings
-      def id
-        super.try(:to_s)
-      end
-    
-      protected      
+    module InstanceMethods    
+      protected
         def raw_destroy
           return if new?
 
@@ -108,7 +111,7 @@ module SuperModel
           redis.srem(self.class.redis_key, self.id)
       
           attributes.keys.each do |key|
-            redis.delete(redis_key(key))
+            redis.del(redis_key(key))
           end
         end
       
@@ -127,7 +130,7 @@ module SuperModel
         end
     
         def generate_id
-          redis.incr(self.class.redis_key(:uid))
+          redis.incr(self.class.redis_key(:uid)).to_s
         end
 
         def indexed_attributes
@@ -153,7 +156,7 @@ module SuperModel
       
         def deserialize_attribute(key, value)
           return value unless serialized_attributes.include?(key)
-          value && JSON.parse(value)
+          value && ActiveSupport::JSON.decode(value)
         end
       
         def redis_set

data/supermodel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supermodel}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2010-05-11}
+  s.date = %q{2010-08-04}
   s.description = %q{In memory DB using ActiveModel}
   s.email = %q{info@eribium.org}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "lib/supermodel/base.rb",
      "lib/supermodel/callbacks.rb",
      "lib/supermodel/dirty.rb",
+     "lib/supermodel/ext/array.rb",
      "lib/supermodel/marshal.rb",
      "lib/supermodel/observing.rb",
      "lib/supermodel/random_id.rb",
@@ -39,14 +40,14 @@ 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.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{In memory DB using ActiveModel}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.beta"])
     else
       s.add_dependency(%q<activemodel>, [">= 3.0.0.beta"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 +01:00
+date: 2010-08-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -52,6 +53,7 @@ files:
 - lib/supermodel/base.rb
 - lib/supermodel/callbacks.rb
 - lib/supermodel/dirty.rb
+- lib/supermodel/ext/array.rb
 - lib/supermodel/marshal.rb
 - lib/supermodel/observing.rb
 - lib/supermodel/random_id.rb
@@ -70,6 +72,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -77,6 +80,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -86,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: In memory DB using ActiveModel