abbey 0.1.1 → 0.1.2

data/README.md

@@ -8,7 +8,7 @@ A simple persistence library with human-readable representation. Uses good 'ol f
 
 ## Usage
 
-Warning: Abbey intentionally uses JSON, therefore it inherits its' caveats. Most notably, symbols are serialized to strings.
+Warning: Abbey intentionally uses JSON, therefore it inherits it's caveats. Most notably, symbols are serialized to strings.
 
 ```ruby
 require 'abbey'
@@ -39,7 +39,7 @@ abbey.exists?(:users, :admin) # => false
 
 abbey.settings.namespaces # => [:users, :books]
 
-abbey.settings.logger # => #<Loger....>
+abbey.settings.logger # => #<Logger....>
 ```
 
 ## License

data/abbey.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "abbey"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pavel Kalvoda"]
-  s.date = "2011-11-17"
+  s.date = "2011-12-03"
   s.description = "Primitive JSON data store. Key-value structure with namespaces."
   s.email = "me@pavelkalvoda.com"
   s.extra_rdoc_files = [

data/lib/entity_storage.rb

@@ -1,3 +1,6 @@
+require 'fileutils'
+require 'tempfile'
+
 module Abbey
 
   # Represents the store. Manages the data for you.
@@ -41,20 +44,6 @@ module Abbey
       end
     end
 
-    # Save an item
-    # @param namespace [String, Fixnum, Symbol or any other object whose #to_s method returns string]
-    # @param key [String, Fixnum, Symbol or any other object whose #to_s method returns string]
-    # @param data [Object]
-    # @return void
-    def save(namespace, key, data)
-      path = make_path(namespace, key)
-      raise ItemAlreadyPresentError, "Item '#{make_key(namespace,key)}' already present" if File.exist?(path)
-      f = File.new(path, File::CREAT | File::RDWR)
-      size = f.write(MultiJson.encode(data))
-      f.close
-      settings.logger.info("Written #{make_key(namespace, key)} (size: #{size})")
-    end
-
     # Fetch an item
     # @param namespace [String, Fixnum, Symbol or any other object whose #to_s method returns string]
     # @param key [String, Fixnum, Symbol or any other object whose #to_s method returns string]
@@ -76,14 +65,24 @@ module Abbey
       exists
     end
 
+    # Save an item
+    # @param namespace [String, Fixnum, Symbol or any other object whose #to_s method returns string]
+    # @param key [String, Fixnum, Symbol or any other object whose #to_s method returns string]
+    # @param data [Object]
+    # @return void
+    def save(namespace, key, data)
+      raise ItemAlreadyPresentError, "Item '#{make_key(namespace,key)}' already exists" if exists?(namespace, key)
+      unsafe_save(namespace, key, data)
+    end
+
     # Update an item. Shorthand for delete & save
     # @param namespace [String, Fixnum, Symbol or any other object whose #to_s method returns string]
     # @param key [String, Fixnum, Symbol or any other object whose #to_s method returns string]
     # @param data [Object]
     # @return void
     def update(namespace, key, data)
-      delete(namespace, key)
-      save(namespace, key, data)
+      raise ItemNotFoundError, "Item '#{make_key(namespace,key)}' not found" unless exists?(namespace, key)
+      unsafe_save(namespace, key, data)
     end
 
     # Delete an item
@@ -92,7 +91,7 @@ module Abbey
     # @return void
     def delete(namespace, key)
       path = make_path(namespace, key)
-      raise ItemNotFoundError, "Item '#{make_key(namespace,key)}' already exists" unless exists?(namespace, key)
+      raise ItemNotFoundError, "Item '#{make_key(namespace,key)}' not found" unless exists?(namespace, key)
       File.delete(path)
       settings.logger.info("Deleted #{make_key(namespace,key)}")
     end
@@ -153,5 +152,20 @@ module Abbey
     def make_key(namespace, key)
       namespace.to_s + ':' + key.to_s
     end
+
+    # Save an item without any checks
+    # @param namespace [String, Fixnum, Symbol or any other object whose #to_s method returns string]
+    # @param key [String, Fixnum, Symbol or any other object whose #to_s method returns string]
+    # @param data [Object]
+    # @return void
+    def unsafe_save(namespace, key, data)
+      path = make_path(namespace, key)
+      tmp = Tempfile.new('abbey')      
+      size = tmp.write(MultiJson.encode(data))
+      tmp.close
+      FileUtils.mv(tmp.path, path)
+      settings.logger.info("Written #{make_key(namespace, key)} (size: #{size})")
+      tmp.unlink
+    end
   end
 end

data/lib/version.rb

@@ -2,7 +2,7 @@ module Abbey
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/entity_storage_test.rb

@@ -78,6 +78,13 @@ class AbbeyTest < Test::Unit::TestCase
     assert_equal({"a" => 2}, @abbey.get(:ns1,:key))
   end
 
+  def test_it_wont_update_nonexistent_item
+    @abbey.set_up!
+    assert_raise Abbey::ItemNotFoundError do
+      @abbey.update(:ns1, :key, {"a" => 2})
+    end
+  end
+
   def test_it_will_drop_items
     @abbey.set_up!
     @abbey.save(:ns1, :key, {"a" => 1})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: abbey
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000 Z
+date: 2011-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &6562960 !ruby/object:Gem::Requirement
+  requirement: &20705080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6562960
+  version_requirements: *20705080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &6560780 !ruby/object:Gem::Requirement
+  requirement: &20704580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6560780
+  version_requirements: *20704580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &6559960 !ruby/object:Gem::Requirement
+  requirement: &20704040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6559960
+  version_requirements: *20704040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &6610240 !ruby/object:Gem::Requirement
+  requirement: &20703520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *6610240
+  version_requirements: *20703520
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &6608820 !ruby/object:Gem::Requirement
+  requirement: &20702840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6608820
+  version_requirements: *20702840
 description: Primitive JSON data store. Key-value structure with namespaces.
 email: me@pavelkalvoda.com
 executables: []
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1187583575974686402
+      hash: -3484515229656058223
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: