zermelo 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8442ff692747d2d56fc983ec85bc6665656748a
-  data.tar.gz: a2ef423d8095fb2d9e7f12f5cf84ca2dadc9c528
+  metadata.gz: 69911858d3394494076bade1249037f111eb5e7b
+  data.tar.gz: 5b2c9e463d7fb0b71a7135bad76b481e4e18629a
 SHA512:
-  metadata.gz: 5364e3f2a9ea70de9f7ec5142909736952d4ab3d3167823877ed40c49759ddbffa002756cbe730d60357776768707f92f0557120b1fe3877439d30a56833ef45
-  data.tar.gz: d15a22b19592f45711c46b684d0fe0d943c971c87a21843a2d291692c5af51756cb8542545e55e7a88042429c45c5021158e35034bf9b98916ecf3dca006072c
+  metadata.gz: b2b62aabc2f4421d99e53bc298e260550d2124cb957786c6ef1bce894cb0fd43c0cd704a6378e6a6acfbc2cfebffda52412984756fc314f98322a2ea63cb7a23
+  data.tar.gz: 69d7a165a1da92e759c6923828d12340d793eead6ee20681a0e22c9f7dde901b0421323ce0fd4c960bc708f5d84e9ebfab79bf166f638a3768032c8b75214074

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Zermelo Changelog
 
+# 1.3.0 - 2015-08-15
+
+ * handle some Zermelo objects as query values, less data back-and-forth
+ * return Set/OrderedSet objects as appropriate (58318c25)
+
 # 1.2.1 - 2015-08-07
 
  * 'empty' filter method (637d0c9c)

data/README.md

@@ -256,21 +256,21 @@ Classes that include `Zermelo::Record` have the following class methods made ava
 
 |Name                     | Arguments     | Returns |
 |-------------------------|---------------|---------|
-|`all`                    |               | Returns an Array of all the records stored for this class |
-|`each`                   |               | Yields all records to the provided block, returns the same Array as .all(): [Array#each](http://ruby-doc.org/core-2.1.2/Array.html#method-i-each)   |
-|`collect` / `map`        |               | Yields all records to the provided block, returns an Array with the values returned from the block: [Array#collect](http://ruby-doc.org/core-2.1.2/Array.html#method-i-collect)  |
-|`select` / `find_all`    |               | Yields all records to the provided block, returns an Array with each record where the block returned true: [Array#select](http://ruby-doc.org/core-2.1.2/Array.html#method-i-select)  |
-|`reject`                 |               | Yields all records to the provided block, returns an Array with each record where the block returned false: [Array#reject](http://ruby-doc.org/core-2.1.2/Array.html#method-i-reject) |
-|`ids`                    |               | Returns an Array with the ids of all stored records |
+|`all`                    |               | Returns a Set of all the records stored for this class |
+|`each`                   |               | Yields all records to the provided block, returns the same Set as .all(): [Enumerable#each](http://ruby-doc.org/core-2.2.2/Enumerable.html#method-i-each)   |
+|`collect` / `map`        |               | Yields all records to the provided block, returns an Array with the values returned from the block: [Enumerable#collect](http://ruby-doc.org/core-2.2.2/Enumerable.html#method-i-collect)  |
+|`select` / `find_all`    |               | Yields all records to the provided block, returns an Array with each record where the block returned true: [Enumerable#select](http://ruby-doc.org/core-2.2.2/Enumerable.html#method-i-select)  |
+|`reject`                 |               | Yields all records to the provided block, returns an Array with each record where the block returned false: [Enumerable#reject](http://ruby-doc.org/core-2.2.2/Enumerable.html#method-i-reject) |
+|`ids`                    |               | Returns a Set with the ids of all stored records |
 |`count`                  |               | Returns an Integer count of the number of stored records |
 |`empty?`                 |               | Returns true if no records are stored, false otherwise |
 |`destroy_all`            |               | Removes all stored records |
 |`exists?`                | ID            | Returns true if the record with the id is present, false if not |
 |`find_by_id`             | ID            | Returns the instantiated record for the id, or nil if not present |
-|`find_by_ids`            | ID, ID, ...   | Returns an Array of instantiated records for the ids, with nils if the respective record is not present |
+|`find_by_ids`            | ID, ID, ...   | Returns a Set of instantiated records for the ids, with nils if the respective record is not present |
 |`find_by_id!`            | ID            | Returns the instantiated record for the id, or raises a Zermelo::Records::RecordNotFound exception if not present |
-|`find_by_ids!`           | ID, ID, ...   | Returns an Array of instantiated records for the ids, or raises a Zermelo::Records::RecordsNotFound exception if any are not present |
-|`associated_ids_for`     | association   | (Defined in the `Associations` section below) |
+|`find_by_ids!`           | ID, ID, ...   | Returns a Set of instantiated records for the ids, or raises a Zermelo::Records::RecordsNotFound exception if any are not present |
+|`associated_ids_for` & `associations_for` | association   | (Defined in the `Associations` section below) |
 
 ### Instance methods
 
@@ -373,16 +373,16 @@ comment1.save
 comment2 = Comment.new(:id => '2')
 comment2.save
 
-p post.comments.ids # == []
-p Comment.ids       # == [1, 2]
+p post.comments.ids # == #<Set: {}>
+p Comment.ids       # == #<Set: {'1', '2'}>
 post.comments << comment1
-p post.comments.ids # == [1]
+p post.comments.ids # == #<Set: {'1'}>
 ```
 
 `.associated_ids_for` is somewhat of a special case; it uses the simplest queries possible to get the ids of the associated records of a set of records, e.g. for the data directly above:
 
 ```ruby
-Post.associated_ids_for(:comments)                       # => {'a' => ['1']}
+Post.associated_ids_for(:comments)                       # => {'a' => #<Set: {'1'}>}
 
 post_b = Post.new(:id => 'b')
 post_b.save
@@ -391,16 +391,18 @@ comment3 = Comment.new(:id => '3')
 comment3.save
 post.comments << comment3
 
-Post.associated_ids_for(:comments)                       # => {'a' => ['1', '3'], 'b' => ['2']}
+Post.associated_ids_for(:comments)                       # => {'a' => #<Set: {'1', '3'}>, 'b' => #<Set: {'2'}>}
 ```
 
 For `belongs to` associations, you may pass an extra option to `associated_ids_for`, `:inversed => true`, and you'll get the data back as if it were applied from the inverse side; however the data will only cover that used as the query root. Again, assuming the data from the last two code blocks, e.g.
 
 ```ruby
 Comment.associated_ids_for(:post)                    # => {'1' => 'a', '2' => 'b', '3' => 'a'}
-Comment.associated_ids_for(:post, :inversed => true) # => {'a' => ['1', '3'], 'b' => ['2']}
+Comment.associated_ids_for(:post, :inversed => true) # => {'a' => #<Set: {'1', '3'}>, 'b' => #<Set: {'2'}>}
 ```
 
+`.associations_for` returns chainable Zermelo association proxy objects, rather than sets of ids, as the Hash values. Please note, `.associations_for` only works with multiple associations (`has_many`, `has_and_belongs_to_many`, `has_sorted_set`).
+
 ### Class data indexing
 
 Simple instance attributes, as defined above, can be indexed by value (and those indices can be queried).
@@ -466,7 +468,7 @@ are both valid, and the `Comment` instances returned by the first query would be
 The chained queries are only executed when the results are invoked (lazy evaluation) by the addition of one of the class methods listed above; e.g.
 
 ```ruby
-Comment.intersect(:title => 'Interesting').all    # -> [Comment, Comment, ...]
+Comment.intersect(:title => 'Interesting').all    # -> #<Set: {Comment, Comment, ...}>
 Comment.intersect(:title => 'Interesting', :promoted => true).count  # -> Integer
 ```
 
@@ -477,7 +479,7 @@ SINTER comment::attrs:ids comment::indices:by_title:string:Interesting
 HGET comment:ca9e427d-4d81-47f8-bcfe-bb614d40528c:attrs title
 ```
 
-with the result being an Array with one member, a Comment record with `{:id => 'ca9e427d-4d81-47f8-bcfe-bb614d40528c', :title => 'Interesting'}`
+with the result being a Set with one member, a Comment record with `{:id => 'ca9e427d-4d81-47f8-bcfe-bb614d40528c', :title => 'Interesting'}`
 
 and the second (`.count`) will execute these Redis commands.
 
@@ -507,9 +509,8 @@ comment2 = Comment.new(:id => '2', :created_at => t - 60)
 comment2.save
 
 range = Zermelo::Filters::IndexRange.new(t - 90, t, :by_score => true)
-Comment.ids # ['1', '2']
-Comment.intersect(:created_at => range).ids # ['2']
-
+Comment.ids # #<Set: {'1', '2'}>
+Comment.intersect(:created_at => range).ids # #<Set: {'2'}>
 ```
 
 ### Future
@@ -519,7 +520,7 @@ Some possible changes:
 * pluggable id generation strategies
 * pluggable key naming strategies
 * instrumentation for benchmarking etc.
-* multiple data backends; there's currently an experimental InfluxDB 0.8 backend (waiting for the Ruby driver to update for 0.9 support).
+* multiple data backends
 
 ## License
 

data/lib/zermelo/associations/multiple.rb

@@ -12,7 +12,7 @@ module Zermelo
         :all, :each, :collect, :map,
         :select, :find_all, :reject, :destroy_all,
         :ids, :count, :empty?, :exists?,
-        :associated_ids_for
+        :associated_ids_for, :associations_for
 
       def initialize(type, parent_klass, parent_id, name)
         @type         = type

data/lib/zermelo/backends/influxdb.rb

@@ -2,6 +2,8 @@ require 'zermelo/backend'
 
 require 'zermelo/filters/influxdb'
 
+require 'zermelo/ordered_set'
+
 # NB influxdb doesn't support individually addressable deletes, so
 # this backend only works to write new records
 # (it could just write the new state of the record, and query id by newest limit 1,
@@ -59,7 +61,7 @@ module Zermelo
             when :hash
               {}
             when :set
-              Set.new()
+              Set.new
             else nil
             end
           else

data/lib/zermelo/backends/redis.rb

@@ -1,6 +1,7 @@
 require 'zermelo/backend'
 
 require 'zermelo/filters/redis'
+require 'zermelo/ordered_set'
 require 'zermelo/locks/redis_lock'
 
 module Zermelo
@@ -54,7 +55,7 @@ module Zermelo
               end
             when :sorted_set
               if attr_key.accessor.nil?
-                Zermelo.redis.zrange(redis_attr_key, 0, -1)
+                Zermelo::OrderedSet.new(Zermelo.redis.zrange(redis_attr_key, 0, -1))
               else
                 # TODO
               end

data/lib/zermelo/filter.rb

@@ -168,6 +168,24 @@ module Zermelo
       }
     end
 
+    def associations_for(name)
+      data_type, type_klass = @associated_class.send(:with_association_data, name.to_sym) do |data|
+        [data.data_type, data.type_klass]
+      end
+
+      lock {
+        case data_type
+        when :belongs_to, :has_one
+          raise "'associations_for' only supports multiple associations"
+        else
+          _ids.each_with_object({}) do |this_id, memo|
+            memo[this_id] = ::Zermelo::Associations::Multiple.new(data_type,
+              @associated_class, this_id, name)
+          end
+        end
+      }
+    end
+
     protected
 
     def lock(when_steps_empty = true, *klasses, &block)
@@ -193,7 +211,7 @@ module Zermelo
     end
 
     def _all
-      _ids.map {|id| _load(id) }
+      _ids.map! {|id| _load(id) }
     end
 
   end

data/lib/zermelo/filters/influxdb.rb

@@ -64,7 +64,15 @@ module Zermelo
             initial_id_data = nil
           end
 
-          return [] if initial_id_data.nil?
+          if initial_id_data.nil?
+            ret = case result_type
+            when :ids
+              Set.new
+            when :count
+              0
+            end
+            return ret
+          end
 
           initial_ids = initial_id_data.first[@initial_key.name]
 
@@ -105,9 +113,9 @@ module Zermelo
 
         case result_type
         when :ids
-          data_keys.empty? ? [] : data_keys.collect {|k| k =~ /^#{class_key}\/(.+)$/; $1 }
+          data_keys.empty? ? Set.new : Set.new(data_keys.collect {|k| k =~ /^#{class_key}\/(.+)$/; $1 })
         when :count
-          data_keys.empty? ?  0 : data_keys.size
+          data_keys.empty? ? 0 : data_keys.size
         end
       end
     end

data/lib/zermelo/filters/redis.rb

@@ -2,6 +2,8 @@ require 'zermelo/filter'
 
 require 'zermelo/filters/index_range'
 
+require 'zermelo/ordered_set'
+
 # TODO check escaping of ids and index_keys -- shouldn't allow bare :
 
 module Zermelo
@@ -14,20 +16,20 @@ module Zermelo
 
       SHORTCUTS = {
         :list => {
-          :ids     => proc {|key|     Zermelo.redis.lrange(key, 0, -1) },
+          :ids     => proc {|key|     Zermelo::OrderedSet.new(Zermelo.redis.lrange(key, 0, -1)) },
           :count   => proc {|key|     Zermelo.redis.llen(key) },
           :exists? => proc {|key, id| Zermelo.redis.lrange(key, 0, -1).include?(id) },
           :first   => proc {|key|     Zermelo.redis.lrange(key, 0, 0).first },
           :last    => proc {|key|     Zermelo.redis.lrevrange(key, 0, 0).first }
         },
         :set => {
-          :ids     => proc {|key|     Zermelo.redis.smembers(key) },
+          :ids     => proc {|key|     Set.new(Zermelo.redis.smembers(key)) },
           :count   => proc {|key|     Zermelo.redis.scard(key) },
           :exists? => proc {|key, id| Zermelo.redis.sismember(key, id) }
         },
         :sorted_set => {
           :ids     => proc {|key, order|
-            Zermelo.redis.send((:desc.eql?(order) ? :zrevrange : :zrange), key, 0, -1)
+            Zermelo::OrderedSet.new(Zermelo.redis.send((:desc.eql?(order) ? :zrevrange : :zrange), key, 0, -1))
           },
           :count   => proc {|key, order|     Zermelo.redis.zcard(key) },
           :exists? => proc {|key, order, id| !Zermelo.redis.zscore(key, id).nil? },
@@ -73,17 +75,12 @@ module Zermelo
         resolve_steps(:exists?, id)
       end
 
-      # If called with a block --  takes a block and passes the name of a set to
-      # it; deletes all temporary sets once done
-
-      # If called with any arguments -- treats them as a hash of shortcuts
-
-      # If not called with any arguments -- returns two values, the first is
-      # the name of a set containing the filtered ids, the second is a boolean
-      # for whether or not to clear up that set once it's been used
-
-      def resolve_steps(shortcut, *args)
+      # If not called with a shortcut, return value is the name of a set
+      # containing the filtered ids
+      def resolve_steps(shortcut = nil, *args)
         if @steps.empty?
+          raise "Shortcut must be provided if no steps" if shortcut.nil?
+
           unless @callback_target_class.nil? || @callbacks.nil?
             br = @callbacks[:before_read]
             if !br.nil? && @callback_target_class.respond_to?(br)
@@ -92,17 +89,13 @@ module Zermelo
           end
 
           sc = Zermelo::Filters::Redis::SHORTCUTS[@initial_key.type][shortcut]
-          ret = if sc.nil?
-            yield(@initial_key)
+          r_key = backend.key_to_redis_key(@initial_key)
+          shortcut_params = if @initial_key.type == :sorted_set
+            [r_key, @sort_order] + args
           else
-            r_key = backend.key_to_redis_key(@initial_key)
-            shortcut_params = if @initial_key.type == :sorted_set
-              [r_key, @sort_order] + args
-            else
-              [r_key] + args
-            end
-            sc.call(*shortcut_params)
+            [r_key] + args
           end
+          ret = sc.call(*shortcut_params)
 
           unless @callback_target_class.nil? || @callbacks.nil?
             ar = @callbacks[:after_read]
@@ -140,7 +133,7 @@ module Zermelo
               raise "'#{step.class.name}' does not accept input type #{step_opts[:source].type}"
             end
 
-            if step == last_step
+            if step == last_step && !shortcut.nil?
               step_opts.update(:shortcut => shortcut, :shortcut_args => args)
             end
 
@@ -160,7 +153,11 @@ module Zermelo
               end
             end
 
-            step_opts[:source] = result unless step == last_step
+            if step == last_step
+              temp_keys.delete(result) if shortcut.nil?
+            else
+              step_opts[:source] = result
+            end
           end
 
           result

data/lib/zermelo/filters/steps/set_step.rb

@@ -25,25 +25,42 @@ module Zermelo
             order       = opts[:sort_order]
 
             source_keys = @attributes.each_with_object([]) do |(att, value), memo|
-
-              val = value.is_a?(Set) ? value.to_a : value
-
-              if :id.eql?(att)
-                ts = associated_class.send(:temp_key, :set)
-                temp_keys << ts
-                Zermelo.redis.sadd(backend.key_to_redis_key(ts), val)
-                memo << ts
-              else
+              idx_class = nil
+              unless :id.eql?(att)
                 idx_class = idx_attrs[att.to_s]
                 raise "'#{att}' property is not indexed" if idx_class.nil?
+              end
+
+              if [Set, Array].any? {|t| value.is_a?(t) }
+                conditions_set = associated_class.send(:temp_key, source.type)
+                temp_keys << conditions_set
+                r_conditions_set = backend.key_to_redis_key(conditions_set)
 
-                if val.is_a?(Enumerable)
-                  conditions_set = associated_class.send(:temp_key, source.type)
-                  temp_keys << conditions_set
-                  r_conditions_set = backend.key_to_redis_key(conditions_set)
+                backend.temp_key_wrap do |conditions_temp_keys|
+                  if idx_class.nil?
+                    cond_objects, cond_ids = value.partition do |v|
+                      [Zermelo::Filter, Zermelo::Associations::Multiple].any? {|c| v.is_a?(c)}
+                    end
 
-                  backend.temp_key_wrap do |conditions_temp_keys|
-                    index_keys = val.collect {|v|
+                    unless cond_objects.empty?
+                      cond_keys = cond_objects.collect do |co|
+                        k = case co
+                        when Zermelo::Filter
+                          co.send(:resolve_steps)
+                        when Zermelo::Associations::Multiple
+                          co.instance_variable_get('@record_ids_key')
+                        end
+                        backend.key_to_redis_key(k)
+                      end
+
+                      Zermelo.redis.sunionstore(r_conditions_set, *cond_keys)
+                    end
+                    unless cond_ids.empty?
+                      cond_ids.map! {|ci| ci.is_a?(Zermelo::Associations::Singular) ? ci.id : ci }
+                      Zermelo.redis.sadd(r_conditions_set, cond_ids)
+                    end
+                  else
+                    index_keys = value.to_a.collect {|v|
                       il = backend.index_lookup(att, associated_class,
                         idx_class, v, attr_types[att], conditions_temp_keys)
                       backend.key_to_redis_key(il)
@@ -56,11 +73,27 @@ module Zermelo
                       Zermelo.redis.zunionstore(r_conditions_set, index_keys)
                     end
                   end
-                  memo << conditions_set
+                end
+                memo << conditions_set
+              elsif idx_class.nil?
+                case value
+                when Zermelo::Filter
+                  ts = value.send(:resolve_steps)
+                  temp_keys << ts
+                  memo << ts
+                when Zermelo::Associations::Multiple
+                  memo << value.instance_variable_get('@record_ids_key')
                 else
-                  memo << backend.index_lookup(att, associated_class,
-                            idx_class, val, attr_types[att], temp_keys)
+                  ts = associated_class.send(:temp_key, :set)
+                  temp_keys << ts
+                  r_ts = backend.key_to_redis_key(ts)
+                  Zermelo.redis.sadd(r_ts,
+                    value.is_a?(Zermelo::Associations::Singular) ? value.id : value)
+                  memo << ts
                 end
+              else
+                memo << backend.index_lookup(att, associated_class,
+                          idx_class, value, attr_types[att], temp_keys)
               end
             end
 
@@ -79,10 +112,10 @@ module Zermelo
                   r_dest_set = backend.key_to_redis_key(dest_set)
 
                   Zermelo.redis.sinterstore(r_dest_set, *r_source_keys)
-                  Zermelo.redis.sunion(r_source_key, r_dest_set)
+                  Set.new(Zermelo.redis.sunion(r_source_key, r_dest_set))
                 end
               when :intersect
-                Zermelo.redis.sinter(r_source_key, *r_source_keys)
+                Set.new(Zermelo.redis.sinter(r_source_key, *r_source_keys))
               when :diff
                 backend.temp_key_wrap do |shortcut_temp_keys|
                   dest_set = associated_class.send(:temp_key, :set)
@@ -90,7 +123,7 @@ module Zermelo
                   r_dest_set = backend.key_to_redis_key(dest_set)
 
                   Zermelo.redis.sinterstore(r_dest_set, *r_source_keys)
-                  Zermelo.redis.sdiff(r_source_key, r_dest_set)
+                  Set.new(Zermelo.redis.sdiff(r_source_key, r_dest_set))
                 end
               end
             else

data/lib/zermelo/ordered_set.rb

@@ -0,0 +1,11 @@
+require 'active_support/ordered_hash'
+
+module Zermelo
+  class OrderedSet < Set
+
+    def initialize(enum = nil, &block)
+      @hash = ActiveSupport::OrderedHash.new
+      super
+    end
+  end
+end

data/lib/zermelo/records/class_methods.rb

@@ -26,7 +26,7 @@ module Zermelo
         :all, :each, :collect, :map,
         :select, :find_all, :reject, :destroy_all,
         :ids, :count, :empty?, :exists?,
-        :associated_ids_for
+        :associated_ids_for, :associations_for
 
       def generate_id
         return SecureRandom.uuid if SecureRandom.respond_to?(:uuid)

data/lib/zermelo/version.rb

@@ -1,3 +1,3 @@
 module Zermelo
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/spec/lib/zermelo/associations/multiple_spec.rb

@@ -20,14 +20,14 @@ describe Zermelo::Associations::Multiple do
 
         children = parent.children.all
 
-        expect(children).to be_an(Array)
+        expect(children).to be_a(Set)
         expect(children).to be_empty
 
         parent.children << child
 
         children = parent.children.all
 
-        expect(children).to be_an(Array)
+        expect(children).to be_a(Set)
         expect(children.size).to eq(1)
       end
 
@@ -36,7 +36,7 @@ describe Zermelo::Associations::Multiple do
 
         children = parent.children.all
 
-        expect(children).to be_an(Array)
+        expect(children).to be_a(Set)
         expect(children.size).to eq(1)
         child = children.first
         expect(child).to be_a(child_class)
@@ -61,7 +61,7 @@ describe Zermelo::Associations::Multiple do
         child = child_class.find_by_id('3')
         parent.children.remove(child)
         expect(parent.children.count).to eq(1)
-        expect(parent.children.ids).to eq(['4'])
+        expect(parent.children.ids).to eq(Set.new(['4']))
       end
 
       it "deletes a record from the set by id" do
@@ -71,7 +71,7 @@ describe Zermelo::Associations::Multiple do
         expect(parent.children.count).to eq(2)
         parent.children.remove_ids('3')
         expect(parent.children.count).to eq(1)
-        expect(parent.children.ids).to eq(['4'])
+        expect(parent.children.ids).to eq(Set.new(['4']))
       end
 
       it "clears all records from the set" do
@@ -82,7 +82,7 @@ describe Zermelo::Associations::Multiple do
         child = child_class.find_by_id('3')
         parent.children.clear
         expect(parent.children.count).to eq(0)
-        expect(parent.children.ids).to eq([])
+        expect(parent.children.ids).to eq(Set.new)
       end
 
       it "does not add a child if the before_add callback raises an exception" # do
@@ -125,15 +125,15 @@ describe Zermelo::Associations::Multiple do
         it "by indexed attribute values" do
           important_kids = parent.children.intersect(:important => true).all
           expect(important_kids).not_to be_nil
-          expect(important_kids).to be_an(Array)
+          expect(important_kids).to be_a(Set)
           expect(important_kids.size).to eq(2)
-          expect(important_kids.map(&:id)).to match_array(['3', '4'])
+          expect(important_kids.map(&:id)).to eq(['3', '4'])
         end
 
         it "by intersecting ids" do
           important_kids = parent.children.intersect(:important => true, :id => ['4', '5']).all
           expect(important_kids).not_to be_nil
-          expect(important_kids).to be_an(Array)
+          expect(important_kids).to be_a(Set)
           expect(important_kids.size).to eq(1)
           expect(important_kids.map(&:id)).to match_array(['4'])
         end
@@ -143,7 +143,7 @@ describe Zermelo::Associations::Multiple do
           create_child(parent, :id => '4', :important => false)
 
           result = parent.children.intersect(:important => true).union(:id => '4').all
-          expect(result).to be_an(Array)
+          expect(result).to be_a(Set)
           expect(result.size).to eq(2)
           expect(result.map(&:id)).to eq(['3', '4'])
         end
@@ -172,7 +172,7 @@ describe Zermelo::Associations::Multiple do
             associated_ids_for(:children)
           expect(assoc_ids).to eq('8'  => Set.new(['3', '4', '5']),
                                   '9'  => Set.new(['6']),
-                                  '10' => Set.new())
+                                  '10' => Set.new)
 
           assoc_parent_ids = child_class.intersect(:id => ['3', '4', '5', '6']).
             associated_ids_for(:parent)
@@ -182,6 +182,27 @@ describe Zermelo::Associations::Multiple do
                                          '6' => '9')
         end
 
+        it 'returns associations for multiple parent ids' do
+          create_parent(:id => '9')
+          parent_9 = parent_class.find_by_id('9')
+
+          create_child(parent_9, :id => '6', :important => false)
+
+          create_parent(:id => '10')
+
+          assocs = parent_class.intersect(:id => [ '8', '9', '10']).
+            associations_for(:children)
+          expect(assocs).to be_a(Hash)
+          expect(assocs.keys).to match_array(['8', '9', '10'])
+          expect(assocs.values.all? {|r| r.is_a?(Zermelo::Associations::Multiple)}).to be true
+
+          expect(assocs['8'].count).to eq(3)
+          expect(assocs['8'].ids).to eq(Set.new(['3', '4', '5']))
+          expect(assocs['9'].count).to eq(1)
+          expect(assocs['9'].ids).to eq(Set.new(['6']))
+          expect(assocs['10'].count).to eq(0)
+          expect(assocs['10'].ids).to eq(Set.new)
+        end
       end
     end
 
@@ -310,6 +331,106 @@ describe Zermelo::Associations::Multiple do
                               "#{ck}:6:attrs"])
       end
 
+      it 'queries using association objects' do
+        create_parent(:id => '8')
+        parent_8 = parent_class.find_by_id('8')
+        create_child(parent_8, :id => '5')
+        create_child(parent_8, :id => '6')
+
+        create_parent(:id => '9')
+        parent_9 = parent_class.find_by_id('9')
+        create_child(parent_9, :id => '7')
+
+        create_parent(:id => '10')
+
+        assocs = parent_class.intersect(:id => ['8', '10']).
+          associations_for(:children).values
+
+        children = child_class.intersect(:id => assocs)
+        expect(children.count).to eq(2)
+        expect(children.ids).to eq(Set.new(['5', '6']))
+      end
+
+      it 'queries using multiple association objects' do
+        create_parent(:id => '8')
+        parent_8 = parent_class.find_by_id('8')
+        create_child(parent_8, :id => '5')
+        create_child(parent_8, :id => '6')
+
+        create_parent(:id => '9')
+        parent_9 = parent_class.find_by_id('9')
+        create_child(parent_9, :id => '7')
+
+        create_parent(:id => '10')
+        parent_10 = parent_class.find_by_id('10')
+        create_child(parent_10, :id => '4')
+
+        children = child_class.intersect(:id => [parent_8.children, parent_9.children])
+        expect(children.count).to eq(3)
+        expect(children.ids).to eq(Set.new(['5', '6', '7']))
+      end
+
+      it 'queries using a single filter object' do
+        create_parent(:id => '8')
+        parent_8 = parent_class.find_by_id('8')
+        create_child(parent_8, :id => '5')
+        create_child(parent_8, :id => '6')
+
+        create_parent(:id => '9')
+        parent_9 = parent_class.find_by_id('9')
+        create_child(parent_9, :id => '7')
+
+        create_parent(:id => '10')
+
+        par = parent_class.intersect(:id => ['8', '10'])
+
+        parent_ids = parent_class.intersect(:id => par).ids
+        expect(parent_ids).to eq(Set.new(['8', '10']))
+      end
+
+      it 'queries using multiple filter objects' do
+        create_parent(:id => '8')
+        parent_8 = parent_class.find_by_id('8')
+        create_child(parent_8, :id => '5')
+        create_child(parent_8, :id => '6')
+
+        create_parent(:id => '9')
+        parent_9 = parent_class.find_by_id('9')
+        create_child(parent_9, :id => '7')
+
+        create_parent(:id => '10')
+
+        par_1 = parent_class.intersect(:id => ['8'])
+        par_2 = parent_class.intersect(:id => ['10'])
+
+        parent_ids = parent_class.intersect(:id => [par_1, par_2]).ids
+        expect(parent_ids).to eq(Set.new(['8', '10']))
+      end
+
+      it 'queries using a combination of bare value, association and filter object' do
+        create_parent(:id => '8')
+        parent_8 = parent_class.find_by_id('8')
+        create_child(parent_8, :id => '5')
+        create_child(parent_8, :id => '6')
+
+        create_parent(:id => '9')
+        parent_9 = parent_class.find_by_id('9')
+        create_child(parent_9, :id => '7')
+
+        create_parent(:id => '10')
+        parent_10 = parent_class.find_by_id('10')
+        create_child(parent_10, :id => '4')
+
+        assocs = parent_class.intersect(:id => ['8']).
+          associations_for(:children).values
+
+        children = child_class.intersect(:id => assocs + [
+          parent_9.children.intersect(:id => '7'), '4'
+        ])
+        expect(children.count).to eq(4)
+        expect(children.ids).to eq(Set.new(['4', '5', '6', '7']))
+      end
+
     end
 
     context 'influxdb', :influxdb => true, :has_many => true do
@@ -349,6 +470,9 @@ describe Zermelo::Associations::Multiple do
         par.children.add(child_class.find_by_id!(attrs[:id]))
       end
 
+      # FIXME not implemented yet for InfluxDB, see SetStep
+      it 'queries associated filters transparently'
+
     end
 
   end
@@ -372,7 +496,7 @@ describe Zermelo::Associations::Multiple do
 
         secondaries = primary.secondaries.all
 
-        expect(secondaries).to be_an(Array)
+        expect(secondaries).to be_a(Set)
         expect(secondaries.size).to eq(1)
         other_secondary = secondaries.first
         expect(other_secondary).to be_a(secondary_class)
@@ -412,9 +536,9 @@ describe Zermelo::Associations::Multiple do
         expect(secondary.primaries.count).to eq(1)
         expect(primary.secondaries.count).to eq(0)
         expect(primary_2.secondaries.count).to eq(1)
-        expect(secondary.primaries.ids).to eq(['9'])
-        expect(primary.secondaries.ids).to eq([])
-        expect(primary_2.secondaries.ids).to eq(['2'])
+        expect(secondary.primaries.ids).to eq(Set.new(['9']))
+        expect(primary.secondaries.ids).to eq(Set.new)
+        expect(primary_2.secondaries.ids).to eq(Set.new(['2']))
       end
 
       it "deletes a record from the set by id" do
@@ -434,9 +558,9 @@ describe Zermelo::Associations::Multiple do
         expect(secondary.primaries.count).to eq(1)
         expect(primary.secondaries.count).to eq(0)
         expect(primary_2.secondaries.count).to eq(1)
-        expect(secondary.primaries.ids).to eq(['9'])
-        expect(primary.secondaries.ids).to eq([])
-        expect(primary_2.secondaries.ids).to eq(['2'])
+        expect(secondary.primaries.ids).to eq(Set.new(['9']))
+        expect(primary.secondaries.ids).to eq(Set.new)
+        expect(primary_2.secondaries.ids).to eq(Set.new(['2']))
       end
 
       it "clears all records from the set" do
@@ -456,9 +580,9 @@ describe Zermelo::Associations::Multiple do
         expect(secondary.primaries.count).to eq(0)
         expect(primary.secondaries.count).to eq(0)
         expect(primary_2.secondaries.count).to eq(0)
-        expect(secondary.primaries.ids).to eq([])
-        expect(primary.secondaries.ids).to eq([])
-        expect(primary_2.secondaries.ids).to eq([])
+        expect(secondary.primaries.ids).to eq(Set.new)
+        expect(primary.secondaries.ids).to eq(Set.new)
+        expect(primary_2.secondaries.ids).to eq(Set.new)
       end
 
       context 'filters' do
@@ -478,7 +602,7 @@ describe Zermelo::Associations::Multiple do
 
           primaries = secondary.primaries.intersect(:active => true).all
           expect(primaries).not_to be_nil
-          expect(primaries).to be_an(Array)
+          expect(primaries).to be_a(Set)
           expect(primaries.size).to eq(2)
           expect(primaries.map(&:id)).to match_array(['8', '10'])
         end
@@ -747,7 +871,7 @@ describe Zermelo::Associations::Multiple do
 
         children = parent.children.all
 
-        expect(children).to be_an(Array)
+        expect(children).to be_a(Zermelo::OrderedSet)
         expect(children.size).to eq(1)
         child = children.first
         expect(child).to be_a(child_class)
@@ -866,9 +990,9 @@ describe Zermelo::Associations::Multiple do
 
         assoc_ids = parent_class.intersect(:id => ['8', '9', '10']).
           associated_ids_for(:children)
-        expect(assoc_ids).to eq('8'  => ['3', '4'],
-                                '9'  => [],
-                                '10' => ['5'])
+        expect(assoc_ids).to eq('8'  => Zermelo::OrderedSet.new(['3', '4']),
+                                '9'  => Zermelo::OrderedSet.new,
+                                '10' => Zermelo::OrderedSet.new(['5']))
       end
 
       it "deletes a record from the set" do
@@ -881,7 +1005,7 @@ describe Zermelo::Associations::Multiple do
         child = child_class.find_by_id('3')
         parent.children.remove(child)
         expect(parent.children.count).to eq(1)
-        expect(parent.children.ids).to eq(['4'])
+        expect(parent.children.ids).to eq(Set.new(['4']))
       end
 
       it "deletes a record from the set by id" do
@@ -893,7 +1017,7 @@ describe Zermelo::Associations::Multiple do
         expect(parent.children.count).to eq(2)
         parent.children.remove_ids('3')
         expect(parent.children.count).to eq(1)
-        expect(parent.children.ids).to eq(['4'])
+        expect(parent.children.ids).to eq(Zermelo::OrderedSet.new(['4']))
       end
 
       it "clears all records from the set" do
@@ -906,7 +1030,7 @@ describe Zermelo::Associations::Multiple do
         child = child_class.find_by_id('3')
         parent.children.clear
         expect(parent.children.count).to eq(0)
-        expect(parent.children.ids).to eq([])
+        expect(parent.children.ids).to eq(Zermelo::OrderedSet.new)
       end
 
       context 'filters' do
@@ -922,7 +1046,7 @@ describe Zermelo::Associations::Multiple do
         it "by indexed attribute values" do
           upset_children = parent.children.intersect(:emotion => 'upset').all
           expect(upset_children).not_to be_nil
-          expect(upset_children).to be_an(Array)
+          expect(upset_children).to be_a(Zermelo::OrderedSet)
           expect(upset_children.size).to eq(2)
           expect(upset_children.map(&:id)).to eq(['4', '6'])
         end
@@ -930,7 +1054,7 @@ describe Zermelo::Associations::Multiple do
         it "by indexed attribute values with a regex search" do
           upset_children = parent.children.intersect(:emotion => /^ups/).all
           expect(upset_children).not_to be_nil
-          expect(upset_children).to be_an(Array)
+          expect(upset_children).to be_a(Zermelo::OrderedSet)
           expect(upset_children.size).to eq(2)
           expect(upset_children.map(&:id)).to eq(['4', '6'])
         end
@@ -939,7 +1063,7 @@ describe Zermelo::Associations::Multiple do
           range = Zermelo::Filters::IndexRange.new(0, 1)
           children = parent.children.intersect(:timestamp => range).all
           expect(children).not_to be_nil
-          expect(children).to be_an(Array)
+          expect(children).to be_a(Zermelo::OrderedSet)
           expect(children.size).to eq(2)
           expect(children.map(&:id)).to eq(['4', '5'])
         end
@@ -948,7 +1072,7 @@ describe Zermelo::Associations::Multiple do
           range = Zermelo::Filters::IndexRange.new(1, 2)
           children = parent.children.intersect(:timestamp => range).sort(:id, :desc => true).all
           expect(children).not_to be_nil
-          expect(children).to be_an(Array)
+          expect(children).to be_a(Zermelo::OrderedSet)
           expect(children.size).to eq(2)
           expect(children.map(&:id)).to eq(['6', '5'])
         end
@@ -957,7 +1081,7 @@ describe Zermelo::Associations::Multiple do
           range = Zermelo::Filters::IndexRange.new(time - 25, time - 5, :by_score => true)
           children = parent.children.intersect(:timestamp => range).all
           expect(children).not_to be_nil
-          expect(children).to be_an(Array)
+          expect(children).to be_a(Zermelo::OrderedSet)
           expect(children.size).to eq(2)
           expect(children.map(&:id)).to eq(['4', '5'])
         end
@@ -967,7 +1091,7 @@ describe Zermelo::Associations::Multiple do
           children = parent.children.intersect(:timestamp => range).
                        sort(:timestamp, :desc => true).all
           expect(children).not_to be_nil
-          expect(children).to be_an(Array)
+          expect(children).to be_a(Zermelo::OrderedSet)
           expect(children.size).to eq(2)
           expect(children.map(&:id)).to eq(['5', '4'])
         end
@@ -994,7 +1118,7 @@ describe Zermelo::Associations::Multiple do
           children = parent.children.intersect(:id => ['4']).
                        union(:emotion => 'upset', :id => ['4', '6']).all
           expect(children).not_to be_nil
-          expect(children).to be_an(Array)
+          expect(children).to be_a(Zermelo::OrderedSet)
           expect(children.size).to eq(2)
           expect(children.map(&:id)).to eq(['4', '6'])
         end
@@ -1002,7 +1126,7 @@ describe Zermelo::Associations::Multiple do
         it "ANDs multiple diff arguments, not ORs them" do
           children = parent.children.diff(:emotion => 'upset', :id => ['4', '5']).all
           expect(children).not_to be_nil
-          expect(children).to be_an(Array)
+          expect(children).to be_a(Zermelo::OrderedSet)
           expect(children.size).to eq(2)
           expect(children.map(&:id)).to eq(['5', '6'])
         end
@@ -1011,7 +1135,7 @@ describe Zermelo::Associations::Multiple do
           range = Zermelo::Filters::IndexRange.new(0, 1)
           children = parent.children.diff(:timestamp => range).all
           expect(children).not_to be_nil
-          expect(children).to be_an(Array)
+          expect(children).to be_a(Zermelo::OrderedSet)
           expect(children.size).to eq(1)
           expect(children.map(&:id)).to eq(['6'])
         end
@@ -1020,7 +1144,7 @@ describe Zermelo::Associations::Multiple do
           range = Zermelo::Filters::IndexRange.new(2, 2)
           children = parent.children.diff(:timestamp => range).sort(:id, :desc => true).all
           expect(children).not_to be_nil
-          expect(children).to be_an(Array)
+          expect(children).to be_a(Zermelo::OrderedSet)
           expect(children.size).to eq(2)
           expect(children.map(&:id)).to eq(['5', '4'])
         end
@@ -1029,7 +1153,7 @@ describe Zermelo::Associations::Multiple do
           range = Zermelo::Filters::IndexRange.new(time - 25, time - 5, :by_score => true)
           children = parent.children.diff(:timestamp => range).all
           expect(children).not_to be_nil
-          expect(children).to be_an(Array)
+          expect(children).to be_a(Zermelo::OrderedSet)
           expect(children.size).to eq(1)
           expect(children.map(&:id)).to eq(['6'])
         end
@@ -1038,7 +1162,7 @@ describe Zermelo::Associations::Multiple do
           range = Zermelo::Filters::IndexRange.new(time - 5, time, :by_score => true)
           children = parent.children.diff(:timestamp => range).sort(:timestamp, :desc => true).all
           expect(children).not_to be_nil
-          expect(children).to be_an(Array)
+          expect(children).to be_a(Zermelo::OrderedSet)
           expect(children.size).to eq(2)
           expect(children.map(&:id)).to eq(['5', '4'])
         end

data/spec/lib/zermelo/filter_spec.rb

@@ -27,7 +27,7 @@ describe Zermelo::Filter do
     it "returns all record ids" do
       examples = example_class.ids
       expect(examples).not_to be_nil
-      expect(examples).to be_an(Array)
+      expect(examples).to be_a(Set)
       expect(examples.size).to eq(2)
       expect(examples).to contain_exactly('8', '9')
     end
@@ -42,7 +42,7 @@ describe Zermelo::Filter do
     it "returns all records" do
       examples = example_class.all
       expect(examples).not_to be_nil
-      expect(examples).to be_an(Array)
+      expect(examples).to be_a(Set)
       expect(examples.size).to eq(2)
       expect(examples.map(&:id)).to contain_exactly('9', '8')
     end
@@ -57,7 +57,7 @@ describe Zermelo::Filter do
     it "finds records by a uniquely indexed value" do
       examples = example_class.intersect(:name => 'John Jones').all
       expect(examples).not_to be_nil
-      expect(examples).to be_an(Array)
+      expect(examples).to be_an(Set)
       expect(examples.size).to eq(1)
       example = examples.first
       expect(example.id).to eq('8')
@@ -67,7 +67,7 @@ describe Zermelo::Filter do
     it "filters all class records by indexed attribute values" do
       example = example_class.intersect(:active => true).all
       expect(example).not_to be_nil
-      expect(example).to be_an(Array)
+      expect(example).to be_a(Set)
       expect(example.size).to eq(1)
       expect(example.map(&:id)).to eq(['8'])
     end
@@ -75,7 +75,7 @@ describe Zermelo::Filter do
     it 'filters by id attribute values' do
       example = example_class.intersect(:id => '9').all
       expect(example).not_to be_nil
-      expect(example).to be_an(Array)
+      expect(example).to be_a(Set)
       expect(example.size).to eq(1)
       expect(example.map(&:id)).to eq(['9'])
     end
@@ -86,7 +86,7 @@ describe Zermelo::Filter do
 
       examples = example_class.intersect(:id => ['8', '10']).all
       expect(examples).not_to be_nil
-      expect(examples).to be_an(Array)
+      expect(examples).to be_a(Set)
       expect(examples.size).to eq(2)
       expect(examples.map(&:id)).to match_array(['8', '10'])
     end
@@ -95,7 +95,7 @@ describe Zermelo::Filter do
       examples = example_class.intersect(:active => true).
                    union(:active => false).all
       expect(examples).not_to be_nil
-      expect(examples).to be_an(Array)
+      expect(examples).to be_a(Set)
       expect(examples.size).to eq(2)
       expect(examples.map(&:id)).to match_array(['8', '9'])
     end
@@ -104,7 +104,7 @@ describe Zermelo::Filter do
       example = example_class.intersect(:active => true).
         intersect(:name => 'John Jones').all
       expect(example).not_to be_nil
-      expect(example).to be_an(Array)
+      expect(example).to be_a(Set)
       expect(example.size).to eq(1)
       expect(example.map(&:id)).to eq(['8'])
     end
@@ -113,7 +113,7 @@ describe Zermelo::Filter do
       example = example_class.intersect(:active => true,
         :name => 'John Jones').all
       expect(example).not_to be_nil
-      expect(example).to be_an(Array)
+      expect(example).to be_a(Set)
       expect(example.size).to eq(1)
       expect(example.map(&:id)).to eq(['8'])
     end
@@ -124,7 +124,7 @@ describe Zermelo::Filter do
 
       example = example_class.intersect(:active => true).diff(:name => 'Fred Bloggs').all
       expect(example).not_to be_nil
-      expect(example).to be_an(Array)
+      expect(example).to be_a(Set)
       expect(example.size).to eq(1)
       expect(example.map(&:id)).to eq(['8'])
     end
@@ -138,7 +138,7 @@ describe Zermelo::Filter do
     it 'finds records by regex match against a uniquely indexed value' do
       examples = example_class.intersect(:name => /hn Jones/).all
       expect(examples).not_to be_nil
-      expect(examples).to be_an(Array)
+      expect(examples).to be_a(Set)
       expect(examples.size).to eq(1)
       example = examples.first
       expect(example.id).to eq('8')
@@ -153,13 +153,13 @@ describe Zermelo::Filter do
 
     it 'can append to a filter chain fragment more than once' do
       inter = example_class.intersect(:active => true)
-      expect(inter.ids).to eq(['8'])
+      expect(inter.ids).to eq(Set.new(['8']))
 
       union = inter.union(:name => 'James Brown')
-      expect(union.ids).to match_array(['8', '9'])
+      expect(union.ids).to eq(Set.new(['8', '9']))
 
       diff = inter.diff(:id => ['8'])
-      expect(diff.ids).to eq([])
+      expect(diff.ids).to eq(Set.new)
     end
 
     it "ANDs multiple union arguments, not ORs them" do
@@ -167,7 +167,7 @@ describe Zermelo::Filter do
       examples = example_class.intersect(:id => ['8']).
                    union(:id => ['9', '10'], :active => true).all
       expect(examples).not_to be_nil
-      expect(examples).to be_an(Array)
+      expect(examples).to be_a(Set)
       expect(examples.size).to eq(2)
       expect(examples.map(&:id)).to match_array(['8', '10'])
     end
@@ -177,7 +177,7 @@ describe Zermelo::Filter do
       examples = example_class.intersect(:id => ['8', '9', '10']).
                    diff(:id => ['9', '10'], :active => false).all
       expect(examples).not_to be_nil
-      expect(examples).to be_an(Array)
+      expect(examples).to be_a(Set)
       expect(examples.size).to eq(2)
       expect(examples.map(&:id)).to match_array(['8', '10'])
     end
@@ -187,7 +187,7 @@ describe Zermelo::Filter do
       examples = example_class.intersect(:id => ['8']).
                    union(:id => ['9', '10'], :name => [nil, /^Jam/]).all
       expect(examples).not_to be_nil
-      expect(examples).to be_an(Array)
+      expect(examples).to be_a(Set)
       expect(examples.size).to eq(2)
       expect(examples.map(&:id)).to match_array(['8', '9'])
     end
@@ -197,7 +197,7 @@ describe Zermelo::Filter do
 
       examples = example_class.intersect(:name => ['Jay Johns', 'James Brown']).all
       expect(examples).not_to be_nil
-      expect(examples).to be_an(Array)
+      expect(examples).to be_a(Set)
       expect(examples.size).to eq(2)
       expect(examples.map(&:id)).to match_array(['9', '10'])
     end
@@ -208,7 +208,7 @@ describe Zermelo::Filter do
       examples = example_class.intersect(:active => false).
                    union(:name => ['Jay Johns', 'James Brown']).all
       expect(examples).not_to be_nil
-      expect(examples).to be_an(Array)
+      expect(examples).to be_a(Set)
       expect(examples.size).to eq(2)
       expect(examples.map(&:id)).to match_array(['9', '10'])
     end
@@ -216,7 +216,7 @@ describe Zermelo::Filter do
     it 'excludes particular records' do
       example = example_class.diff(:active => true).all
       expect(example).not_to be_nil
-      expect(example).to be_an(Array)
+      expect(example).to be_a(Set)
       expect(example.size).to eq(1)
       expect(example.map(&:id)).to eq(['9'])
     end
@@ -260,7 +260,7 @@ describe Zermelo::Filter do
     it 'sorts records by an attribute' do
       example = example_class.sort(:name, :order => 'alpha').all
       expect(example).not_to be_nil
-      expect(example).to be_an(Array)
+      expect(example).to be_a(Set)
       expect(example.size).to eq(2)
       expect(example.map(&:id)).to eq(['9', '8'])
     end

data/spec/support/mock_logger.rb

@@ -1,7 +1,8 @@
+# Store logger messages in specs for possible later output
 class MockLogger
   attr_accessor :messages, :errors
 
-  def self.configure_log(name, config = {})
+  def self.configure_log(name, _config = {})
     @name = name
   end
 
@@ -20,7 +21,8 @@ class MockLogger
       def #{level}(msg = nil, &block)
         msg = yield if msg.nil? && block_given?
         @messages << '[#{level.upcase}] :: ' +
-          (self.class.instance_variable_get('@name') || 'flapjack') + ' :: ' + msg
+          (self.class.instance_variable_get('@name') || 'flapjack') + ' :: ' +
+          msg
       end
     RUBY
   end
@@ -30,9 +32,11 @@ class MockLogger
       def #{level}(msg = nil, &block)
         msg = yield if msg.nil? && block_given?
         @messages << '[#{level.upcase}] :: ' +
-          (self.class.instance_variable_get('@name') || 'flapjack') + ' :: ' + msg
+          (self.class.instance_variable_get('@name') || 'flapjack') + ' :: ' +
+          msg
         @errors << '[#{level.upcase}] :: ' +
-          (self.class.instance_variable_get('@name') || 'flapjack') + ' :: ' + msg
+          (self.class.instance_variable_get('@name') || 'flapjack') + ' :: ' +
+          msg
       end
     ERRORS
   end
@@ -44,5 +48,4 @@ class MockLogger
       end
     LEVELS
   end
-
-end
+end

data/spec/support/profile_all_formatter.rb

@@ -1,9 +1,10 @@
 require 'rspec/core/formatters/base_formatter'
 
+# Outputs how log each spec takes to run
 class ProfileAllFormatter < RSpec::Core::Formatters::BaseFormatter
-
   RSpec::Core::Formatters.register self,
-    :example_started, :example_passed, :start_dump
+                                   :example_started, :example_passed,
+                                   :start_dump
 
   def initialize(output)
     super(output)
@@ -12,33 +13,33 @@ class ProfileAllFormatter < RSpec::Core::Formatters::BaseFormatter
 
   def start(notification)
     super(notification)
-    @output.puts "Profiling enabled."
+    @output.puts 'Profiling enabled.'
   end
 
-  def example_started(notification)
-    @time = ((Time.respond_to?(:zone) && Time.zone) ? Time.zone.now : Time.now)
+  def example_started(_notification)
+    @time = (Time.respond_to?(:zone) && Time.zone) ? Time.zone.now : Time.now
   end
 
   def example_passed(notification)
+    now = (Time.respond_to?(:zone) && Time.zone) ? Time.zone.now : Time.now
     @example_times << [
       notification.example.example_group.description,
       notification.example.description,
-      ((Time.respond_to?(:zone) && Time.zone) ? Time.zone.now : Time.now) - @time
+      now - @time
     ]
   end
 
-  def start_dump(notification)
+  def start_dump(_notification)
     @output.puts "\n\nExample times:\n"
 
-    @example_times = @example_times.sort_by do |description, example, time|
+    @example_times = @example_times.sort_by do |_description, _example, time|
       time
     end.reverse
 
     @example_times.each do |description, example, time|
-      @output.print sprintf("%.7f", time)
+      @output.print format('%.7f', time)
       @output.puts " #{description} #{example}"
     end
     @output.flush
   end
-
-end
+end

data/spec/support/uncolored_doc_formatter.rb

@@ -1,11 +1,13 @@
 require 'rspec/core/formatters/base_text_formatter'
 
+# Output text witout colourising it
 module NoColorizer
-  def self.wrap(text, color)
+  def self.wrap(text, _)
     text
   end
 end
 
+# Re-implements RSpec's doc formatter without ANSI text colours
 class UncoloredDocFormatter < RSpec::Core::Formatters::BaseTextFormatter
   RSpec::Core::Formatters.register(self, :example_group_started,
                                    :example_group_finished,
@@ -25,7 +27,7 @@ class UncoloredDocFormatter < RSpec::Core::Formatters::BaseTextFormatter
     @group_level += 1
   end
 
-  def example_group_finished(notification)
+  def example_group_finished(_)
     @group_level -= 1
   end
 
@@ -34,12 +36,12 @@ class UncoloredDocFormatter < RSpec::Core::Formatters::BaseTextFormatter
   end
 
   def example_pending(pending)
-    output.puts "#{current_indentation}#{pending.example.description.strip} " +
+    output.puts "#{current_indentation}#{pending.example.description.strip} " \
       "(PENDING: #{pending.example.execution_result.pending_message})"
   end
 
   def example_failed(failure)
-    output.puts "#{current_indentation}#{failure.example.description.strip} " +
+    output.puts "#{current_indentation}#{failure.example.description.strip} " \
       "(FAILED - #{next_failure_index})"
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zermelo
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ali Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -91,6 +91,7 @@ files:
 - lib/zermelo/filters/steps/sort_step.rb
 - lib/zermelo/locks/no_lock.rb
 - lib/zermelo/locks/redis_lock.rb
+- lib/zermelo/ordered_set.rb
 - lib/zermelo/record.rb
 - lib/zermelo/records/attributes.rb
 - lib/zermelo/records/class_methods.rb