activerecord-snapshot 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18d5d34a4ada1258ba348e7d97d4926c70a57830
-  data.tar.gz: 39df59bd7e29419efe9cfd30288f9933ba122c03
+  metadata.gz: 5e940ac1dd6c0727931c63986fd0d9ab647a8a97
+  data.tar.gz: 581896f88fb4b33b80bdbf8332298dc1dbe01b96
 SHA512:
-  metadata.gz: eded70402ecd026b2995eadc893d780e0e67244b307a6783d005a6fa0beecc002f7ee635eaa95d634638b6fbc420e6ee3f242300b7c3daa6c2982fc2ce1db658
-  data.tar.gz: 1404fe17a689e44fb9cb00bf96a5f128b674d6468b96516f42d3e7285f47719ddd880f24c007698a07dc8d8027fb5cc1feb2ac1be3507d7ad4838947b759e1a9
+  metadata.gz: 4c99693338d284f980b2d8a6a6c92475fbdbd43f2331853c16f0e92ddb71fa045890f23a80b6cfb60743808d33846de6ff4d738bbff637305df4a3a3db3ac55b
+  data.tar.gz: 16be625dff9065a4862887082953c3a320645853c87eb4c1a6a0cee4e37db9eb62f421702ad205b65003bc9438693d68df6aea9d9474dfe2dfd141fb9248b9d3

data/lib/active_record/snapshot/configuration.rb

@@ -9,18 +9,18 @@ require "hashie"
 
 module ActiveRecord
   module Snapshot
-    class Configuration < Hashie::Dash
-      class S3Paths < Hashie::Dash
-        include Hashie::Extensions::Dash::IndifferentAccess
+    class ConfigClass < Hashie::Dash
+      include Hashie::Extensions::Dash::Coercion
+      include Hashie::Extensions::Dash::IndifferentAccess
+    end
 
+    class Configuration < ConfigClass
+      class S3Paths < ConfigClass
         property :snapshots, required: true
         property :named_snapshots, required: true
       end
 
-      class S3Config < Hashie::Dash
-        include Hashie::Extensions::Dash::Coercion
-        include Hashie::Extensions::Dash::IndifferentAccess
-
+      class S3Config < ConfigClass
         property :access_key_id, required: true
         property :secret_access_key, required: true
         property :bucket, required: true
@@ -28,11 +28,10 @@ module ActiveRecord
         property :paths, required: true, coerce: S3Paths
       end
 
-      class DBConfig < Hashie::Dash
-        include Hashie::Extensions::Dash::IndifferentAccess
-
-        def initialize(database_hash)
-          super database_hash.slice("database", "username", "password", "host")
+      class DBConfig < ConfigClass
+        def initialize(env)
+          database_hash = ::Rails.application.config.database_configuration[env]
+          super(database_hash.slice("database", "username", "password", "host"))
         end
 
         property :database, required: true
@@ -41,38 +40,48 @@ module ActiveRecord
         property :password
       end
 
-      class StoreConfig < Hashie::Dash
-        include Hashie::Extensions::Dash::Coercion
-        include Hashie::Extensions::Dash::IndifferentAccess
-
+      class StoreConfig < ConfigClass
         property :tmp, default: ->(_) { ::Rails.root.join("tmp/snapshots") }, coerce: Pathname
         property :local, default: ->(_) { ::Rails.root.join("db/snapshots") }, coerce: Pathname
       end
 
-      include Hashie::Extensions::Dash::Coercion
-      include Hashie::Extensions::Dash::IndifferentAccess
+      include Singleton
 
-      def self.env
-        ENV.fetch("SNAPSHOT_ENV", Rails.env)
+      def initialize
+        super(read_config_file)
+        @env = ENV.fetch("SNAPSHOT_ENV", Rails.env)
       end
 
-      property :db, default: ->(_) { ::Rails.application.config.database_configuration[env] }, coerce: DBConfig
+      attr_accessor :env
+
       property :s3, required: true, coerce: S3Config
       property :ssl_key, required: true
       property :tables, required: true
       property :store, coerce: StoreConfig
 
+      def db
+        DBConfig.new(env)
+      end
+
       def adapter
         ActiveRecord::Snapshot::MySQL
       end
-    end
 
-    def self.config_file
-      ::Rails.root.join("config", "snapshot.yml")
+      private
+
+      def config_file
+        ::Rails.root.join("config", "snapshot.yml")
+      end
+
+      def read_config_file
+        contents = File.read(config_file)
+        interpolated = ERB.new(contents).result
+        YAML.safe_load(interpolated)
+      end
     end
 
     def self.config
-      @config ||= Configuration.new(YAML.safe_load(ERB.new(::File.read(config_file)).result))
+      Configuration.instance
     end
   end
 end

data/lib/active_record/snapshot/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Snapshot
-    VERSION = '0.3.1'
+    VERSION = '0.3.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-snapshot
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Bernardo Farah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Snapshots for ActiveRecord