map 5.3.0 → 5.4.0

data/lib/map.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Map < Hash
-  Version = '5.3.0' unless defined?(Version)
+  Version = '5.4.0' unless defined?(Version)
   Load = Kernel.method(:load) unless defined?(Load)
 
   class << Map

data/lib/map/options.rb

@@ -15,11 +15,14 @@ class Map
               raise(ArgumentError, arg.inspect) unless arg.respond_to?(:to_hash)
               arg.to_hash
           end
+
         unless options.is_a?(Options)
           options = Map.for(options)
           options.extend(Options)
         end
+
         raise unless options.is_a?(Map)
+
         options
       end
 
@@ -40,6 +43,20 @@ class Map
 
     attr_accessor :arguments
 
+    def pop
+      arguments.pop if arguments.last.object_id == object_id
+      self
+    end
+
+    def popped?
+      !(arguments.last.object_id == object_id)
+    end
+
+    def pop!
+      arguments.pop if arguments.last.object_id == object_id
+      self
+    end
+
     %w( to_options stringify_keys ).each do |method|
       module_eval <<-__, __FILE__, __LINE__
         def #{ method }() dup end
@@ -108,30 +125,21 @@ class Map
     end
     alias_method('setopts', 'set_opts')
     alias_method('setopts!', 'set_opts')
-
-    def pop
-      pop! unless popped?
-      self
-    end
-
-    def popped?
-      @popped = false unless defined?(@popped)
-      arguments and arguments.last!=self and @popped
-    end
-
-    def pop!
-      arguments.pop unless popped?
-    ensure
-      @popped = true
-    end
   end
 
   module Arguments
     def options
       @options ||=(
-        options = Options.for(last.is_a?(Hash) ? last : {})
-        options.arguments = self
-        options
+        if last.is_a?(Hash)
+          options = Options.for(pop)
+          options.arguments = self
+          push(options)
+          options
+        else
+          options = Options.for({})
+          options.arguments = self
+          options
+        end
       )
     end
 

data/map.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "map"
-  spec.version = "5.3.0"
+  spec.version = "5.4.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "map"
   spec.description = "description: map kicks the ass"

data/test/map_test.rb

@@ -270,26 +270,38 @@ Testing Map do
   testing 'that map supports basic option parsing for methods' do
     %w( options_for options opts ).each do |method|
       args = [0,1, {:k => :v, :a => false}]
+      Map.send(method, args)
       opts = assert{ Map.send(method, args) }
       assert{ opts.is_a?(Map) }
       assert{ opts.getopt(:k)==:v }
       assert{ opts.getopt(:a)==false }
       assert{ opts.getopt(:b, :default => 42)==42 }
-      assert{ args.last.is_a?(Hash) }
+      assert{ args.last.object_id == opts.object_id }
     end
   end
 
   testing 'that bang option parsing can pop the options off' do
-    %w( options_for! options! opts! ).each do |method|
-      args = [0,1, {:k => :v, :a => false}]
+    logic = proc do |method, args|
+      before = args.dup
       opts = assert{ Map.send(method, args) }
+      after = args
+
       assert{ opts.is_a?(Map) }
-      assert{ !args.last.is_a?(Hash) }
+      assert{ !args.last.is_a?(Hash) } if before.last.is_a?(Hash)
+      assert{ args.last.object_id != opts.object_id }
 
-      new_args = [0,1, opts]
-      new_opts = assert{ Map.send(method, new_args) }
-      assert{ new_opts.is_a?(Map) }
-      assert{ !new_args.last.is_a?(Hash) }
+      opts
+    end
+
+    %w( options_for! options! opts! ).each do |method|
+      [
+        [0,1, {:k => :v, :a => false}],
+        [42],
+        []
+      ].each do |args|
+        opts = logic.call(method, args)
+        logic.call(method, [0, 1, opts])
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: map
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies: []
 description: ! 'description: map kicks the ass'
 email: ara.t.howard@gmail.com