highrise 3.0.0 → 3.0.1

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.9.2
+  - 1.8.7
+  - ree-1.8.7
+# branches:
+#   only:
+#     - master

data/Gemfile.lock

@@ -1,23 +1,28 @@
 PATH
   remote: .
   specs:
-    highrise (3.0.0.pre04)
-      activeresource (~> 3.0.0)
+    highrise (3.0.1)
+      activeresource (~> 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activeresource (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-    activesupport (3.0.1)
-    builder (2.1.2)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    bcrypt-ruby (3.0.0)
+    builder (3.0.0)
     diff-lcs (1.1.2)
-    i18n (0.4.2)
+    i18n (0.6.0)
+    multi_json (1.0.3)
+    rake (0.8.7)
     rspec (2.0.1)
       rspec-core (~> 2.0.1)
       rspec-expectations (~> 2.0.1)
@@ -33,6 +38,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource (~> 3.0.0)
   highrise!
-  rspec
+  rake (= 0.8.7)
+  rspec (~> 2.0.1)

data/{README.mkdn → README.md}

@@ -1,4 +1,4 @@
-# Highrise (3.0.0)
+# Highrise (3.0.0) [![Build Status](https://secure.travis-ci.org/tapajos/highrise.png)](http://travis-ci.org/tapajos/highrise)
 
 ## What is it?
 
@@ -22,7 +22,7 @@ All these classes are inherited from ActiveResouce::Base. Refer to the [ActiveRe
     
     require 'highrise'
     
-    Highrise::Base.site = 'http://your_site.highrisehq.com'
+    Highrise::Base.site = 'https://your_site.highrisehq.com'
     Highrise::Base.user = 'api-auth-token'
 
 If you are using this in a Rails application, putting this code in a config/initializers/highrise.rb
@@ -59,7 +59,7 @@ version file.
 * [Thiago Lelis][ThiagoLelis]
 * [Denis Odorcic][odorcicd]
 
-## References
+
 
 [api]: http://developer.37signals.com/highrise
 [ar]: http://api.rubyonrails.org/classes/ActiveResource/Base.html
@@ -67,10 +67,10 @@ version file.
 [h]:  http://www.highrisehq.com/
 [i]:  https://github.com/tapajos/highrise/issues
 [kmayer]: https://github.com/kmayer
-[lg]: https://github.com/luisbebop
+[luisbebop]: https://github.com/luisbebop
 [mit]:http://www.opensource.org/licenses/mit-license.php
-[nb]: https://github.com/slainer86
+[slainer86]: https://github.com/slainer86
 [odorcicd]: https://github.com/odorcicd
 [rdoc]: http://rdoc.info/projects/tapajos/highrise
 [tapajos]: http://www.improveit.com.br/en/company/tapajos
-[tl]: https://github.com/ThiagoLelis
+[ThiagoLelis]: https://github.com/ThiagoLelis

data/highrise.gemspec

@@ -8,10 +8,11 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
 
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_dependency "activeresource", "~>3.0.0"
-  s.add_development_dependency "rspec"
+  s.add_dependency "activeresource", "~>3.0"
+  s.add_development_dependency "rspec", "~>2.0.1"
+  s.add_development_dependency "rake", "=0.8.7"
 
-  s.files         =  `git ls-files`.split("\n")
+  s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features,examples}/*`.split("\n")
   s.require_paths = ["lib"]
 
@@ -29,5 +30,4 @@ Gem::Specification.new do |s|
     Highrise::Base.site = 'http://your_site.highrisehq.com/'
     Highrise::Base.user = 'your_api_auth_token'
   EOT
-
 end

data/lib/highrise/company.rb

@@ -4,10 +4,6 @@ module Highrise
     include Taggable
     include Searchable
 
-    def self.find_all_across_pages_since(time)
-      find_all_across_pages(:params => { :since => time.utc.strftime("%Y%m%d%H%M%S") })
-    end
-
     def people
       Person.find_all_across_pages(:from => "/companies/#{id}/people.xml")
     end

data/lib/highrise/pagination.rb

@@ -16,6 +16,21 @@ module Highrise
         find_all_across_pages(:params => { :since => time.utc.strftime("%Y%m%d%H%M%S") })
       end
 
+      # This is useful only for Company, Person, Note, Comment, Email and Task, but should be safely ignored by other classes
+      def find_all_deletions_across_pages(options = {})
+        # point to the global deletions feed
+        options[:from] = '/deletions.xml'
+
+        records = []
+        each_deletions(options) { |record| records << record }
+        records
+      end
+
+      # This is useful only for Company, Person, Note, Comment, Email and Task, but should be safely ignored by other classes
+      def find_all_deletions_across_pages_since(time)
+        find_all_deletions_across_pages(:params => { :since => time.utc.strftime("%Y%m%d%H%M%S") })
+      end
+
       private
       
       def each(options = {})
@@ -31,6 +46,27 @@ module Highrise
           end
         end
       end
+
+      def each_deletions(options = {})
+        options[:params] ||= {}
+        # first index for deletions is 1
+        options[:params][:n] = 1
+
+        loop do
+          if (records = self.find(:all, options)).try(:any?)
+            # reject the records whose resource type is different from self
+            records.reject!{|r| r.class.to_s.split('::').last != self.to_s.split('::').last}
+
+            records.each{ |record| yield record }
+
+            # index increment for deletions is 1 per page of 500 resources
+            options[:params][:n] += 1
+          else
+            break # no deletions included on that page, thus no more deletions
+          end
+        end
+      end
+
     end
   end
-end
+end

data/lib/highrise/version.rb

@@ -1,3 +1,3 @@
 module Highrise
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 end

data/spec/highrise/pagination_behavior.rb

@@ -17,4 +17,34 @@ shared_examples_for "a paginated class" do
     subject.class.should_receive(:find_all_across_pages).with({:params=>{:since=>"20090114174311"}}).and_return("result")
     subject.class.find_all_across_pages_since(time).should == "result"
   end
+  
+  it ".find_all_deletions_across_pages" do
+    class TestClass2 < Highrise::Base; include Highrise::Pagination; end
+    subject_type = subject.class.to_s.split('::').last
+    deleted_resource_1 = subject.class.new(:id => 12, :type => subject_type)
+    deleted_resource_2 = TestClass2.new(:id => 34, :type => 'TestClass2')
+    deleted_resource_3 = subject.class.new(:id => 45, :type => subject_type)
+    
+    subject.class.should_receive(:find).with(:all,{:from => '/deletions.xml', :params=>{:n=>1}}).and_return([deleted_resource_1, deleted_resource_2, deleted_resource_3])
+    subject.class.should_receive(:find).with(:all,{:from => '/deletions.xml', :params=>{:n=>2}}).and_return([])
+    subject.class.find_all_deletions_across_pages.should == [deleted_resource_1, deleted_resource_3]
+  end
+  
+  it ".find_all_deletions_across_pages with zero results" do
+    subject.class.should_receive(:find).with(:all,{:from => '/deletions.xml', :params=>{:n=>1}}).and_return(nil)
+    subject.class.find_all_deletions_across_pages.should == []
+  end
+
+  it ".find_all_deletions_across_pages_since" do
+    class TestClass2 < Highrise::Base; include Highrise::Pagination; end
+    subject_type = subject.class.to_s.split('::').last
+    time = Time.parse("Wed Jan 14 15:43:11 -0200 2009")
+    deleted_resource_1 = subject.class.new(:id => 12, :type => subject_type)
+    deleted_resource_2 = TestClass2.new(:id => 34, :type => 'TestClass2')
+    deleted_resource_3 = subject.class.new(:id => 45, :type => subject_type)
+
+    subject.class.should_receive(:find).with(:all,{:from => '/deletions.xml', :params=>{:n=>1, :since=>"20090114174311"}}).and_return([deleted_resource_1, deleted_resource_2, deleted_resource_3])
+    subject.class.should_receive(:find).with(:all,{:from => '/deletions.xml', :params=>{:n=>2, :since=>"20090114174311"}}).and_return([])
+    subject.class.find_all_deletions_across_pages_since(time).should == [deleted_resource_1, deleted_resource_3]
+  end
 end

data/spec/highrise/person_spec.rb

@@ -10,12 +10,6 @@ describe Highrise::Person do
   it_should_behave_like "a taggable class"
   it_should_behave_like "a searchable class"
 
-  it ".find_all_across_pages_since" do
-    mocked_now = Time.parse("Wed Jan 14 15:43:11 -0200 2009")
-    Highrise::Person.should_receive(:find_all_across_pages).with({:params=>{:since=>"20090114174311"}}).and_return("result")
-    Highrise::Person.find_all_across_pages_since(mocked_now).should == "result"
-  end
-  
   describe "#company" do
     it "returns nil when it doesn't have a company" do
       subject.should_receive(:company_id).and_return(nil)

data/spec/highrise/recording_spec.rb

@@ -4,10 +4,4 @@ describe Highrise::Recording do
   it { should be_a_kind_of Highrise::Base }
 
   it_should_behave_like "a paginated class"
-  
-  it ".find_all_across_pages_since" do
-    time = Time.parse("Wed Jan 14 15:43:11 -0200 2009")
-    Highrise::Recording.should_receive(:find_all_across_pages).with({:params=>{:since=>"20090114174311"}}).and_return("result")
-    Highrise::Recording.find_all_across_pages_since(time).should == "result"
-  end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ Bundler.setup
 require File.join(File.dirname(__FILE__), '/../lib/highrise')
 
 Highrise::Base.user = ENV['HIGHRISE_USER'] || 'x'
-Highrise::Base.site = ENV['HIGHRISE_SITE'] || 'http://www.example.com'
+Highrise::Base.site = ENV['HIGHRISE_SITE'] || 'https://www.example.com'
 
 require 'highrise/pagination_behavior'
 require 'highrise/searchable_behavior'

metadata

@@ -1,70 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: highrise
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 3
-  - 0
-  - 0
-  version: 3.0.0
+version: !ruby/object:Gem::Version
+  version: 3.0.1
+  prerelease: 
 platform: ruby
-authors: 
-- "Marcos Tapaj\xC3\xB3s"
+authors:
+- Marcos Tapajós
 - Ken Mayer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-06 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-31 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activeresource
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153906540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2153906540
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &2153905960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153905960
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2153905380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :development
-  version_requirements: *id002
-description: "    Based on the original API module from DHH, http://developer.37signals.com/highrise/, this\n    gem is a cleaned up, tested version of the same. \n\n    Configure by adding the following:\n\n    require 'highrise'\n    Highrise::Base.site = 'http://your_site.highrisehq.com/'\n    Highrise::Base.user = 'your_api_auth_token'\n"
-email: 
+  prerelease: false
+  version_requirements: *2153905380
+description: ! "    Based on the original API module from DHH, http://developer.37signals.com/highrise/,
+  this\n    gem is a cleaned up, tested version of the same. \n\n    Configure by
+  adding the following:\n\n    require 'highrise'\n    Highrise::Base.site = 'http://your_site.highrisehq.com/'\n
+  \   Highrise::Base.user = 'your_api_auth_token'\n"
+email:
 - marcos@tapajos.me
 - kmayer@bitwrangler.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
-- README.mkdn
+- README.md
 - Rakefile
 - autotest/discover.rb
 - examples/config_initializers_highrise.rb
@@ -121,43 +118,34 @@ files:
 - spec/highrise/task_spec.rb
 - spec/highrise/user_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/tapajos/highrise
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -677915891012339323
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper around Highrise API
-test_files: 
+test_files:
 - examples/config_initializers_highrise.rb
 - examples/extending.rb
 - examples/sample.rb