mack-data_mapper 0.8.2 → 0.8.3

data/lib/gems/{addressable-2.0.0 → addressable-2.0.1}/lib/addressable/uri.rb

@@ -990,7 +990,8 @@ module Addressable
       end
       if ![String, ::Addressable::URI].include?(returning)
         raise TypeError,
-          "Expected String or Addressable::URI, got #{returning.inspect}"
+          "Expected Class (String or Addressable::URI), " +
+          "got #{returning.inspect}"
       end
       result = uri.to_str.gsub(/%[0-9a-f]{2}/i) do |sequence|
         sequence[1..3].to_i(16).chr
@@ -1030,7 +1031,8 @@ module Addressable
       end
       if ![String, ::Addressable::URI].include?(returning)
         raise TypeError,
-          "Expected String or Addressable::URI, got #{returning.inspect}"
+          "Expected Class (String or Addressable::URI), " +
+          "got #{returning.inspect}"
       end
       uri_object = uri.kind_of?(self) ? uri : self.parse(uri.to_str)
       encoded_uri = Addressable::URI.new(
@@ -1077,7 +1079,8 @@ module Addressable
       end
       if ![String, ::Addressable::URI].include?(returning)
         raise TypeError,
-          "Expected String or Addressable::URI, got #{returning.inspect}"
+          "Expected Class (String or Addressable::URI), " +
+          "got #{returning.inspect}"
       end
       uri_object = uri.kind_of?(self) ? uri : self.parse(uri.to_str)
       components = {
@@ -1099,9 +1102,9 @@ module Addressable
         :scheme => self.encode_component(components[:scheme],
           Addressable::URI::CharacterClasses::SCHEME),
         :user => self.encode_component(components[:user],
-          Addressable::URI::CharacterClasses::AUTHORITY),
+          Addressable::URI::CharacterClasses::UNRESERVED),
         :password => self.encode_component(components[:password],
-          Addressable::URI::CharacterClasses::AUTHORITY),
+          Addressable::URI::CharacterClasses::UNRESERVED),
         :host => components[:host],
         :port => components[:port],
         :path => self.encode_component(components[:path],
@@ -1245,7 +1248,12 @@ module Addressable
           if self.scheme =~ /^\s*ssh\+svn\s*$/i
             "svn+ssh"
           else
-            self.scheme.strip.downcase
+            Addressable::URI.encode_component(
+              Addressable::IDNA.unicode_normalize_kc(
+                Addressable::URI.unencode_component(
+                  self.scheme.strip.downcase)),
+              Addressable::URI::CharacterClasses::SCHEME
+            )
           end
         else
           nil
@@ -1284,7 +1292,11 @@ module Addressable
               (!self.password || self.password.strip == "")
             nil
           else
-            self.user.strip
+            Addressable::URI.encode_component(
+              Addressable::IDNA.unicode_normalize_kc(
+                Addressable::URI.unencode_component(self.user.strip)),
+              Addressable::URI::CharacterClasses::UNRESERVED
+            )
           end
         else
           nil
@@ -1333,7 +1345,11 @@ module Addressable
               (!self.user || self.user.strip == "")
             nil
           else
-            self.password.strip
+            Addressable::URI.encode_component(
+              Addressable::IDNA.unicode_normalize_kc(
+                Addressable::URI.unencode_component(self.password.strip)),
+              Addressable::URI::CharacterClasses::UNRESERVED
+            )
           end
         else
           nil
@@ -1608,6 +1624,9 @@ module Addressable
     #
     # @param [String, Integer, #to_s] new_port The new port component.
     def port=(new_port)
+      if new_port != nil && new_port.respond_to?(:to_str)
+        new_port = Addressable::URI.unencode_component(new_port.to_str)
+      end
       if new_port != nil && !(new_port.to_s =~ /^\d+$/)
         raise InvalidURIError,
           "Invalid port number: #{new_port.inspect}"
@@ -1659,7 +1678,12 @@ module Addressable
     # @return [String] The path component, normalized.
     def normalized_path
       @normalized_path ||= (begin
-        result = self.class.normalize_path(self.path.strip)
+        result = Addressable::URI.encode_component(
+          Addressable::IDNA.unicode_normalize_kc(
+            Addressable::URI.unencode_component(self.path.strip)),
+          Addressable::URI::CharacterClasses::PATH
+        )
+        result = self.class.normalize_path(result)
         if result == "" &&
             ["http", "https", "ftp", "tftp"].include?(self.normalized_scheme)
           result = "/"
@@ -1714,7 +1738,17 @@ module Addressable
     #
     # @return [String] The query component, normalized.
     def normalized_query
-      @normalized_query ||= (self.query ? self.query.strip : nil)
+      @normalized_query ||= (begin
+        if self.query
+          Addressable::URI.encode_component(
+            Addressable::IDNA.unicode_normalize_kc(
+              Addressable::URI.unencode_component(self.query.strip)),
+            Addressable::URI::CharacterClasses::QUERY
+          )
+        else
+          nil
+        end
+      end)
     end
 
     ##
@@ -1722,7 +1756,7 @@ module Addressable
     #
     # @param [String, #to_str] new_query The new query component.
     def query=(new_query)
-      @query = new_query.to_str
+      @query = new_query ? new_query.to_str : nil
 
       # Reset dependant values
       @normalized_query = nil
@@ -1840,7 +1874,17 @@ module Addressable
     #
     # @return [String] The fragment component, normalized.
     def normalized_fragment
-      @normalized_fragment ||= (self.fragment ? self.fragment.strip : nil)
+      @normalized_fragment ||= (begin
+        if self.fragment
+          Addressable::URI.encode_component(
+            Addressable::IDNA.unicode_normalize_kc(
+              Addressable::URI.unencode_component(self.fragment.strip)),
+            Addressable::URI::CharacterClasses::FRAGMENT
+          )
+        else
+          nil
+        end
+      end)
     end
 
     ##
@@ -2171,15 +2215,12 @@ module Addressable
         end
       end
 
-      return Addressable::URI.normalized_encode(
-        Addressable::URI.new(
-          :scheme => normalized_scheme,
-          :authority => normalized_authority,
-          :path => normalized_path,
-          :query => normalized_query,
-          :fragment => normalized_fragment
-        ),
-        ::Addressable::URI
+      return Addressable::URI.new(
+        :scheme => normalized_scheme,
+        :authority => normalized_authority,
+        :path => normalized_path,
+        :query => normalized_query,
+        :fragment => normalized_fragment
       )
     end
 

data/lib/gems/{addressable-2.0.0 → addressable-2.0.1}/lib/addressable/version.rb

@@ -27,7 +27,7 @@ if !defined?(Addressable::VERSION)
     module VERSION #:nodoc:
       MAJOR = 2
       MINOR = 0
-      TINY  = 0
+      TINY  = 1
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/lib/gems/addressable-2.0.1/tasks/clobber.rake

@@ -0,0 +1,2 @@
+desc "Remove all build products"
+task "clobber"

data/lib/gems/addressable-2.0.1/tasks/gem.rake

@@ -0,0 +1,68 @@
+require "rake/gempackagetask"
+
+namespace :gem do
+  GEM_SPEC = Gem::Specification.new do |s|
+    s.name = PKG_NAME
+    s.version = PKG_VERSION
+    s.summary = PKG_SUMMARY
+    s.description = PKG_DESCRIPTION
+
+    s.files = PKG_FILES.to_a
+
+    s.has_rdoc = true
+    s.extra_rdoc_files = %w( README )
+    s.rdoc_options.concat ["--main",  "README"]
+
+    if !s.respond_to?(:add_development_dependency)
+      puts "Cannot build Gem with this version of RubyGems."
+      exit(1)
+    end
+
+    s.add_development_dependency("rake", ">= 0.7.3")
+    s.add_development_dependency("rspec", ">= 1.0.8")
+    s.add_development_dependency("launchy", ">= 0.3.2")
+
+    s.require_path = "lib"
+
+    s.author = "Bob Aman"
+    s.email = "bob@sporkmonger.com"
+    s.homepage = RUBY_FORGE_URL
+    s.rubyforge_project = RUBY_FORGE_PROJECT
+  end
+
+  Rake::GemPackageTask.new(GEM_SPEC) do |p|
+    p.gem_spec = GEM_SPEC
+    p.need_tar = true
+    p.need_zip = true
+  end
+
+  desc "Show information about the gem"
+  task :debug do
+    puts GEM_SPEC.to_ruby
+  end
+
+  desc "Install the gem"
+  task :install => ["clobber", "gem:package"] do
+    sh "#{SUDO} gem install --local pkg/#{GEM_SPEC.full_name}"
+  end
+
+  desc "Uninstall the gem"
+  task :uninstall do
+    installed_list = Gem.source_index.find_name(PKG_NAME)
+    if installed_list &&
+        (installed_list.collect { |s| s.version.to_s}.include?(PKG_VERSION))
+      sh(
+        "#{SUDO} gem uninstall --version '#{PKG_VERSION}' " +
+        "--ignore-dependencies --executables #{PKG_NAME}"
+      )
+    end
+  end
+
+  desc "Reinstall the gem"
+  task :reinstall => [:uninstall, :install]
+end
+
+desc "Alias to gem:package"
+task "gem" => "gem:package"
+
+task "clobber" => ["gem:clobber_package"]

data/lib/gems/addressable-2.0.1/tasks/git.rake

@@ -0,0 +1,40 @@
+namespace :git do
+  namespace :tag do
+    desc "List tags from the Git repository"
+    task :list do
+      tags = `git tag -l`
+      tags.gsub!("\r", "")
+      tags = tags.split("\n").sort {|a, b| b <=> a }
+      puts tags.join("\n")
+    end
+
+    desc "Create a new tag in the Git repository"
+    task :create do
+      changelog = File.open("CHANGELOG", "r") { |file| file.read }
+      puts "-" * 80
+      puts changelog
+      puts "-" * 80
+      puts
+
+      v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
+      abort "Versions don't match #{v} vs #{PKG_VERSION}" if v != PKG_VERSION
+
+      tag = "#{PKG_NAME}-#{PKG_VERSION}"
+      msg = "Release #{PKG_NAME}-#{PKG_VERSION}"
+
+      existing_tags = `git tag -l instrument-*`.split("\n")
+      if existing_tags.include?(tag)
+        warn("Tag already exists, deleting...")
+        unless system "git tag -d #{tag}"
+          abort "Tag deletion failed."
+        end
+      end
+      puts "Creating git tag '#{tag}'..."
+      unless system "git tag -a -m \"#{msg}\" #{tag}"
+        abort "Tag creation failed."
+      end
+    end
+  end
+end
+
+task "gem:release" => "git:tag:create"

data/lib/gems/addressable-2.0.1/tasks/metrics.rake

@@ -0,0 +1,22 @@
+namespace :metrics do
+  task :lines do
+    lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
+    for file_name in FileList["lib/**/*.rb"]
+      f = File.open(file_name)
+      while line = f.gets
+        lines += 1
+        next if line =~ /^\s*$/
+        next if line =~ /^\s*#/
+        codelines += 1
+      end
+      puts "L: #{sprintf("%4d", lines)}, " +
+        "LOC #{sprintf("%4d", codelines)} | #{file_name}"
+      total_lines     += lines
+      total_codelines += codelines
+
+      lines, codelines = 0, 0
+    end
+
+    puts "Total: Lines #{total_lines}, LOC #{total_codelines}"
+  end
+end

data/lib/gems/addressable-2.0.1/tasks/rdoc.rake

@@ -0,0 +1,29 @@
+require "rake/rdoctask"
+
+namespace :doc do
+  desc "Generate RDoc documentation"
+  Rake::RDocTask.new do |rdoc|
+    rdoc.rdoc_dir = "doc"
+    rdoc.title    = "#{PKG_NAME}-#{PKG_VERSION} Documentation"
+    rdoc.options << "--line-numbers" << "--inline-source" <<
+      "--accessor" << "cattr_accessor=object" << "--charset" << "utf-8"
+    rdoc.template = "#{ENV["template"]}.rb" if ENV["template"]
+    rdoc.rdoc_files.include("README", "CHANGELOG", "LICENSE")
+    rdoc.rdoc_files.include("lib/**/*.rb")
+  end
+
+  desc "Generate ri locally for testing"
+  task :ri do
+    sh "rdoc --ri -o ri ."
+  end
+
+  desc "Remove ri products"
+  task :clobber_ri do
+    rm_r "ri" rescue nil
+  end
+end
+
+desc "Alias to doc:rdoc"
+task "doc" => "doc:rdoc"
+
+task "clobber" => ["doc:clobber_rdoc", "doc:clobber_ri"]

data/lib/gems/addressable-2.0.1/tasks/rubyforge.rake

@@ -0,0 +1,89 @@
+namespace :gem do
+  desc 'Package and upload to RubyForge'
+  task :release => ["gem:package"] do |t|
+    require 'rubyforge'
+
+    v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
+    abort "Versions don't match #{v} vs #{PROJ.version}" if v != PKG_VERSION
+    pkg = "pkg/#{GEM_SPEC.full_name}"
+
+    rf = RubyForge.new
+    rf.configure
+    puts 'Logging in...'
+    rf.login
+
+    c = rf.userconfig
+    changelog = File.open("CHANGELOG") { |file| file.read }
+    c['release_changes'] = changelog
+    c['preformatted'] = true
+
+    files = ["#{pkg}.tgz", "#{pkg}.zip", "#{pkg}.gem"]
+
+    puts "Releasing #{PKG_NAME} v. #{PKG_VERSION}"
+    rf.add_release RUBY_FORGE_PROJECT, PKG_NAME, PKG_VERSION, *files
+  end
+end
+
+namespace :doc do
+  desc "Publish RDoc to RubyForge"
+  task :release => ["doc:rdoc"] do
+    require "rake/contrib/sshpublisher"
+    require "yaml"
+
+    config = YAML.load(
+      File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+    )
+    host = "#{config['username']}@rubyforge.org"
+    remote_dir = RUBY_FORGE_PATH + "/api"
+    local_dir = "doc"
+    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+  end
+end
+
+namespace :spec do
+  desc "Publish specdoc to RubyForge"
+  task :release => ["spec:specdoc"] do
+    require "rake/contrib/sshpublisher"
+    require "yaml"
+
+    config = YAML.load(
+      File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+    )
+    host = "#{config['username']}@rubyforge.org"
+    remote_dir = RUBY_FORGE_PATH + "/specdoc"
+    local_dir = "specdoc"
+    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+  end
+
+  namespace :rcov do
+    desc "Publish coverage report to RubyForge"
+    task :release => ["spec:rcov"] do
+      require "rake/contrib/sshpublisher"
+      require "yaml"
+
+      config = YAML.load(
+        File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+      )
+      host = "#{config['username']}@rubyforge.org"
+      remote_dir = RUBY_FORGE_PATH + "/coverage"
+      local_dir = "coverage"
+      Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+    end
+  end
+end
+
+namespace :website do
+  desc "Publish website to RubyForge"
+  task :release => ["doc:release", "spec:release", "spec:rcov:release"] do
+    require "rake/contrib/sshpublisher"
+    require "yaml"
+
+    config = YAML.load(
+      File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+    )
+    host = "#{config['username']}@rubyforge.org"
+    remote_dir = RUBY_FORGE_PATH
+    local_dir = "website"
+    Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+  end
+end

data/lib/gems/addressable-2.0.1/tasks/spec.rake

@@ -0,0 +1,64 @@
+require 'spec/rake/verify_rcov'
+
+namespace :spec do
+  Spec::Rake::SpecTask.new(:rcov) do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--color', '--format', 'specdoc']
+    if RCOV_ENABLED
+      t.rcov = true
+    else
+      t.rcov = false
+    end
+    t.rcov_opts = [
+      '--exclude', 'spec',
+      '--exclude', '1\\.8\\/gems',
+      '--exclude', '1\\.9\\/gems',
+      '--exclude', 'addressable\\/idna\\.rb', # unicode tables too big
+    ]
+  end
+
+  Spec::Rake::SpecTask.new(:normal) do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--color', '--format', 'specdoc']
+    t.rcov = false
+  end
+
+  if RCOV_ENABLED
+    RCov::VerifyTask.new(:verify) do |t|
+      t.threshold = 100.0
+      t.index_html = 'coverage/index.html'
+    end
+
+    task :verify => :rcov
+  end
+
+  desc "Generate HTML Specdocs for all specs"
+  Spec::Rake::SpecTask.new(:specdoc) do |t|
+    specdoc_path = File.expand_path(
+      File.join(File.dirname(__FILE__), '../specdoc/'))
+    Dir.mkdir(specdoc_path) if !File.exist?(specdoc_path)
+
+    output_file = File.join(specdoc_path, 'index.html')
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ["--format", "\"html:#{output_file}\"", "--diff"]
+    t.fail_on_error = false
+  end
+
+  namespace :rcov do
+    desc "Browse the code coverage report."
+    task :browse => "spec:rcov" do
+      require "launchy"
+      Launchy::Browser.run("coverage/index.html")
+    end
+  end
+end
+
+if RCOV_ENABLED
+  desc "Alias to spec:verify"
+  task "spec" => "spec:verify"
+else
+  desc "Alias to spec:normal"
+  task "spec" => "spec:normal"
+end
+
+task "clobber" => ["spec:clobber_rcov"]