map 4.7.1 → 5.1.0

data/a.rb

@@ -1,24 +1,30 @@
 require 'map'
 
+args = [0, 1, {:k => :v, :a => false}]
+opts = Map.options_for!(args)
 
-require 'rubygems'
-require 'mongoid'
+#p args.object_id
+#p opts.arguments.object_id
+#p !args.last.is_a?(Hash)
+#puts
+#puts
 
-class Map
-  include Mongoid::Fields::Serializable
+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
 
-  def default(*args)
-    @default
-  end
+puts
+puts
+__END__
 
-  def deserialize(object)
-    Map.for(object.to_hash)
-  end
+puts '---'
+
+p opts.arguments
+p args
 
-  def serialize(object)
-    object.to_hash
-  end
-end
 
-m = Map.new
-m[:key]

data/lib/map.rb

@@ -1,5 +1,5 @@
 class Map < Hash
-  Version = '4.7.1' unless defined?(Version)
+  Version = '5.1.0' unless defined?(Version)
   Load = Kernel.method(:load) unless defined?(Load)
 
   class << Map
@@ -617,7 +617,7 @@ class Map < Hash
       else
         key = method
         unless has_key?(key)
-          return(block ? fetch(*args, &block) : super(*args))
+          return(block ? fetch(key, &block) : super(*args))
         end
         self[key]
     end

data/lib/map/options.rb

@@ -2,7 +2,7 @@ class Map
   module Options
     class << Options
       def for(arg)
-        hash =
+        options =
           case arg
             when Hash
               arg
@@ -14,18 +14,19 @@ class Map
               raise(ArgumentError, arg.inspect) unless arg.respond_to?(:to_hash)
               arg.to_hash
           end
-        map = Map.coerce(hash)
-      ensure
-        map.extend(Options) unless map.is_a?(Options)
+        options.extend(Options) unless options.is_a?(Options)
+        options
       end
 
       def parse(arg)
         case arg
           when Array
-            arg.extend(Arguments) unless arg.is_a?(Arguments)
-            arg.options
+            arguments = arg
+            arguments.extend(Arguments) unless arguments.is_a?(Arguments)
+            options = arguments.options
           when Hash
-            Options.for(arg)
+            options = arg
+            options = Options.for(options)
           else
             raise(ArgumentError, "`arg` should be an Array or Hash")
         end
@@ -109,27 +110,21 @@ class Map
     end
 
     def popped?
-      defined?(@popped) and @popped
-    end
-
-    def popped=(boolean)
-      @popped = !!boolean
+      arguments and arguments.last != self
     end
 
     def pop!
-      if arguments.last.is_a?(Hash)
-        @popped = arguments.pop
-      else
-        @popped = true
-      end
+      arguments.pop if !popped?
     end
   end
 
   module Arguments
     def options
-      @options ||= Options.for(last.is_a?(Hash) ? last : {})
-    ensure
-      @options.arguments = self
+      @options ||=(
+        options = Options.for(last.is_a?(Hash) ? last : {})
+        options.arguments = self
+        options
+      )
     end
 
     class << Arguments
@@ -155,11 +150,8 @@ def Map.options_for!(*args, &block)
 end
 
 def Map.update_options_for!(args, &block)
-  options = Map.options_for!(args)
+  options = Map.options_for(args)
   block.call(options)
-ensure
-  args.push(options)
-  options.popped = false
 end
 
 class << Map

data/map.gemspec

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

data/test/map_test.rb

@@ -282,6 +282,10 @@ Testing Map do
       args = [0,1, {:k => :v, :a => false}]
       opts = assert{ Map.send(method, args) }
       assert{ !args.last.is_a?(Hash) }
+
+      new_args = [0,1, opts]
+      new_opts = assert{ Map.send(method, new_args) }
+      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: 4.7.1
+  version: 5.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-24 00:00:00.000000000 Z
+date: 2011-12-01 00:00:00.000000000 Z
 dependencies: []
 description: ! 'description: map kicks the ass'
 email: ara.t.howard@gmail.com
@@ -49,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: codeforpeople
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: map