pipejump 0.4.0 → 0.4.1

data/.rspec

@@ -1 +1,3 @@
---color
+--color
+--format Fuubar
+

data/Gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 gem 'rake'
 gem 'rspec'
 gem 'rcov'
-gem 'vcr'
-gem "webmock"
 gem 'json'
+gem 'fuubar'
+

data/Gemfile.lock

@@ -1,9 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.6)
-    crack (0.1.8)
     diff-lcs (1.1.3)
+    fuubar (1.0.0)
+      rspec (~> 2.0)
+      rspec-instafail (~> 0.2.0)
+      ruby-progressbar (~> 0.0.10)
     json (1.5.3)
     rake (0.9.2)
     rcov (0.9.10)
@@ -14,19 +16,16 @@ GEM
     rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
+    rspec-instafail (0.2.4)
     rspec-mocks (2.6.0)
-    vcr (1.11.2)
-    webmock (1.7.5)
-      addressable (~> 2.2, > 2.2.5)
-      crack (>= 0.1.7)
+    ruby-progressbar (0.0.10)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  fuubar
   json
   rake
   rcov
   rspec
-  vcr
-  webmock

data/lib/pipejump.rb

@@ -9,10 +9,11 @@ require 'pipejump/base/resource'
 require 'pipejump/base/session'
 require 'pipejump/base/errors'
 require 'pipejump/base/connection'
+require 'pipejump/base/util'
 
 require 'pipejump/resources/account'
 require 'pipejump/resources/deal'
 require 'pipejump/resources/note'
 require 'pipejump/resources/reminder'
 require 'pipejump/resources/source'
-require 'pipejump/resources/contact'
+require 'pipejump/resources/contact'

data/lib/pipejump/base/resource.rb

@@ -144,7 +144,7 @@ module Pipejump
     end
 
     def inspect
-      "#<#{self.class} #{@attributes.collect { |pair| pair[1] = "\"#{pair[1]}\""; pair.join(': ') }.join(', ')}>"
+      "#<#{self.class} #{@attributes.collect { |pair| pair[1] = pair[1].inspect; pair.join(': ') }.join(', ')}>"
     end
 
     def element_path
@@ -187,4 +187,4 @@ module Pipejump
 
   end
 
-end
+end

data/lib/pipejump/base/util.rb

@@ -0,0 +1,24 @@
+module Pipejump
+
+  module Util
+
+    def self.to_query(value, key = nil)
+      case value
+      when Hash  then value.map { |k,v| to_query(v, append_key(key,k)) }.join('&')
+      when Array then value.map { |v| to_query(v, "#{key}[]") }.join('&')
+      when nil   then ''
+      else
+        "#{key}=#{CGI.escape(value.to_s)}" 
+      end
+    end
+
+    private
+
+    def self.append_key(root_key, key)
+      root_key.nil? ? key : "#{root_key}[#{key.to_s}]"
+    end
+
+  end
+
+end
+

data/lib/pipejump/resources/contact.rb

@@ -227,10 +227,25 @@ module Pipejump
 
     def before_save
       @attributes.delete('organisation')
+      @attributes.delete('organisation_name')
       @attributes.delete('linkedin_display')
       @attributes.delete('tags_joined_by_comma')
     end
 
+    def to_query
+      Pipejump::Util.to_query(:contact => @attributes)
+    end
+
+    def load(attrs = {}) #:nodoc:
+      super
+      fields = @attributes['custom_fields'] || {}
+      @attributes['custom_fields'] = fields.inject({}) do |memo, field|
+        memo[field.first] = field.last['value']
+        memo
+      end
+      @attributes
+    end
+
   end
 
 end

data/lib/pipejump/version.rb

@@ -1,3 +1,3 @@
 module Pipejump
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/pipejump/resources/contact_custom_fields_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Pipejump::Contact do
+
+  before do
+    @session = PipejumpSpec.session
+    @contact = @session.contacts.create(:name => 'contact1'+uuid)
+  end
+
+  after do
+    @contact.destroy
+  end
+
+  describe "#custom_fields" do
+
+    it "returns a hash of custom fields" do
+      @contact.custom_fields['test_field'] = 'yaaay'
+      @contact.save.should == true
+
+      @session.contacts.find(@contact.id).custom_fields['test_field'].should =='yaaay'
+    end
+  end
+
+end
+

data/spec/pipejump/resources/contact_spec.rb

@@ -98,4 +98,17 @@ describe Pipejump::Contact do
 
   end
 
-end
+  describe "#custom_fields" do
+
+    it "returns a hash of custom fields" do
+      @contact1.name = 'AAA TESTING ONE'
+      @contact1.custom_fields['test_field'] = 'yaaay'
+      @contact1.save
+
+      puts @contact1.inspect
+
+      @session.contacts.find(@contact1.id).custom_fields['test_field']['value'].should =='yaaay'
+    end
+  end
+
+end

data/spec/pipejump/util_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe Pipejump::Util do
+
+  describe ".to_query" do
+
+    it "works with a simple hash" do
+      result = Pipejump::Util.to_query :a => 1, :b => 1
+      result.should == "a=1&b=1"
+    end
+
+    it "works with a nested hash" do
+      result = Pipejump::Util.to_query :a => 1, :b => { :c => 1 }
+      result.should == "a=1&b[c]=1"
+    end
+
+    it "works with an array" do
+      result = Pipejump::Util.to_query :a => [1,2]
+      result.should == "a[]=1&a[]=2"
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipejump
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies: []
 description: Base API Ruby client
 email: marcin@futuresimple.com
@@ -34,6 +34,7 @@ files:
 - lib/pipejump/base/errors.rb
 - lib/pipejump/base/resource.rb
 - lib/pipejump/base/session.rb
+- lib/pipejump/base/util.rb
 - lib/pipejump/resources/account.rb
 - lib/pipejump/resources/contact.rb
 - lib/pipejump/resources/deal.rb
@@ -45,12 +46,14 @@ files:
 - spec/connection.sample.yml
 - spec/pipejump/resources/contact/note_spec.rb
 - spec/pipejump/resources/contact/reminder_spec.rb
+- spec/pipejump/resources/contact_custom_fields_spec.rb
 - spec/pipejump/resources/contact_spec.rb
 - spec/pipejump/resources/deal/note_spec.rb
 - spec/pipejump/resources/deal/reminder_spec.rb
 - spec/pipejump/resources/deal_spec.rb
 - spec/pipejump/resources/source_spec.rb
 - spec/pipejump/session_spec.rb
+- spec/pipejump/util_spec.rb
 - spec/spec_helper.rb
 homepage: http://futuresimple.com/api
 licenses: []
@@ -72,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pipejump
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Base API Ruby client
@@ -80,11 +83,13 @@ test_files:
 - spec/connection.sample.yml
 - spec/pipejump/resources/contact/note_spec.rb
 - spec/pipejump/resources/contact/reminder_spec.rb
+- spec/pipejump/resources/contact_custom_fields_spec.rb
 - spec/pipejump/resources/contact_spec.rb
 - spec/pipejump/resources/deal/note_spec.rb
 - spec/pipejump/resources/deal/reminder_spec.rb
 - spec/pipejump/resources/deal_spec.rb
 - spec/pipejump/resources/source_spec.rb
 - spec/pipejump/session_spec.rb
+- spec/pipejump/util_spec.rb
 - spec/spec_helper.rb
 has_rdoc: