modis 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a53daa02a9a6c4cc8463b7d7bd340a0581fe4748
-  data.tar.gz: fa9efc54e2ff9d4e7947e1deee4313ed59a6f345
+  metadata.gz: 774c89b8695921821cc449741a450f77f69f649f
+  data.tar.gz: 941a15b53b91e8c955a1599199867a0595b58b5a
 SHA512:
-  metadata.gz: 129daf466455122c27dddd64bd4c3196de3b7cb227753e12c62a9cdda1e91410239823464c14ff8c94b1754af4b186588ed9deae38d5f479a8a53318ca0d71fb
-  data.tar.gz: 5055dd9c6e2bdc13c49d59423385009d8d528ec06358b7a9f06ee2632ac870bc421e678093f376e9d71b2a23b32fdea73c68c70af7caf1f7beba710c383055c9
+  metadata.gz: 47964396569527b5f809150eaf9c6a82353226e66bfd05b49f5295cf520ed57ba84a07c63b7bdf52c181c4adbf6fc459e0f1f5b2207994f96992d067b220eff6
+  data.tar.gz: 8a4b7f80c4c39593c8de11c457c1bd6430bbc3f559a739c3dab7b11282750bd29a53fb0f88d9deb4748983d9641f8d0699fcd45afdcf0094c52c7b3ef26b1d4f

data/.rubocop.yml

@@ -29,3 +29,9 @@ Style/NumericLiterals:
 
 Metrics/AbcSize:
   Max: 25
+
+Style/StructInheritance:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.0
+ruby-2.2.2

data/Gemfile.lock

@@ -12,10 +12,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activesupport (4.2.0)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -27,50 +27,54 @@ GEM
     builder (3.2.2)
     cane (2.6.2)
       parallel
-    codeclimate-test-reporter (0.4.5)
+    codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
-    connection_pool (2.1.0)
+    connection_pool (2.2.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    hiredis (0.5.2)
+    hiredis (0.6.0)
+    hiredis (0.6.0-java)
     i18n (0.7.0)
-    json (1.8.2)
-    minitest (5.5.1)
-    msgpack (0.5.10)
-    multi_json (1.10.1)
-    parallel (1.3.3)
-    parser (2.2.0.2)
+    json (1.8.3)
+    json (1.8.3-java)
+    minitest (5.7.0)
+    msgpack (0.6.0)
+    msgpack (0.6.0-java)
+    parallel (1.6.0)
+    parser (2.2.2.5)
       ast (>= 1.1, < 3.0)
-    powerpack (0.0.9)
+    powerpack (0.1.1)
     rainbow (2.0.0)
     rake (10.4.2)
-    redis (3.2.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    redis (3.2.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    rubocop (0.28.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    rubocop (0.32.1)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.7, < 3.0)
-      powerpack (~> 0.0.6)
+      parser (>= 2.2.2.5, < 3.0)
+      powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.1)
-    simplecov (0.9.1)
+    ruby-progressbar (1.7.5)
+    simplecov (0.10.0)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     stackprof (0.2.7)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -87,3 +91,6 @@ DEPENDENCIES
   rubocop
   simplecov
   stackprof
+
+BUNDLED WITH
+   1.10.5

data/lib/modis/finder.rb

@@ -60,11 +60,14 @@ module Modis
       end
 
       def model_for(attributes)
-        model_class(attributes).new(attributes, new_record: false)
+        cls = model_class(attributes)
+        return unless self == cls || cls < self
+        cls.new(attributes, new_record: false)
       end
 
       def record_for(redis, id)
-        redis.hgetall(key_for(id))
+        key = sti_child? ? sti_base_key_for(id) : key_for(id)
+        redis.hgetall(key)
       end
 
       def model_class(record)

data/lib/modis/persistence.rb

@@ -16,13 +16,14 @@ module Modis
         child.instance_eval do
           parent.instance_eval do
             class << self
-              attr_accessor :sti_parent
+              attr_accessor :sti_base, :sti_parent
             end
             attribute :type, :string unless attributes.key?('type')
           end
 
           @sti_child = true
           @sti_parent = parent
+          @sti_base = parent.sti_base || parent
 
           bootstrap_attributes(parent)
           bootstrap_indexes(parent)
@@ -30,8 +31,11 @@ module Modis
       end
 
       def namespace
-        return sti_parent.namespace if sti_child?
-        @namespace ||= name.split('::').map(&:underscore).join(':')
+        @namespace ||= if sti_child?
+          "#{sti_parent.namespace}:#{name.split('::').last.underscore}"
+        else
+          name.split('::').map(&:underscore).join(':')
+        end
       end
 
       def namespace=(value)
@@ -43,10 +47,18 @@ module Modis
         @absolute_namespace ||= [Modis.config.namespace, namespace].compact.join(':')
       end
 
+      def sti_base_absolute_namespace
+        @sti_base_absolute_namespace ||= [Modis.config.namespace, sti_base.namespace].compact.join(':')
+      end
+
       def key_for(id)
         "#{absolute_namespace}:#{id}"
       end
 
+      def sti_base_key_for(id)
+        "#{sti_base_absolute_namespace}:#{id}"
+      end
+
       def create(attrs)
         model = new(attrs)
         model.save
@@ -104,7 +116,8 @@ module Modis
     end
 
     def key
-      new_record? ? nil : self.class.key_for(id)
+      return nil if new_record?
+      self.class.sti_child? ? self.class.sti_base_key_for(id) : self.class.key_for(id)
     end
 
     def new_record?
@@ -127,6 +140,7 @@ module Modis
           redis.pipelined do
             remove_from_indexes(redis)
             redis.srem(self.class.key_for(:all), id)
+            redis.srem(self.class.sti_base_key_for(:all), id) if self.class.sti_child?
             redis.del(key)
           end
         end
@@ -190,10 +204,12 @@ module Modis
           run_callbacks callback do
             redis.pipelined do
               attrs = coerced_attributes(persist_all)
-              future = attrs.any? ? redis.hmset(self.class.key_for(id), attrs) : :unchanged
+              key = self.class.sti_child? ? self.class.sti_base_key_for(id) : self.class.key_for(id)
+              future = attrs.any? ? redis.hmset(key, attrs) : :unchanged
 
               if new_record?
                 redis.sadd(self.class.key_for(:all), id)
+                redis.sadd(self.class.sti_base_key_for(:all), id) if self.class.sti_child?
                 add_to_indexes(redis)
               else
                 update_indexes(redis)
@@ -206,7 +222,7 @@ module Modis
       future
     end
 
-    def coerced_attributes(persist_all) # rubocop:disable Metrics/AbcSize
+    def coerced_attributes(persist_all)
       attrs = []
 
       if new_record? || persist_all
@@ -225,8 +241,9 @@ module Modis
     end
 
     def set_id
+      namespace = self.class.sti_child? ? self.class.sti_base_absolute_namespace : self.class.absolute_namespace
       Modis.with_connection do |redis|
-        self.id = redis.incr("#{self.class.absolute_namespace}_id_seq")
+        self.id = redis.incr("#{namespace}_id_seq")
       end
     end
   end

data/lib/modis/version.rb

@@ -1,3 +1,3 @@
 module Modis
-  VERSION = '1.4.1'
+  VERSION = '1.4.2'
 end

data/spec/finder_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module FindersSpec
   class User
     include Modis::Model
-    self.namespace = 'users'
+    self.namespace = 'user'
 
     attribute :name, :string
     attribute :age, :integer
@@ -17,6 +17,9 @@ module FindersSpec
   class Producer < User
     attribute :child_default, :string, default: 'derp'
   end
+
+  class Worker < Producer
+  end
 end
 
 describe Modis::Finder do
@@ -70,40 +73,108 @@ describe Modis::Finder do
 
   describe 'Single Table Inheritance' do
     it 'returns the correct namespace' do
-      expect(FindersSpec::Consumer.namespace).to eq('users')
-      expect(FindersSpec::Consumer.absolute_namespace).to eq('modis:users')
-      expect(FindersSpec::Producer.namespace).to eq('users')
-      expect(FindersSpec::Producer.absolute_namespace).to eq('modis:users')
+      expect(FindersSpec::Consumer.namespace).to eq('user:consumer')
+      expect(FindersSpec::Consumer.absolute_namespace).to eq('modis:user:consumer')
+      expect(FindersSpec::Producer.namespace).to eq('user:producer')
+      expect(FindersSpec::Producer.absolute_namespace).to eq('modis:user:producer')
+      expect(FindersSpec::Worker.namespace).to eq('user:producer:worker')
+      expect(FindersSpec::Worker.absolute_namespace).to eq('modis:user:producer:worker')
     end
 
     it 'returns instances of the correct class' do
       FindersSpec::Consumer.create!(name: 'Kyle')
       FindersSpec::Producer.create!(name: 'Tanya')
+      FindersSpec::Worker.create!(name: 'Max')
 
       models = FindersSpec::User.all
 
       ian = models.find { |model| model.name == 'Ian' }
       kyle = models.find { |model| model.name == 'Kyle' }
       tanya = models.find { |model| model.name == 'Tanya' }
+      max = models.find { |model| model.name == 'Max' }
 
       expect(ian).to be_kind_of(FindersSpec::User)
       expect(kyle).to be_kind_of(FindersSpec::Consumer)
       expect(tanya).to be_kind_of(FindersSpec::Producer)
+      expect(max).to be_kind_of(FindersSpec::Worker)
 
       expect(FindersSpec::User.find(ian.id)).to be_kind_of(FindersSpec::User)
       expect(FindersSpec::User.find(kyle.id)).to be_kind_of(FindersSpec::Consumer)
       expect(FindersSpec::User.find(tanya.id)).to be_kind_of(FindersSpec::Producer)
+      expect(FindersSpec::User.find(max.id)).to be_kind_of(FindersSpec::Worker)
+    end
+
+    it 'scopes IDs within the parent' do
+      user = FindersSpec::User.create!(name: 'Ian')
+      consumer = FindersSpec::Consumer.create!(name: 'Kyle')
+      producer = FindersSpec::Producer.create!(name: 'Tanya')
+      worker = FindersSpec::Worker.create!(name: 'Max')
+      expect(user.id).to eq(2)
+      expect(consumer.id).to eq(3)
+      expect(producer.id).to eq(4)
+      expect(worker.id).to eq(5)
+    end
+
+    it 'does not return instances of other siblings in all' do
+      producer = FindersSpec::Producer.create!(name: 'Tanya')
+      expect(FindersSpec::Consumer.all).to_not include(producer)
+    end
+
+    it 'does not return instances of subclasses of other siblings in all' do
+      worker = FindersSpec::Worker.create!(name: 'Max')
+      expect(FindersSpec::Consumer.all).to_not include(worker)
+    end
+
+    it 'does not find an instance of a sibling' do
+      consumer = FindersSpec::Consumer.create!(name: 'Kyle')
+      producer = FindersSpec::Producer.create!(name: 'Tanya')
+      expect do
+        FindersSpec::Consumer.find(producer.id)
+      end.to raise_error(Modis::RecordNotFound)
+    end
+
+    it 'does not find an instance of a subclass of a sibling' do
+      producer = FindersSpec::Worker.create!(name: 'Tanya')
+      expect do
+        FindersSpec::Consumer.find(producer.id)
+      end.to raise_error(Modis::RecordNotFound)
     end
 
     it 'inherits attributes from the parent' do
-      consumer = FindersSpec::Consumer.create!(name: 'Kyle', consumed: true)
-      expect(consumer.attributes.keys.sort).to eq(%w(age consumed id name parent_default type))
+      producer = FindersSpec::Producer.create!(name: 'Kyle', consumed: true)
+      expect(producer.attributes.keys.sort).to eq(%w(age child_default id name parent_default type))
+
+      worker = FindersSpec::Worker.create!(name: 'Max')
+      expect(worker.attributes.keys.sort).to eq(%w(age child_default id name parent_default type))
     end
 
     it 'inherits default attribute values from the parent' do
       producer = FindersSpec::Producer.create!(name: 'Kyle')
       expect(producer.parent_default).to eq('omg')
       expect(producer.child_default).to eq('derp')
+
+      worker = FindersSpec::Worker.create!(name: 'Max')
+      expect(worker.parent_default).to eq('omg')
+      expect(worker.child_default).to eq('derp')
+    end
+
+    it 'does not find a destroyed child instance on the parent' do
+      consumer = FindersSpec::Consumer.create!(name: 'Ian')
+      expect(FindersSpec::User.find(consumer.id)).to eq(consumer)
+      consumer.destroy
+      expect do
+        FindersSpec::User.find(consumer.id)
+      end.to raise_error(Modis::RecordNotFound)
+    end
+
+    describe('backwards compatibility') do
+      it 'transparently upgrades old data' do
+        consumer = FindersSpec::Consumer.create!(name: 'Ian')
+        Modis.with_connection do |redis|
+          redis.srem(FindersSpec::Consumer.key_for(:all), consumer.id)
+        end
+        expect(FindersSpec::Consumer.find(consumer.id)).to eq(consumer)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modis
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: ActiveModel + Redis