roart 0.1.7 → 0.1.8

data/History.txt

@@ -1,5 +1,12 @@
-==0.1.7 / 2010-30-11
+==0.1.8 / 2010-03-16
+Added validate presence of.
+Updated specs to test validations.
+No Longer depend on mechanize version 0.9.3 and get rid of those pesky deprecation warnings.
+The connection adapter classes are now suffixed with "Adapter", so Mechanize is now MechanizeAdapter. You still specify it with :adapter => 'mechanize', however.
+
+==0.1.7 / 2010-03-11
 Added some new error classes, add removed any extraneous raise 'text' (via jrbingham)
+Removed debugging puts from the ticket file.
 
 ==0.1.6 / 2010-03-09
 Updated the search feature to pull all the ticket information at the same time, instead of only loading the id and subject.

data/Rakefile

@@ -28,7 +28,7 @@ PROJ.rubyforge.name = 'roart'
 PROJ.exclude = %w(.git pkg coverage)
 PROJ.description = "Interface for working with Request Tracker (RT) tickets inspired by ActiveRecord."
 PROJ.rdoc.main = 'README.rdoc'
-depend_on 'mechanize'
+depend_on 'mechanize' #this will go away when a stdlib adapter gets written
 
 PROJ.spec.opts << '--color'
 

data/lib/roart.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 module Roart
 
   # :stopdoc:
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/roart/connection.rb

@@ -1,5 +1,4 @@
 require 'yaml'
-require 'mechanize'
 
 module Roart
 

data/lib/roart/connection_adapter.rb

@@ -6,7 +6,7 @@ module Roart
     extend Forwardable
 
     def initialize(config)
-      @adapter = Roart::ConnectionAdapters.const_get(config[:adapter].capitalize).new(config)
+      @adapter = Roart::ConnectionAdapters.const_get(config[:adapter].capitalize + "Adapter").new(config)
       @adapter.login(config) if config[:user] && config[:pass]
     end
 

data/lib/roart/connection_adapters/mechanize_adapter.rb

@@ -1,6 +1,8 @@
+require 'mechanize'
+
 module Roart
   module ConnectionAdapters
-    class Mechanize
+    class MechanizeAdapter
 
       def initialize(config)
         @conf = config
@@ -8,7 +10,7 @@ module Roart
 
       def login(config)
         @conf.merge!(config)
-        agent = WWW::Mechanize.new
+        agent = Mechanize.new
         page = agent.get(@conf[:server])
         form = page.form('login')
         form.user = @conf[:user]

data/lib/roart/validations.rb

@@ -70,6 +70,7 @@ module Roart
       end
 
       def validate(obj)
+        obj.errors.clear
         @validators.each{|validator| validator.call(obj)}
       end
 
@@ -80,14 +81,21 @@ module Roart
       ALL_RANGE_OPTIONS = [ :is, :within, :in, :minimum, :min, :maximum, :max ].freeze
       ALL_NUMERICALITY_CHECKS = { :greater_than => '>', :greater_than_or_equal_to => '>=',
                                   :equal_to => '==', :less_than => '<', :less_than_or_equal_to => '<=',
-                                  :odd => 'odd?', :even => 'even?' }.freeze
+                                  :odd => 'odd?', :even => 'even?', :only_integer => 'is_a?' }.freeze
 
       def validator
         @validator ||= Validators.new
       end
 
       def validates_presence_of(*args)
-
+        args.each do |field|
+          validator_proc = lambda do |obj|
+            if obj.send(field.to_sym).nil? || obj.send(field.to_sym).blank?
+              obj.errors.add(field.to_sym, "Can't Be Blank")
+            end
+          end
+          self.validator.add(validator_proc)
+        end
       end
 
       def validates_format_of(*args)
@@ -165,35 +173,37 @@ module Roart
 
       def validates_numericality_of(*args)
         options = args.last.is_a?(Hash) ? args.pop : {}
-        numericality_options = ALL_NUMERICALITY_CHECKS & options.keys
-
-        case numericality_options
-        when 0
-          raise ArgumentError, "Options Unspecified. Specify an option to use."
-        when 1
-          #continue
-        else
-          raise ArgumentError, "Too many options specified"
-        end
-
-        option = numericality_options.first
-        option_value = options[numericality_options.first]
-        key = {:is => :wrong_length, :minimum => :too_short, :maximum => :too_long}[option]
-        custom_message = options[:message] || options[key]
-
+        numericality_options = ALL_NUMERICALITY_CHECKS.keys & options.keys
         args.each do |field|
           numericality_options.each do |option|
-            case option
-              when :odd, :even
-                unless raw_value.to_i.method(ALL_NUMERICALITY_CHECKS[option])[]
-                  record.errors.add(attr_name, option, :value => raw_value, :default => configuration[:message])
+            validator_proc = case option
+            when :only_integer
+              lambda do |obj|
+                unless obj.send(field.to_sym).send(ALL_NUMERICALITY_CHECKS[option], Integer )
+                  obj.errors.add(field.to_sym, "Must be #{ALL_NUMERICALITY_CHECKS[option]}.")
+                end
+              end
+            when :even, :odd
+              lambda do |obj|
+                if obj.send(field.to_sym).send("is_a?".to_sym, Integer) == true
+                  unless obj.send(field.to_sym).send(ALL_NUMERICALITY_CHECKS[option] )
+                    obj.errors.add(field.to_sym, "Must be #{ALL_NUMERICALITY_CHECKS[option]}.")
+                  end
+                else
+                  obj.errors.add(field.to_sym, "Must be an #{option} Integer.")
                 end
-              else
-                record.errors.add(attr_name, option, :default => configuration[:message], :value => raw_value, :count => configuration[option]) unless raw_value.method(ALL_NUMERICALITY_CHECKS[option])[configuration[option]]
+              end
+            else
+              raise ArgumentError, ":#{option} must be a number" unless options[option].is_a?(Numeric)
+              lambda do |obj|
+                unless obj.send(field.to_sym).send(ALL_NUMERICALITY_CHECKS[option], options[option] )
+                  obj.errors.add(field.to_sym, "Must be #{ALL_NUMERICALITY_CHECKS[option]}.")
+                end
+              end
             end
+            self.validator.add(validator_proc)
           end
         end
-
       end
 
     end

data/roart.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roart}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["PJ Davis"]
-  s.date = %q{2010-03-11}
+  s.date = %q{2010-03-17}
   s.description = %q{Interface for working with Request Tracker (RT) tickets inspired by ActiveRecord.}
   s.email = %q{pj.davis@gmail.com}
   s.extra_rdoc_files = ["History.txt", "README.rdoc", "spec/test_data/full_history.txt", "spec/test_data/search_ticket.txt", "spec/test_data/single_history.txt", "spec/test_data/ticket.txt"]
-  s.files = ["History.txt", "README.rdoc", "Rakefile", "lib/roart.rb", "lib/roart/callbacks.rb", "lib/roart/connection.rb", "lib/roart/connection_adapter.rb", "lib/roart/connection_adapters/mechanize_adapter.rb", "lib/roart/core/array.rb", "lib/roart/core/hash.rb", "lib/roart/core/hash/indifferent_access.rb", "lib/roart/core/string.rb", "lib/roart/errors.rb", "lib/roart/history.rb", "lib/roart/roart.rb", "lib/roart/ticket.rb", "lib/roart/ticket_page.rb", "lib/roart/validations.rb", "roart.gemspec", "spec/roart/callbacks_spec.rb", "spec/roart/connection_adapter_spec.rb", "spec/roart/connection_spec.rb", "spec/roart/core/array_spec.rb", "spec/roart/core/hash_spec.rb", "spec/roart/core/string_spec.rb", "spec/roart/history_spec.rb", "spec/roart/roart_spec.rb", "spec/roart/ticket_page_spec.rb", "spec/roart/ticket_spec.rb", "spec/roart_spec.rb", "spec/spec_helper.rb", "spec/test_data/full_history.txt", "spec/test_data/search_ticket.txt", "spec/test_data/single_history.txt", "spec/test_data/ticket.txt"]
+  s.files = ["History.txt", "README.rdoc", "Rakefile", "lib/roart.rb", "lib/roart/callbacks.rb", "lib/roart/connection.rb", "lib/roart/connection_adapter.rb", "lib/roart/connection_adapters/mechanize_adapter.rb", "lib/roart/core/array.rb", "lib/roart/core/hash.rb", "lib/roart/core/hash/indifferent_access.rb", "lib/roart/core/string.rb", "lib/roart/errors.rb", "lib/roart/history.rb", "lib/roart/roart.rb", "lib/roart/ticket.rb", "lib/roart/ticket_page.rb", "lib/roart/validations.rb", "roart.gemspec", "spec/roart/callbacks_spec.rb", "spec/roart/connection_adapter_spec.rb", "spec/roart/connection_spec.rb", "spec/roart/core/array_spec.rb", "spec/roart/core/hash_spec.rb", "spec/roart/core/string_spec.rb", "spec/roart/history_spec.rb", "spec/roart/roart_spec.rb", "spec/roart/ticket_page_spec.rb", "spec/roart/ticket_spec.rb", "spec/roart/validation_spec.rb", "spec/roart_spec.rb", "spec/spec_helper.rb", "spec/test_data/full_history.txt", "spec/test_data/search_ticket.txt", "spec/test_data/single_history.txt", "spec/test_data/ticket.txt"]
   s.homepage = %q{http://github.com/pjdavis/roart}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
@@ -23,14 +23,14 @@ 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<mechanize>, [">= 0.9.3"])
+      s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
       s.add_development_dependency(%q<bones>, [">= 2.5.1"])
     else
-      s.add_dependency(%q<mechanize>, [">= 0.9.3"])
+      s.add_dependency(%q<mechanize>, [">= 1.0.0"])
       s.add_dependency(%q<bones>, [">= 2.5.1"])
     end
   else
-    s.add_dependency(%q<mechanize>, [">= 0.9.3"])
+    s.add_dependency(%q<mechanize>, [">= 1.0.0"])
     s.add_dependency(%q<bones>, [">= 2.5.1"])
   end
 end

data/spec/roart/connection_adapter_spec.rb

@@ -4,7 +4,7 @@ require File.join(File.dirname(__FILE__), %w[ .. spec_helper])
 describe "ConnectionAdapter" do
   
   it 'should give us back a connection' do
-    Roart::ConnectionAdapters::Mechanize.should_receive(:new).with(:adapter => 'mechanize').and_return(mock('mechanize'))
+    Roart::ConnectionAdapters::MechanizeAdapter.should_receive(:new).with(:adapter => 'mechanize').and_return(mock('mechanize'))
     Roart::ConnectionAdapter.new(:adapter => 'mechanize')
   end
 

data/spec/roart/connection_spec.rb

@@ -40,7 +40,7 @@ describe "Connection" do
   it 'should give us back the whole thing' do
     mock_mech = mock('mech')
     @options = {:server => 'server', :user => 'user', :pass => 'pass', :adapter => 'mechanize'}
-    Roart::ConnectionAdapters::Mechanize.should_receive(:new).with(@options).and_return(mock_mech)
+    Roart::ConnectionAdapters::MechanizeAdapter.should_receive(:new).with(@options).and_return(mock_mech)
 		mock_mech.should_receive(:login).with(@options)
     mock_mech.should_receive(:get).with('uri').and_return('body')
     connection = Roart::Connection.new(@options)

data/spec/roart/validation_spec.rb

@@ -0,0 +1,152 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "validations" do
+  
+	describe "field length" do
+		
+		it "show validate too short" do
+			class ShortTicket < Roart::Ticket; validates_length_of(:subject, :min => 6); end
+			ticket = inst_ticket(ShortTicket)
+			ticket.subject = "short"
+			ticket.valid?.should be_false
+			ticket.subject = "longer subject"
+			ticket.valid?.should be_true
+		end
+		
+		it "should validate too long" do
+			class LongTicket < Roart::Ticket; validates_length_of(:subject, :max => 6); end
+			ticket = inst_ticket(LongTicket)
+			ticket.subject = "too long"
+			ticket.valid?.should be_false
+			ticket.subject = "short"
+			ticket.valid?.should be_true
+		end
+		
+		it "should validate exact" do
+			class ExactTicket < Roart::Ticket; validates_length_of(:subject, :is => 5); end
+			ticket = inst_ticket(ExactTicket)
+			ticket.subject = "Not Five"
+			ticket.valid?.should be_false
+			ticket.subject = "Yes 5"
+			ticket.valid?.should be_true
+		end
+		
+		it "should validate range" do
+		  class RangeTicket < Roart::Ticket; validates_length_of(:subject, :within => 7..12); end
+			ticket = inst_ticket(RangeTicket)
+			ticket.subject = 'short'
+			ticket.valid?.should be_false
+			ticket.subject = 'waaaaay toooooo long'
+			ticket.valid?.should be_false
+			ticket.subject = 'just right'
+			ticket.valid?.should be_true
+		end
+		
+	end
+	
+	describe "format" do
+		
+		it "should validate format" do
+			class FormatTicket < Roart::Ticket; validates_format_of(:subject, :format => /^lol$/); end
+			ticket = inst_ticket(FormatTicket)
+			ticket.subject = 'poop'
+			ticket.valid?.should be_false
+			ticket.subject = 'lol'
+			ticket.valid?.should be_true
+		end
+
+	end
+	
+	describe "presence" do
+	  
+	  it "should validate presence of" do
+			class PresenceTicket < Roart::Ticket; validates_presence_of(:subject); end
+			ticket = inst_ticket(PresenceTicket)
+			ticket.subject = ""
+			ticket.valid?.should be_false
+			ticket.subject = "I'M HERE!"
+			ticket.valid?.should be_true
+    end
+    
+    it "should validate presence of" do
+			class PresenceTicket < Roart::Ticket; validates_presence_of(:subject); end
+			ticket = inst_ticket(PresenceTicket)
+			ticket.subject = nil
+			ticket.valid?.should be_false
+			ticket.subject = "I'M HERE!"
+			ticket.valid?.should be_true
+    end
+    
+  end
+	
+	describe "numericality" do
+		
+		it "should validate greater than" do
+			class GTTicket < Roart::Ticket; validates_numericality_of(:subject, :greater_than => 5); end
+			ticket = inst_ticket(GTTicket)
+			ticket.subject = 4
+			ticket.valid?.should be_false
+			ticket.subject = 6
+			ticket.valid?.should be_true
+		end
+		
+		it "should validate less than" do
+			class LTTicket < Roart::Ticket; validates_numericality_of(:subject, :less_than => 5); end
+			ticket = inst_ticket(LTTicket)
+			ticket.subject = 6
+			ticket.valid?.should be_false
+			ticket.subject = 4
+			ticket.valid?.should be_true
+		end
+		
+		it "should validate integer" do
+			class IntTicket < Roart::Ticket; validates_numericality_of(:subject, :only_integer => true); end
+			ticket = inst_ticket(IntTicket)
+			ticket.subject = 6.3
+			ticket.valid?.should be_false
+			ticket.subject = 4
+			ticket.valid?.should be_true
+		end
+		
+		it "should validate integer" do
+			class EqualTicket < Roart::Ticket; validates_numericality_of(:subject, :equal_to => 4); end
+			ticket = inst_ticket(EqualTicket)
+			ticket.subject = 6.3
+			ticket.valid?.should be_false
+			ticket.subject = 4
+			ticket.valid?.should be_true
+		end
+		
+		it "should validate even" do
+			class EvenTicket < Roart::Ticket; validates_numericality_of(:subject, :even => true); end
+			ticket = inst_ticket(EvenTicket)
+			ticket.subject = 6.3
+			ticket.valid?.should be_false
+			ticket.subject = 5
+			ticket.valid?.should be_false
+			ticket.subject = 4
+			ticket.valid?.should be_true
+		end
+		
+		it "should validate two at once" do
+			class DoubleTeam < Roart::Ticket; validates_numericality_of(:subject, :even => true, :greater_than => 5); end
+			ticket = inst_ticket(DoubleTeam)
+			ticket.subject = 6.3
+			ticket.valid?.should be_false
+			ticket.subject = 9
+			ticket.valid?.should be_false
+			ticket.subject = 4
+			ticket.valid?.should be_false
+			ticket.subject = 8
+			ticket.valid?.should be_true
+		end
+		
+	end
+	
+end
+
+#helpers
+
+def inst_ticket(klass)
+	klass.send(:instantiate,{:subject => 'A New Ticket', :queue => 'My Queue', :id => 1})
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: roart
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - PJ Davis
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -06:00
+date: 2010-03-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mechanize
-  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.9.3
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 1
         version: 2.5.1
-    version: 
+  type: :development
+  version_requirements: *id002
 description: Interface for working with Request Tracker (RT) tickets inspired by ActiveRecord.
 email: pj.davis@gmail.com
 executables: []
@@ -75,6 +88,7 @@ files:
 - spec/roart/roart_spec.rb
 - spec/roart/ticket_page_spec.rb
 - spec/roart/ticket_spec.rb
+- spec/roart/validation_spec.rb
 - spec/roart_spec.rb
 - spec/spec_helper.rb
 - spec/test_data/full_history.txt
@@ -95,18 +109,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: roart
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Interface for working with Request Tracker (RT) tickets inspired by ActiveRecord