modis 1.4.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 774c89b8695921821cc449741a450f77f69f649f
-  data.tar.gz: 941a15b53b91e8c955a1599199867a0595b58b5a
+  metadata.gz: d72c95fa261834b9a837e642e63e3ef9094e6a00
+  data.tar.gz: d43a8f952fc05fc725adc94354d77ef4d8318a98
 SHA512:
-  metadata.gz: 47964396569527b5f809150eaf9c6a82353226e66bfd05b49f5295cf520ed57ba84a07c63b7bdf52c181c4adbf6fc459e0f1f5b2207994f96992d067b220eff6
-  data.tar.gz: 8a4b7f80c4c39593c8de11c457c1bd6430bbc3f559a739c3dab7b11282750bd29a53fb0f88d9deb4748983d9641f8d0699fcd45afdcf0094c52c7b3ef26b1d4f
+  metadata.gz: 8cf44d0818eb8c163064cee228732b1d86811b08475c033f45b90a4b23cc8e0fc8a1fe030c6822c4ae1e69e7e0873d53a3f0d304572ad3d538ad3d6c18a7490d
+  data.tar.gz: 1293bc123e53195e5cc5e44c4b77669a52927e5fd6ec3ee20c3523fc3f0ff875905b861a02be07c0f276e2571e951ba35d73d0bf1ef03b59da7139adf3594e00

data/.gitignore

@@ -14,3 +14,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+Gemfile.lock

data/.rubocop.yml

@@ -35,3 +35,9 @@ Style/StructInheritance:
 
 Metrics/ModuleLength:
   Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Security/YAMLLoad:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.2
+2.4.1

data/.travis.yml

@@ -3,11 +3,10 @@ services:
 - redis-server
 language: ruby
 rvm:
-- 2.0.0
-- 2.1.5
-- 2.2.0
-- jruby-1.7.18
-- rbx-2.5.0
+- 2.2.4
+- 2.3.0
+- 2.4.0
+- jruby-9.1.9.0
 env:
   global:
     secure: LrTz0Pq2ibNZuKDhdzcrvEUSNxUpPopEq9aJeCxy3UpV0v4vpHBtWV0S6zofvf98g/RkZ6cGI1u+0H578dHgE6pWTo+iR8LAwqPKofrFIWRkeo+M77Vs5swahb3mQyPOcig1hfVWDm25MsojePYm70eBIcBU55NWImtdePXfiU0=

data/Gemfile

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'rake'
 gem 'rspec'
 
 platform :mri do
-  gem 'codeclimate-test-reporter', require: nil
   gem 'cane'
+  gem 'codeclimate-test-reporter', require: nil
   gem 'rubocop', require: false
   gem 'simplecov', require: false
 end

data/README.md

@@ -6,6 +6,10 @@
 
 ActiveModel + Redis with the aim to mimic ActiveRecord where possible.
 
+## Requirements
+
+Modis supports CRuby 2.2.2+ and jRuby 9k+
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rake"
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"

data/benchmark/bench.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stackprof'
 require 'benchmark'
 
@@ -40,14 +42,14 @@ class Bench
 
   private
 
-  def with_profile(name, &blk)
+  def with_profile(name)
     if ENV['PROFILE']
       mode = :wall
       out = "tmp/stackprof-#{mode}-#{name}.dump"
       @profiles << out
-      StackProf.run(mode: mode, out: out, &blk)
+      StackProf.run(mode: mode, out: out, &Proc.new)
     else
-      blk.call
+      yield
     end
   end
 

data/benchmark/find.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift('benchmark')
 require 'bench'
 
@@ -16,7 +18,7 @@ class User
   attribute :flag, :boolean
   attribute :array, :array
   attribute :hash, :hash
-  attribute :string_or_hash, [:string, :hash]
+  attribute :string_or_hash, %i[string hash]
 
   index :name
 end

data/benchmark/persistence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift('benchmark')
 require 'bench'
 
@@ -16,7 +18,7 @@ class User
   attribute :flag, :boolean
   attribute :array, :array
   attribute :hash, :hash
-  attribute :string_or_hash, [:string, :hash]
+  attribute :string_or_hash, %i[string hash]
 
   index :name
 end

data/lib/modis.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'redis'
 require 'connection_pool'
 require 'active_model'
 require 'active_support/all'
-require 'yaml'
 require 'msgpack'
 
 require 'modis/version'

data/lib/modis/attribute.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Modis
   module Attribute
     TYPES = { string: [String],
-              integer: [Fixnum],
+              integer: [0.class],
               float: [Float],
               timestamp: [Time],
               hash: [Hash],

data/lib/modis/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Modis
   def self.configure
     yield config

data/lib/modis/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Modis
   class ModisError < StandardError; end
   class RecordNotSaved < ModisError; end

data/lib/modis/finder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Modis
   module Finder
     def self.included(base)
@@ -61,7 +63,7 @@ module Modis
 
       def model_for(attributes)
         cls = model_class(attributes)
-        return unless self == cls || cls < self
+        return unless cls == self || cls < self
         cls.new(attributes, new_record: false)
       end
 

data/lib/modis/index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Modis
   module Index
     def self.included(base)

data/lib/modis/model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Modis
   module Model
     def self.included(base)
@@ -42,6 +44,6 @@ module Modis
     def ==(other)
       super || other.instance_of?(self.class) && id.present? && other.id == id
     end
-    alias_method :eql?, :==
+    alias eql? ==
   end
 end

data/lib/modis/persistence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Modis
   module Persistence
     def self.included(base)
@@ -5,7 +7,7 @@ module Modis
       base.instance_eval do
         class << self
           attr_reader :sti_child
-          alias_method :sti_child?, :sti_child
+          alias sti_child? sti_child
         end
       end
     end
@@ -32,10 +34,10 @@ module Modis
 
       def namespace
         @namespace ||= if sti_child?
-          "#{sti_parent.namespace}:#{name.split('::').last.underscore}"
-        else
-          name.split('::').map(&:underscore).join(':')
-        end
+                         "#{sti_parent.namespace}:#{name.split('::').last.underscore}"
+                       else
+                         name.split('::').map(&:underscore).join(':')
+                       end
       end
 
       def namespace=(value)
@@ -71,7 +73,6 @@ module Modis
         model
       end
 
-      YAML_MARKER = '---'.freeze
       def deserialize(record)
         values = record.values
         values = MessagePack.unpack(msgpack_array_header(values.size) + values.join)
@@ -79,20 +80,8 @@ module Modis
         values.each_with_index { |v, i| record[keys[i]] = v }
         record
       rescue MessagePack::MalformedFormatError
-        found_yaml = false
-
         record.each do |k, v|
-          if v.start_with?(YAML_MARKER)
-            found_yaml = true
-            record[k] = YAML.load(v)
-          else
-            record[k] = MessagePack.unpack(v)
-          end
-        end
-
-        if found_yaml
-          id = record['id']
-          STDERR.puts "#{self}(id: #{id}) contains attributes serialized as YAML. As of Modis 1.4.0, YAML is no longer used as the serialization format. To improve performance loading this record, you can force the record to new serialization format (MessagePack) with: #{self}.find(#{id}).save!(yaml_sucks: true)"
+          record[k] = MessagePack.unpack(v)
         end
 
         record
@@ -177,7 +166,7 @@ module Modis
 
     def create_or_update(args = {})
       validate(args)
-      future = persist(args[:yaml_sucks])
+      future = persist
 
       if future && (future == :unchanged || future.value == 'OK')
         reset_changes
@@ -194,7 +183,8 @@ module Modis
       raise Modis::RecordInvalid, errors.full_messages.join(', ')
     end
 
-    def persist(persist_all)
+    # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
+    def persist
       future = nil
       set_id if new_record?
       callback = new_record? ? :create : :update
@@ -203,7 +193,7 @@ module Modis
         run_callbacks :save do
           run_callbacks callback do
             redis.pipelined do
-              attrs = coerced_attributes(persist_all)
+              attrs = coerced_attributes
               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
 
@@ -222,10 +212,10 @@ module Modis
       future
     end
 
-    def coerced_attributes(persist_all)
+    def coerced_attributes
       attrs = []
 
-      if new_record? || persist_all
+      if new_record?
         attributes.each do |k, v|
           if (self.class.attributes[k][:default] || nil) != v
             attrs << k << coerce_for_persistence(v)

data/lib/modis/transaction.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Modis
   module Transaction
     def self.included(base)

data/lib/modis/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Modis
-  VERSION = '1.4.2'
+  VERSION = '2.0.0'
 end

data/lib/tasks/quality.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   if ENV['TRAVIS']
     namespace :spec do
@@ -16,7 +18,7 @@ begin
     end
 
     namespace :spec do
-      task cane: %w(spec cane_quality)
+      task cane: %w[spec cane_quality]
     end
   end
 rescue LoadError
@@ -37,5 +39,5 @@ rescue LoadError
 end
 
 namespace :spec do
-  task quality: %w(cane rubocop)
+  task quality: %w[cane rubocop]
 end

data/modis.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |gem|
   gem.email         = ["port001@gmail.com"]
   gem.description   = "ActiveModel + Redis"
   gem.summary       = "ActiveModel + Redis"
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/ileitch/modis"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/spec/attribute_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module AttributeSpec
@@ -11,7 +13,7 @@ module AttributeSpec
     attribute :flag, :boolean
     attribute :array, :array
     attribute :hash, :hash
-    attribute :string_or_hash, [:string, :hash]
+    attribute :string_or_hash, %i[string hash]
   end
 end
 

data/spec/errors_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module ErrorsSpec

data/spec/finder_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module FindersSpec
@@ -126,7 +128,7 @@ describe Modis::Finder do
     end
 
     it 'does not find an instance of a sibling' do
-      consumer = FindersSpec::Consumer.create!(name: 'Kyle')
+      FindersSpec::Consumer.create!(name: 'Kyle')
       producer = FindersSpec::Producer.create!(name: 'Tanya')
       expect do
         FindersSpec::Consumer.find(producer.id)
@@ -142,10 +144,10 @@ describe Modis::Finder do
 
     it 'inherits attributes from the parent' do
       producer = FindersSpec::Producer.create!(name: 'Kyle', consumed: true)
-      expect(producer.attributes.keys.sort).to eq(%w(age child_default id name parent_default type))
+      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))
+      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

data/spec/index_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module IndexSpec

data/spec/persistence_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module PersistenceSpec
@@ -294,26 +296,4 @@ 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,3 +1,5 @@
+# frozen_string_literal: true
+
 unless ENV['TRAVIS']
   begin
     require './spec/support/simplecov_helper'

data/spec/support/simplecov_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 require './spec/support/simplecov_quality_formatter'
 
@@ -17,7 +19,7 @@ module SimpleCovHelper
         end
       end
 
-      formatter SimpleCov::Formatter::MultiFormatter[*formatters]
+      formatter SimpleCov::Formatter::MultiFormatter.new(*formatters)
     end
   end
 end

data/spec/support/simplecov_quality_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleCov
   module Formatter
     class QualityFormatter

data/spec/transaction_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module TransactionSpec

data/spec/validations_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'validations' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modis
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -107,7 +107,6 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -137,8 +136,9 @@ files:
 - spec/support/simplecov_quality_formatter.rb
 - spec/transaction_spec.rb
 - spec/validations_spec.rb
-homepage: ''
-licenses: []
+homepage: https://github.com/ileitch/modis
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/Gemfile.lock

@@ -1,96 +0,0 @@
-PATH
-  remote: .
-  specs:
-    modis (1.4.1)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      connection_pool (>= 2)
-      hiredis (>= 0.5)
-      msgpack (>= 0.5)
-      redis (>= 3.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
-      builder (~> 3.1)
-    activesupport (4.2.3)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
-    builder (3.2.2)
-    cane (2.6.2)
-      parallel
-    codeclimate-test-reporter (0.4.7)
-      simplecov (>= 0.7.1, < 1.0.0)
-    connection_pool (2.2.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    hiredis (0.6.0)
-    hiredis (0.6.0-java)
-    i18n (0.7.0)
-    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.1.1)
-    rainbow (2.0.0)
-    rake (10.4.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.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.2.5, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.5)
-    simplecov (0.10.0)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    stackprof (0.2.7)
-    thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  cane
-  codeclimate-test-reporter
-  modis!
-  rake
-  rspec
-  rubocop
-  simplecov
-  stackprof
-
-BUNDLED WITH
-   1.10.5