merlin 0.1.0 → 0.1.4

data/lib/merlin/version.rb

@@ -1,3 +1,3 @@
 module Merlin
-  VERSION = "0.1.0"
+  VERSION = "0.1.4"
 end

data/lib/merlin/webmock.rb

@@ -1,6 +1,6 @@
 begin
   require 'webmock'
-  WebMock.disable_net_connect!(allow: /herokuapp.com/)
+  WebMock.allow_net_connect!
 rescue LoadError
   nil
-end
+end

data/lib/merlin.rb

@@ -1,5 +1,5 @@
-require "merlin/webmock" if Rails.env.test?
 require "merlin/engine"
+require "merlin/webmock" if Rails.env.test?
 
 module Merlin
   def self.method_missing(*args, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: merlin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: App configuration made simple