dm-is-select 0.0.7 → 0.0.8

data/README.rdoc

@@ -14,12 +14,7 @@ A DataMapper plugin that makes getting the <tt><select></tt> options from a Mode
 
 The plugin depends upon the following:
 
-* dm-core ( >= 0.10.0)
-* dm-more ( >= 0.10.0) [not really, but your code will depend upon it]
-
-
-<b>NB!</b> The plugin has been developed for and on DM's next branch[http://github.com/datamapper/dm-core/tree/next], so may NOT work on previous incarnations.
-
+* dm-core ( >= 1.0.0)
 
 
 == Getting Started
@@ -30,9 +25,9 @@ Let's say you got a basic Category Model.
     include DataMapper::Resource
     property :id, Serial
     property :name, String
-  
+    
     is :select, :name
-  
+    
   end
     
 Through that simple declaration you get the following class method ..

data/Rakefile

@@ -3,6 +3,7 @@ require 'rake'
 
 begin
   require 'jeweler'
+  
   Jeweler::Tasks.new do |gem|
     gem.name = "dm-is-select"
     # gem.version = IO.read('VERSION')
@@ -12,15 +13,16 @@ begin
     gem.homepage = "http://github.com/kematzy/dm-is-select"
     gem.authors = ["kematzy"]
     gem.extra_rdoc_files = %w[ README.rdoc LICENSE TODO History.rdoc ]
-    gem.add_dependency('dm-core', '>= 0.10.2')
-    # gem.add_dependency('dm-more', '>= 0.10.0')
-    # gem.add_dependency('dm-validations', '>= 0.10.0')
-    
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_dependency 'dm-core',   '~> 1.0.0.rc3'
+    gem.add_development_dependency 'rspec',          '~> 1.3'
+    gem.add_development_dependency 'dm-migrations', '~> 1.0.0.rc3'
+    gem.add_development_dependency 'dm-validations', '~> 1.0.0.rc3'
   end
-
+  
+  Jeweler::GemcutterTasks.new
+  
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 require 'spec/rake/spectask'
@@ -91,20 +93,3 @@ namespace :docs do
   end
   
 end
-
-
-# kept just as a reference for now. 
-# 
-# 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/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/dm-is-select.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-select}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kematzy"]
-  s.date = %q{2010-05-20}
+  s.date = %q{2010-06-09}
   s.description = %q{A DataMapper plugin that makes getting the <tt>select</tt> options from a Model easier.}
   s.email = %q{kematzy@gmail.com}
   s.extra_rdoc_files = [
@@ -48,12 +48,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, [">= 0.10.2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<dm-migrations>, ["~> 1.0.0.rc3"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
     else
-      s.add_dependency(%q<dm-core>, [">= 0.10.2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
     end
   else
-    s.add_dependency(%q<dm-core>, [">= 0.10.2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
   end
 end
 

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

@@ -35,7 +35,7 @@ module DataMapper
       #   
       # 
       # @api public
-      def is_select(select_field = :name, options = {})
+      def is_select(select_field = :name, options = {}) 
         raise ArgumentError, "The :select_field, must be an existing attribute in the Model. Got [ #{select_field.inspect} ]" unless properties.any?{ |p| p.name == select_field.to_sym }
         
         @select_options = {
@@ -54,7 +54,7 @@ module DataMapper
         
       end
       
-      module ClassMethods
+      module ClassMethods 
         attr_reader :select_field, :select_options, :value_field
         
         ##
@@ -102,8 +102,6 @@ module DataMapper
           # clean out the various parts
           html_options = options.only(:prompt, :divider, :show_root, :root_text)
           sql_options = options.except(:prompt, :divider, :show_root, :root_text)
-          # puts "sql_options=[#{sql_options.inspect}] [#{__FILE__}:#{__LINE__}]"
-          # puts "html_options=[#{html_options.inspect}] [#{__FILE__}:#{__LINE__}]"
           
           options = {
             :prompt => "Select #{self.name}",
@@ -116,9 +114,7 @@ module DataMapper
             :order => [self.select_field.to_sym],
           }.merge(sql_options)
           
-          mi = self.select_options[:is_tree] ?  
-            all({ :parent_id => 0 }.merge(sql_options) ) :  
-            all(sql_options)
+          mi = self.select_options[:is_tree] ?  all({ :parent_id => nil }.merge(sql_options) ) :  all(sql_options)
           
           res = []
           if options[:prompt]

data/lib/dm-is-select/is/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module Is
     module Select
-      VERSION = '0.0.7'
+      VERSION = '0.0.8'
     end
   end
 end

data/lib/dm-is-select.rb

@@ -3,14 +3,8 @@ require 'rubygems'
 require 'pathname'
 
 # Add all external dependencies for the plugin here
-gem 'dm-core', '~> 0.10.0'
 require 'dm-core'
-# gem 'extlib', '~> 0.9.13'
-# require 'extlib'
-gem 'dm-is-tree', '~> 0.10.0'
 require 'dm-is-tree'
-
-
 # Require plugin-files
 require Pathname(__FILE__).dirname.expand_path / 'dm-is-select' / 'is' / 'select.rb'
 

data/spec/integration/select_spec.rb

@@ -4,53 +4,45 @@ require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
 if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
   describe 'DataMapper::Is::Select' do
     
-    class Category
-      include DataMapper::Resource
-      property :id, Serial
-      property :name, String
-      property :publish_status, String, :default => "on"
+    before(:each) do 
       
-      is :select, :name
+      class Category
+        include DataMapper::Resource
+        property :id, Serial
+        property :name, String
+        property :publish_status, String, :default => "on"
+        
+        is :select, :name
+      end 
       
-      auto_migrate!
-    end 
-    
-    class TreeCategory
-      include DataMapper::Resource
-      property :id, Serial
-      property :name, String
-      property :publish_status, String, :default => "on"
+      class TreeCategory
+        include DataMapper::Resource
+        property :id, Serial
+        property :name, String
+        property :publish_status, String, :default => "on"
+        # property :parent_id, Integer
+        
+        is :tree, :order => :name
+        is :select, :name, :is_tree => true 
+      end
       
-      is :tree, :order => :name
-      is :select, :name, :is_tree => true 
+      class Country
+        include DataMapper::Resource
+        property :code,     String, :key => true
+        property :name,    String
+        is :select, :name, :value_field => :code
+      end #/ Country
       
-      auto_migrate!
-    end
-    
-    
-    class Country
-      include DataMapper::Resource
-      property :code,     String, :key => true  
-      property :name,    String
-      is :select, :name, :value_field => :code 
+      DataMapper.finalize
+      
+      DataMapper.auto_migrate!
       
-      auto_migrate!
-    end #/ Country
-    
-    5.times do |n| 
-      Category.create(:name => "Category #{n+1}")
     end
     
-    2.times do |parent_id|
-      parent_id += 1
-      parent = TreeCategory.create(:name => "TreeCategory-#{parent_id}" , :parent_id => 0 )
-      child = TreeCategory.create(:name => "TreeCategory-#{parent_id}-Child" , :parent_id => parent.id )
-      grandchild = TreeCategory.create(:name => "TreeCategory-#{parent_id}-Child-GrandChild" , :parent_id => child.id )
+    it "should use DM-Core 1.0.0.rc3" do
+      DataMapper::VERSION.should == '1.0.0.rc3'
     end
     
-    3.times do |i|
-      Country.create(:code => "A#{i}", :name => "Country#{i}")
-    end
     
     describe "Class Methods" do 
       
@@ -64,9 +56,10 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
             property :name, String
             
             is :select, 'name'
-            auto_migrate!
           end 
           
+          DataMapper.auto_migrate!
+          
           }.should_not raise_error(ArgumentError)
         end
         
@@ -78,9 +71,9 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
             property :name, String
             
             is :select, :does_not_exist
-            auto_migrate!
           end 
           
+          DataMapper.auto_migrate!
           }.should raise_error(ArgumentError)
         end
         
@@ -90,6 +83,12 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         
         describe "A Normal Model" do 
           
+          before(:each) do 
+            5.times do |n| 
+              Category.create(:name => "Category #{n+1}")
+            end
+          end
+          
           it "should return the default select options when given no params" do 
             Category.items_for_select_menu.should == [ 
               [nil, "Select Category"], 
@@ -175,6 +174,7 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
               # [1, "Category 1"] 
             ]
           end
+          
           it "should handle invalid SQL select options" do 
             Category.items_for_select_menu(:publish_status => "invalid", :order => [ :id.desc ] ).should == [ 
               [nil, "Select Category"], 
@@ -191,6 +191,16 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         
         describe "Tree Model" do 
           
+          before(:each) do 
+            2.times do |parent_id|
+              parent_id += 1
+              theparent = TreeCategory.create(:name => "TreeCategory-#{parent_id}") # sets parent_id => nil
+              child = TreeCategory.create(:name => "TreeCategory-#{parent_id}-Child" , :parent => theparent )
+              grandchild = TreeCategory.create(:name => "TreeCategory-#{parent_id}-Child-GrandChild" , :parent_id => child.id )
+            end
+            
+          end
+          
           it "should return the default select options when given no params" do 
             TreeCategory.items_for_select_menu.should == [
               [nil, "Select TreeCategory"], 
@@ -287,6 +297,12 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         
         describe "A value_field model" do 
           
+          before(:each) do 
+            3.times do |i|
+              Country.create(:code => "A#{i}", :name => "Country#{i}")
+            end
+          end
+          
           it "should return the default select options when given no params" do 
             Country.items_for_select_menu.should == [
               [nil, "Select Country"], 

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
 require 'pathname'
 require 'rubygems'
 
-# gem 'rspec', '~>1.2.6'
-require 'spec'
+# require 'spec'
+require 'dm-validations'
+require 'dm-migrations'
+require 'dm-is-tree'
 
 require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-is-select'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - kematzy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 +08:00
+date: 2010-06-09 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,15 +22,59 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 10
-        - 2
-        version: 0.10.2
+        - 0
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: dm-migrations
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc3
+        version: 1.0.0.rc3
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc3
+        version: 1.0.0.rc3
+  type: :development
+  version_requirements: *id004
 description: A DataMapper plugin that makes getting the <tt>select</tt> options from a Model easier.
 email: kematzy@gmail.com
 executables: []