lumber 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39acf970ab7a4cba53d738adec952246cdb7e36d
-  data.tar.gz: 84b4141111b47aafb6a133913f4d118c6ba7bacf
+  metadata.gz: 52f2f551d156ddf2cac81cc1fd65175a58e6cb57
+  data.tar.gz: 24d93d72aa28bf70a8b56be3996f00a7b3354d31
 SHA512:
-  metadata.gz: d59e9dea06165dea70ad6d4f49e7e271065452c8c58c7656fbcac166dc20d792f2033219416941abe28e2274308945f6b88fea7c1c9c8643b1362397681dc1e1
-  data.tar.gz: 6a2a398953b7f856988abcf74950d3e50086647b3d1b8e4ec95aadb2a93e3548f15d1e889306ab5afa1a0b44956ea5f62fd4d105320aa85fe338b763d3511397
+  metadata.gz: 04fea1c9766af3d4e05a8fc87dd00fd9337f77901475947c3860d686fe5fbe1373ac85d69955357d54d3e3bfc00e05caa6db3f5696e9dd125d23763b9b862b28
+  data.tar.gz: 8574b553f1ed8f1d77e6facd45d5a9ac3820272430116333552fe3b638e4d7901a6051bee9048c6747255569c9fb886b753329322f97603bac017a27865c0baa

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.1.1 (11/25/2013)
+------------------
+
+handle mattr as well as cattr when preventing rails override <4b4138c> [Matt Conway]
+
 1.1.0 (11/10/2013)
 ------------------
 

data/lib/lumber/prevent_rails_override.rb

@@ -11,11 +11,30 @@ module Lumber
 
       class << self
         # Prevent rails from overwriting our logger
-        def cattr_accessor_with_lumber(*syms)
+        def cattr_reader_with_lumber(*syms)
           without_logger = syms.reject {|s| s == :logger}
-          cattr_accessor_without_lumber(*without_logger)
+          cattr_reader_without_lumber(*without_logger)
         end
-        alias_method_chain :cattr_accessor, :lumber
+        alias_method_chain :cattr_reader, :lumber
+
+        def cattr_writer_with_lumber(*syms)
+          without_logger = syms.reject {|s| s == :logger}
+          cattr_writer_without_lumber(*without_logger)
+        end
+        alias_method_chain :cattr_writer, :lumber
+
+        def mattr_reader_with_lumber(*syms)
+          without_logger = syms.reject {|s| s == :logger}
+          mattr_reader_without_lumber(*without_logger)
+        end
+        alias_method_chain :mattr_reader, :lumber
+
+        def mattr_writer_with_lumber(*syms)
+          without_logger = syms.reject {|s| s == :logger}
+          mattr_writer_without_lumber(*without_logger)
+        end
+        alias_method_chain :mattr_writer, :lumber
+
       end
 
     end

data/lib/lumber/version.rb

@@ -1,3 +1,3 @@
 module Lumber
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/prevent_rails_override_spec.rb

@@ -8,7 +8,8 @@ describe Lumber::PreventRailsOverride do
     Foo1.class_eval do
       cattr_accessor :logger
     end
-    defined?(Foo1.logger).should be_false
+    Foo1.method_defined?(:logger).should be_false
+    Foo1.method_defined?(:logger=).should be_false
   end
 
   it "should allow cattr_accessor for attrs other than :logger" do
@@ -17,7 +18,28 @@ describe Lumber::PreventRailsOverride do
     Foo1.class_eval do
       cattr_accessor :foo
     end
-    defined?(Foo1.foo).should be_true
+    Foo1.method_defined?(:foo).should be_true
+    Foo1.method_defined?(:foo=).should be_true
+  end
+
+  it "should prevent mattr_accessor for :logger" do
+    new_class('Foo1')
+    Foo1.send(:include, Lumber::PreventRailsOverride)
+    Foo1.class_eval do
+      mattr_accessor :logger
+    end
+    Foo1.method_defined?(:logger).should be_false
+    Foo1.method_defined?(:logger=).should be_false
+  end
+
+  it "should allow mattr_accessor for attrs other than :logger" do
+    new_class('Foo1')
+    Foo1.send(:include, Lumber::PreventRailsOverride)
+    Foo1.class_eval do
+      mattr_accessor :foo
+    end
+    Foo1.method_defined?(:foo).should be_true
+    Foo1.method_defined?(:foo=).should be_true
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lumber
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Matt Conway
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Lumber integrates the log4r logging system within your application.
@@ -240,4 +240,3 @@ test_files:
 - spec/server_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: