modis 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb24ac739595677e1200448641dc4e7c35a26f1d
-  data.tar.gz: 428715902d2b7e335e16d7ee2b65aa58c3864b52
+SHA256:
+  metadata.gz: 05bca2cd787d1ec58cc5c274071e759662787d15744028afd26e8c5686e98a0f
+  data.tar.gz: fd65fc90ad00304558727529f1fcdbae12d9768a7870c9a89a567203ab65f6c8
 SHA512:
-  metadata.gz: 7f34d83dd16b16bd113a116d060523c8f832593f604e318077be24d279d8a9f06ce269f86a3935f5fbe8e1a70d815075a54f69c9ee3f4d45eaa0fafc211a461e
-  data.tar.gz: a3451db68ba6943d667fb11470c9635dfb0c74ac9449b330125ffe7be4d9b0c3e94df459d8a2acb8ab0069a6fa80fadf4c83a8630898ef26c023857f34cfa473
+  metadata.gz: 3651e8862dc7d6a15d640fcc7260d7515515d65976900f3c53f56d1240dd0e63a6a5a547b3bce7facff6e6a85b2382dd0a52e4469e89d890f682d1547713c7bb
+  data.tar.gz: 59f47ccdeb055ca70774e88d40a0a203123c230871d5e7d36dedaa9ac7a4e1a0c4e4aa9b4aa6f7b7c01d74f2d5e6c22d7cb4cfc6721bbe142ebd202aaf42cb69

data/.rubocop.yml

@@ -2,6 +2,7 @@ AllCops:
   Exclude:
     - modis.gemspec
     - vendor/**/*
+    - gemfiles/**/*
 
 LineLength:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.3

data/.travis.yml

@@ -1,12 +1,25 @@
+language: ruby
+
 sudo: false
+
+cache: bundler
+
 services:
-- redis-server
-language: ruby
+  - redis-server
+
 rvm:
-- 2.2.4
-- 2.3.0
-- 2.4.0
-- jruby-9.1.9.0
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - jruby-9.1.17.0
+  - jruby-9.2.5.0
+
+gemfile:
+  - gemfiles/rails_42.gemfile
+  - gemfiles/rails_50.gemfile
+  - gemfiles/rails_51.gemfile
+  - gemfiles/rails_52.gemfile
+
 env:
   global:
     secure: LrTz0Pq2ibNZuKDhdzcrvEUSNxUpPopEq9aJeCxy3UpV0v4vpHBtWV0S6zofvf98g/RkZ6cGI1u+0H578dHgE6pWTo+iR8LAwqPKofrFIWRkeo+M77Vs5swahb3mQyPOcig1hfVWDm25MsojePYm70eBIcBU55NWImtdePXfiU0=

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+## Unreleased
+
+## v3.0.0 - 2018-12-20
+
+- Drop support for any Ruby < 2.3 and Rails < 4.2.
+- Add support for Rails 5.2
+- Resolve Rubocop lint violations
+- Test combinations of Ruby and Rails versions in CI
+
+## v2.1.0
+
+- Add `enable_all_index` option to allow disabling the `all` keys. [#7](https://github.com/ileitch/modis/pull/7)
+
+## v2.0.0
+
+- Support MRI 2.2.2+ and JRuby 9k+ [#5](https://github.com/ileitch/modis/pull/5)
+- Remove YAML (de)serialization support [#5](https://github.com/ileitch/modis/pull/5)

data/Gemfile

@@ -2,18 +2,4 @@
 
 source 'https://rubygems.org'
 
-gem 'rake'
-gem 'rspec'
-
-platform :mri do
-  gem 'cane'
-  gem 'codeclimate-test-reporter', require: nil
-  gem 'rubocop', require: false
-  gem 'simplecov', require: false
-end
-
-platform :mri_21 do
-  gem 'stackprof'
-end
-
 gemspec

data/README.md

@@ -8,7 +8,7 @@ ActiveModel + Redis with the aim to mimic ActiveRecord where possible.
 
 ## Requirements
 
-Modis supports CRuby 2.2.2+ and jRuby 9k+
+Modis supports any actively supported Ruby and Ruby on Rails versions. As of 2018-12-20, that means CRuby 2.3+ and jRuby 9k+, as well as Rails 4.2+.
 
 ## Installation
 
@@ -28,12 +28,12 @@ Or install it yourself as:
 
 ```ruby
 class MyModel
-  include Modis::Models
-  attribute :name, String
-  attribute :age, Integer
+  include Modis::Model
+  attribute :name, :string
+  attribute :age, :integer
 end
 
-MyModel.create!(:name => 'Ian', :age => 28)
+MyModel.create!(name: 'Ian', age: 28)
 ```
 
 ### all index

data/gemfiles/rails_42.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'activemodel', '~> 4.2.0'
+gem 'activesupport', '~> 4.2.0'
+
+gemspec path: '../'

data/gemfiles/rails_50.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'activemodel', '~> 5.0.0'
+gem 'activesupport', '~> 5.0.0'
+
+gemspec path: '../'

data/gemfiles/rails_51.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'activemodel', '~> 5.1.0'
+gem 'activesupport', '~> 5.1.0'
+
+gemspec path: '../'

data/gemfiles/rails_52.gemfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'activemodel', '~> 5.2.0'
+gem 'activesupport', '~> 5.2.0'
+
+gemspec path: '../'

data/lib/modis.rb

@@ -20,23 +20,32 @@ module Modis
   @mutex = Mutex.new
 
   class << self
-    attr_accessor :connection_pool, :redis_options, :connection_pool_size,
-                  :connection_pool_timeout
-  end
+    attr_writer :redis_options, :connection_pool_size, :connection_pool_timeout,
+                :connection_pool
 
-  self.redis_options = { driver: :hiredis }
-  self.connection_pool_size = 5
-  self.connection_pool_timeout = 5
+    def redis_options
+      @redis_options ||= { driver: :hiredis }
+    end
 
-  def self.connection_pool
-    return @connection_pool if @connection_pool
-    @mutex.synchronize do
-      options = { size: connection_pool_size, timeout: connection_pool_timeout }
-      @connection_pool = ConnectionPool.new(options) { Redis.new(redis_options) }
+    def connection_pool_size
+      @connection_pool_size ||= 5
+    end
+
+    def connection_pool_timeout
+      @connection_pool_timeout ||= 5
     end
-  end
 
-  def self.with_connection
-    connection_pool.with { |connection| yield(connection) }
+    def connection_pool
+      return @connection_pool if @connection_pool
+
+      @mutex.synchronize do
+        options = { size: connection_pool_size, timeout: connection_pool_timeout }
+        @connection_pool = ConnectionPool.new(options) { Redis.new(redis_options) }
+      end
+    end
+
+    def with_connection
+      connection_pool.with { |connection| yield(connection) }
+    end
   end
 end

data/lib/modis/attribute.rb

@@ -19,8 +19,6 @@ module Modis
 
     module ClassMethods
       def bootstrap_attributes(parent = nil)
-        attr_reader :attributes
-
         class << self
           attr_accessor :attributes, :attributes_with_defaults
         end
@@ -37,6 +35,7 @@ module Modis
 
         type_classes = Array(type).map do |t|
           raise UnsupportedAttributeType, t unless TYPES.key?(t)
+
           TYPES[t]
         end.flatten
 
@@ -53,7 +52,7 @@ module Modis
         end
         RUBY
 
-        class_eval <<-RUBY, __FILE__, __LINE__
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{name}
             attributes['#{name}']
           end
@@ -72,6 +71,10 @@ module Modis
       end
     end
 
+    def attributes
+      @modis_attributes
+    end
+
     def assign_attributes(hash)
       hash.each do |k, v|
         setter = "#{k}="
@@ -91,15 +94,12 @@ module Modis
 
     def set_sti_type
       return unless self.class.sti_child?
-      write_attribute(:type, self.class.name)
-    end
 
-    def reset_changes
-      @changed_attributes = nil
+      write_attribute(:type, self.class.name)
     end
 
     def apply_defaults
-      @attributes = Hash[self.class.attributes_with_defaults]
+      @modis_attributes = Hash[self.class.attributes_with_defaults]
     end
   end
 end

data/lib/modis/finder.rb

@@ -33,9 +33,7 @@ module Modis
 
         attributes = deserialize(record_for(redis, id))
 
-        unless attributes['id'].present?
-          raise RecordNotFound, "Couldn't find #{name} with id=#{id}"
-        end
+        raise RecordNotFound, "Couldn't find #{name} with id=#{id}" unless attributes['id'].present?
 
         attributes
       end
@@ -69,6 +67,7 @@ module Modis
       def model_for(attributes)
         cls = model_class(attributes)
         return unless cls == self || cls < self
+
         cls.new(attributes, new_record: false)
       end
 
@@ -79,6 +78,7 @@ module Modis
 
       def model_class(record)
         return self if record["type"].blank?
+
         record["type"].constantize
       end
     end

data/lib/modis/index.rb

@@ -21,14 +21,17 @@ module Modis
       def index(attribute)
         attribute = attribute.to_s
         raise IndexError, "No such attribute '#{attribute}'" unless attributes.key?(attribute)
+
         indexed_attributes << attribute
       end
 
       def where(query)
         raise IndexError, 'Queries using multiple indexes is not currently supported.' if query.keys.size > 1
+
         attribute, value = query.first
         ids = index_for(attribute, value)
         return [] if ids.empty?
+
         find_all(ids)
       end
 

data/lib/modis/model.rb

@@ -35,9 +35,10 @@ module Modis
       apply_defaults
       set_sti_type
       assign_attributes(record) if record
-      reset_changes
+      changes_applied
 
       return unless options.key?(:new_record)
+
       instance_variable_set('@new_record', options[:new_record])
     end
 

data/lib/modis/persistence.rb

@@ -97,13 +97,13 @@ module Modis
 
       private
 
-      def msgpack_array_header(n)
-        if n < 16
-          [0x90 | n].pack("C")
-        elsif n < 65536
-          [0xDC, n].pack("Cn")
+      def msgpack_array_header(values_size)
+        if values_size < 16
+          [0x90 | values_size].pack("C")
+        elsif values_size < 65536
+          [0xDC, values_size].pack("Cn")
         else
-          [0xDD, n].pack("CN")
+          [0xDD, values_size].pack("CN")
         end.force_encoding(Encoding::UTF_8)
       end
     end
@@ -114,6 +114,7 @@ module Modis
 
     def key
       return nil if new_record?
+
       self.class.sti_child? ? self.class.sti_base_key_for(id) : self.class.key_for(id)
     end
 
@@ -179,7 +180,7 @@ module Modis
       future = persist
 
       if future && (future == :unchanged || future.value == 'OK')
-        reset_changes
+        changes_applied
         @new_record = false
         true
       else
@@ -190,6 +191,7 @@ module Modis
     def validate(args)
       skip_validate = args.key?(:validate) && args[:validate] == false
       return if skip_validate || valid?
+
       raise Modis::RecordInvalid, errors.full_messages.join(', ')
     end
 
@@ -223,19 +225,18 @@ module Modis
 
       future
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
     def coerced_attributes
       attrs = []
 
       if new_record?
         attributes.each do |k, v|
-          if (self.class.attributes[k][:default] || nil) != v
-            attrs << k << coerce_for_persistence(v)
-          end
+          attrs << k << coerce_for_persistence(v) if (self.class.attributes[k][:default] || nil) != v
         end
       else
-        changed_attributes.each do |k, _|
-          attrs << k << coerce_for_persistence(attributes[k])
+        changed_attributes.each_key do |key|
+          attrs << key << coerce_for_persistence(attributes[key])
         end
       end
 

data/lib/modis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modis
-  VERSION = '2.1.0'
+  VERSION = '3.0.0'
 end

data/modis.gemspec

@@ -18,8 +18,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'activemodel', '>= 3.0'
-  gem.add_runtime_dependency 'activesupport', '>= 3.0'
+  gem.required_ruby_version = ">= 2.3.0"
+
+  gem.add_runtime_dependency 'activemodel', '>= 4.2'
+  gem.add_runtime_dependency 'activesupport', '>= 4.2'
+  gem.add_runtime_dependency 'i18n', ['>= 0.7', '< 1.3']
   gem.add_runtime_dependency 'redis', '>= 3.0'
   gem.add_runtime_dependency 'hiredis', '>= 0.5'
   gem.add_runtime_dependency 'connection_pool', '>= 2'
@@ -30,4 +33,11 @@ Gem::Specification.new do |gem|
   else
     gem.add_runtime_dependency 'msgpack', '>= 0.5'
   end
+
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'codeclimate-test-reporter'
+  gem.add_development_dependency 'cane'
+  gem.add_development_dependency 'rubocop', '0.61.1'
+  gem.add_development_dependency 'simplecov'
 end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@
 unless ENV['TRAVIS']
   begin
     require './spec/support/simplecov_helper'
-    include SimpleCovHelper
+    include SimpleCovHelper # rubocop:disable Style/MixinUsage
     start_simple_cov('unit')
   rescue LoadError
     puts "Coverage disabled."

data/spec/support/simplecov_helper.rb

@@ -14,9 +14,7 @@ module SimpleCovHelper
       if ENV['TRAVIS']
         require 'codeclimate-test-reporter'
 
-        if CodeClimate::TestReporter.run?
-          formatters << CodeClimate::TestReporter::Formatter
-        end
+        formatters << CodeClimate::TestReporter::Formatter if CodeClimate::TestReporter.run?
       end
 
       formatter SimpleCov::Formatter::MultiFormatter.new(*formatters)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modis
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,28 +16,48 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +114,90 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.61.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.61.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveModel + Redis
 email:
 - port001@gmail.com
@@ -106,6 +210,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -114,6 +219,10 @@ files:
 - benchmark/find.rb
 - benchmark/persistence.rb
 - benchmark/redis/connection/fakedis.rb
+- gemfiles/rails_42.gemfile
+- gemfiles/rails_50.gemfile
+- gemfiles/rails_51.gemfile
+- gemfiles/rails_52.gemfile
 - lib/modis.rb
 - lib/modis/attribute.rb
 - lib/modis/configuration.rb
@@ -148,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -156,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: ActiveModel + Redis