merlin 0.1.0 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/lib/merlin/version.rb +1 -1
  2. data/lib/merlin/webmock.rb +2 -2
  3. data/lib/merlin.rb +1 -1
  4. metadata +3 -3
data/lib/merlin/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Merlin
2
- VERSION = "0.1.0"
2
+ VERSION = "0.1.4"
3
3
  end
data/lib/merlin/webmock.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  begin
2
2
  require 'webmock'
3
- WebMock.disable_net_connect!(allow: /herokuapp.com/)
3
+ WebMock.allow_net_connect!
4
4
  rescue LoadError
5
5
  nil
6
- end
6
+ end
data/lib/merlin.rb CHANGED
@@ -1,5 +1,5 @@
1
- require "merlin/webmock" if Rails.env.test?
2
1
  require "merlin/engine"
2
+ require "merlin/webmock" if Rails.env.test?
3
3
 
4
4
  module Merlin
5
5
  def self.method_missing(*args, &block)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merlin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.0
4
+ version: 0.1.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-12-03 00:00:00.000000000 Z
12
+ date: 2013-03-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -150,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
150
150
  version: '0'
151
151
  requirements: []
152
152
  rubyforge_project:
153
- rubygems_version: 1.8.24
153
+ rubygems_version: 1.8.25
154
154
  signing_key:
155
155
  specification_version: 3
156
156
  summary: App configuration made simple