zermelo 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3d59a8d79a91b5703b7b9b40760f6dd25e668dd
-  data.tar.gz: 5f92bcd3c18207b37f2220aee647aa3cc08d1d36
+  metadata.gz: a7492dc2e67e9921a87e1dbea33eb721464dce5f
+  data.tar.gz: 62906c88696b9eb2fdfb8d2a94d0244184cd33da
 SHA512:
-  metadata.gz: dff50d1c6b883cb73f33dbeaf379d7a8cc25f87bb55eec340850b0362be0f34857d39f2bbc6584203d0bd6acdbd8d2725cd5e910a89c3fb88e4d650d755a16e4
-  data.tar.gz: c6e64def6eaa3fe7212fd78eb5221dba0e32babc74d7a04711134e411a0f69f10598d4617383b2d6051efa7ac54cfd0cd706d43c1748a4e29c6ab0b9f4d1d88e
+  metadata.gz: dde70cf8e7c241eeef5de1925a67719a6c3779cc7afc784ffdca13e5925a146e8b8cb1797b4f70eb1c377a990057a1f2a008f94156201c81bcf705f999c61f27
+  data.tar.gz: 62fe986cbc4ab69699bfc2286ef58c17b8fa12c4e79c0c11a2d82ce805637c7f66a002a94b3e785bb4cb7d34fc1ffe74a7ce6f47c1d7ffb8ed8b82f56e34de58

data/.travis.yml

@@ -11,7 +11,7 @@ before_install:
 - wget http://s3.amazonaws.com/influxdb/influxdb_0.8.8_amd64.deb
 - sudo dpkg -i influxdb_0.8.8_amd64.deb
 - sudo /etc/init.d/influxdb start
-- sleep 10
+- sleep 8
 - 'curl -X POST ''http://localhost:8086/db?u=root&p=root'' -d ''{"name": "zermelo_test"}'''
 - 'curl -X POST ''http://localhost:8086/db/zermelo_test/users?u=root&p=root'' -d
   ''{"name": "zermelo", "password": "zermelo"}'''

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+## Zermelo Changelog
+
+# 1.0.1 - 2015-02-04
+
+* bugfix has_one class locking (779907d8d)
+* add save! command, raise exceptions on error (#13)
+
+# 1.0.0 - 2015-01-28
+
+* Initial release

data/README.md

@@ -42,7 +42,7 @@ Include **zermelo**'s Record module in the class you want to persist data from:
 
 ```ruby
 class Post
-  include Zermelo:Record
+  include Zermelo::Record
 end
 ```
 
@@ -67,7 +67,7 @@ A data record without any actual data isn't very useful, so let's add a few simp
 
 ```ruby
 class Post
-  include Zermelo:Record
+  include Zermelo::Record
   define_attributes :title     => :string,
                     :score     => :integer,
                     :timestamp => :timestamp,
@@ -116,7 +116,7 @@ So if we add tags to the Post data definition:
 
 ```ruby
 class Post
-  include Zermelo:Record
+  include Zermelo::Record
   define_attributes :title     => :string,
                     :score     => :integer,
                     :timestamp => :timestamp,
@@ -161,7 +161,7 @@ So an attribute which should be present:
 
 ```ruby
 class Post
-  include Zermelo:Record
+  include Zermelo::Record
   define_attributes :title     => :string,
                     :score     => :integer
   validates :title, :presence => true
@@ -202,15 +202,15 @@ Another feature added by ActiveModel is the ability to detect changed data in re
 
 ```ruby
 class Author
-  include Zermelo:Record
+  include Zermelo::Record
 end
 
 class Post
-  include Zermelo:Record
+  include Zermelo::Record
 end
 
 class Comment
-  include Zermelo:Record
+  include Zermelo::Record
 end
 
 Author.lock(Post, Comment) do
@@ -224,7 +224,7 @@ Assuming a saved `Post` instance has been created:
 
 ```ruby
 class Post
-  include Zermelo:Record
+  include Zermelo::Record
   define_attributes :title     => :string,
                     :score     => :integer,
                     :timestamp => :timestamp,
@@ -303,12 +303,12 @@ Instances also have attribute accessors and the various methods included from th
 
 ```ruby
 class Post
-  include Zermelo:Record
+  include Zermelo::Record
   has_many :comments, :class_name => 'Comment', :inverse_of => :post
 end
 
 class Comment
-  include Zermelo:Record
+  include Zermelo::Record
   belongs_to :post, :class_name => 'Post', :inverse_of => :comments
 end
 ```
@@ -331,12 +331,12 @@ post.comments.add(comment1, comment2, comment3)
 
 ```ruby
 class User
-  include Zermelo:Record
+  include Zermelo::Record
   has_one :preferences, :class_name => 'Preferences', :inverse_of => :user
 end
 
 class Preferences
-  include Zermelo:Record
+  include Zermelo::Record
   belongs_to :user, :class_name => 'User', :inverse_of => :preferences
 end
 
@@ -398,7 +398,7 @@ Using the code from the instance attributes section, and adding indexing:
 
 ```ruby
 class Post
-  include Zermelo:Record
+  include Zermelo::Record
   define_attributes :title     => :string,
                     :score     => :integer,
                     :timestamp => :timestamp,

data/lib/zermelo/associations/has_one.rb

@@ -25,7 +25,7 @@ module Zermelo
       end
 
       def value
-        @parent.class.lock(*@associated_class) do
+        @parent.class.lock(@associated_class) do
           if id = @backend.get(@record_id_key)
             @associated_class.send(:load, id)
           else

data/lib/zermelo/records/errors.rb

@@ -1,8 +1,11 @@
 module Zermelo
+
+  class ZermeloError < RuntimeError
+  end
+
   module Records
     module Errors
-
-      class RecordNotFound < RuntimeError
+      class RecordNotFound < ::Zermelo::ZermeloError
         attr_reader :klass, :id
 
         def initialize(k, i)
@@ -11,7 +14,7 @@ module Zermelo
         end
       end
 
-      class RecordsNotFound < RuntimeError
+      class RecordsNotFound < ::Zermelo::ZermeloError
         attr_reader :klass, :ids
 
         def initialize(k, i)
@@ -19,6 +22,22 @@ module Zermelo
           @ids = i
         end
       end
-   end
- end
+
+      class RecordInvalid < ::Zermelo::ZermeloError
+        attr_reader :record
+
+        def initialize(r)
+          @record = r
+        end
+      end
+
+      class RecordNotSaved < ::Zermelo::ZermeloError
+        attr_reader :record
+
+        def initialize(r)
+          @record = r
+        end
+      end
+    end
+  end
 end

data/lib/zermelo/records/instance_methods.rb

@@ -74,12 +74,13 @@ module Zermelo
         save
       end
 
-      def save
+      def save!
         return unless @is_new || self.changed?
         self.id ||= self.class.generate_id
-        return false unless valid?
+        raise Zermelo::Records::Errors::RecordInvalid.new(self) unless valid?
 
         creating = !self.persisted?
+        saved = false
 
         run_callbacks( (creating ? :create : :update) ) do
 
@@ -123,8 +124,11 @@ module Zermelo
           end
 
           @is_new = false
+          saved = true
         end
 
+        raise Zermelo::Records::Errors::RecordNotSaved.new(self) unless saved
+
         # AM::Dirty -- private method in 4.1.0+, internal state before that
         if self.respond_to?(:changes_applied, true)
           changes_applied
@@ -136,6 +140,12 @@ module Zermelo
         true
       end
 
+      def save
+        save!
+      rescue Zermelo::Records::Errors::RecordInvalid, Zermelo::Records::Errors::RecordNotSaved
+        false
+      end
+
       def destroy
         raise "Record was not persisted" if !persisted?
 

data/lib/zermelo/version.rb

@@ -1,3 +1,3 @@
 module Zermelo
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/lib/zermelo/records/redis_record_spec.rb

@@ -32,6 +32,18 @@ describe Zermelo::Records::RedisRecord, :redis => true do
       end
     end
 
+    class RedisUnsavable
+      include Zermelo::Records::RedisRecord
+
+      define_attributes :name => :string
+
+      before_create :block_create
+
+      def block_create
+        false
+      end
+    end
+
     class RedisExampleChild
       include Zermelo::Records::RedisRecord
 
@@ -111,6 +123,22 @@ describe Zermelo::Records::RedisRecord, :redis => true do
     )
   end
 
+  it 'raises an RecordInvalid exception if validation fails while saving' do
+    example = Zermelo::RedisExample.new(:id => '1', :email => 'jsmith@example.com')
+
+    expect {
+      example.save!
+    }.to raise_error(Zermelo::Records::Errors::RecordInvalid)
+  end
+
+  it 'raises a RecordNotSaved exception if a callback blocks saving' do
+    example = Zermelo::RedisUnsavable.new(:id => '1', :name => 'not saving')
+
+    expect {
+      example.save!
+    }.to raise_error(Zermelo::Records::Errors::RecordNotSaved)
+  end
+
   it "finds a record by id in redis" do
     create_example(:id => '8', :name => 'John Jones',
                    :email => 'jjones@example.com', :active => 'true')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zermelo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ali Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -62,6 +62,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md