perpetuity-memory 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca9f272273107e89f3ecac8937d20ccf945707e9
-  data.tar.gz: c74fd2ac60046eeaf97b8ffe523010da30616e86
+  metadata.gz: 2b6a27a63d63bec0a710cbb16bf011a2ecfb72e4
+  data.tar.gz: f52a34142f093b8d0dd0bc736d9c60ea5f2fd010
 SHA512:
-  metadata.gz: e31010b928e5ba96b9f4c6e4df201c78742fb5b66f0a6926588fb0a8149cd62aa663b1ba380c23abc356763c2b0bb27d575178babc8fabf5eec7589c415ac7cc
-  data.tar.gz: 16d030e599d7e18f149e6a818c64ed82fa356e2feb1ed0ff4b352a04f0c9d5d3a8ad781503728c5bdc2c290df666028e889fd4ad34f3d09c7a68b3add67135c0
+  metadata.gz: 14e35879db317de4749ef77d02943e61fd9205f597bf0e28ba4096d9bfe3aecada518dec903b7de24e928cf30fb3f19c5ccabcac61cce029c4d2003b4c90bd1d
+  data.tar.gz: 384fdef9534a665575810c9d94e1c6729c2efe8473695848f70dcfb4d1464e1dfeaa0e026b37693431e36c62b54b56408d8c5e02104b83206c7e45cb55d8c47a

data/README.md

@@ -1,6 +1,6 @@
 # Perpetuity::Memory
 
-This is the in-memory adapter for Perpetuity.
+This is the in-memory adapter for the [Perpetuity](https://github.com/jgaskins/perpetuity) ORM.
 
 ## Installation
 
@@ -27,6 +27,12 @@ Perpetuity.data_source :memory
 
 For information on using Perpetuity to persist your Ruby objects, see the [main Perpetuity repo](https://github.com/jgaskins/perpetuity).
 
+## TODO
+
+* Make sure update works.
+* Make sure save works.
+* Make sure identity map works properly.
+
 ## Contributing
 
 1. Fork it

data/lib/perpetuity/memory.rb

@@ -11,32 +11,22 @@ module Perpetuity
       @indexes  = Hash.new
     end
 
-    def insert klass, attributes, _
-      if attributes.is_a? Array
-        return attributes.map{|attr| insert(klass, attr, _)}
+    def insert klass, object, _
+      if object.is_a? Array
+        return object.map{|obj| insert(klass, obj, _)}
       end
 
-      unless attributes.has_key? :id
-        attributes[:id] = SecureRandom.uuid
-      end
-
-      # make keys indifferent
-      attributes.default_proc = proc do |h, k|
-        case k
-          when String then sym = k.to_sym; h[sym] if h.key?(sym)
-          when Symbol then str = k.to_s; h[str] if h.key?(str)
-        end
-      end
+      id = get_id(object) || set_id(object, SecureRandom.uuid)
 
-      collection(klass) << attributes
-      attributes[:id]
+      collection(klass)[id] = object
+      id
     end
 
     def count klass, criteria=nil, &block
       if block_given?
-        collection(klass).select(&block).size
+        collection(klass).values.select(&block).size
       elsif criteria
-        collection(klass).select(&criteria).size
+        collection(klass).values.select(&criteria).size
       else
         collection(klass).size
       end
@@ -47,19 +37,19 @@ module Perpetuity
     end
 
     def first klass
-      collection(klass).first
+      all(klass).first
     end
 
     def find klass, id
-      collection(klass).find{|o| o[:id] = id}
+      collection(klass)[id]
     end
 
     def retrieve klass, criteria, options = {}
-      collection(klass).find_all(&criteria)
+      collection(klass).values.find_all(&criteria)
     end
 
     def all klass
-      collection(klass)
+      collection(klass).values
     end
 
     def delete object, klass=nil
@@ -90,11 +80,11 @@ module Perpetuity
     end
 
     def serialize object, mapper
-      Marshal.dump(object)
+      object.dup
     end
 
     def unserialize data, mapper
-      Marshal.load(data)
+      data.dup
     end
 
 
@@ -124,8 +114,35 @@ module Perpetuity
     protected
 
     def collection klass
-      @cache[klass] = Array.new unless @cache.key? klass
+      @cache[klass] = Hash.new unless @cache.has_key? klass
       @cache[klass]
     end
+
+    def get_id(object)
+      if object.respond_to?(:id)
+        object.id
+      elsif object.respond_to?(:fetch)
+        object.fetch(:id, nil)
+      elsif object.respond_to?(:[])
+        object[:id] || nil
+      else
+        object.instance_variable_get(:@id)
+      end
+    end
+
+    def set_id(object, id)
+      if object.respond_to?(:id=)
+        object.id = id
+      elsif object.respond_to?(:[]=)
+        object[:id] = id
+      else
+        object.instance_variable_set(:@id, id)
+      end
+      id
+    end
   end
 end
+
+
+# Register the adapter with Perpetuity.
+Perpetuity::Configuration.adapters[:memory] = 'Perpetuity::Memory'

data/lib/perpetuity/memory/version.rb

@@ -1,5 +1,5 @@
 module Perpetuity
   module Memory
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/perpetuity/integration_spec.rb

@@ -0,0 +1,42 @@
+require_relative '../../lib/perpetuity/memory'
+
+describe 'Full Perpetuity stack using in-memory adapter' do
+
+  before do
+    Perpetuity.data_source :memory
+    class User
+      attr_reader :name, :age
+      def initialize(name, age)
+        @name = name
+        @age = age
+      end
+    end
+    Perpetuity.generate_mapper_for(User) do
+      attribute :name
+      attribute :age
+    end
+  end
+
+  let(:mapper) { Perpetuity[User] }
+  let(:user) { User.new(name, age) }
+  let(:name) { 'Craig' }
+  let(:age) { 43 }
+
+  it 'can store an object' do
+    mapper.insert(user)
+    expect(mapper.count).to eq(1)
+  end
+
+  it 'can retrieve a stored object by ID' do
+    id = mapper.insert(user)
+    expect(mapper.count).to eq(1)
+    expect(mapper.find(id).name).to eq(name)
+    expect(mapper.find(id).age).to eq(age)
+  end
+
+  it 'can retrieve a stored object by attribute' do
+    mapper.insert(user)
+    expect(mapper.count).to eq(1)
+    expect(mapper.find{|u| u.name == 'Craig'}.age).to eq(age)
+  end
+end

data/spec/perpetuity/memory_spec.rb

@@ -38,7 +38,7 @@ module Perpetuity
     it 'gets the first object' do
       value = {value: 1}
       subject.insert klass, value, []
-      subject.first(klass)[:value].should == value['value']
+      subject.first(klass)[:value].should == value[:value]
     end
 
     it 'gets all objects' do
@@ -47,12 +47,12 @@ module Perpetuity
       subject.all(klass).should == values
     end
 
-    it 'retrieves by ID if the ID is a string' do
+    it 'retrieves by ID' do
       time = Time.now.utc
       id = subject.insert Object, {inserted: time}, []
 
-      object = subject.retrieve(Object, subject.query{|o| o[:id] == id.to_s }).first
-      retrieved_time = object["inserted"]
+      object = subject.find(Object, id)
+      retrieved_time = object[:inserted]
       retrieved_time.to_f.should be_within(0.001).of time.to_f
     end
 
@@ -74,9 +74,9 @@ module Perpetuity
         subject.increment klass, id, :count
         subject.increment klass, id, :count, 10
         query = subject.query { |o| o[:id] == id }
-        subject.retrieve(klass, query).first['count'].should be == 12
+        subject.retrieve(klass, query).first[:count].should be == 12
         subject.increment klass, id, :count, -1
-        subject.retrieve(klass, query).first['count'].should be == 11
+        subject.retrieve(klass, query).first[:count].should be == 11
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity-memory
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Jamie Gaskins
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - lib/perpetuity/memory.rb
 - lib/perpetuity/memory/version.rb
 - perpetuity-memory.gemspec
+- spec/perpetuity/integration_spec.rb
 - spec/perpetuity/memory_spec.rb
 homepage: https://github.com/boochtek/perpetuity-memory
 licenses:
@@ -109,4 +110,5 @@ signing_key:
 specification_version: 4
 summary: In-memory adapter for Perpetuity
 test_files:
+- spec/perpetuity/integration_spec.rb
 - spec/perpetuity/memory_spec.rb