pipejump 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.3

data/lib/pipejump/base/collection.rb

@@ -27,6 +27,8 @@ module Pipejump
   # * size
   # * collect
   # * reject
+  # * inject
+  # * map
   # ===== Example:
   #   @session.sources.size
   #   @session.sources.each { |source| }
@@ -108,7 +110,7 @@ module Pipejump
       all.inspect
     end
 
-    ['first', 'last', 'each', 'size', 'collect', 'reject', 'inject'].each do |method|
+    ['first', 'last', 'each', 'size', 'collect', 'reject', 'inject', 'map'].each do |method|
       class_eval <<-STR
         def #{method}(*args, &block)
           all.#{method}(*args, &block)

data/lib/pipejump/base/session.rb

@@ -129,9 +129,56 @@ module Pipejump
     end
 
     def get(url) #:nodoc:
-      response = connection.get(url)
-      data = (response.code.to_i == 200 and url.match('.json')) ? JSON.parse(response.body) : ''
-      [response.code.to_i, data]
+      result = []
+      code = 0
+      page = 1
+      url = paginate(url, 1)
+      while (response = get_data(get_response(url)))[1] != []
+        data = response[1]
+
+        # If this is a single item, or this isn't a duplicate, continue.
+        if !data.is_a?(Array) 
+          result = data 
+          break
+        end
+
+        break if result == data
+
+        # Concatenate our result and data
+        result += data
+        page = page + 1
+
+        url = paginate(url, page)
+
+      end
+      code = response[0]
+      [code, result]
+    end
+
+    def paginate(url, num) #:nodoc:
+      # Convenience
+      num = num.to_s
+
+      # If the URL is a single object, don't paginate
+      return url if url.match("\w.json")
+
+      # If the URL has already been paginated.
+      return url.gsub(/(page=)(\d+)/, "page=#{num}") if url.match("page=")
+
+      # If the URL contains a ?
+      return url.gsub(/$/, "&page=#{num}") if url.match(/\?.*$/)
+
+      # If the URL hasn't been paginated, and has no ?
+      url.gsub(/$/, "?page=#{num}")
+    end
+
+    def get_response(url)
+      connection.get(url)
+    end
+
+    def get_data(response)
+      code = response.code.to_i
+      (code == 200) ? [200, JSON.parse(response.body)] : [code,'']
     end
 
     def post(url, data) #:nodoc:
@@ -183,4 +230,4 @@ module Pipejump
 
 
   end
-end
+end

data/lib/pipejump/version.rb

@@ -1,3 +1,3 @@
 module Pipejump
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/pipejump/resources/deal_spec.rb

@@ -40,14 +40,13 @@ describe Pipejump::Deal do
       (@deal.attributes.keys - ['entity']).each do |attribute|
         @deal.send(attribute).should == @deal.attributes[attribute]
       end
-      @deal.entity.class.should == Pipejump::Contact
       @deal.destroy
     end
 
     it "should return errors with invalid params" do
       @deal = @session.deals.create({})
       @deal.id.should == nil
-      @deal.errors['deal'].collect{ |e| e['error']['field'] }.sort.should == ['entity', 'name']
+      @deal.errors['deal'].collect{ |e| e['error']['field'] }.sort.should == ['entity_id', 'name']
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pipejump
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies: []
 description: Base API Ruby client
 email: marcin@futuresimple.com
@@ -46,7 +46,6 @@ 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/contact_validation_spec.rb
 - spec/pipejump/resources/deal/note_spec.rb
@@ -84,7 +83,6 @@ 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/contact_validation_spec.rb
 - spec/pipejump/resources/deal/note_spec.rb

data/spec/pipejump/resources/contact_custom_fields_spec.rb

@@ -1,25 +0,0 @@
-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
-