mongomatic-rails3 0.0.1 → 0.0.2

data/README.rdoc

@@ -53,4 +53,18 @@ will generate a class inheriting from Mongomatic::Base. Mongomatic supports per-
 
 ==== Scaffolds
 
-mongomatic-rails3 adds support for Scaffold generation, however, scaffold support is currently limited. This library does not *yet* support form_for, due to its hash-only data access syntax (you should instead use form_tag), which scaffolds generate in their views (*yet* will most likely mean a special form helper for Mongomatic). You can, however, still use scaffolds as a starting point.  
+mongomatic-rails3 adds support for Scaffold generation, however, scaffold support is currently limited. This library does not *yet* support form_for, due to its hash-only data access syntax (you should instead use form_tag), which scaffolds generate in their views (*yet* will most likely mean a special form helper for Mongomatic). You can, however, still use scaffolds as a starting point.  
+
+== Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Copyright
+
+Copyright (c) 2010 Jordan West. See LICENSE for details.

data/lib/rails/generators/mongomatic_generator.rb

@@ -15,7 +15,7 @@ module Mongomatic
       end
       
       def self.find(klass, params=nil)
-        (params.blank?) ? "#{klass}.find" : "#{klass}.find_one(BSON::ObjectID(#{params}))"
+        (params.blank?) ? "#{klass}.find" : "#{klass}.find_one(BSON::ObjectId(#{params}))"
       end
       
       def self.build(klass, params=nil)

data/lib/rails/mongomatic/support.rb

@@ -3,22 +3,7 @@ module Rails
     module Support
       def self.included(base)
         base.extend ClassMethods
-      end
-      
-      def new_record?
-        new?
-      end
-      
-      def persisted?
-        !(new? || removed?)
-      end
-      
-      def to_key
-        (new_record?) ? nil : [to_param]
-      end
-      
-      def to_param
-        self['_id'].to_s
+        ::Mongomatic::Errors.send(:include, Errors)
       end
       
       def merge!(hash)
@@ -27,11 +12,37 @@ module Rails
         update
       end
       
+      def upsert
+        if new?
+          insert
+        else
+          update
+        end
+      end
+      
+      def upsert!
+        if new?
+          insert!
+        else
+          update!
+        end
+      end
+      
       module ClassMethods
         def model_name
           @_model_name ||= ActiveModel::Name.new(self)
         end
       end
+      
+      module Errors
+        def any?
+          !empty?
+        end
+        
+        def count
+          @errors.values.inject(0) { |sum, errors| sum += errors.size }
+        end
+      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jordan West
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 -07:00
+date: 2010-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,13 +23,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 3
-        - 1
-        version: 0.3.1
+        - 6
+        - 0
+        version: 0.6.0
   type: :runtime
   version_requirements: *id001
 description: Mongomatic is a simple Ruby object mapper for Mongo
@@ -57,8 +57,8 @@ homepage: http://mongomatic.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement