modis 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bceb3d4a73d55abb1e394c0a5bc3b4d2aba0a5c
-  data.tar.gz: 0e12bc5e617999f6c6da40c96add042f9b43feb8
+  metadata.gz: d6f800df4e32942fff0bab6bcc91be7c5703ad85
+  data.tar.gz: 44fb61a6e24d183599bc9b55372f327140696b30
 SHA512:
-  metadata.gz: 80a0a72e0ce9d49e440e10e030f5c3c0d91615780ea7bdafba3ff9fc2cfe31e88bcfdecaa7a27c0e7feb62322d576f5d178afebf2fee0fdec296f77fc0685abd
-  data.tar.gz: 3896ccbe329b3e308b5deccc2960e89c6bbc21f4121eb99967135b02f7eb12a0fc4f89755f68fc4c2d8f37cf4c7d8f331fe7174162bedbdb7d0c5123b4e085a8
+  metadata.gz: fb1be4a74d4b4b7c0ea6686b6fcba3acf1013b601ca580e993aeef84532e364e167e13e08475a6b820818f8f05cdada5eacd2f10ffb6af517920c57c731bd3f8
+  data.tar.gz: 6122913d3e5c734f0f7aa8cd1d2a52a1bdb5fbedcdcbd89c3ce7f3f74d35a255f20cf090512732dcc73c70c6f2116bfdfbed8964e8d6966f012f02411dba4923

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
   Exclude:
     - modis.gemspec
+    - vendor/**/*
 
 LineLength:
   Enabled: false
@@ -22,3 +23,9 @@ CyclomaticComplexity:
 
 Style/SignalException:
   EnforcedStyle: only_raise
+
+Style/NumericLiterals:
+  Enabled: false
+
+Metrics/AbcSize:
+  Max: 25

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.2
+ruby-2.2.0

data/.travis.yml

@@ -1,8 +1,13 @@
+sudo: false
 services:
-  - redis-server
+- redis-server
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.2
-  - jruby
-  - rbx-2
+- 2.0.0
+- 2.1.5
+- 2.2.0
+- jruby-1.7.18
+- rbx-2.4.1
+env:
+  global:
+    secure: LrTz0Pq2ibNZuKDhdzcrvEUSNxUpPopEq9aJeCxy3UpV0v4vpHBtWV0S6zofvf98g/RkZ6cGI1u+0H578dHgE6pWTo+iR8LAwqPKofrFIWRkeo+M77Vs5swahb3mQyPOcig1hfVWDm25MsojePYm70eBIcBU55NWImtdePXfiU0=

data/Gemfile

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

data/Gemfile.lock

@@ -1,83 +1,76 @@
 PATH
   remote: .
   specs:
-    modis (1.3.0)
+    modis (1.4.0)
       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.1.5)
-      activesupport (= 4.1.5)
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
       builder (~> 3.1)
-    activesupport (4.1.5)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.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
-    connection_pool (2.0.0)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    codeclimate-test-reporter (0.4.5)
+      simplecov (>= 0.7.1, < 1.0.0)
+    connection_pool (2.1.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    i18n (0.6.11)
-    json (1.8.1)
-    mime-types (2.3)
-    minitest (5.4.1)
+    hiredis (0.5.2)
+    i18n (0.7.0)
+    json (1.8.2)
+    minitest (5.5.1)
+    msgpack (0.5.10)
     multi_json (1.10.1)
-    netrc (0.7.7)
-    parallel (1.3.0)
-    parser (2.2.0.pre.4)
+    parallel (1.3.3)
+    parser (2.2.0.2)
       ast (>= 1.1, < 3.0)
-      slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
     rainbow (2.0.0)
-    rake (10.3.2)
-    redis (3.1.0)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.4)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.4)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.4)
-    rubocop (0.25.0)
-      parser (>= 2.2.0.pre.4, < 3.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)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.0.pre.7, < 3.0)
       powerpack (~> 0.0.6)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.5.1)
-    simplecov (0.9.0)
+    ruby-progressbar (1.7.1)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    slop (3.6.0)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.19.1)
+    stackprof (0.2.7)
     thread_safe (0.3.4)
-    tins (1.3.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -87,9 +80,10 @@ PLATFORMS
 
 DEPENDENCIES
   cane
-  coveralls
+  codeclimate-test-reporter
   modis!
   rake
   rspec
   rubocop
   simplecov
+  stackprof

data/README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://secure.travis-ci.org/ileitch/modis.png?branch=master)](http://travis-ci.org/ileitch/modis)
-[![Code Climate](https://codeclimate.com/github/ileitch/modis.png)](https://codeclimate.com/github/ileitch/modis)
-[![Coverage Status](https://coveralls.io/repos/ileitch/modis/badge.png?branch=master)](https://coveralls.io/r/ileitch/modis?branch=master)
+[![Code Climate](https://codeclimate.com/github/ileitch/modis/badges/gpa.svg)](https://codeclimate.com/github/ileitch/modis)
+[![Test Coverage](https://codeclimate.com/github/ileitch/modis/badges/coverage.svg)](https://codeclimate.com/github/ileitch/modis)
 
 # Modis
 

data/benchmark/bench.rb

@@ -0,0 +1,65 @@
+require 'stackprof'
+require 'benchmark'
+
+$LOAD_PATH.unshift('.')
+require 'lib/modis'
+
+puts "Profiler enabled." if ENV['PROFILE']
+
+Modis.configure do |config|
+  config.namespace = 'modis_benchmark'
+end
+
+class Bench
+  def self.run
+    bench = new
+    yield(bench)
+    bench._run
+  end
+
+  def initialize
+    @bms = []
+    @profiles = []
+  end
+
+  def report(name, &blk)
+    @bms << [name, blk]
+  end
+
+  def _run
+    Benchmark.bmbm do |x|
+      @bms.each do |name, blk|
+        x.report(name) do
+          with_profile(name, &blk)
+        end
+      end
+    end
+
+    after
+  end
+
+  private
+
+  def with_profile(name, &blk)
+    if ENV['PROFILE']
+      mode = :wall
+      out = "tmp/stackprof-#{mode}-#{name}.dump"
+      @profiles << out
+      StackProf.run(mode: mode, out: out, &blk)
+    else
+      blk.call
+    end
+  end
+
+  def after
+    Modis.with_connection do |connection|
+      keys = connection.keys "#{Modis.config.namespace}:*"
+      connection.del(*keys) unless keys.empty?
+    end
+
+    return unless @profiles.any?
+
+    puts "\nProfiler dumps:"
+    @profiles.uniq.each { |dump| puts " * stackprof #{dump} --text" }
+  end
+end

data/benchmark/find.rb

@@ -0,0 +1,62 @@
+$LOAD_PATH.unshift('benchmark')
+require 'bench'
+
+require 'redis/connection/fakedis'
+# Redis::Connection::Fakedis.start_recording
+Redis::Connection::Fakedis.start_replay(:find)
+Modis.redis_options = { driver: :fakedis }
+
+class User
+  include Modis::Model
+
+  attribute :name, :string
+  attribute :age, :integer
+  attribute :percentage, :float
+  attribute :created_at, :timestamp
+  attribute :flag, :boolean
+  attribute :array, :array
+  attribute :hash, :hash
+  attribute :string_or_hash, [:string, :hash]
+
+  index :name
+end
+
+def create_user
+  User.create!(name: 'Test', age: 30, percentage: 50.0, created_at: Time.now,
+               flag: true, array: [1, 2, 3], hash: { k: :v }, string_or_hash: "an string")
+end
+
+user = create_user
+
+n = 10_000
+
+Bench.run do |b|
+  b.report(:find) do
+    n.times do
+      User.find(user.id)
+    end
+  end
+
+  b.report(:where) do
+    n.times do
+      User.where(name: user.name)
+    end
+  end
+end
+
+n = 1_000
+i = 20
+STDOUT.write "\n* Creating #{i} users for :where_multiple... "
+STDOUT.flush
+i.times { create_user }
+puts "✔\n\n"
+
+Bench.run do |b|
+  b.report(:where_multiple) do
+    n.times do
+      User.where(name: 'Test')
+    end
+  end
+end
+
+# Redis::Connection::Fakedis.stop_recording(:find)

data/benchmark/persistence.rb

@@ -0,0 +1,82 @@
+$LOAD_PATH.unshift('benchmark')
+require 'bench'
+
+require 'redis/connection/fakedis'
+# Redis::Connection::Fakedis.start_recording
+Redis::Connection::Fakedis.start_replay(:persistence)
+Modis.redis_options = { driver: :fakedis }
+
+class User
+  include Modis::Model
+
+  attribute :name, :string, default: 'Test'
+  attribute :age, :integer
+  attribute :percentage, :float
+  attribute :created_at, :timestamp
+  attribute :flag, :boolean
+  attribute :array, :array
+  attribute :hash, :hash
+  attribute :string_or_hash, [:string, :hash]
+
+  index :name
+end
+
+def create_user
+  User.create!(name: 'Test', age: 30, percentage: 50.0, created_at: Time.now,
+               flag: true, array: [1, 2, 3], hash: { k: :v }, string_or_hash: "an string")
+end
+
+n = 10_000
+
+Bench.run do |b|
+  b.report(:create) do
+    n.times do
+      create_user
+    end
+  end
+
+  b.report(:save) do
+    n.times do
+      user = User.new
+      user.name = 'Test'
+      user.age = 30
+      user.percentage = 50.0
+      user.created_at = Time.now
+      user.flag = true
+      user.array = [1, 2, 3]
+      user.hash = { k: :v }
+      user.string_or_hash = "an string"
+      user.save!
+    end
+  end
+
+  b.report(:initialize) do
+    n.times do
+      User.new(name: 'Test', age: 30, percentage: 50.0, created_at: Time.now,
+               flag: true, array: [1, 2, 3], hash: { k: :v }, string_or_hash: "an string")
+    end
+  end
+
+  b.report(:update_without_changes) do
+    user = create_user
+    n.times do
+      user.update_attributes!(name: user.name, age: user.age)
+    end
+  end
+
+  b.report(:update_with_changes) do
+    user = create_user
+    n.times do |i|
+      user.update_attribute(:name, i.to_s)
+    end
+  end
+
+  b.report(:reload) do
+    user = create_user
+    n.times do
+      user.reload
+    end
+  end
+end
+
+# Redis::Connection::Fakedis.stop_recording(:persistence)

data/benchmark/redis/connection/fakedis.rb

@@ -0,0 +1,90 @@
+# rubocop:disable all
+
+require 'fileutils'
+require 'redis/connection/hiredis'
+
+class Redis
+  module Connection
+    class Fakedis < ::Redis::Connection::Hiredis
+      class << self
+        attr_accessor :reads, :read_indicies, :replaying, :recording
+        alias_method :replaying?, :replaying
+        alias_method :recording?, :recording
+      end
+
+      @reads = []
+      @read_indicies = []
+
+      def self.start_replay(name)
+        puts "Fakedis replaying."
+        self.replaying = true
+
+        @reads = Marshal.load(File.read(reads_path(name)))
+        @read_indicies = Marshal.load(File.read(read_indicies_path(name)))
+      end
+
+      def self.start_recording
+        puts "Fakedis recording."
+        self.recording = true
+      end
+
+      def self.stop_recording(name)
+        self.recording = false
+
+        puts "\nFakedis:"
+        puts " * #{reads.size} unique reads recorded"
+
+        FileUtils.mkdir_p("tmp/fakedis")
+
+        File.open(reads_path(name), 'w') { |fd| fd.write(Marshal.dump(reads)) }
+        File.open(read_indicies_path(name), 'w') { |fd| fd.write(Marshal.dump(read_indicies)) }
+      end
+
+      def self.reads_path(name)
+        "tmp/fakedis/#{name}_reads.dump"
+      end
+
+      def self.read_indicies_path(name)
+        "tmp/fakedis/#{name}_read_indicies.dump"
+      end
+
+      def initialize(*args)
+        super
+        @reads_idx = -1
+        @read_depth = 0
+      end
+
+      def read
+        if self.class.recording?
+          @read_depth += 1
+          v = super
+          @read_depth -= 1
+          return v if @read_depth > 0
+          i = self.class.reads.index(v)
+
+          if i
+            self.class.read_indicies << i
+          else
+            self.class.reads << v
+            self.class.read_indicies << self.class.reads.size - 1
+          end
+
+          v
+        elsif self.class.replaying?
+          @reads_idx += 1
+          self.class.reads[self.class.read_indicies[@reads_idx]]
+        else
+          super
+        end
+      end
+
+      def write(v)
+        if self.class.replaying?
+          # Do nothing.
+        else
+          super
+        end
+      end
+    end
+  end
+end