supermodel 0.1.2 → 0.1.3

data/.gitignore

@@ -3,3 +3,4 @@ test.rb
 redis_test.rb
 pkg
 lib/supermodel/cassandra.rb
+*.gem

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Alexander MacCaw (info@eribium.org)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/supermodel.rb

@@ -24,6 +24,7 @@ end
 
 $:.unshift(File.dirname(__FILE__))
 
+require "supermodel/association"
 require "supermodel/callbacks"
 require "supermodel/observing"
 require "supermodel/marshal"

data/lib/supermodel/association.rb

@@ -0,0 +1,51 @@
+require "active_support/core_ext/string/inflections.rb"
+
+module SuperModel
+  module Association
+    module ClassMethods
+      def belongs_to(to_model, options = {})
+        to_model    = to_model.to_s
+        class_name  = options[:class_name]  || to_model.classify
+        foreign_key = options[:foreign_key] || "#{to_model}_id"
+        primary_key = options[:primary_key] || "id"
+        
+        attributes foreign_key
+        
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{to_model}                                             # def user
+            #{foreign_key} && #{class_name}.find(#{foreign_key})      #   user_id && User.find(user_id)
+          end                                                         # end
+                                                                      # 
+          def #{to_model}?                                            # def user?
+            #{foreign_key} && #{class_name}.exists?(#{foreign_key})   #   user_id && User.exists?(user_id)
+          end                                                         # end
+                                                                      # 
+          def #{to_model}=(object)                                    # def user=(model)
+            self.#{foreign_key} = (object && object.#{primary_key})   #   self.user_id = (model && model.id)
+          end                                                         # end
+        EOS
+      end
+      
+      def has_many(to_model, options = {})
+        to_model    = to_model.to_s
+        class_name  = options[:class_name]  || to_model.classify
+        foreign_key = options[:foreign_key] || "#{model_name.singular}_id"
+        primary_key = options[:primary_key] || "id"
+        class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{to_model}                                             # def user
+            #{class_name}.find_all_by_attribute(                      #   User.find_all_by_attribute(
+              :#{foreign_key},                                        #    :task_id,
+              #{primary_key}                                          #    id
+            )                                                         #   )
+          end                                                         # end
+        EOS
+      end
+    end
+    
+    module Model
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+    end
+  end
+end

data/lib/supermodel/base.rb

@@ -5,6 +5,12 @@ module SuperModel
     
     class << self
       attr_accessor_with_default(:primary_key, 'id') #:nodoc:
+      
+      def collection(&block)
+        @collection ||= Class.new(Array)
+        @collection.class_eval(&block) if block_given?
+        @collection
+      end
 
       def attributes(*attributes)
         self.known_attributes += attributes.map(&:to_s)
@@ -19,8 +25,13 @@ module SuperModel
         item && item.dup
       end
       
+      def find_all_by_attribute(name, value) #:nodoc:
+        items = records.values.select {|r| r.send(name) == value }
+        collection.new(items)
+      end
+      
       def raw_find(id) #:nodoc:
-        records[id] || raise(UnknownRecord)
+        records[id] || raise(UnknownRecord, "Couldn't find #{self.name} with ID=#{id}")
       end
       
       # Find record by ID, or raise.
@@ -40,12 +51,16 @@ module SuperModel
         item && item.dup
       end
       
+      def exists?(id)
+        records.has_key?(id)
+      end
+      
       def count
         records.length
       end
     
       def all
-        records.values.dup
+        collection.new(records.values)
       end
       
       def update(id, atts)
@@ -73,7 +88,11 @@ module SuperModel
       #   create(:name => "foo", :id => 1)
       def create(atts = {})
         rec = self.new(atts)
-        rec.save! && rec
+        rec.save && rec
+      end
+      
+      def create!(*args)
+        create(*args) || raise(InvalidRecord)
       end
       
       def method_missing(method_symbol, *args) #:nodoc:
@@ -85,6 +104,8 @@ module SuperModel
           find_by_attribute($1, args.first)
         elsif method_name =~ /^find_or_create_by_(\w+)/
           send("find_by_#{$1}", *args) || create($1 => args.first)
+        elsif method_name =~ /^find_all_by_(\w+)/
+          find_all_by_attribute($1, args.first)
         else
           super
         end
@@ -101,6 +122,7 @@ module SuperModel
     def initialize(attributes = {})
       @new_record = true
       @attributes = {}.with_indifferent_access
+      @changed_attributes = {}
       load(attributes)
     end
     
@@ -175,6 +197,10 @@ module SuperModel
       load(attributes) && save
     end
     
+    def update_attributes!(attributes)
+      update_attributes(attributes) || raise(InvalidRecord)
+    end
+    
     def has_attribute?(name)
       @attributes.has_key?(name)
     end
@@ -259,10 +285,11 @@ module SuperModel
   end
   
   class Base
-    extend ActiveModel::Naming
+    extend  ActiveModel::Naming
     include ActiveModel::Conversion
     include ActiveModel::Serializers::JSON
     include ActiveModel::Serializers::Xml
     include Dirty, Observing, Callbacks, Validations
+    include Association::Model
   end
 end

data/lib/supermodel/dirty.rb

@@ -15,10 +15,10 @@ module SuperModel
         alias_method_chain(method, :dirty)
       end
     end
-    
+        
     def save_previous_changes
       @previously_changed = changes
-      changed_attributes.clear
+      @changed_attributes.clear
     end
   end
 end

data/lib/supermodel/marshal.rb

@@ -22,14 +22,17 @@ module SuperModel
       File.open(path, "rb") do |file|
         begin
           data = ::Marshal.load(file)
-        rescue
+        rescue => e
+          if defined?(Bowline)
+            Bowline::Logging.log_error(e)
+          end
           # Lots of errors can occur during
           # marshaling - such as EOF etc
           return false
         end
       end
       data.each do |klass, records| 
-        klass.marshal_records(records)
+        klass.marshal_records = records
       end
       true
     end
@@ -43,6 +46,7 @@ module SuperModel
         hash
       }
       ::Marshal.dump(data, tmp_file)
+  	  tmp_file.close
       # Atomic serialization - so we never corrupt the db
       FileUtils.mv(tmp_file.path, path)
       true
@@ -57,20 +61,30 @@ module SuperModel
       end
       
       def marshal_dump
-        serializable_hash
+        serializable_hash(self.class.marshal)
       end
 
       def marshal_load(atts)
         # Can't call load, since class
         # isn't setup properly
-        @attributes = atts
+        @attributes         = atts.with_indifferent_access
+        @changed_attributes = {}
       end
       
       module ClassMethods
-        def marshal_records(records = nil)
-          @records = records if records
-          @records
+        def marshal(options = nil)
+          @marshal = options if options
+          @marshal ||= {}
+        end
+        alias_method :marshal=, :marshal
+                
+        def marshal_records=(records)
+          @records = records
         end
+        
+        def marshal_records
+          @records
+        end    
       end
     end
   end

data/lib/supermodel/redis.rb

@@ -36,19 +36,27 @@ module SuperModel
       end
       
       def find(id)
-        if redis.set_member?(redis_key, id)
+        if redis.sismember(redis_key, id.to_s)
           existing(:id => id)
         else
-          raise(UnknownRecord)
+          raise UnknownRecord, "Couldn't find #{self.name} with ID=#{id}"
         end
       end
       
       def first
-        all.first
+        item_ids = redis.sort(redis_key, :order => "ASC", :limit => [0, 1])
+        item_id  = item_ids.first
+        item_id && existing(:id => item_id)        
       end
       
       def last
-        all.last
+        item_ids = redis.sort(redis_key, :order => "DESC", :limit => [0, 1])
+        item_id  = item_ids.first
+        item_id && existing(:id => item_id)        
+      end
+      
+      def exists?(id)
+        redis.set_member?(redis_key, id.to_s)
       end
       
       def count
@@ -56,7 +64,7 @@ module SuperModel
       end
       
       def all
-        from_ids(redis.set_members(redis_key))
+        from_ids(redis.sort(redis_key))
       end
       
       def delete_all
@@ -64,9 +72,13 @@ module SuperModel
       end
       
       def find_by_attribute(key, value)
-        item_ids = redis.set_members(redis_key(key, value))
-        return if item_ids.empty?
-        existing(:id => item_ids.first)
+        item_ids = redis.sort(redis_key(key, value.to_s))
+        item_id  = item_ids.first
+        item_id && existing(:id => item_id)
+      end
+      
+      def find_all_by_attribute(key, value)
+        from_ids(redis.sort(redis_key(key, value.to_s)))
       end
       
       protected
@@ -85,7 +97,7 @@ module SuperModel
     module InstanceMethods
       # Redis integers are stored as strings
       def id
-        super.try(:to_i)
+        super.try(:to_s)
       end
     
       protected      
@@ -93,7 +105,7 @@ module SuperModel
           return if new?
 
           destroy_indexes
-          redis.set_delete(self.class.redis_key, self.id)
+          redis.srem(self.class.redis_key, self.id)
       
           attributes.keys.each do |key|
             redis.delete(redis_key(key))
@@ -103,14 +115,14 @@ module SuperModel
         def destroy_indexes
           indexed_attributes.each do |index|
             old_attribute = changes[index].try(:first) || send(index)
-            redis.set_delete(self.class.redis_key(index, old_attribute), id)
+            redis.srem(self.class.redis_key(index, old_attribute), id)
           end
         end
       
         def create_indexes
           indexed_attributes.each do |index|
             new_attribute = send(index)
-            redis.set_add(self.class.redis_key(index, new_attribute), id)
+            redis.sadd(self.class.redis_key(index, new_attribute), id)
           end
         end
     
@@ -161,7 +173,7 @@ module SuperModel
         def raw_create
           redis_set
           create_indexes
-          redis.set_add(self.class.redis_key, self.id)
+          redis.sadd(self.class.redis_key, self.id)
         end
       
         def raw_update
@@ -178,4 +190,4 @@ module SuperModel
       end
     end
   end
-end
+end

data/lib/supermodel/timestamp.rb

@@ -8,17 +8,46 @@ module SuperModel
           before_create :set_created_at
           before_save   :set_updated_at
         end
+      end
         
-        private
-        
-          def set_created_at
-            self.created_at = Time.now
+      def touch
+        set_updated_at
+        save!
+      end
+      
+      def created_at=(time)
+        write_attribute(:created_at, parse_time(time))
+      end
+
+      def updated_at=(time)
+        write_attribute(:updated_at, parse_time(time))
+      end
+      
+      private
+        def parse_time(time)
+          return time unless time.is_a?(String)
+          if Time.respond_to?(:zone) && Time.zone
+            Time.zone.parse(time)
+          else
+            Time.parse(time)
           end
-          
-          def set_updated_at
-            self.updated_at = Time.now
+        end
+
+        def current_time
+          if Time.respond_to?(:current)
+            Time.current
+          else
+            Time.now
           end
-      end
+        end
+      
+        def set_created_at
+          self.created_at = current_time
+        end
+        
+        def set_updated_at
+          self.updated_at = current_time
+        end
     end
   end
 end

data/lib/supermodel/validations.rb

@@ -27,4 +27,6 @@ module SuperModel
       false
     end
   end
-end
+end
+
+require "supermodel/validations/uniqueness"

data/lib/supermodel/validations/uniqueness.rb

@@ -0,0 +1,40 @@
+module ActiveModel
+  module Validations
+    class UniquenessValidator < EachValidator
+      attr_reader :klass
+      
+      def validate_each(record, attribute, value)
+        alternate = klass.find_by_attribute(attribute, value)
+        return unless alternate == record
+        record.errors.add(attribute, "must be unique", :default => options[:message])
+      end
+      
+      def setup(klass)
+        @klass = klass
+      end
+    end
+
+    module ClassMethods
+
+      # Validates that the specified attribute is unique.
+      #   class Person < ActiveRecord::Base
+      #     validates_uniquness_of :essay
+      #   end
+      #
+      # Configuration options:
+      # * <tt>:allow_nil</tt> - Attribute may be +nil+; skip validation.
+      # * <tt>:allow_blank</tt> - Attribute may be blank; skip validation.
+      # * <tt>:message</tt> - The error message to use for a <tt>:minimum</tt>, <tt>:maximum</tt>, or <tt>:is</tt> violation.  An alias of the appropriate <tt>too_long</tt>/<tt>too_short</tt>/<tt>wrong_length</tt> message.
+      # * <tt>:on</tt> - Specifies when this validation is active (default is <tt>:save</tt>, other options <tt>:create</tt>, <tt>:update</tt>).
+      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should
+      #   occur (e.g. <tt>:if => :allow_validation</tt>, or <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>).  The
+      #   method, proc or string should return or evaluate to a true or false value.
+      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should
+      #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>).  The
+      #   method, proc or string should return or evaluate to a true or false value.
+      def validates_uniqueness_of(*attr_names)
+        validates_with UniquenessValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end

data/supermodel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supermodel}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]
-  s.date = %q{2010-03-11}
+  s.date = %q{2010-05-11}
   s.description = %q{In memory DB using ActiveModel}
   s.email = %q{info@eribium.org}
   s.extra_rdoc_files = [
@@ -17,11 +17,13 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "MIT-LICENSE",
      "README",
      "Rakefile",
      "VERSION",
      "lib/super_model.rb",
      "lib/supermodel.rb",
+     "lib/supermodel/association.rb",
      "lib/supermodel/base.rb",
      "lib/supermodel/callbacks.rb",
      "lib/supermodel/dirty.rb",
@@ -31,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/supermodel/redis.rb",
      "lib/supermodel/timestamp.rb",
      "lib/supermodel/validations.rb",
+     "lib/supermodel/validations/uniqueness.rb",
      "supermodel.gemspec"
   ]
   s.homepage = %q{http://github.com/maccman/supermodel}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Alex MacCaw
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 +00:00
+date: 2010-05-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,11 +42,13 @@ extra_rdoc_files:
 - README
 files: 
 - .gitignore
+- MIT-LICENSE
 - README
 - Rakefile
 - VERSION
 - lib/super_model.rb
 - lib/supermodel.rb
+- lib/supermodel/association.rb
 - lib/supermodel/base.rb
 - lib/supermodel/callbacks.rb
 - lib/supermodel/dirty.rb
@@ -56,6 +58,7 @@ files:
 - lib/supermodel/redis.rb
 - lib/supermodel/timestamp.rb
 - lib/supermodel/validations.rb
+- lib/supermodel/validations/uniqueness.rb
 - supermodel.gemspec
 has_rdoc: true
 homepage: http://github.com/maccman/supermodel