modis 1.3.0 → 1.4.0

data/lib/modis/version.rb

@@ -1,3 +1,3 @@
 module Modis
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/lib/tasks/quality.rake

@@ -1,17 +1,23 @@
 begin
-  require 'cane/rake_task'
+  if ENV['TRAVIS']
+    namespace :spec do
+      task cane: ['spec']
+    end
+  else
+    require 'cane/rake_task'
 
-  desc 'Run cane to check quality metrics'
-  Cane::RakeTask.new(:cane_quality) do |cane|
-    cane.add_threshold 'coverage/covered_percent', :>=, 99
-    cane.no_style = false
-    cane.style_measure = 1000
-    cane.no_doc = true
-    cane.abc_max = 25
-  end
+    desc 'Run cane to check quality metrics'
+    Cane::RakeTask.new(:cane_quality) do |cane|
+      cane.add_threshold 'coverage/covered_percent', :>=, 99
+      cane.no_style = false
+      cane.style_measure = 1000
+      cane.no_doc = true
+      cane.abc_max = 25
+    end
 
-  namespace :spec do
-    task cane: %w(spec cane_quality)
+    namespace :spec do
+      task cane: %w(spec cane_quality)
+    end
   end
 rescue LoadError
   warn "cane not available."
@@ -23,7 +29,8 @@ end
 
 begin
   require 'rubocop/rake_task'
-  RuboCop::RakeTask.new
+  t = RuboCop::RakeTask.new
+  t.options << '-D'
 rescue LoadError
   warn 'rubocop not available.'
   task rubocop: ['spec']

data/modis.gemspec

@@ -17,8 +17,16 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activemodel', '>= 3.0'
-  gem.add_dependency 'activesupport', '>= 3.0'
-  gem.add_dependency 'redis', '>= 3.0'
-  gem.add_dependency 'connection_pool', '>= 2'
+  gem.add_runtime_dependency 'activemodel', '>= 3.0'
+  gem.add_runtime_dependency 'activesupport', '>= 3.0'
+  gem.add_runtime_dependency 'redis', '>= 3.0'
+  gem.add_runtime_dependency 'hiredis', '>= 0.5'
+  gem.add_runtime_dependency 'connection_pool', '>= 2'
+
+  if defined? JRUBY_VERSION
+    gem.platform = 'java'
+    gem.add_runtime_dependency 'msgpack-jruby'
+  else
+    gem.add_runtime_dependency 'msgpack', '>= 0.5'
+  end
 end

data/spec/attribute_spec.rb

@@ -93,12 +93,12 @@ describe Modis::Attribute do
 
   describe ':timestamp type' do
     it 'is coerced' do
-      now = Time.now
-      model.created_at = now
+      time = Time.new(2014, 12, 11, 17, 31, 50, '-02:00')
+      model.created_at = time
       model.save!
       found = AttributeSpec::MockModel.find(model.id)
       expect(found.created_at).to be_kind_of(Time)
-      expect(found.created_at.to_s).to eq(now.to_s)
+      expect(found.created_at.to_s).to eq(time.to_s)
     end
   end
 
@@ -144,7 +144,7 @@ describe Modis::Attribute do
       model.hash = { foo: :bar }
       model.save!
       found = AttributeSpec::MockModel.find(model.id)
-      expect(found.hash).to eq(foo: :bar)
+      expect(found.hash).to eq('foo' => 'bar')
     end
 
     it 'raises an error when assigned another type' do
@@ -157,7 +157,7 @@ describe Modis::Attribute do
       model.string_or_hash = { foo: :bar }
       model.save!
       found = AttributeSpec::MockModel.find(model.id)
-      expect(found.string_or_hash).to eq(foo: :bar)
+      expect(found.string_or_hash).to eq('foo' => 'bar')
 
       model.string_or_hash = 'test'
       model.save!

data/spec/finder_spec.rb

@@ -7,12 +7,15 @@ module FindersSpec
 
     attribute :name, :string
     attribute :age, :integer
+    attribute :parent_default, :string, default: 'omg'
   end
 
   class Consumer < User
+    attribute :consumed, :boolean
   end
 
   class Producer < User
+    attribute :child_default, :string, default: 'derp'
   end
 end
 
@@ -26,10 +29,22 @@ describe Modis::Finder do
     expect(found.age).to eq(model.age)
   end
 
-  it 'raises an error if the record could not be found' do
+  it 'finds multiple by ID' do
+    model1 = FindersSpec::User.create!(name: 'Ian', age: 28)
+    model2 = FindersSpec::User.create!(name: 'Tanya', age: 32)
+    model3 = FindersSpec::User.create!(name: 'Kyle', age: 35)
+    models = FindersSpec::User.find(model1.id, model2.id, model3.id)
+    expect(models).to eq([model1, model2, model3])
+  end
+
+  it 'raises an error a record could not be found' do
     expect do
       FindersSpec::User.find(model.id + 1)
     end.to raise_error(Modis::RecordNotFound, "Couldn't find FindersSpec::User with id=#{model.id + 1}")
+
+    expect do
+      FindersSpec::User.find(model.id, model.id + 1)
+    end.to raise_error(Modis::RecordNotFound, "Couldn't find FindersSpec::User with id=#{model.id + 1}")
   end
 
   it 'does not flag an attribute as dirty on a found instance' do
@@ -79,5 +94,16 @@ describe Modis::Finder do
       expect(FindersSpec::User.find(kyle.id)).to be_kind_of(FindersSpec::Consumer)
       expect(FindersSpec::User.find(tanya.id)).to be_kind_of(FindersSpec::Producer)
     end
+
+    it 'inherits attributes from the parent' do
+      consumer = FindersSpec::Consumer.create!(name: 'Kyle', consumed: true)
+      expect(consumer.attributes.keys.sort).to eq(%w(consumed 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')
+    end
   end
 end

data/spec/persistence_spec.rb

@@ -93,11 +93,23 @@ describe Modis::Persistence do
     expect(model.name_changed?).to be false
   end
 
+  it 'does not identify an attribute as changed if the value is the default' do
+    expect(model.class.attributes_with_defaults).to eq('name' => 'Ian')
+    expect(model.name).to eq('Ian')
+    expect(model.name_changed?).to be false
+  end
+
   it 'is persisted' do
     expect(model.persisted?).to be true
   end
 
-  it 'does not track the ID if the underlying Redis command failed'
+  it 'does not track the ID if the underlying Redis command failed' do
+    redis = double(hmset: double(value: nil), sadd: nil)
+    expect(model.class).to receive(:transaction).and_yield(redis)
+    expect(redis).to receive(:pipelined).and_yield
+    model.save
+    expect { model.class.find(model.id) }.to raise_error(Modis::RecordNotFound)
+  end
 
   it 'does not perform validation if validate: false' do
     model.name = nil
@@ -110,7 +122,18 @@ describe Modis::Persistence do
   end
 
   describe 'an existing record' do
-    it 'only updates dirty attributes'
+    it 'only updates dirty attributes' do
+      model.name = 'Ian'
+      model.age = 10
+      model.save!
+      model.age = 11
+      redis = double
+      expect(redis).to receive(:hmset).with("modis:persistence_spec:mock_model:1", ["age", "\v"]).and_return(double(value: 'OK'))
+      expect(model.class).to receive(:transaction).and_yield(redis)
+      expect(redis).to receive(:pipelined).and_yield
+      model.save!
+      expect(model.age).to eq(11)
+    end
   end
 
   describe 'reload' do
@@ -183,11 +206,19 @@ describe Modis::Persistence do
     end
 
     describe 'a valid model' do
-      it 'returns the created model'
+      it 'returns the created model' do
+        model = PersistenceSpec::MockModel.create(name: 'Ian')
+        expect(model.valid?).to be true
+        expect(model.new_record?).to be false
+      end
     end
 
     describe 'an invalid model' do
-      it 'returns the unsaved model'
+      it 'returns the unsaved model' do
+        model = PersistenceSpec::MockModel.create(name: nil)
+        expect(model.valid?).to be false
+        expect(model.new_record?).to be true
+      end
     end
   end
 
@@ -263,4 +294,26 @@ describe Modis::Persistence do
       expect(model.update_attributes(name: nil)).to be false
     end
   end
+
+  describe 'YAML backward compatability' do
+    it 'loads a YAML serialized value' do
+      Modis.with_connection do |redis|
+        model.save!
+        key = model.class.key_for(model.id)
+        record = redis.hgetall(key)
+        record['age'] = YAML.dump(30)
+        redis.hmset(key, *record.to_a)
+        record = redis.hgetall(key)
+
+        expect(record['age']).to eq("--- 30\n...\n")
+
+        model.reload
+        expect(model.age).to eq(30)
+
+        model.save!(yaml_sucks: true)
+        record = redis.hgetall(key)
+        expect(record['age']).to eq("\x1E")
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
-begin
-  require './spec/support/simplecov_helper'
-  include SimpleCovHelper
-  start_simple_cov('unit')
-rescue LoadError
-  puts "Coverage disabled."
+unless ENV['TRAVIS']
+  begin
+    require './spec/support/simplecov_helper'
+    include SimpleCovHelper
+    start_simple_cov('unit')
+  rescue LoadError
+    puts "Coverage disabled."
+  end
 end
 
 require 'modis'

data/spec/support/simplecov_helper.rb

@@ -7,13 +7,17 @@ module SimpleCovHelper
       add_filter '/spec/'
       command_name name
 
+      formatters = [SimpleCov::Formatter::QualityFormatter]
+
       if ENV['TRAVIS']
-        require 'coveralls'
-        formatter SimpleCov::Formatter::MultiFormatter[SimpleCov::Formatter::QualityFormatter,
-                                                       Coveralls::SimpleCov::Formatter]
-      else
-        formatter SimpleCov::Formatter::QualityFormatter
+        require 'codeclimate-test-reporter'
+
+        if CodeClimate::TestReporter.run?
+          formatters << CodeClimate::TestReporter::Formatter
+        end
       end
+
+      formatter SimpleCov::Formatter::MultiFormatter[*formatters]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modis
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: hiredis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: ActiveModel + Redis
 email:
 - port001@gmail.com
@@ -73,7 +101,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-gemset"
@@ -84,6 +111,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmark/bench.rb
+- benchmark/find.rb
+- benchmark/persistence.rb
+- benchmark/redis/connection/fakedis.rb
 - lib/modis.rb
 - lib/modis/attribute.rb
 - lib/modis/configuration.rb
@@ -125,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ActiveModel + Redis

data/.coveralls.yml

@@ -1 +0,0 @@
-service-name: travis-ci