dm-types 0.9.5 → 0.9.6

data/Manifest.txt

@@ -13,8 +13,11 @@ lib/dm-types/file_path.rb
 lib/dm-types/flag.rb
 lib/dm-types/ip_address.rb
 lib/dm-types/json.rb
+lib/dm-types/slug.rb
+lib/dm-types/regexp.rb
 lib/dm-types/serial.rb
 lib/dm-types/uri.rb
+lib/dm-types/uuid.rb
 lib/dm-types/version.rb
 lib/dm-types/yaml.rb
 spec/integration/bcrypt_hash_spec.rb
@@ -23,6 +26,7 @@ spec/integration/file_path_spec.rb
 spec/integration/flag_spec.rb
 spec/integration/ip_address_spec.rb
 spec/integration/json_spec.rb
+spec/integration/slug_spec.rb
 spec/integration/uri_spec.rb
 spec/integration/yaml_spec.rb
 spec/spec.opts
@@ -35,5 +39,6 @@ spec/unit/file_path_spec.rb
 spec/unit/flag_spec.rb
 spec/unit/ip_address_spec.rb
 spec/unit/json_spec.rb
+spec/unit/regexp_spec.rb
 spec/unit/uri_spec.rb
 spec/unit/yaml_spec.rb

data/Rakefile

@@ -10,7 +10,7 @@ AUTHOR = "Sam Smoot"
 EMAIL  = "ssmoot@gmail.com"
 GEM_NAME = "dm-types"
 GEM_VERSION = DataMapper::Types::VERSION
-GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
+GEM_DEPENDENCIES = [["dm-core", GEM_VERSION], "uuidtools"]
 GEM_CLEAN = ["log", "pkg", "coverage"]
 GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
 
@@ -45,7 +45,7 @@ end
 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(Pathname.new(__FILE__).dirname + 'spec/**/*_spec.rb')
+  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
 
   begin
     t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true

data/lib/dm-types.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'pathname'
 
-gem 'dm-core', '=0.9.5'
+gem 'dm-core', '=0.9.6'
 require 'dm-core'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-types'
@@ -14,8 +14,11 @@ require dir / 'flag'
 require dir / 'ip_address'
 require dir / "json"""
 require dir / 'uri'
+require dir / 'uuid'
 require dir / 'yaml'
 require dir / 'serial'
+require dir / 'regexp'
+require dir / 'slug'
 
 # this looks a little ugly, but everyone who uses dm-types shouldn't have to have ruby-bcrypt installed
 module DataMapper

data/lib/dm-types/regexp.rb

@@ -0,0 +1,20 @@
+module DataMapper
+  module Types
+    class Regexp < DataMapper::Type
+      primitive String
+
+      def self.load(value, property)
+        ::Regexp.new(value) unless value.nil?
+      end
+
+      def self.dump(value, property)
+        return nil if value.nil?
+        value.source
+      end
+
+      def self.typecast(value, property)
+        value.kind_of?(::Regexp) ? value : load(value, property)
+      end
+    end
+  end
+end

data/lib/dm-types/slug.rb

@@ -0,0 +1,37 @@
+require 'iconv'
+
+module DataMapper
+  module Types
+    class Slug < DataMapper::Type
+      primitive String
+      size 65535
+
+      def self.load(value, property)
+        value
+      end
+
+      def self.dump(value, property)
+        if value.nil?
+          nil
+        elsif value.is_a?(String)
+          #Iconv.new('UTF-8//TRANSLIT//IGNORE', 'UTF-8').iconv(value.gsub(/[^\w\s\-\—]/,'').gsub(/[^\w]|[\_]/,' ').split.join('-').downcase).to_s
+          escape(value)
+        else
+          raise ArgumentError.new("+value+ must be nil or a String")
+        end
+      end
+
+      # Hugs and kisses to Rick Olsons permalink_fu for the escape method
+      def self.escape(string)
+        result = Iconv.iconv('ascii//translit//IGNORE', 'utf-8', string).to_s
+        result.gsub!(/[^\x00-\x7F]+/, '')  # Remove anything non-ASCII entirely (e.g. diacritics).
+        result.gsub!(/[^\w_ \-]+/i,   '')  # Remove unwanted chars.
+        result.gsub!(/[ \-]+/i,      '-')  # No more than one of the separator in a row.
+        result.gsub!(/^\-|\-$/i,      '')  # Remove leading/trailing separator.
+        result.downcase!
+        result
+      end
+
+    end # class Slug
+  end # module Types
+end # module DataMapper

data/lib/dm-types/uri.rb

@@ -16,7 +16,13 @@ module DataMapper
       end
 
       def self.typecast(value, property)
-        value.kind_of?(Addressable::URI) ? value : load(value.to_s, property)
+        if value.kind_of?(Addressable::URI)
+          value
+        elsif value.nil?
+          load(nil, property)
+        else
+          load(value.to_s, property)
+        end
       end
     end # class URI
   end # module Types

data/lib/dm-types/uuid.rb

@@ -0,0 +1,43 @@
+require 'uuidtools'
+
+module DataMapper
+  module Types
+    # UUID Type
+    # First run at this, because I need it. A few caveats:
+    #  * Only works on postgres, using the built-in native uuid type.
+    #    To make it work in mysql, you'll have to add a typemap entry to
+    #    the mysql_adapter. I think. I don't have mysql handy, so I'm
+    #    not going to try. For SQLite, this will have to inherit from the
+    #    String primitive
+    #  * Won't accept a random default, because of the namespace clash
+    #    between this and the UUIDtools gem. Also can't set the default
+    #    type to UUID() (postgres-contrib's native generator) and
+    #    automigrate, because auto_migrate! tries to make it a string "UUID()"
+    # Feel free to enchance this, and delete these caveats when they're fixed.
+    #
+    #  -- Rando Sept 25, 08
+    #
+    class UUID < DataMapper::Type
+      primitive 'UUID'
+
+      def self.load(value, property)
+        return nil if value.nil?
+        ::UUID.parse(value)
+      end
+
+      def self.dump(value, property)
+        return nil if value.nil?
+        value.to_s
+      end
+
+      def self.typecast(value, property)
+        value.kind_of?(::UUID) ? value : load(value, property)
+      end
+
+      ::DataMapper::Property::TYPES << self
+      if defined? DataMapper::Adapters::PostgresAdapter
+        DataMapper::Adapters::PostgresAdapter.type_map.map(self).to('UUID')
+      end
+    end
+  end
+end

data/lib/dm-types/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Types
-    VERSION = "0.9.5"
+    VERSION = "0.9.6"
   end
 end

data/spec/integration/slug_spec.rb

@@ -0,0 +1,54 @@
+require 'pathname'
+require 'iconv'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+describe DataMapper::Types::Slug do
+
+  before(:all) do
+    class SlugTest
+      include DataMapper::Resource
+
+      property :id, Serial
+      property :name, Slug
+
+    end
+    SlugTest.auto_migrate!
+  end
+
+  it "should create the permalink" do
+    repository(:default) do
+      SlugTest.create(:name => 'New DataMapper Type')
+    end
+
+    SlugTest.first.name.should == "new-datamapper-type"
+  end
+  
+  it "should find by a slug" do
+    repository(:default) do
+      SlugTest.create(:name => "This Should Be a Slug")
+    end
+    slug = "this-should-be-a-slug"
+    
+    slugged = SlugTest.first(:name => slug)
+    slugged.should_not be_nil
+    slugged.name.should == slug
+  end
+  
+  [
+    ["Iñtërnâtiônàlizætiøn",      "internationalizaetion" ],
+    ["Hello World",               "hello-world"],
+    ["This is Dan's Blog",        "this-is-dans-blog"],
+    ["This is My Site, and Blog", "this-is-my-site-and-blog"]
+  ].each do |name, slug|
+      
+      it "should sluggify #{name}" do
+        repository(:default) do
+          SlugTest.create(:name => name)
+        end
+        SlugTest.first(:name => slug).should_not be_nil
+      end
+    end
+    
+
+
+end

data/spec/integration/uri_spec.rb

@@ -23,4 +23,9 @@ describe DataMapper::Types::URI do
   it 'should immediately typecast supplied values' do
     URITest.new(:uri => 'http://localhost').uri.should == Addressable::URI.parse('http://localhost')
   end
+
+  it "should correctly typecast nil values" do
+    URITest.new(:uri => nil).uri.should == nil
+  end
+
 end

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ ENV["SQLITE3_SPEC_URI"]   ||= 'sqlite3::memory:'
 ENV["MYSQL_SPEC_URI"]     ||= 'mysql://localhost/dm_core_test'
 ENV["POSTGRES_SPEC_URI"]  ||= 'postgres://postgres@localhost/dm_more_test'
 
+# DataMapper::Logger.new(STDOUT, :debug)
+
 def setup_adapter(name, default_uri = nil)
   begin
     DataMapper.setup(name, ENV["#{ENV['ADAPTER'].to_s.upcase}_SPEC_URI"] || default_uri)

data/spec/unit/regexp_spec.rb

@@ -0,0 +1,23 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.parent.expand_path + 'spec_helper'
+
+describe DataMapper::Types::Regexp, ".load" do
+  it 'should make a Regexp from the value if a string is provided' do
+    Regexp.should_receive(:new).with('regexp_string').once
+    DataMapper::Types::Regexp.load('regexp_string', :property)
+  end
+
+  it 'should return nil otherwise' do
+    DataMapper::Types::Regexp.load(nil, :property).should == nil
+  end
+end
+
+describe DataMapper::Types::Regexp, ".dump" do
+  it 'should dump to a string' do
+    DataMapper::Types::Regexp.dump(/\d+/, :property).should == "\\d+"
+  end
+
+  it 'should return nil if the value is nil' do
+    DataMapper::Types::Regexp.dump(nil, :property).should == nil
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-types
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 -05:00
+date: 2008-10-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.5
+        version: 0.9.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: uuidtools
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -59,8 +69,11 @@ files:
 - lib/dm-types/flag.rb
 - lib/dm-types/ip_address.rb
 - lib/dm-types/json.rb
+- lib/dm-types/slug.rb
+- lib/dm-types/regexp.rb
 - lib/dm-types/serial.rb
 - lib/dm-types/uri.rb
+- lib/dm-types/uuid.rb
 - lib/dm-types/version.rb
 - lib/dm-types/yaml.rb
 - spec/integration/bcrypt_hash_spec.rb
@@ -69,6 +82,7 @@ files:
 - spec/integration/flag_spec.rb
 - spec/integration/ip_address_spec.rb
 - spec/integration/json_spec.rb
+- spec/integration/slug_spec.rb
 - spec/integration/uri_spec.rb
 - spec/integration/yaml_spec.rb
 - spec/spec.opts
@@ -81,6 +95,7 @@ files:
 - spec/unit/flag_spec.rb
 - spec/unit/ip_address_spec.rb
 - spec/unit/json_spec.rb
+- spec/unit/regexp_spec.rb
 - spec/unit/uri_spec.rb
 - spec/unit/yaml_spec.rb
 has_rdoc: true