pushr-core 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d796496da363829ca4ccbdf77044b7b091392a54717871d6cec168c0413dbce4
-  data.tar.gz: abc0435d73c288f343f9d34bc86edf59ebed7ed19fcd88057c0e05daee1df7fb
+  metadata.gz: b863ca933317f600b397b26c3e1ba6075f0882cbf9790687f1556288e2819e65
+  data.tar.gz: b6d46fb71f809753fd66f0fa1639bb2f0afe1b04d021874aff4f9112e1304882
 SHA512:
-  metadata.gz: 7cace2417bb7dcfa77c3496f4b97018b77003735b999e01679c9a9d9825e82209023c533baa0efb23a89fc7899bd3b2e8d7501395af3c1b51978c4ef107726ff
-  data.tar.gz: bf37754b174865ba67a77635df9780709559f379567adc7b58729156df57a807fbcd80a817d4fd00d05f3a7c65ca44ac97c9e30fccebd227a5819cc76e3473a1
+  metadata.gz: f3358210249ae43ea51905979fcd0f3b10f560a67ca203dbd13b6f32124d3ebb91f9d3b5558f4997f849de1ab549a567f9a608b5f9a5a32ccd5e7b072a10a033
+  data.tar.gz: cecd4649f0078410f928c91608a40d5d8ba12484b49af38e74acf3764ae87e5014b5c5a8f7eda5219d2bd47dd9c673ce8c1faa79a15e74e5efe8ba09f93f5b79

data/lib/pushr/configuration.rb

@@ -69,13 +69,13 @@ module Pushr
     def self.read_from_yaml_file
       filename = Pushr::Core.configuration_file
       configs = File.open(filename) { |fd| YAML.load(fd) }
-      configs.map { |hsh| instantiate(hsh) }
+      configs.map { |hsh| instantiate(hsh) }.compact
     end
 
     def self.read_from_redis
       configurations = Pushr::Core.redis { |conn| conn.hgetall('pushr:configurations') }
       configurations.each { |key, config| configurations[key] = instantiate_json(config, key) }
-      configurations.values
+      configurations.values.compact
     end
 
     def self.instantiate_json(config, id)
@@ -83,7 +83,12 @@ module Pushr
     end
 
     def self.instantiate(hsh)
-      klass = hsh['type'].split('::').reduce(Object) { |a, e| a.const_get e }
+      klass = hsh['type'].split('::').reduce(Object) do |a, e|
+        if Object.const_defined?(hsh['type'])
+          a.const_get e
+        end
+      end
+      return nil if klass == nil
       klass.new(hsh)
     end
   end

data/lib/pushr/redis_connection.rb

@@ -17,7 +17,7 @@ module Pushr
     end
 
     def self.build_client(url, namespace, driver)
-      client = Redis.connect(url: url, driver: driver)
+      client = Redis.new(url: url, driver: driver)
       if namespace
         Redis::Namespace.new(namespace, redis: client)
       else

data/lib/pushr/version.rb

@@ -1,3 +1,3 @@
 module Pushr
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/spec/lib/pushr/configuration_spec.rb

@@ -12,6 +12,12 @@ describe Pushr::Configuration do
     it 'returns all configurations' do
       expect(Pushr::Configuration.all).to eql([])
     end
+
+    it 'should not load missing configuration constant' do
+      Pushr::ConfigurationDummy2.new(app: 'app_name', connections: 2, enabled: true).save
+      Pushr.send(:remove_const, :ConfigurationDummy2)
+      expect(Pushr::Configuration.all).to eql([])
+    end
   end
 
   describe 'create' do

data/spec/support/pushr_configuration_dummy2.rb

@@ -0,0 +1,13 @@
+module Pushr
+  class ConfigurationDummy2 < Pushr::Configuration
+    attr_accessor :test_attr
+
+    def name
+      :dummy
+    end
+
+    def to_hash(_ = nil)
+      { id: [@app, name].join(':'), type: self.class.to_s, app: app, enabled: enabled, connections: connections, test_attr: test_attr }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushr-core
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Tom Pesman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +235,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/logger.rb
 - spec/support/pushr_configuration_dummy.rb
+- spec/support/pushr_configuration_dummy2.rb
 - spec/support/pushr_connection_dummy.rb
 - spec/support/pushr_dummy.rb
 - spec/support/pushr_feedback_dummy.rb
@@ -260,8 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Core of the pushr daemon.
@@ -280,6 +280,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/logger.rb
 - spec/support/pushr_configuration_dummy.rb
+- spec/support/pushr_configuration_dummy2.rb
 - spec/support/pushr_connection_dummy.rb
 - spec/support/pushr_dummy.rb
 - spec/support/pushr_feedback_dummy.rb