schron 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f4bf73bf955f3f82baa2bab5bc3acc1b812cd61
-  data.tar.gz: 334dc42717de4a920f6c698a031829d6113615c3
+  metadata.gz: f49a1d20dee523a612a54957311f0b2e0d6c1261
+  data.tar.gz: 1b86c1df7aaa310f1729032f2a029c3135293a88
 SHA512:
-  metadata.gz: 978dfca8ba3c7ea74efd6ad4825fcc34f6cf9641c2b8417185a9242c15e9a68122442c3736711288ccbb5b2fb48ce73364aaf602598ab517d5391d8be5b4dac1
-  data.tar.gz: 4385936c35b1df5c92c15d00fef37d12641f613766305d78baf319f1a3317618205f7f1d736734f03ab6027bf0f6ff0abba6dd3dd10be757f0b8d10d6d94d0b0
+  metadata.gz: e4b7793227d44a52f21568e892a3f1525c03bc8d0f037daf4115bbeda4900c3d593e5c301a03e951fd6a50946edab32d564682dff67bc3e34dcb2874830fc938
+  data.tar.gz: 6c4a329eb00714ee3b258b88e94ea313718b7e09f879b6db011681e2bc3b9d4654df9ee0d38911cea5f9087b7c1bd0e58ab28812cf788e47570fe7d8b528d5c7

data/lib/schron/datastore/mongo.rb

@@ -170,22 +170,23 @@ module Schron
         selector = {}
         query.filters.each do |(field, op, filter_value)|
           mongo_field = mongoize_field(field)
+          selector[mongo_field] ||= {}
           case op
           when '='
             selector[mongo_field] = filter_value
           when '!='
-            selector[mongo_field] = { "$ne" => filter_value }
+            selector[mongo_field]['$ne'] = filter_value
           when 'in'
             raise EmptyQueryError if filter_value.to_a.empty?
-            selector[mongo_field] = { "$in" => filter_value.to_a }
+            selector[mongo_field]['$in'] = filter_value.to_a
           when '>'
-            selector[mongo_field] = { "$gt" => filter_value }
+            selector[mongo_field]['$gt'] = filter_value
           when '<'
-            selector[mongo_field] = { "$lt" => filter_value }
+            selector[mongo_field]['$lt'] = filter_value
           when '>='
-            selector[mongo_field] = { "$gte" => filter_value }
+            selector[mongo_field]['$gte'] = filter_value
           when '<='
-            selector[mongo_field] = { "$lte" => filter_value }
+            selector[mongo_field]['$lte'] = filter_value
           else
             raise "unsupported op #{op}"
           end

data/lib/schron/db.rb

@@ -26,11 +26,24 @@ module Schron
       end
     end
 
+    def session_end!
+      @repos.each do |name, repo|
+        repo.session_end! if repo.respond_to?(:session_end!)
+      end
+    end
+
     def session(&block)
       session_begin
       block.call
     ensure
       session_end
     end
+
+    def session!(&block)
+      session_begin
+      block.call
+    ensure
+      session_end!
+    end
   end
 end

data/lib/schron/identity_map_repository.rb

@@ -30,16 +30,27 @@ module Schron
     # end
 
     def session_begin
-      @id_map ||= IdentityMap.new
-      @sessions ||= 0
-      @sessions += 1
+      @sessions ||= []
+      @sessions.push IdentityMap.new
+      # @id_map ||= IdentityMap.new
+      # @sessions ||= 0
+      # @sessions += 1
       nil
     end
 
     def session_end
-      raise 'no session is open' unless @id_map
-      @sessions -= 1
-      @id_map = nil if @sessions == 0
+      @sessions.pop
+      # raise 'no session is open' unless @id_map
+      # @sessions -= 1
+      # @id_map = nil if @sessions == 0
+      nil
+    end
+
+    def session_end!
+      @sessions = []
+      # raise 'no session is open' unless @id_map
+      # @sessions = 0
+      # @id_map = nil
       nil
     end
 
@@ -50,6 +61,13 @@ module Schron
       session_end
     end
 
+    def session!(&block)
+      session_begin
+      block.call
+    ensure
+      session_end!
+    end
+
     # [:datastore, :kind, :entity_class, :indexed_fields,
     #   :identity].each do |repo_method|
     #   define_method(repo_method) do |*args, &block|
@@ -78,7 +96,6 @@ module Schron
     def get(id)
       identity_map.fetch(id) do
         super
-        # @repo.get(id)
       end
     end
 
@@ -125,14 +142,16 @@ module Schron
     end
 
     def update(object)
-      super
-      # @repo.update(object)
+      result = super
+      assign_attributes from: result, to: object
       object
     end
 
     def multi_update(objects)
-      super
-      # @repo.multi_update(objects)
+      results = super
+      objects.each_with_index do |o, i|
+        assign_attributes(from: results[i], to: o)
+      end
       objects
     end
 
@@ -153,7 +172,7 @@ module Schron
     end
 
     def identity_map
-      @id_map || raise('Must start a session before accessing data from an IdentityMapRepository')
+      @sessions.last || raise('Must start a session before accessing data from an IdentityMapRepository')
     end
 
     private

data/lib/schron/test/datastore_examples.rb

@@ -242,6 +242,13 @@ if defined?(RSpec)
             expect(ds.exec_query(query.filter(name: '123'))).to eq([])
           end
 
+          it 'filters more than one condition on a single field' do
+            query.filter(:name, '>', 'a').filter(:name, '<', 'c')
+            found = ds.exec_query(query)
+            expect(found.size).to eq(1)
+            expect(found.first[:id]).to eq(@b[:id])
+          end
+
           context 'nil filtering' do
             it 'filters by = nil' do
               found = ds.exec_query(query.filter(name: nil))
@@ -570,4 +577,4 @@ if defined?(RSpec)
     end
   end
 
-end
+end

data/schron.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "schron"
-  spec.version       = "0.0.4"
+  spec.version       = "0.0.5"
   spec.authors       = ["David Faber"]
   spec.email         = ["david@1bios.co"]
   spec.summary       = %q{Repository implementation for entity persistence}

data/spec/lib/schron/identity_map_repository_spec.rb

@@ -42,11 +42,28 @@ describe Schron::IdentityMapRepository do
       end
     end
 
-    it 'uses the same identity map if a session has already started' do
-      repo.session_begin
-      id_map = repo.identity_map
-      repo.session_begin
-      expect(id_map).to be(repo.identity_map)
+    it 'nests sessions' do
+      id_maps = []
+      repo.session do
+        id_maps << repo.identity_map
+        repo.session do
+          expect(repo.identity_map).not_to eq(id_maps.first)
+        end
+        expect(repo.identity_map).to eq(id_maps.first)
+      end
+      expect { repo.identity_map }.to raise_error
+    end
+
+    it 'uses unique identity maps in nested sessions' do
+      obj = nil
+      repo.session do
+        obj = repo.insert(repo.entity_class.new)
+        repo.session do
+          expect(obj).not_to be(repo.get(obj.id))
+        end
+        expect(obj).to be(repo.get(obj.id))
+      end
+      
     end
 
     it 'closes sessions after an equal number of begin and end calls have been made' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schron
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - David Faber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake