map 3.0.0 → 4.0.0

data/Rakefile

@@ -1,7 +1,7 @@
 This.rubyforge_project = 'codeforpeople'
 This.author = "Ara T. Howard"
 This.email = "ara.t.howard@gmail.com"
-This.homepage = "http://github.com/ahoward/#{ This.lib }/tree/master"
+This.homepage = "https://github.com/ahoward/#{ This.lib }"
 
 
 task :default do
@@ -59,9 +59,9 @@ end
 
 
 task :gemspec do
-  ignore_extensions = 'git', 'svn', 'tmp', /sw./, 'bak', 'gem'
-  ignore_directories = 'pkg'
-  ignore_files = 'test/log'
+  ignore_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
+  ignore_directories = ['pkg']
+  ignore_files = ['test/log']
 
   shiteless = 
     lambda do |list|
@@ -87,7 +87,7 @@ task :gemspec do
   version     = This.version
   files       = shiteless[Dir::glob("**/**")]
   executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
-  has_rdoc    = true #File.exist?('doc')
+  #has_rdoc    = true #File.exist?('doc')
   test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
   summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
   description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
@@ -117,15 +117,15 @@ task :gemspec do
             spec.summary = #{ lib.inspect }
             spec.description = #{ description.inspect }
 
-            spec.files = #{ files.inspect }
+            spec.files =\n#{ files.sort.pretty_inspect }
             spec.executables = #{ executables.inspect }
             
             spec.require_path = "lib"
 
-            spec.has_rdoc = #{ has_rdoc.inspect }
             spec.test_files = #{ test_files.inspect }
-            #spec.add_dependency 'lib', '>= version'
-            #spec.add_dependency 'fattr'
+
+          ### spec.add_dependency 'lib', '>= version'
+          #### spec.add_dependency 'map'
 
             spec.extensions.push(*#{ extensions.inspect })
 
@@ -235,6 +235,7 @@ BEGIN {
   require 'erb'
   require 'fileutils'
   require 'rbconfig'
+  require 'pp'
 
 # fu shortcut
 #
@@ -292,7 +293,7 @@ BEGIN {
 
     def unindent(s)
       indent = nil
-      s.each do |line|
+      s.each_line do |line|
       next if line =~ %r/^\s*$/
       indent = line[%r/^\s*/] and break
     end
@@ -309,7 +310,7 @@ BEGIN {
       @template = block.call.to_s
     end
     def expand(b=nil)
-      ERB.new(Util.unindent(@template)).result(b||@block)
+      ERB.new(Util.unindent(@template)).result((b||@block).binding)
     end
     alias_method 'to_s', 'expand'
   end

data/lib/map.rb

@@ -1,5 +1,5 @@
 class Map < Hash
-  Version = '3.0.0' unless defined?(Version)
+  Version = '4.0.0' unless defined?(Version)
   Load = Kernel.method(:load) unless defined?(Load)
 
   class << Map
@@ -241,7 +241,8 @@ class Map < Hash
   def self.convert_value(value)
     conversion_methods.each do |method|
       #return convert_value(value.send(method)) if value.respond_to?(method)
-      if value.respond_to?(method)
+      hashlike = value.is_a?(Hash)
+      if hashlike and value.respond_to?(method)
         value = value.send(method)
         break
       end

data/map.gemspec

@@ -3,25 +3,39 @@
 
 Gem::Specification::new do |spec|
   spec.name = "map"
-  spec.version = "3.0.0"
+  spec.version = "4.0.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "map"
   spec.description = "description: map kicks the ass"
 
-  spec.files = ["lib", "lib/map", "lib/map/options.rb", "lib/map/struct.rb", "lib/map.rb", "map.gemspec", "Rakefile", "README", "test", "test/lib", "test/lib/testing.rb", "test/map_test.rb", "TODO"]
+  spec.files =
+["README",
+ "Rakefile",
+ "TODO",
+ "lib",
+ "lib/map",
+ "lib/map.rb",
+ "lib/map/options.rb",
+ "lib/map/struct.rb",
+ "map.gemspec",
+ "test",
+ "test/lib",
+ "test/lib/testing.rb",
+ "test/map_test.rb"]
+
   spec.executables = []
   
   spec.require_path = "lib"
 
-  spec.has_rdoc = true
   spec.test_files = nil
-  #spec.add_dependency 'lib', '>= version'
-  #spec.add_dependency 'fattr'
+
+### spec.add_dependency 'lib', '>= version'
+#### spec.add_dependency 'map'
 
   spec.extensions.push(*[])
 
   spec.rubyforge_project = "codeforpeople"
   spec.author = "Ara T. Howard"
   spec.email = "ara.t.howard@gmail.com"
-  spec.homepage = "http://github.com/ahoward/map/tree/master"
+  spec.homepage = "https://github.com/ahoward/map"
 end

data/test/map_test.rb

@@ -232,7 +232,7 @@ Testing Map do
 
   testing 'that custom conversion methods are coerced - just in case' do
     map = Map.new
-    record = Class.new do
+    record = Class.new(Hash) do
       def to_map() {:id => 42} end
     end
     map.update(:list => [record.new, record.new])
@@ -240,6 +240,17 @@ Testing Map do
     assert{ map.list.all?{|x| x.id==42} }
   end
 
+  testing 'that non-hashlike classes do *not* have conversion methods called on them' do
+    map = Map.new
+    record = Class.new do
+      def to_map() {:id => 42} end
+    end
+    map.update(:record => record.new) 
+    assert{ !map.record.is_a?(Hash) } 
+    assert{ !map.record.is_a?(Map) } 
+    assert{ map.record.is_a?(record) } 
+  end
+
   testing 'that coercion is minimal' do
     map = Map.new
     a = Class.new(Map) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: map
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 63
   prerelease: 
   segments: 
-  - 3
+  - 4
   - 0
   - 0
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -06:00
+date: 2011-05-17 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -28,17 +28,17 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- README
+- Rakefile
+- TODO
+- lib/map.rb
 - lib/map/options.rb
 - lib/map/struct.rb
-- lib/map.rb
 - map.gemspec
-- Rakefile
-- README
 - test/lib/testing.rb
 - test/map_test.rb
-- TODO
 has_rdoc: true
-homepage: http://github.com/ahoward/map/tree/master
+homepage: https://github.com/ahoward/map
 licenses: []
 
 post_install_message: