dm-is-select 0.0.5 → 0.0.7

data/Rakefile

@@ -12,8 +12,8 @@ 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.0')
-    gem.add_dependency('dm-more', '>= 0.10.0')
+    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
@@ -26,6 +26,7 @@ end
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
+  spec.spec_opts = ["--color", "--format", "nested", "--require", "spec/spec_helper.rb"]
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.7

data/dm-is-select.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-is-select}
-  s.version = "0.0.5"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kematzy"]
-  s.date = %q{2009-10-30}
+  s.date = %q{2010-05-20}
   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 = [
@@ -31,13 +31,12 @@ Gem::Specification.new do |s|
      "lib/dm-is-select/is/select.rb",
      "lib/dm-is-select/is/version.rb",
      "spec/integration/select_spec.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/kematzy/dm-is-select}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A DataMapper plugin that makes getting the <tt>select</tt> options from a Model easier.}
   s.test_files = [
     "spec/integration/select_spec.rb",
@@ -49,14 +48,12 @@ 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.0"])
-      s.add_runtime_dependency(%q<dm-more>, [">= 0.10.0"])
+      s.add_runtime_dependency(%q<dm-core>, [">= 0.10.2"])
     else
-      s.add_dependency(%q<dm-core>, [">= 0.10.0"])
-      s.add_dependency(%q<dm-more>, [">= 0.10.0"])
+      s.add_dependency(%q<dm-core>, [">= 0.10.2"])
     end
   else
-    s.add_dependency(%q<dm-core>, [">= 0.10.0"])
-    s.add_dependency(%q<dm-more>, [">= 0.10.0"])
+    s.add_dependency(%q<dm-core>, [">= 0.10.2"])
   end
 end
+

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

@@ -29,17 +29,23 @@ module DataMapper
       #       => creates a <select> options array with the results ordered in hierarchical order
       #          parent > child > grandchild for each parent
       #   
+      #   is :select, :name, :value_field => :code  
+      #       => creates a <select> options array with the results ordered in hierarchical order
+      #          parent > child > grandchild for each parent
+      #   
       # 
       # @api public
       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 = {
+          :value_field => "id", 
           # add specical features if we are working with Tree Model
           :is_tree => false
         }.merge(options)
         
         @select_field = select_field
+        @value_field = @select_options[:value_field]
         
         
         # Add class & Instance methods
@@ -49,7 +55,7 @@ module DataMapper
       end
       
       module ClassMethods
-        attr_reader :select_field, :select_options
+        attr_reader :select_field, :select_options, :value_field
         
         ##
         # Provides the Model content in a ready to use <tt><select></tt> options array
@@ -128,19 +134,19 @@ module DataMapper
           
           if self.select_options[:is_tree]
             mi.each do |x|
-              res << [x.id, x.send(self.select_field)]
+              res << [x.send(self.value_field), x.send(self.select_field)]
               unless x.children.blank?
                 x.children.each do |child|
-                  res << [child.id, "-- #{child.send(self.select_field)}"]
+                  res << [child.send(self.value_field), "-- #{child.send(self.select_field)}"]
                   child.children.each do |grand_child| 
-                    res << [ grand_child.id, "-- -- #{grand_child.send(self.select_field)}"] 
+                    res << [ grand_child.send(self.value_field), "-- -- #{grand_child.send(self.select_field)}"] 
                   end unless child.children.blank?
                 end
               end
             end
           else
             mi.each do |x|
-              res << [x.id, x.send(self.select_field)]
+              res << [x.send(self.value_field), x.send(self.select_field)]
             end
           end
           res

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

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

data/spec/integration/select_spec.rb

@@ -27,6 +27,16 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       auto_migrate!
     end
     
+    
+    class Country
+      include DataMapper::Resource
+      property :code,     String, :key => true  
+      property :name,    String
+      is :select, :name, :value_field => :code 
+      
+      auto_migrate!
+    end #/ Country
+    
     5.times do |n| 
       Category.create(:name => "Category #{n+1}")
     end
@@ -38,6 +48,9 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       grandchild = TreeCategory.create(:name => "TreeCategory-#{parent_id}-Child-GrandChild" , :parent_id => child.id )
     end
     
+    3.times do |i|
+      Country.create(:code => "A#{i}", :name => "Country#{i}")
+    end
     
     describe "Class Methods" do 
       
@@ -272,6 +285,22 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
           
         end #/ Tree Model
         
+        describe "A value_field model" do 
+          
+          it "should return the default select options when given no params" do 
+            Country.items_for_select_menu.should == [
+              [nil, "Select Country"], 
+              ["nil", "  ------  "], 
+              ['A0', "Country0"], 
+              ['A1', "Country1"], 
+              ['A2', "Country2"], 
+              # [4, "Country3"], 
+              # [5, "Country4"]
+            ]
+          end
+          
+        end #/ A value_field model
+        
       end #/ #item_for_select_menu
       
     end #/ Class Methods

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-is-select
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - kematzy
@@ -9,29 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 +08:00
+date: 2010-05-20 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: dm-more
+        segments: 
+        - 0
+        - 10
+        - 2
+        version: 0.10.2
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.10.0
-    version: 
+  version_requirements: *id001
 description: A DataMapper plugin that makes getting the <tt>select</tt> options from a Model easier.
 email: kematzy@gmail.com
 executables: []
@@ -56,7 +55,6 @@ files:
 - lib/dm-is-select/is/select.rb
 - lib/dm-is-select/is/version.rb
 - spec/integration/select_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kematzy/dm-is-select
@@ -71,18 +69,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A DataMapper plugin that makes getting the <tt>select</tt> options from a Model easier.

data/spec/spec.opts

@@ -1 +0,0 @@
---colour