store 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c439b9355bde8a092b4bfea3d5d95630177d3b
-  data.tar.gz: 459439d12096f896eea821d5e57a6a57e7b28217
+  metadata.gz: a74cccaaa0ed4cdab16de31489b1ff617729d4c1
+  data.tar.gz: 5e91a636c220af914cb10fd87c91c13b69ccf476
 SHA512:
-  metadata.gz: 575737d172c70e5338cffe8c85d3b6361a14b775e06ae061f285746832a358f9e9c871c80b80ed1708fdfcd49cc1bca31e431bd5af8e6fe15b3c9f1ab168e9f3
-  data.tar.gz: c5e233707425ffd8c367c7f4beea0c12748820c893fe1bfb08597f182df19bad000efdd376fed4d47c87eaeaa69f569012ed974080d7f062a80c847e5849a9a8
+  metadata.gz: e4e07870ed58bdd9502ccda5399c2f356eb80044f1e35e100f2fa3a671056b1f15205bb765e7e54cfa4b5a01f172d845db925335ac78879336970039e04141a7
+  data.tar.gz: 984fc480e714a55d799f2fd57c598e632ddb4477c6a1a5fdc862e50c99f2858a6069992ddcf36f104d47a460eba1ee659c26ec4aa942e5e5a5ae14632968a1c0

data/README.md

@@ -1,4 +1,4 @@
-# Store
+# Store [![Gem Version](https://badge.fury.io/rb/store.png)](http://badge.fury.io/rb/store)
 
 Implementations for using the Repository- and Data Mapper Pattern in ruby
 
@@ -18,7 +18,7 @@ Or install it yourself as:
 
 ## Usage
 
-See example.rb for capabilities of the current implementation.
+See [example.rb](https://github.com/holderbaum/store/blob/master/example.rb) for capabilities of the current implementation.
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,17 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:spec) do |t|
+  t.libs << "lib"
+  t.libs << "spec"
+  t.test_files = FileList['spec/**/*_spec.rb']
+  t.verbose = true
+end
+
+desc 'Run test for spec with coverage'
+task :'spec:coverage' do
+  system "coverage=1 rake spec"
+end
+
+task :default => :spec

data/example.rb

@@ -1,7 +1,11 @@
 require 'store'
 
+class User
+  attr_accessor :name
+end
+
 class Catalog 
-  attr_accessor :name, :products
+  attr_accessor :editor, :name, :products
 
   def products
     @products ||= []
@@ -16,9 +20,18 @@ class Product
   attr_accessor :name, :price
 end
 
+class UserEntityMapper < Struct.new(:store, :user)
+  def mapped
+    {
+      'name' => user.name
+    }
+  end
+end
+
 class CatalogEntityMapper < Struct.new(:store, :catalog)
   def mapped
     {
+      'editor' => store.save(catalog.editor),
       'name' => catalog.name,
       'products' => store.save(*catalog.products)
     }
@@ -34,6 +47,19 @@ class ProductEntityMapper < Struct.new(:store, :product)
   end
 end
 
+class UserDataMapper
+  def insert(data)
+    reference = :"user_#{rand 100}"
+    puts "user_insert[#{reference.inspect}] => #{data.inspect}"
+    reference
+  end
+
+  def update(reference, data)
+    puts "user_update[#{reference.inspect}] => #{data.inspect}"
+    reference
+  end
+end
+
 class CatalogDataMapper
   def insert(data)
     reference = :"catalog_#{rand 100}"
@@ -62,29 +88,42 @@ end
 
 
 entities = {
+  'User'    => User,
   'Catalog' => Catalog,
   'Product' => Product
 }
 
 data_mappers = {
+  'User'    => UserDataMapper.new,
   'Catalog' => CatalogDataMapper.new,
   'Product' => ProductDataMapper.new
 }
 
 entity_mappers = {
+  'User'    => UserEntityMapper,
   'Catalog' => CatalogEntityMapper,
   'Product' => ProductEntityMapper
 }
 
 store = Store.new(entities, data_mappers, entity_mappers)
 
-catalog = store.build('Catalog', :name => 'Catalog 1')
+editor = store.build 'User', :name => 'Mr. Repo'
+
+catalog = store.build 'Catalog', :name => 'Catalog 1', :editor => editor
 
 catalog.add_product store.build('Product', :name => 'Pickaxe', :price => 100)
 catalog.add_product store.build('Product', :name => 'Scredriver', :price => 400)
 
+p 'save call'
 store.save(catalog)
 
 catalog.products[0].price = 24
 
+p 'save call'
+store.save(catalog)
+
+catalog.products.delete_at(1)
+
+p 'save call'
+# no implicit delete here. is this a problem?
 store.save(catalog)

data/lib/store.rb

@@ -5,7 +5,6 @@ class Store
     @entity_classes = entity_classes
     @data_mapping = data_mapping
     @entity_mapping = entity_mapping
-    @existing_entities = Set.new
     @entity_references = Hash.new
   end
 
@@ -20,7 +19,9 @@ class Store
   end
 
   def save(*entities)
-    entities.map do |entity|
+    references = entities.map do |entity|
+      next nil unless entity
+
       data_mapper = data_mapper_for_entity(entity)
       raise_unless_data_mapper_found(entity, data_mapper)
 
@@ -32,6 +33,12 @@ class Store
         data_mapper.update(reference, map_entity(entity))
       end
     end
+
+    if references.size == 1
+      references[0]
+    else
+      references
+    end
   end
 
   def remove(entity)

data/lib/store/version.rb

@@ -1,3 +1,3 @@
 class Store
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/store_spec.rb

@@ -38,15 +38,19 @@ describe 'store' do
   it 'delegates second save to update' do
     data_mapper.expect(:insert, :ref1, [entity_hash])
 
-    store.save(entity)
+    assert_equal :ref1, store.save(entity)
 
-    data_mapper.expect(:update, nil, [:ref1, entity_hash])
+    data_mapper.expect(:update, :ref1, [:ref1, entity_hash])
 
-    store.save(entity)
+    assert_equal :ref1, store.save(entity)
 
     assert data_mapper.verify
   end
 
+  it 'returns nil if entity of save is nil' do
+    assert_nil store.save(nil)
+  end
+
   it 'fails save if data_mapper not found' do
     entity = OpenStruct.new(:test => 42)
     error = assert_raises RuntimeError do
@@ -56,6 +60,23 @@ describe 'store' do
     assert_match(/no data_mapper .* found/i, error.message)
   end
 
+  it 'returns references from insert/update save' do
+    e1 = entity_class.new('e1', 'e1')
+    e1_hash = {'email' => 'e1', 'gender' => 'e1'}
+    e2 = entity_class.new('e2', 'e2')
+    e2_hash = {'email' => 'e2', 'gender' => 'e2'}
+
+    data_mapper.expect(:insert, :ref1, [e1_hash])
+    store.save(e1)
+
+    data_mapper.expect(:update, :ref1, [:ref1, e1_hash])
+    data_mapper.expect(:insert, :ref2, [e2_hash])
+
+    assert_equal [:ref1, :ref2], store.save(e1, e2)
+
+    assert data_mapper.verify
+  end
+
   it 'delegates query to select' do
     data_mapper.expect(:select, nil, [query])
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: store
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jakob Holderbaum