ses_machine 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd32d8cfba9ae9ecad37c18a92997f3c80db9134
-  data.tar.gz: 56d800115ed11922322f52633a7709fc8df7fe3d
+  metadata.gz: 8e1abe2736d6761141c419681add7d3bed678fd7
+  data.tar.gz: 8736ffe8bd3e3236d228a0f852877cb1baf05979
 SHA512:
-  metadata.gz: 614ff603f0a9c6cdb1511ce348b411404bbd45b56425b7b22599c96f528c354fd49471ce626987d5900e5151032de4f5bc068d9126b73049139b1721c04cb89b
-  data.tar.gz: e89d55b852447f7739e85e2d6c776070eaaaafd6a2241612ec053d14ce1828a01e94c8b43f6d142b0b680d781ec679d47c1f4be59d0d74ec9e73e13c6c8c24be
+  metadata.gz: 95edb059867f7a0395c90cc96c376dc7059349439f60a4b86763e27dac5793fac54a2b5db29bc906c4a35ff8ca3d9537c7f6165e8019d97a30138f8582a90ced
+  data.tar.gz: 84d31a526b00a93bfcbbe012d76872aed29c4da7c07c4acc5073b844e8a42380c2a42f3ef4a1e81c81df2f468be2b43012b9b0d45ad92587501666a8d84f2a5e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ses_machine (0.0.1)
+    ses_machine (0.0.2)
       aws-ses (>= 0.4.4)
       bson (>= 1.9.1)
       bson_ext (>= 1.9.1)

data/lib/ses_machine.rb

@@ -59,9 +59,14 @@ module SesMachine #:nodoc
     #
     # The SesMachine +Config+ singleton instance.
     def configure
-      SesMachine::Config.instance
       config = SesMachine::Config.instance
-      block_given? ? yield(config) : config
+
+      if block_given?
+        yield(config)
+        config.load
+      end
+
+      config
     end
     alias :config :configure
   end
@@ -82,6 +87,4 @@ module SesMachine #:nodoc
 end
 
 ENV['RAILS_ENV'] ||= Rails.env || 'development'
-ENV['RAILS_ROOT'] ||= Rails.root.to_s || File.dirname(__FILE__) + '/../../../..'
-
-SesMachine.config.load
+ENV['RAILS_ROOT'] ||= Rails.root.to_s

data/lib/ses_machine/config.rb

@@ -5,7 +5,7 @@ module SesMachine #:nodoc:
   class Config #:nodoc:
     include Singleton
 
-    attr_accessor :ses,
+    attr_accessor :ses, :path,
                   :dkim_domain, :dkim_selector, :dkim_private_key,
                   :email_server, :email_port, :email_use_ssl, :email_account, :email_password, :email_imap_folders
     attr_reader :database, :use_dkim
@@ -28,8 +28,8 @@ module SesMachine #:nodoc:
       @dkim_private_key = nil
     end
 
-    def load(filename=nil)
-      filename = File.join(ENV['RAILS_ROOT'], 'config', 'ses_machine.yml') if filename.blank?
+    def load
+      filename = path || File.join(ENV['RAILS_ROOT'], 'config', 'ses_machine.yml')
       if File.exist?(filename)
         settings = YAML.load_file(filename)[ENV['RAILS_ENV']]
         from_hash(settings)

data/lib/ses_machine/version.rb

@@ -4,7 +4,7 @@ module SesMachine #:nodoc
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ses_machine
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kirill Nikitin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail