mack-data_mapper 0.8.2 → 0.8.3

data/lib/gems/{dm-types-0.9.7 → dm-types-0.9.9}/lib/dm-types/json.rb

@@ -13,14 +13,12 @@ module DataMapper
         elsif value.is_a?(String)
           ::JSON.load(value)
         else
-          raise ArgumentError.new("+value+ must be nil or a String")
+          raise ArgumentError, '+value+ must be nil or a String'
         end
       end
 
       def self.dump(value, property)
-        if value.nil?
-          nil
-        elsif value.is_a?(String)
+        if value.nil? || value.is_a?(String)
           value
         else
           ::JSON.dump(value)
@@ -28,8 +26,7 @@ module DataMapper
       end
 
       def self.typecast(value, property)
-        # Arrays and hashes are left alone, while strings are parsed as JSON.
-        if value.kind_of?(Array) || value.kind_of?(Hash)
+        if value.nil? || value.kind_of?(Array) || value.kind_of?(Hash)
           value
         else
           ::JSON.load(value.to_s)

data/lib/gems/{dm-types-0.9.7 → dm-types-0.9.9}/lib/dm-types/uri.rb

@@ -1,4 +1,6 @@
 require 'rubygems'
+
+gem 'addressable', '~>2.0.1'
 require 'addressable/uri'
 
 module DataMapper

data/lib/gems/{dm-types-0.9.7 → dm-types-0.9.9}/lib/dm-types/uuid.rb

@@ -1,3 +1,6 @@
+require 'rubygems'
+
+gem 'uuidtools', '~>1.0.7'
 require 'uuidtools'
 
 module DataMapper

data/lib/gems/{dm-types-0.9.7 → dm-types-0.9.9}/lib/dm-types/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Types
-    VERSION = "0.9.7"
+    VERSION = '0.9.9'
   end
 end

data/lib/gems/{dm-types-0.9.7 → dm-types-0.9.9}/lib/dm-types/yaml.rb

@@ -3,8 +3,7 @@ require 'yaml'
 module DataMapper
   module Types
     class Yaml < DataMapper::Type
-      primitive String
-      size 65535
+      primitive Text
       lazy true
 
       def self.load(value, property)

data/lib/gems/dm-types-0.9.9/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/lib/gems/dm-types-0.9.9/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

data/lib/gems/{dm-validations-0.9.7 → dm-validations-0.9.9}/lib/dm-validations.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '~>0.9.7'
+gem 'dm-core', '~>0.9.9'
 require 'dm-core'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-validations'

data/lib/gems/{dm-validations-0.9.7 → dm-validations-0.9.9}/lib/dm-validations/contextual_validators.rb

@@ -17,15 +17,14 @@ module DataMapper
       #
       # @return <Hash> a hash of validators <GenericValidator>
       def contexts
-        @contexts ||= @contexts = {}
+        @contexts ||= {}
       end
 
       # Return an array of validators for a named context
       #
       # @return <Array> An array of validators
       def context(name)
-        contexts[name] = [] unless contexts.has_key?(name)
-        contexts[name]
+        contexts[name] ||= []
       end
 
       # Clear all named context validators off of the resource

data/lib/gems/{dm-validations-0.9.7 → dm-validations-0.9.9}/lib/dm-validations/formats/email.rb

@@ -9,6 +9,7 @@ module DataMapper
           )
         end
 
+        # RFC2822 (No attribution reference available)
         EmailAddress = begin
             alpha = "a-zA-Z"
             digit = "0-9"

data/lib/gems/{dm-validations-0.9.7 → dm-validations-0.9.9}/lib/dm-validations/uniqueness_validator.rb

@@ -6,7 +6,7 @@ module DataMapper
     # @author Guy van den Berg
     # @since  0.9
     class UniquenessValidator < GenericValidator
-      include Assertions
+      include Extlib::Assertions
 
       def initialize(field_name, options = {})
         assert_kind_of 'scope', options[:scope], Array, Symbol if options.has_key?(:scope)

data/lib/gems/{dm-validations-0.9.7 → dm-validations-0.9.9}/lib/dm-validations/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Validations
-    VERSION = "0.9.7"
+    VERSION = '0.9.9'
   end
 end

data/lib/gems/dm-validations-0.9.9/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/lib/gems/dm-validations-0.9.9/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

data/lib/gems/json_pure-1.1.3/tools/fuzz.rb

@@ -0,0 +1,140 @@
+$KCODE='UTF8'
+require 'json'
+
+require 'iconv'
+ISO_8859_1_TO_UTF8 = Iconv.new('utf-8', 'iso-8859-15')
+class ::String
+  def to_utf8
+    ISO_8859_1_TO_UTF8.iconv self
+  end
+end
+
+class Fuzzer
+  def initialize(n, freqs = {})
+    sum = freqs.inject(0.0) { |s, x| s + x.last }
+    freqs.each_key { |x| freqs[x] /= sum }
+    s = 0.0
+    freqs.each_key do |x|
+      freqs[x] = s .. (s + t = freqs[x])
+      s += t
+    end
+    @freqs = freqs
+    @n = n
+    @alpha = (0..0xff).to_a
+  end
+
+  def random_string
+    s = ''
+    30.times { s << @alpha[rand(@alpha.size)] }
+    s.to_utf8
+  end
+
+  def pick
+    r = rand
+    found = @freqs.find { |k, f| f.include? rand }
+    found && found.first
+  end
+
+  def make_pick
+    k = pick
+    case
+    when k == Hash, k == Array
+      k.new
+    when k == true, k == false, k == nil
+      k
+    when k == String
+      random_string
+    when k == Fixnum
+      rand(2 ** 30) - 2 ** 29
+    when k == Bignum
+      rand(2 ** 70) - 2 ** 69
+    end
+  end
+
+  def fuzz(current = nil)
+    if @n > 0
+      case current
+      when nil
+        @n -= 1
+        current = fuzz [ Hash, Array ][rand(2)].new
+      when Array
+        while @n > 0
+          @n -= 1
+          current << case p = make_pick
+          when Array, Hash
+            fuzz(p)
+          else
+            p
+          end
+        end
+      when Hash
+        while @n > 0
+          @n -= 1
+          current[random_string] = case p = make_pick
+          when Array, Hash
+            fuzz(p)
+          else
+            p
+          end
+        end
+      end
+    end
+    current
+  end
+end
+
+class MyState < JSON.state
+  WS = " \r\t\n"
+
+  def initialize
+    super(
+          :indent       => make_spaces,
+          :space        => make_spaces,
+          :space_before => make_spaces,
+          :object_nl    => make_spaces,
+          :array_nl     => make_spaces,
+          :max_nesting  => false
+         )
+  end
+
+  def make_spaces
+    s = ''
+    rand(1).times { s << WS[rand(WS.size)] }
+    s
+  end
+end
+
+n = (ARGV.shift || 500).to_i
+loop do
+  fuzzer = Fuzzer.new(n,
+                      Hash => 25,
+                      Array => 25,
+                      String => 10,
+                      Fixnum => 10,
+                      Bignum => 10,
+                      nil => 5,
+                      true => 5,
+                      false => 5
+                     )
+  o1 = fuzzer.fuzz
+  json = JSON.generate o1, MyState.new
+  if $DEBUG
+    puts "-" * 80
+    puts json, json.size
+  else 
+    puts json.size
+  end
+  begin
+    o2 = JSON.parse(json, :max_nesting => false)
+  rescue JSON::ParserError => e
+    puts "Caught #{e.class}: #{e.message}\n#{e.backtrace * "\n"}"
+    puts "o1 = #{o1.inspect}", "json = #{json}", "json_str = #{json.inspect}"
+    puts "locals = #{local_variables.inspect}"
+    exit
+  end
+  if o1 != o2
+    puts "mismatch", "o1 = #{o1.inspect}", "o2 = #{o2.inspect}",
+      "json = #{json}", "json_str = #{json.inspect}"
+    puts "locals = #{local_variables.inspect}"
+  end
+end

data/lib/gems/json_pure-1.1.3/tools/server.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+
+$KCODE='UTF8'
+require 'webrick'
+include WEBrick
+$:.unshift 'ext'
+$:.unshift 'lib'
+require 'json'
+
+class JSONServlet < HTTPServlet::AbstractServlet
+  @@count = 1
+
+  def do_GET(req, res)
+    obj = {
+      "TIME" => Time.now.strftime("%FT%T"),
+      "foo" => "Bär",
+      "bar" => "© ≠ €!",
+      'a' => 2,
+      'b' => 3.141,
+      'COUNT' => @@count += 1,
+      'c' => 'c',
+      'd' => [ 1, "b", 3.14 ],
+      'e' => { 'foo' => 'bar' },
+      'g' => "松本行弘",
+      'h' => 1000.0,
+      'i' => 0.001,
+      'j' => "\xf0\xa0\x80\x81",
+    }
+    res.body = JSON.generate obj
+    res['Content-Type'] = "application/json"
+  end
+end
+
+def create_server(err, dir, port)
+  dir = File.expand_path(dir)
+  err.puts "Surf to:", "http://#{Socket.gethostname}:#{port}"
+
+  s = HTTPServer.new(
+    :Port         => port,
+    :DocumentRoot => dir,
+    :Logger       => WEBrick::Log.new(err),
+    :AccessLog    => [
+      [ err, WEBrick::AccessLog::COMMON_LOG_FORMAT  ],
+      [ err, WEBrick::AccessLog::REFERER_LOG_FORMAT ],
+      [ err, WEBrick::AccessLog::AGENT_LOG_FORMAT   ]
+    ]
+  )
+  s.mount("/json", JSONServlet)
+  s
+end
+
+default_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'data'))
+dir = ARGV.shift || default_dir
+port = (ARGV.shift || 6666).to_i
+s = create_server(STDERR, dir, 6666)
+t = Thread.new { s.start }
+trap(:INT) do
+  s.shutdown
+  t.join
+  exit
+end
+sleep