cushion 0.0.4 → 0.0.5

data/LICENSE.txt

@@ -0,0 +1,8 @@
+Copyright (c) 2011 Helge Rausch <helge@rausch.io>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/cushion.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'cushion'
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.authors     = ['Helge Rausch']
   s.email       = ['helge@rausch.io']
   s.homepage    = 'https://github.com/tsujigiri/cushion'

data/lib/cushion.rb

@@ -8,6 +8,9 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/object'
 
 class Cushion < HashWithIndifferentAccess
+
+  attr_accessor :id
+
   def initialize(*args, &block)
     if args[0].is_a?(String)
       uri = args.shift
@@ -31,8 +34,8 @@ class Cushion < HashWithIndifferentAccess
     self.class.server [ $2 || 'localhost', $4 ? $4.to_i : 5984 ]
     @document_location            = {}
     @document_location[:database] = $5
-    @id                           = $7
-    @document_location[:uri]      = "/#{@document_location[:database]}/#{@id}" if @id
+    self.id                       = $7
+    @document_location[:uri]      = "/#{@document_location[:database]}/#{id}" if id
   end
 
   def self.create_database uri
@@ -52,27 +55,26 @@ class Cushion < HashWithIndifferentAccess
     @revision
   end
 
-  def id
-    @id
-  end
-
   def load
-    replace(self.class.get(document_location[:uri]))
+    doc = self.class.get(document_location[:uri])
+    self.id = doc.delete('_id')
+    @revision = doc.delete('_rev')
+    replace doc
   end
 
   def save
     unless self.class.database_created
       self.class.create_database('/' << document_location[:database])
     end
-    if @id.present?
+    if id.present?
       copy = @revision ? self.merge(_rev: @revision) : self.dup
       response = self.class.put(document_location[:uri], copy)
       @revision = response['rev']
     else
       response = self.class.post('/' << document_location[:database], self)
-      @id = response['id']
+      self.id = response['id']
       @revision = response['rev']
-      @document_location[:uri] = "/#{@document_location[:database]}/#{@id}"
+      @document_location[:uri] = "/#{@document_location[:database]}/#{id}"
     end
     @revision
   end

data/test/cushion_test.rb

@@ -16,6 +16,8 @@ class CushionTest < Test::Unit::TestCase
       doc = Cushion.new(@doc_uri)
       assert_equal nil, doc[:foo]
       doc.load
+      assert_nil doc[:_id]
+      assert_nil doc[:_rev]
       assert_equal "bar", doc[:foo]
       assert_equal 'test_doc', @doc.id
       new_revision = revision.to_i + 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cushion
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000 Z
+date: 2011-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &11099760 !ruby/object:Gem::Requirement
+  requirement: &17592060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11099760
+  version_requirements: *17592060
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &11099020 !ruby/object:Gem::Requirement
+  requirement: &17591380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11099020
+  version_requirements: *17591380
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &11098400 !ruby/object:Gem::Requirement
+  requirement: &17590700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11098400
+  version_requirements: *17590700
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &11097680 !ruby/object:Gem::Requirement
+  requirement: &17590040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11097680
+  version_requirements: *17590040
 description: A Hash with indifferent access and CouchDB persistence layer
 email:
 - helge@rausch.io
@@ -64,6 +64,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - cushion.gemspec