simple_record 2.0.4 → 2.0.5

data/lib/simple_record.rb

@@ -32,7 +32,6 @@ require File.expand_path(File.dirname(__FILE__) + "/simple_record/attributes")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/active_sdb")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/callbacks")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/encryptor")
-require File.expand_path(File.dirname(__FILE__) + "/simple_record/exceptions")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/errors")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/json")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/logging")
@@ -602,7 +601,12 @@ module SimpleRecord
     end
 
     def save!(options={})
-      save(options) || raise(RecordNotSaved)
+      save(options) || raise(RecordNotSaved.new(nil, self))
+    end
+
+    # this is a bit wonky, save! should call this, not sure why it's here.
+    def save_with_validation!(options={})
+      save!
     end
 
     def self.create(attributes={})
@@ -616,14 +620,6 @@ module SimpleRecord
       item
     end
 
-    def save_with_validation!(options={})
-      if valid?
-        save
-      else
-        raise RecordInvalid.new(self)
-      end
-    end
-
 
     def self.get_encryption_key()
       key = SimpleRecord.options[:encryption_key]

data/lib/simple_record/errors.rb

@@ -1,18 +1,22 @@
 module SimpleRecord
 
     class SimpleRecordError < StandardError
-        
+
     end
 
 
-    class RecordInvalid < SimpleRecordError
+    class RecordNotSaved < SimpleRecordError
         attr_accessor :record
 
-        def initialize(record)
+        def initialize(record=nil)
             @record = record
+            super("Validation failed: #{@record.errors.full_messages.join(", ")}")
         end
     end
 
+    class RecordNotFound < SimpleRecordError
+
+    end
 
     class Error
         attr_accessor :base, :attribute, :type, :message, :options

data/test/temp.rb

@@ -1,46 +1,9 @@
 require_relative 'my_model'
 
-class ToSClass
-    def to_s
-        "#{self.class.name} to_s called"
-    end
-end
-class InspectClass
-    def inspect
-        "#{self.class.name} inspect called"
-    end
-end
-class BothClass
-    def inspect
-        "#{self.class.name} inspect called"
-    end
-    def to_s
-        "#{self.class.name} to_s called"
-    end
-end
-
-c1 = ToSClass.new
-puts c1.inspect
-puts c1.to_s
-c1 = InspectClass.new
-puts c1.inspect
-puts c1.to_s
-c1 = BothClass.new
-puts c1.inspect
-puts c1.to_s
 
-a = []
-afirst = a.first
-puts 'afirst=' + afirst.inspect
-
-p = nil
-puts 'p=' + p.inspect.to_s
-puts "p=" + p.inspect
-
-p = MyModel.new
-puts 'p=' + p.inspect.to_s
-puts 'p=' + p.to_s
-puts "p=" + p.inspect
-
-id = 123
-puts 'id&&id ' + (id && id.to_s).inspect
+begin
+  raise StandardError
+rescue => ex
+  p ex
+  puts ex.message
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - Travis Reeder
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 -08:00
+date: 2011-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Drop in replacement for ActiveRecord to Amazon SimpleDB instead.
+description: ActiveRecord like interface for Amazon SimpleDB. Store, query, shard, etc. By http://www.appoxy.com
 email: travis@appoxy.com
 executables: []
 
@@ -47,7 +47,6 @@ files:
 - lib/simple_record/callbacks.rb
 - lib/simple_record/encryptor.rb
 - lib/simple_record/errors.rb
-- lib/simple_record/exceptions.rb
 - lib/simple_record/json.rb
 - lib/simple_record/logging.rb
 - lib/simple_record/password.rb
@@ -111,7 +110,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Drop in replacement for ActiveRecord to Amazon SimpleDB instead.
+summary: ActiveRecord like interface for Amazon SimpleDB. By http://www.appoxy.com
 test_files: 
 - test/conversions_test.rb
 - test/model_with_enc.rb

data/lib/simple_record/exceptions.rb

@@ -1,6 +0,0 @@
-module SimpleRecord
-
-    class RecordNotSaved < StandardError
-
-    end
-end