dm-is-indexed 0.1.0 → 0.1.1

data/ChangeLog.md

@@ -1,3 +1,8 @@
+### 0.1.1 / 2011-03-21
+
+* Use `DataMapper::Property#valid?` to check if a key is compatible with a
+  Property.
+
 ### 0.1.0 / 2011-03-21
 
 * Initial release.

data/Gemfile

@@ -98,6 +98,10 @@ end
 
 gem 'dm-core',	DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
 
+group :test do
+  gem 'dm-types', DM_VERSION, :git => "#{DATAMAPPER}/dm-types.git"
+end
+
 group :development do
   gem 'rake',		    '~> 0.8.7'
 

data/gemspec.yml

@@ -1,5 +1,5 @@
 name: dm-is-indexed
-version: 0.1.0
+version: 0.1.1
 summary: Query DataMapper Resources via their indexed properties.
 description:
   dm-is-indexed overloads the Model[] method, and allows querying Resources

data/lib/dm-is-indexed/is/indexed.rb

@@ -33,7 +33,7 @@ module DataMapper
 
               properties.each do |field|
                 if (field.index || field.unique?)
-                  if field.primitive?(key)
+                  if field.valid?(key)
                     resource = first(field => key)
 
                     break if resource

data/spec/integration/indexed_spec.rb

@@ -8,43 +8,50 @@ describe DataMapper::Is::Indexed do
     Atom.create(
       :symbol => 'He',
       :name => 'Helium',
-      :atomic_weight => 4.002602
+      :atomic_weight => 4.002602,
+      :url => 'http://www.webelements.com/helium/'
     )
 
     Atom.create(
       :symbol => 'Ne',
       :name => 'Neon',
-      :atomic_weight => 20.1797
+      :atomic_weight => 20.1797,
+      :url => 'http://www.webelements.com/neon/'
     )
 
     Atom.create(
       :symbol => 'Ar',
       :name => 'Argon',
-      :atomic_weight => 39.948
+      :atomic_weight => 39.948,
+      :url => 'http://www.webelements.com/argon/'
     )
 
     Atom.create(
       :symbol => 'Kr',
       :name => 'Krypton',
-      :atomic_weight => 83.798
+      :atomic_weight => 83.798,
+      :url => 'http://www.webelements.com/krypton/'
     )
 
     Atom.create(
       :symbol => 'Xe',
       :name => 'Xeon',
-      :atomic_weight => 131.293
+      :atomic_weight => 131.293,
+      :url => 'http://www.webelements.com/xenon/'
     )
 
     Atom.create(
       :symbol => 'Rn',
       :name => 'Radon',
-      :atomic_weight => 222.0
+      :atomic_weight => 222.0,
+      :url => 'http://www.webelements.com/radon/'
     )
 
     Atom.create(
       :symbol => 'Uuo',
       :name => 'Ununoctium',
-      :atomic_weight => 294.0
+      :atomic_weight => 294.0,
+      :url => 'http://www.webelements.com/ununoctium/'
     )
   end
 
@@ -84,5 +91,9 @@ describe DataMapper::Is::Indexed do
     it "should select the properties to query based on the key type" do
       subject[83.798].symbol.should == 'Kr'
     end
+
+    it "should select the properties to query based on supported key types" do
+      subject['http://www.webelements.com/ununoctium/'].symbol.should == 'Uuo'
+    end
   end
 end

data/spec/integration/models/atom.rb

@@ -1,4 +1,5 @@
 require 'dm-core'
+require 'dm-types'
 require 'dm-is-indexed'
 
 class Atom
@@ -15,4 +16,6 @@ class Atom
 
   property :atomic_weight, Float, :index => true
 
+  property :url, URI, :index => true
+
 end

metadata

@@ -2,7 +2,7 @@
 name: dm-is-indexed
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Postmodern