supermodel 0.1.4 → 0.1.5

data/README

@@ -54,7 +54,9 @@ You can marshal objects to disk on startup/shutdown
 You can use Redis, you need the Redis gem installed:
 
   require "redis"
-  class Test < SuperModel::Redis
+  class Test < SuperModel::Base
+    include SuperModel::Redis::Model
+  
     attributes :name
     indexes :name
   end

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gemspec.homepage = "http://github.com/maccman/supermodel"
     gemspec.description = "In memory DB using ActiveModel"
     gemspec.authors = ["Alex MacCaw"]
-    gemspec.add_dependency("activemodel", ">= 3.0.0.beta")
+    gemspec.add_dependency("activemodel", "~> 3.0.0")
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/supermodel.rb

@@ -2,15 +2,14 @@ gem "activesupport"
 gem "activemodel"
 
 require "active_support/core_ext/class/attribute_accessors"
-require "active_support/core_ext/class/inheritable_attributes"
 require "active_support/core_ext/hash/indifferent_access"
 require "active_support/core_ext/kernel/reporting"
-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/try"
 require "active_support/core_ext/object/to_query"
+require "active_support/core_ext/class/attribute"
 require "active_support/json"
 
 require "active_model"
@@ -22,16 +21,17 @@ module SuperModel
 end
 
 $:.unshift(File.dirname(__FILE__))
-
 require "supermodel/ext/array"
 
-require "supermodel/association"
-require "supermodel/callbacks"
-require "supermodel/observing"
-require "supermodel/marshal"
-require "supermodel/random_id"
-require "supermodel/timestamp"
-require "supermodel/validations"
-require "supermodel/dirty"
-require "supermodel/base"
-require "supermodel/redis"
+module SuperModel
+  autoload :Association, "supermodel/association"
+  autoload :Callbacks,   "supermodel/callbacks"
+  autoload :Observing,   "supermodel/observing"
+  autoload :Marshal,     "supermodel/marshal"
+  autoload :RandomID,    "supermodel/random_id"
+  autoload :Timestamp,   "supermodel/timestamp"
+  autoload :Validations, "supermodel/validations"
+  autoload :Dirty,       "supermodel/dirty"
+  autoload :Redis,       "supermodel/redis"
+  autoload :Base,        "supermodel/base"
+end

data/lib/supermodel/base.rb

@@ -1,10 +1,14 @@
 module SuperModel
   class Base    
-    class_inheritable_array :known_attributes
+    class_attribute :known_attributes
     self.known_attributes = []
     
     class << self
-      attr_accessor_with_default(:primary_key, 'id') #:nodoc:
+      attr_accessor(:primary_key) #:nodoc:
+      
+      def primary_key
+        @primary_key ||= 'id'
+      end
       
       def collection(&block)
         @collection ||= Class.new(Array)
@@ -120,12 +124,13 @@ module SuperModel
     attr_writer   :new_record
     
     def known_attributes
-      self.class.known_attributes + self.attributes.keys.map(&:to_s)
+      self.class.known_attributes | self.attributes.keys.map(&:to_s)
     end
     
     def initialize(attributes = {})
       @new_record = true
       @attributes = {}.with_indifferent_access
+      @attributes.merge!(known_attributes.inject({}) {|h, n| h[n] = nil; h })
       @changed_attributes = {}
       load(attributes)
     end
@@ -185,8 +190,10 @@ module SuperModel
     def exists?
       !new?
     end
+    alias_method :persisted?, :exists?
     
     def load(attributes) #:nodoc:
+      return unless attributes
       attributes.each do |(name, value)| 
         self.send("#{name}=".to_sym, value) 
       end

data/lib/supermodel/redis.rb

@@ -5,10 +5,7 @@ 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
@@ -29,11 +26,7 @@ module SuperModel
       def indexes(*indexes)
         self.indexed_attributes += indexes.map(&:to_s)
       end
-      
-      def serialize(*attributes)
-        self.serialized_attributes += attributes.map(&:to_s)
-      end
-      
+            
       def redis_key(*args)
         args.unshift(self.namespace)
         args.join(":")
@@ -109,10 +102,7 @@ module SuperModel
 
           destroy_indexes
           redis.srem(self.class.redis_key, self.id)
-      
-          attributes.keys.each do |key|
-            redis.del(redis_key(key))
-          end
+          redis.del(redis_key)
         end
       
         def destroy_indexes
@@ -130,7 +120,7 @@ module SuperModel
         end
     
         def generate_id
-          redis.incr(self.class.redis_key(:uid)).to_s
+          redis.incr(self.class.redis_key(:uid))
         end
 
         def indexed_attributes
@@ -140,36 +130,17 @@ module SuperModel
         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)
-          value && ActiveSupport::JSON.decode(value)
-        end
-      
         def redis_set
-          serializable_hash.each do |(key, value)|
-            redis.set(redis_key(key), serialize_attribute(key, value))
-          end
+          redis.set(redis_key, serializable_hash.to_json)
         end
       
         def redis_get
-          known_attributes.each do |key|
-            result = deserialize_attribute(key, redis.get(redis_key(key)))
-            send("#{key}=", result)
-          end
+          load(ActiveSupport::JSON.decode(redis.get(redis_key)))
         end
         public :redis_get
     

data/lib/supermodel/validations/uniqueness.rb

@@ -1,11 +1,11 @@
-module ActiveModel
+module SuperModel
   module Validations
-    class UniquenessValidator < EachValidator
+    class UniquenessValidator < ActiveModel::EachValidator
       attr_reader :klass
       
       def validate_each(record, attribute, value)
         alternate = klass.find_by_attribute(attribute, value)
-        return unless alternate == record
+        return unless alternate
         record.errors.add(attribute, "must be unique", :default => options[:message])
       end
       

data/supermodel.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2010-08-04}
+  s.date = %q{2010-08-30}
   s.description = %q{In memory DB using ActiveModel}
   s.email = %q{info@eribium.org}
   s.extra_rdoc_files = [
@@ -48,12 +48,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.beta"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0"])
     else
-      s.add_dependency(%q<activemodel>, [">= 3.0.0.beta"])
+      s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
     end
   else
-    s.add_dependency(%q<activemodel>, [">= 3.0.0.beta"])
+    s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
   end
 end
 

metadata

@@ -1,48 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: supermodel
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+version: !ruby/object:Gem::Version
+  version: 0.1.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Alex MacCaw
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-04 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70137254259940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        - beta
-        version: 3.0.0.beta
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70137254259940
 description: In memory DB using ActiveModel
 email: info@eribium.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README
-files: 
-- .gitignore
+files:
 - MIT-LICENSE
 - README
 - Rakefile
@@ -62,37 +48,28 @@ files:
 - lib/supermodel/validations.rb
 - lib/supermodel/validations/uniqueness.rb
 - supermodel.gemspec
-has_rdoc: true
 homepage: http://github.com/maccman/supermodel
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: In memory DB using ActiveModel
 test_files: []
-

data/.gitignore

@@ -1,6 +0,0 @@
-dump.db
-test.rb
-redis_test.rb
-pkg
-lib/supermodel/cassandra.rb
-*.gem