pivotal-tracker 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/pivotal-tracker.rb

@@ -4,6 +4,7 @@ require 'happymapper'
 require 'nokogiri'
 
 
+require File.join(File.dirname(__FILE__), 'pivotal-tracker', 'validation')
 require File.join(File.dirname(__FILE__), 'pivotal-tracker', 'extensions')
 require File.join(File.dirname(__FILE__), 'pivotal-tracker', 'proxy')
 require File.join(File.dirname(__FILE__), 'pivotal-tracker', 'client')
@@ -22,18 +23,16 @@ module PivotalTracker
   class ProjectNotSpecified < StandardError; end
 
   def self.encode_options(options)
-    return nil if !options.is_a?(Hash) || options.empty?
-    options_strings = []
-    # remove options which are not filters, and encode them as such
-    [:limit, :offset].each do |o|
-      options_strings << "#{CGI.escape(o.to_s)}=#{CGI.escape(options.delete(o))}" if options[o]
-    end
-    # assume remaining key-value pairs describe filters, and encode them as such.
-    filters_string = options.map do |key, value|
-      [value].flatten.map {|v| "#{CGI.escape(key.to_s)}%3A#{CGI.escape(v)}"}.join('&filter=')
-    end
-    options_strings << "filter=#{filters_string}" unless filters_string.empty?
-    return "?#{options_strings.join('&')}"
+    options_strings = options.inject({}) do |m, (k,v)|
+      if [:limit, :offset].include?(k.to_sym)
+        m.update k => v
+      else
+        filter_query = %{#{k}:#{[v].flatten.join(",")}}
+        m.update :filter => (m[:filter] ? "#{m[:filter]} #{filter_query}" : filter_query)
+      end
+    end.map {|k,v| "#{k}=#{CGI.escape(v.to_s)}"}
+
+    %{?#{options_strings.join("&")}} unless options_strings.empty?
   end
 
 end

data/lib/pivotal-tracker/story.rb

@@ -41,6 +41,7 @@ module PivotalTracker
     element :jira_url, String
     element :other_id, Integer
     element :integration_id, Integer
+    element :deadline, DateTime # Only available for Release stories
 
     has_many :attachments, Attachment, :tag => 'attachments'
 
@@ -128,6 +129,7 @@ module PivotalTracker
             xml.integration_id "#{integration_id}"
             xml.created_at DateTime.parse(created_at.to_s).to_s if created_at
             xml.accepted_at DateTime.parse(accepted_at.to_s).to_s if accepted_at
+            xml.deadline DateTime.parse(deadline.to_s).to_s if deadline
           }
         end
         return builder.to_xml
@@ -139,4 +141,8 @@ module PivotalTracker
         end
       end
   end
+
+  class Story
+    include Validation
+  end
 end

data/lib/pivotal-tracker/task.rb

@@ -46,4 +46,8 @@ module PivotalTracker
       end
 
   end
+
+  class Task
+    include Validation
+  end
 end

data/lib/pivotal-tracker/validation.rb

@@ -0,0 +1,68 @@
+module PivotalTracker
+
+  class Errors
+    include Enumerable
+    attr_reader :errors
+
+    alias :messages :errors
+
+    def initialize
+      @errors = []
+    end
+
+    def each
+      @errors.each do |error|
+        yield error
+      end
+    end
+
+    def empty?
+      @errors.empty?
+    end
+
+    def add_from_xml(xml)
+      Nokogiri::XML(xml).xpath("/errors/error").each do |error|
+        @errors << error.text
+      end
+    end
+  end
+
+  module Validation
+
+    def self.included(klass)
+      klass.class_eval do
+        if klass.instance_methods.include?(:create)
+          alias_method :create_without_validations, :create
+          alias_method :create, :create_with_validations
+        end
+
+        if klass.instance_methods.include?(:update)
+          alias_method :update_without_validations, :update
+          alias_method :update, :update_with_validations
+        end
+      end
+    end
+
+    def create_with_validations
+      begin
+        create_without_validations
+      rescue RestClient::UnprocessableEntity => e
+        errors.add_from_xml e.response
+        self
+      end
+    end
+
+    def update_with_validations(attrs={})
+      begin
+        update_without_validations attrs
+      rescue RestClient::UnprocessableEntity => e
+        errors.add_from_xml e.response
+        self
+      end
+    end
+
+    def errors
+      @errors ||= Errors.new
+    end
+  end
+end

data/pivotal-tracker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pivotal-tracker}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Smestad", "Josh Nichols", "Terence Lee"]
-  s.date = %q{2010-11-04}
+  s.date = %q{2010-12-15}
   s.email = %q{justin.smestad@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
      "lib/pivotal-tracker/proxy.rb",
      "lib/pivotal-tracker/story.rb",
      "lib/pivotal-tracker/task.rb",
+     "lib/pivotal-tracker/validation.rb",
      "lib/pivotal_tracker.rb",
      "pivotal-tracker.gemspec",
      "spec/fixtures/activity.xml",

data/spec/unit/pivotal-tracker/story_spec.rb

@@ -22,6 +22,27 @@ describe PivotalTracker::Story do
     it "should return the created story" do
       @project.stories.create(:name => 'Create Stuff').should be_a(PivotalTracker::Story)
     end
+
+    context "on failure" do
+      before do
+        FakeWeb.register_uri(:post, "http://www.pivotaltracker.com/services/v3/projects/#{@project.id}/stories",
+          :body => %{<?xml version="1.0" encoding="UTF-8"?>
+             <errors>
+               <error>error#1 message</error>
+               <error>error#2 message</error>
+             </errors>%},
+           :status => "422")
+      end
+
+      it "should not raise an exception" do
+        expect { @project.stories.create }.to_not raise_error(Exception)
+      end
+
+      it "should report errors encountered" do
+        story = @project.stories.create :name => "Invalid story"
+        story.errors.messages.should =~ ["error#1 message", "error#2 message"]
+      end
+    end
   end
 
   context ".attachments" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pivotal-tracker
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Justin Smestad
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -06:00
+date: 2010-12-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -172,6 +172,7 @@ files:
 - lib/pivotal-tracker/proxy.rb
 - lib/pivotal-tracker/story.rb
 - lib/pivotal-tracker/task.rb
+- lib/pivotal-tracker/validation.rb
 - lib/pivotal_tracker.rb
 - pivotal-tracker.gemspec
 - spec/fixtures/activity.xml