must_be 1.0.1 → 1.0.2

data/ChangeLog.md

@@ -0,0 +1,7 @@
+# dynamic_variable 1.0.2 2010-09-29
+
+* Update for compatibility with Ruby 1.8.6.
+
+# must_be 1.0.1 2010-09-27
+
+* Update for compatibility with Ruby 1.9.2.

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/must_be/basic.rb

@@ -6,14 +6,14 @@ module MustBe
   
   def must_be(*cases)
     unless cases.empty? ? self : MustBe.match_any_case?(self, cases)
-      must_notify(self, __method__, cases, nil, ", but matches #{self.class}")
+      must_notify(self, :must_be, cases, nil, ", but matches #{self.class}")
     end
     self
   end
 
   def must_not_be(*cases)
     if cases.empty? ? self : MustBe.match_any_case?(self, cases)
-      must_notify(self, __method__, cases, nil, ", but matches #{self.class}")
+      must_notify(self, :must_not_be, cases, nil, ", but matches #{self.class}")
     end
     self
   end
@@ -41,17 +41,17 @@ private
 public
   
   def must_be_a(*modules)
-    must_be_a__body(modules, :none?, __method__)
+    must_be_a__body(modules, :none?, :must_be_a)
   end
   
   def must_not_be_a(*modules)
-    must_be_a__body(modules, :any?, __method__)
+    must_be_a__body(modules, :any?, :must_not_be_a)
   end
   
   def must_be_in(*collection)
     cs = collection.size == 1 ? collection[0] : collection
     unless cs.include? self
-      must_notify(self, __method__, collection)
+      must_notify(self, :must_be_in, collection)
     end
     self
   end
@@ -59,34 +59,34 @@ public
   def must_not_be_in(*collection)
     cs = collection.size == 1 ? collection[0] : collection
     if cs.include? self
-      must_notify(self, __method__, collection)
+      must_notify(self, :must_not_be_in, collection)
     end
     self
   end
   
   def must_be_nil
-    must_notify(self, __method__) unless nil?
+    must_notify(self, :must_be_nil) unless nil?
     self
   end
   
   def must_not_be_nil
-    must_notify(self, __method__) if nil?
+    must_notify(self, :must_not_be_nil) if nil?
     self
   end
   
   def must_be_true
-    must_notify(self, __method__) unless self == true
+    must_notify(self, :must_be_true) unless self == true
     self
   end
   
   def must_be_false
-    must_notify(self, __method__) unless self == false
+    must_notify(self, :must_be_false) unless self == false
     self
   end
   
   def must_be_boolean
     unless self == true or self == false
-      must_notify(self, __method__)
+      must_notify(self, :must_be_boolean)
     end
     self
   end
@@ -94,7 +94,7 @@ public
   def must_be_close(expected, delta = 0.1)
     difference = (self - expected).abs
     unless difference < delta
-      must_notify(self, __method__, [expected, delta], nil,
+      must_notify(self, :must_be_close, [expected, delta], nil,
         ", difference is #{difference}")
     end
     self
@@ -102,7 +102,7 @@ public
   
   def must_not_be_close(expected, delta = 0.1)
     if (self - expected).abs < delta
-      must_notify(self, __method__, [expected, delta])
+      must_notify(self, :must_not_be_close, [expected, delta])
     end
     self
   end

data/lib/must_be/containers.rb

@@ -152,13 +152,15 @@ module MustBe
       module ClassMethods
         def must_check_contents_after(*methods)
           methods.each do |method|
-            define_method(method) do |*args, &block|
-              begin
-                super(*args, &block)
-              ensure
-                must_check_contents
+            module_eval %Q{
+              def #{method}(*args)
+                begin
+                  super
+                ensure
+                  must_check_contents
+                end
               end
-            end
+            }
           end
         end
       end
@@ -231,15 +233,18 @@ module MustBe
       
       mutator_advice = Module.new
       mod.instance_methods(false).each do |method_name|
-        mutator_advice.send(:define_method, method_name) do |*args, &block|
-          must_check(lambda { super(*args, &block) }) do |note|
-            note.prefix = nil
-            call_s = Note.new(self.class, method_name, args, block).message
-            call_s.sub!(".", "#")
-            note.prefix = "#{must_only_ever_contain_prefix}#{call_s}: "
-            note
+        mutator_advice.module_eval %Q{
+          def #{method_name}(*args, &block)
+            must_check(lambda { super(*args, &block) }) do |note|
+              note.prefix = nil
+              call_s = Note.new(self.class, #{method_name.inspect}, args,
+                block).message
+              call_s.sub!(".", "#")
+              note.prefix = "\#{must_only_ever_contain_prefix}\#{call_s}: "
+              note
+            end
           end
-        end
+        }
       end
       mod.const_set(:MutatorAdvice, mutator_advice)
       mod.instance_eval do

data/lib/must_be/proxy.rb

@@ -36,7 +36,7 @@ module MustBe
         if message
           must_notify(message)
         else
-          must_notify(self, __method__, nil, block)
+          must_notify(self, :must, nil, block)
         end
       end
       self
@@ -51,7 +51,7 @@ module MustBe
         if message
           must_notify(message)
         else
-          must_notify(self, __method__, nil, block)
+          must_notify(self, :must_not, nil, block)
         end
       end
       self

data/lib/must_be.rb

@@ -1,5 +1,55 @@
 here = File.expand_path(File.dirname(__FILE__))
 
+if RUBY_VERSION < "1.8.7"
+  unless :symbol.respond_to? :to_proc
+    class Symbol
+      def to_proc
+        Proc.new {|*args| args.shift.__send__ self, *args}
+      end
+    end
+  end
+  
+  unless "string".respond_to? :bytesize
+    class String
+      alias bytesize size
+    end
+  end
+  
+  unless [].respond_to? :none?
+    class Array
+      def none?(&block)
+        not any?(&block)
+      end
+    end
+  end
+  
+  unless [].respond_to? :drop_while
+    class Array
+      def drop_while 
+        index = 0
+        index += 1 while yield(self[index])
+        self[index..-1]
+      end
+    end
+  end
+  
+  unless 3.respond_to? :odd?
+    class Fixnum
+      def odd?
+        self % 2 == 1
+      end
+    end
+  end
+  
+  unless 3.respond_to? :even?
+    class Fixnum
+      def even?
+        self % 2 == 0
+      end
+    end
+  end
+end
+
 require here+'/must_be/core'
 require here+'/must_be/basic'
 require here+'/must_be/proxy'

data/must_be.gemspec

@@ -5,18 +5,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{must_be}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Taysom"]
-  s.date = %q{2010-09-27}
+  s.date = %q{2010-09-29}
   s.description = %q{must_be provides runtime assertions which can easily be disabled in production environments.  Likewise, the notifier can be customized to raise errors, log failure, enter the debugger, or anything else.}
   s.email = %q{wtaysom@gmail.com}
   s.extra_rdoc_files = [
-    "README.md"
+    "ChangeLog.md",
+     "README.md"
   ]
   s.files = [
     ".gitignore",
+     "ChangeLog.md",
      "README.md",
      "Rakefile",
      "VERSION",

data/spec/must_be/containers_spec.rb

@@ -607,9 +607,7 @@ describe MustBe do
         it "should notify if inserting a non-matching key" do
           subject["six"] = 6
           subject["six"].should == 6
-          should notify("must_only_ever_contain: Hash#[]=(\"six\", 6):"\
-            " pair {\"six\"=>6} does not match"\
-            " [{Symbol=>Integer, Integer=>Symbol}] in container {\"six\"=>6}")
+          should notify
         end
         
         it "should notify if inserting a matching value" do
@@ -634,9 +632,7 @@ describe MustBe do
         
         it "should notify if merged with an unacceptable hash" do
           subject.merge!({3 => 1})
-          should notify("must_only_ever_contain: Hash#merge!({3=>1}):"\
-            " pair {3=>1} does not match"\
-            " [{Symbol=>Integer, Integer=>Symbol}] in container {3=>1}")
+          should notify
         end
         
         it "should not notify if updated with an acceptable hash" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: must_be
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - William Taysom
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-27 00:00:00 +08:00
+date: 2010-09-29 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -26,9 +26,11 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- ChangeLog.md
 - README.md
 files: 
 - .gitignore
+- ChangeLog.md
 - README.md
 - Rakefile
 - VERSION