supermodel 0.0.2 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

data/lib/supermodel/base.rb

@@ -5,6 +5,14 @@ module SuperModel
     class << self
       attr_accessor_with_default(:primary_key, 'id') #:nodoc:
       
+      def attributes(*attributes)
+        @known_attributes = attributes.map(&:to_s)
+      end
+      
+      def known_attributes
+        @known_attributes ||= []
+      end
+      
       def records
         @records ||= []
       end
@@ -26,7 +34,7 @@ module SuperModel
       end
       
       def last
-        item = records[1]
+        item = records[-1]
         item && item.dup
       end
       
@@ -66,13 +74,15 @@ module SuperModel
         rec.save && rec
       end
       
-      def method_missing(method_symbol, *arguments) #:nodoc:
+      def method_missing(method_symbol, *args) #:nodoc:
         method_name = method_symbol.to_s
 
         if method_name =~ /^find_by_(\w+)!/
-          send("find_by_#{$1}", *arguments) || raise(UnknownRecord)
+          send("find_by_#{$1}", *args) || raise(UnknownRecord)
         elsif method_name =~ /^find_by_(\w+)/
-          records.find {|r| r.send($1) == arguments.first }
+          records.find {|r| r.send($1) == args.first }
+        elsif method_name =~ /^find_or_create_by_(\w+)/
+          send("find_by_#{$1}", *args) || create($1 => args.first)
         else
           super
         end
@@ -81,6 +91,10 @@ module SuperModel
     
     attr_accessor :attributes
     
+    def known_attributes
+      self.class.known_attributes + self.attributes.keys.map(&:to_s)
+    end
+    
     def initialize(attributes = {})
       @attributes = {}.with_indifferent_access
       load(attributes)
@@ -164,6 +178,8 @@ module SuperModel
       method_name = method.to_s
       if attributes.nil?
         super
+      elsif known_attributes.include?(method_name)
+        true
       elsif method_name =~ /(?:=|\?)$/ && attributes.include?($`)
         true
       else
@@ -221,6 +237,7 @@ module SuperModel
           end
         else
           return attributes[method_name] if attributes.include?(method_name)
+          return nil if known_attributes.include?(method_name)
           super
         end
       end
@@ -229,6 +246,8 @@ module SuperModel
   class Base
     extend ActiveModel::Naming
     include ActiveModel::Conversion
+    include ActiveModel::Serializers::JSON
+    include ActiveModel::Serializers::Xml
     include Observing, Validations, Callbacks
   end
 end

data/lib/supermodel/scriber.rb

@@ -1,15 +1,20 @@
 module SuperModel
-  module Scriber
-    def klasses
-      @klasses ||= []
-    end
-    module_function :klasses
-    
-    class Observer < ActiveModel::Observer
-      def self.observed_classes
-        Scriber.klasses
-      end
+  module Scriber    
+    class Observer
+      include Singleton
       
+      class << self
+        def disabled?
+          @disabled
+        end
+        
+        def disable(&block)
+          @disabled = true
+          yield
+          @disabled = false
+        end
+      end
+   
       def after_create(rec)
         rec.class.record(:create, rec.attributes)
       end
@@ -24,28 +29,45 @@ module SuperModel
       
       def after_destroy
         rec.class.record(:destroy, rec.id)
-      end      
+      end
+      
+      def update(observed_method, object) #:nodoc:
+        return if self.class.disabled?
+        send(observed_method, object) if respond_to?(observed_method)
+      end
+
+      def observed_class_inherited(subclass) #:nodoc:
+        subclass.add_observer(self)
+      end
     end
     
+    def klasses
+      @klasses ||= []
+    end
+    module_function :klasses
+    
     module Model
       def self.included(base)
         Scriber.klasses << base
         base.extend ClassMethods
+        base.add_observer(Observer.instance)
       end
       
       module ClassMethods
         def scribe_play(type, data) #:nodoc:
-          case type
-          when :create  then create(data)
-          when :destroy then destroy(data)
-          when :update  then update(data)
-          else
-            method = "scribe_play_#{type}"
-            send(method) if respond_to?(method)
+          Observer.disable do
+            case type
+            when :create  then create(data)
+            when :destroy then destroy(data)
+            when :update  then update(data)
+            else
+              method = "scribe_play_#{type}"
+              send(method) if respond_to?(method)
+            end
           end
         end
       
-        def record(type, data)
+        def record(type, data = nil)
           ::Scriber.record(self, type, data)
         end
       end

data/supermodel.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{supermodel}
-  s.version = "0.0.2"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex MacCaw"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: supermodel
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - Alex MacCaw