dm-predefined 0.2.0 → 0.2.1

data/Manifest.txt

@@ -1,9 +1,7 @@
-History.txt
-LICENSE.txt
+History.rdoc
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
-TODO.txt
 lib/dm-predefined.rb
 lib/dm-predefined/exceptions/unknown_resource.rb
 lib/dm-predefined/predefined.rb

data/{README.txt → README.rdoc}

@@ -35,12 +35,15 @@ A DataMapper plugin for adding predefined resources to Models.
   Licence.gpl2
   # => #<Licence: id: 1, name: "GPL-2", url: "http://www.gnu.org/copyleft/gpl.html">
   
-  Licence[:mit]
+  Licence.predefined_resource(:mit)
   # => #<Licence: id: 2, name: "MIT">
 
+  License.predefined_names
+  # => [:gpl2, :mit]
+
 == REQUIREMENTS:
 
-* {YARD}[http://yard.soen.ca/] >= 0.2.3.5
+* {dm-core}[http://github.com/datamapper/dm-core/] >= 0.10.2
 
 == INSTALL:
 
@@ -48,7 +51,9 @@ A DataMapper plugin for adding predefined resources to Models.
 
 == LICENSE:
 
-Copyright (c) 2008-2009 Hal Brodigan
+(The MIT License)
+
+Copyright (c) 2008-2010 Hal Brodigan
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -3,23 +3,24 @@
 require 'rubygems'
 require 'hoe'
 require 'hoe/signing'
-require './tasks/spec.rb'
-require './tasks/yard.rb'
+
+Hoe.plugin :yard
 
 Hoe.spec('dm-predefined') do
-  self.rubyforge_name = 'dm-predefined'
   self.developer('Postmodern','postmodern.mod3@gmail.com')
+
+  self.rspec_options += ['--colour', '--format', 'specdoc']
+
+  self.yard_opts += ['--protected']
   self.remote_rdoc_dir = ''
-  self.extra_deps = [
-    ['yard', '>=0.2.3.5'],
-    ['dm-core', '>=0.10.0']
-  ]
 
-  self.extra_dev_deps = [
-    ['rspec', '>=1.2.8']
+  self.extra_deps += [
+    ['dm-core', '>=0.10.2']
   ]
 
-  self.spec_extras = {:has_rdoc => 'yard'}
+  self.extra_dev_deps += [
+    ['rspec', '>=1.2.9']
+  ]
 end
 
 # vim: syntax=Ruby

data/lib/dm-predefined/predefined.rb

@@ -10,6 +10,18 @@ module DataMapper
     end
 
     module ClassMethods
+      #
+      # Returns the names of the predefined resources.
+      #
+      # @return [Array<Symbol>]
+      #   The names of the predefined resources.
+      #
+      # @since 0.2.1
+      #
+      def predefined_names
+        predefined_attributes.keys
+      end
+
       #
       # Finds or auto-creates the pre-defined resource with the given name.
       #
@@ -19,7 +31,13 @@ module DataMapper
       # @return [Object]
       #   The pre-defined resource.
       #
-      def [](name)
+      # @raise [UnknownResource]
+      #   Indicates that there are no predefined attributes for the resource
+      #   with the given name.
+      #
+      # @since 0.2.1
+      #
+      def predefined_resource(name)
         name = name.to_sym
         attributes = self.predefined_attributes[name]
 
@@ -64,7 +82,7 @@ module DataMapper
         class_eval %{
           class << self
             define_method(#{name.dump}) do
-              self[#{name.dump}]
+              predefined_resource(#{name.dump})
             end
           end
         }

data/lib/dm-predefined/version.rb

@@ -1,6 +1,6 @@
 module DataMapper
   module Predefined
     # The version of dm-predefined
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/spec/integration/predefined_spec.rb

@@ -7,6 +7,10 @@ if (HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES)
       TestModel.auto_migrate!
     end
 
+    it "should provide the names of all predefined resources of a Model" do
+      TestModel.predefined_names.should =~ [:test1, :test2]
+    end
+
     it "should be able to define resources of a Model" do
       test1 = TestModel.test1
 
@@ -35,7 +39,7 @@ if (HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES)
     end
 
     it "should provide a generic interface for accessing resources" do
-      test1 = TestModel[:test1]
+      test1 = TestModel.predefined_resource(:test1)
 
       test1.name.should == 'test1'
       test1.number.should == 1
@@ -43,7 +47,7 @@ if (HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES)
 
     it "should raise an UnknownResource exception when accessing undefined resources" do
       lambda {
-        TestModel[:test3]
+        TestModel.predefined_resource(:test3)
       }.should raise_error(DataMapper::Predefined::UnknownResource)
     end
   end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'rubygems'
 
-gem 'rspec', '~>1.2.6'
+gem 'rspec', '>=1.2.9'
 require 'spec'
 
 require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-predefined'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-predefined
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Postmodern
@@ -30,28 +30,58 @@ cert_chain:
   pDj+ws7QjtH/Qcrr1l9jfN0ehDs=
   -----END CERTIFICATE-----
 
-date: 2009-09-25 00:00:00 -07:00
+date: 2010-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: dm-core
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.3.5
+        version: 0.10.2
     version: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  type: :runtime
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe-yard
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 0.1.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -61,7 +91,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.8
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -71,7 +101,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.5.0
     version: 
 description: A DataMapper plugin for adding predefined resources to Models.
 email: 
@@ -81,18 +111,13 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- LICENSE.txt
 - Manifest.txt
-- README.txt
-- TODO.txt
+- History.rdoc
 files: 
-- History.txt
-- LICENSE.txt
+- History.rdoc
 - Manifest.txt
-- README.txt
+- README.rdoc
 - Rakefile
-- TODO.txt
 - lib/dm-predefined.rb
 - lib/dm-predefined/exceptions/unknown_resource.rb
 - lib/dm-predefined/predefined.rb
@@ -112,8 +137,10 @@ licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --protected
+- --title
+- DmPredefined Documentation
+- --quiet
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2008 Hal Brodigan
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.