map 5.2.0 → 5.3.0

data/a.rb

@@ -1,31 +1,9 @@
 # -*- encoding : utf-8 -*-
-require 'map'
+require './lib/map.rb'
 
-args = [0, 1, {:k => :v, :a => false}]
-opts = Map.options_for!(args)
-
-#p args.object_id
-#p opts.arguments.object_id
-#p !args.last.is_a?(Hash)
-#puts
-#puts
-
-new_args = [0, 1, opts]
-new_opts = Map.options_for!(new_args)
-#p new_opts.popped?
-p new_args
-p args
-#p !new_args.last.is_a?(Hash)
-#p new_opts.arguments.object_id
-#p new_args.object_id
+args = [0, 1, {:k=>:v, :a=>false}]
 
-puts
-puts
-__END__
-
-puts '---'
+opts = Map.options_for!(args)
 
-p opts.arguments
 p args
-
-
+p opts

data/lib/map.rb

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

data/lib/map/options.rb

@@ -15,7 +15,11 @@ class Map
               raise(ArgumentError, arg.inspect) unless arg.respond_to?(:to_hash)
               arg.to_hash
           end
-        options.extend(Options) unless options.is_a?(Options)
+        unless options.is_a?(Options)
+          options = Map.for(options)
+          options.extend(Options)
+        end
+        raise unless options.is_a?(Map)
         options
       end
 
@@ -111,11 +115,14 @@ class Map
     end
 
     def popped?
-      arguments and arguments.last != self
+      @popped = false unless defined?(@popped)
+      arguments and arguments.last!=self and @popped
     end
 
     def pop!
-      arguments.pop if !popped?
+      arguments.pop unless popped?
+    ensure
+      @popped = true
     end
   end
 

data/map.gemspec

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

data/test/map_test.rb

@@ -271,6 +271,7 @@ Testing Map do
     %w( options_for options opts ).each do |method|
       args = [0,1, {:k => :v, :a => false}]
       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 }
@@ -282,10 +283,12 @@ Testing Map do
     %w( options_for! options! opts! ).each do |method|
       args = [0,1, {:k => :v, :a => false}]
       opts = assert{ Map.send(method, args) }
+      assert{ opts.is_a?(Map) }
       assert{ !args.last.is_a?(Hash) }
 
       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) }
     end
   end

metadata

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