active_orm 4.0.3 → 5.0.0

data/lib/active_orm/redis/string.rb

@@ -1,96 +1,100 @@
-class ActiveOrm::Redis::String < ActiveOrm::Redis
+# frozen_string_literal: true
 
-  def self.find(key)
-    value = client.get(normalize_key(key))
-    value = metamorph(value) if evaluate?
-    value
-  end
+class ActiveOrm::Redis::String < ActiveOrm::Redis::Base
+  class << self
 
-  def self.find_each(*args)
-    args  = stringify_keys(args)
-    value = client.mget(args)
-    value = metamorph(value) if evaluate?
-    value
-  end
+    def find(key)
+      value = client.get(normalize_key(key))
+      value = metamorph(value) if evaluate?
+      value
+    end
 
-  def self.length(key)
-    client.strlen(normalize_key(key))
-  end
+    def find_each(*args)
+      args  = stringify_keys(args)
+      value = client.mget(args)
+      value = metamorph(value) if evaluate?
+      value
+    end
 
-  def self.split(key, start, finish)
-    client.getrange(normalize_key(key), start, finish)
-  end
+    def length(key)
+      client.strlen(normalize_key(key))
+    end
 
-  def self.create(key, value, opts = {})
-    client.set(normalize_key(key), value, opts)
-  end
+    def split(key, start, finish)
+      client.getrange(normalize_key(key), start, finish)
+    end
 
-  def self.create!(key, value)
-    client.setnx(normalize_key(key), value)
-  end
+    def create(key, value, opts = {})
+      client.set(normalize_key(key), value, opts)
+    end
 
-  def self.create_each(*args)
-    args = stringify_keys(args)
-    client.mset(args)
-  end
+    def create!(key, value)
+      client.setnx(normalize_key(key), value)
+    end
 
-  def self.create_each!(*args)
-    args = stringify_keys(args)
-    client.msetnx(args)
-  end
+    def create_each(*args)
+      args = stringify_keys(args)
+      client.mset(args)
+    end
+
+    def create_each!(*args)
+      args = stringify_keys(args)
+      client.msetnx(args)
+    end
 
-  def self.create_until(key, value, seconds, format = :seconds)
-    normalized_key = normalize_key(key)
+    def create_until(key, value, seconds, format = :seconds)
+      normalized_key = normalize_key(key)
 
-    if seconds?(format)
-      client.setex(normalized_key, seconds, value)
-    else
-      client.psetex(normalized_key, seconds, value)
+      if seconds?(format)
+        client.setex(normalized_key, seconds, value)
+      else
+        client.psetex(normalized_key, seconds, value)
+      end
     end
-  end
 
-  def self.append(key, value)
-    client.append(normalize_key(key), value)
-  end
+    def append(key, value)
+      client.append(normalize_key(key), value)
+    end
 
-  def self.replace(key, value, offset)
-    client.setrange(normalize_key(key), offset, value)
-  end
+    def replace(key, value, offset)
+      client.setrange(normalize_key(key), offset, value)
+    end
 
-  def self.decrement(key, value = 1)
-    normalized_key = normalize_key(key)
+    def decrement(key, value = 1)
+      normalized_key = normalize_key(key)
 
-    value == 1 ? client.decr(normalized_key) : client.decrby(normalized_key, value)
-  end
+      value == 1 ? client.decr(normalized_key) : client.decrby(normalized_key, value)
+    end
 
-  def self.increment(key, value = 1)
-    normalized_key = normalize_key(key)
+    def increment(key, value = 1)
+      normalized_key = normalize_key(key)
 
-    if value.is_a?(Float)
-      client.incrbyfloat(normalized_key, value)
-    else
-      value == 1 ? client.incr(normalized_key) : client.incrby(normalized_key, value)
+      if value.is_a?(Float)
+        client.incrbyfloat(normalized_key, value)
+      else
+        value == 1 ? client.incr(normalized_key) : client.incrby(normalized_key, value)
+      end
     end
-  end
 
-  def self.reset(key, value = 0)
-    client.getset(normalize_key(key), value)
-  end
+    def reset(key, value = 0)
+      client.getset(normalize_key(key), value)
+    end
 
-  def self.bit_count(key, start = 0, finish = -1)
-    client.bitcount(normalize_key(key), start, finish)
-  end
+    def bit_count(key, start = 0, finish = -1)
+      client.bitcount(normalize_key(key), start, finish)
+    end
 
-  def self.bit_where(operation, key, *keys)
-    client.bitop(operation, key, *keys)
-  end
+    def bit_where(operation, key, *keys)
+      client.bitop(operation, key, *keys)
+    end
 
-  def self.get_bit(key, offset)
-    client.getbit(normalize_key(key), offset)
-  end
+    def get_bit(key, offset)
+      client.getbit(normalize_key(key), offset)
+    end
 
-  def self.set_bit(key, offset, bit)
-    client.setbit(normalize_key(key), offset, bit)
-  end
+    def set_bit(key, offset, bit)
+      client.setbit(normalize_key(key), offset, bit)
+    end
 
+  end
 end

data/lib/active_orm/redis/transaction.rb

@@ -1,23 +1,27 @@
-class ActiveOrm::Redis::Transaction < ActiveOrm::Redis
+# frozen_string_literal: true
 
-  def self.discard
-    client.discard
-  end
+class ActiveOrm::Redis::Transaction < ActiveOrm::Redis::Base
+  class << self
 
-  def self.exec
-    client.exec
-  end
+    def discard
+      client.discard
+    end
 
-  def self.multi(&block)
-    client.multi(&block)
-  end
+    def exec
+      client.exec
+    end
 
-  def self.watch(*args)
-    client.watch(args)
-  end
+    def multi(&block)
+      client.multi(&block)
+    end
 
-  def self.unwatch
-    client.unwatch
-  end
+    def watch(*args)
+      client.watch(args)
+    end
+
+    def unwatch
+      client.unwatch
+    end
 
+  end
 end

data/lib/active_orm/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveOrm
-  VERSION = '4.0.3'.freeze
+  VERSION ||= '5.0.0'
 end

data/lib/generators/active_orm/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 class ActiveOrm::InstallGenerator < Rails::Generators::Base

data/lib/generators/active_orm/templates/install.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined?(Redis)
   ActiveOrm::Redis.configure do |config|
     config.client = Redis.new

data/lib/tasks/redis.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :db do
   namespace :redis do
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_orm
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 5.0.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dry-configurable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +144,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".DS_Store"
-- ".coveralls.yml"
 - ".fasterer.yml"
 - ".gitignore"
 - ".reek"
@@ -176,9 +161,7 @@ files:
 - lib/.DS_Store
 - lib/active_orm.rb
 - lib/active_orm/.DS_Store
-- lib/active_orm/base.rb
 - lib/active_orm/railtie.rb
-- lib/active_orm/redis.rb
 - lib/active_orm/redis/.DS_Store
 - lib/active_orm/redis/base.rb
 - lib/active_orm/redis/configuration.rb
@@ -218,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Gem for commonly used database ORM.

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data/lib/active_orm/base.rb

@@ -1,13 +0,0 @@
-class ActiveOrm::Base
-
-  attr_accessor :configuration
-
-  def self.configuration
-    @configuration ||= Configuration.new
-  end
-
-  def self.configure
-    yield(configuration)
-  end
-
-end

data/lib/active_orm/redis.rb

@@ -1,23 +0,0 @@
-begin
-  require 'fakeredis'
-rescue LoadError
-  require 'redis'
-end
-
-require 'active_orm/redis/base'
-require 'active_orm/redis/configuration'
-
-class ActiveOrm::Redis < ActiveOrm::Base
-  extend Base
-
-  attr_accessor :client
-
-  def initialize(client = nil)
-    @client ||= (client.nil? ? ActiveOrm::Redis.configuration.client : client)
-  end
-
-  def self.client(client = nil)
-    client.nil? ? new.client : new(client).client
-  end
-
-end