csun-student-affairs · Feb 11, 2011 · Jun 7, 2011 · Jun 7, 2011 · Jun 7, 2011 · Jun 9, 2011
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ redis_test.rb
 pkg
 lib/supermodel/cassandra.rb
 *.gem
+tags
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 source :rubygems
 
-gemspec
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,23 +1,27 @@
 PATH
   remote: .
   specs:
-    supermodel (0.1.4)
-      activemodel (~> 3.0.0)
+    csun-student-affairs-supermodel (0.1.6)
+      activemodel (~> 3.2.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.4)
-    builder (2.1.2)
-    i18n (0.5.0)
+    activemodel (3.2.22.4)
+      activesupport (= 3.2.22.4)
+      builder (~> 3.0.0)
+    activesupport (3.2.22.4)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    builder (3.0.4)
+    i18n (0.7.0)
+    multi_json (1.12.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 3.0.0)
-  supermodel!
+  csun-student-affairs-supermodel!
+
+BUNDLED WITH
+   1.12.5
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.4
+0.1.7
diff --git a/lib/active_model/serialize_options.rb b/lib/active_model/serialize_options.rb
diff --git a/lib/supermodel.rb b/lib/supermodel.rb
@@ -2,15 +2,14 @@
 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"
@@ -35,8 +34,4 @@ module SuperModel
   autoload :Dirty,       "supermodel/dirty"
   autoload :Redis,       "supermodel/redis"
   autoload :Base,        "supermodel/base"
-end
-
-module ActiveModel
-  autoload :SerializeOptions, "active_model/serialize_options"
 end
diff --git a/lib/supermodel/base.rb b/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)
@@ -13,7 +17,7 @@ def collection(&block)
       end
 
       def attributes(*attributes)
-        self.known_attributes += attributes.map(&:to_s)
+        self.known_attributes |= attributes.map(&:to_s)
       end
 
       def records
@@ -50,6 +54,19 @@ def last
         item = records.values[-1]
         item && item.dup
       end
+
+      def where(options)
+        items = records.values.select do |r|
+          options.all? do |k, v|
+            if v.is_a?(Enumerable)
+              v.include?(r.send(k))
+            else
+              r.send(k) == v
+            end
+          end
+        end
+        collection.new(items.deep_dup)
+      end
 
       def exists?(id)
         records.has_key?(id)
@@ -76,7 +93,7 @@ def destroy(id)
       end
 
       # Removes all records and executes 
-      # destory callbacks.
+      # destroy callbacks.
       def destroy_all
         all.each {|r| r.destroy }
       end
@@ -120,7 +137,7 @@ def method_missing(method_symbol, *args) #:nodoc:
     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 = {})
@@ -306,4 +323,4 @@ class Base
     include Dirty, Observing, Callbacks, Validations
     include Association::Model
   end
-end
+end
diff --git a/lib/supermodel/callbacks.rb b/lib/supermodel/callbacks.rb
@@ -11,7 +11,7 @@ module Callbacks
       %w( create save update destroy ).each do |method|
         class_eval(<<-EOS, __FILE__, __LINE__ + 1)
           def #{method}_with_callbacks(*args, &block)
-            _run_#{method}_callbacks do
+            run_callbacks :#{method} do
               #{method}_without_callbacks(*args, &block)
             end
           end
@@ -20,4 +20,4 @@ def #{method}_with_callbacks(*args, &block)
       end
     end
   end
-end
+end
diff --git a/supermodel.gemspec b/supermodel.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{csun-student-affairs-supermodel}
-  s.version = "0.1.5"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw", "Mani Tadayon"]
-  s.date = %q{2010-08-30}
+  s.date = %q{2013-07-08}
   s.description = %q{In memory DB using ActiveModel}
   s.email = %q{info@eribium.org}
   s.extra_rdoc_files = [
@@ -48,11 +48,11 @@ 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"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0"])
     else
-      s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
+      s.add_dependency(%q<activemodel>, [">= 3.0.0"])
     end
   else
-    s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
+    s.add_dependency(%q<activemodel>, [">= 3.0.0"])
   end
-end
+end
-Original file line number
+Diff line change
@@ @@ -4,3 +4,4 @@ redis_test.rb @@
     pkg
     lib/supermodel/cassandra.rb
     *.gem
+    tags