highrise 2.0.1 → 3.0.0

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: .
+  specs:
+    highrise (3.0.0.pre04)
+      activeresource (~> 3.0.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)
+    diff-lcs (1.1.2)
+    i18n (0.4.2)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activeresource (~> 3.0.0)
+  highrise!
+  rspec

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Ken Mayer
+Copyright (c) 2010 Ken Mayer & Marcos Tapajos
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.mkdn

@@ -1,10 +1,10 @@
-# Highrise (2.0.0)
+# Highrise (3.0.0)
 
 ## What is it?
 
 This gem provides a set of classes to access information on [Highrise][h] via the published [API][api]:
 
-    Account, Comment, Company, Deal, Email, Group, Case, Membership, Note, Person, Subject, Tag, Task, User. 
+    Account, Comment, Company, Deal, DealCategory, Email, Group, Case, Membership, Note, Party, Person, Recording, Subject, Tag, Task, TaskCategory and User.
 
 All these classes are inherited from ActiveResouce::Base. Refer to the [ActiveResouce][ar] documentation for more information.
 
@@ -12,24 +12,19 @@ All these classes are inherited from ActiveResouce::Base. Refer to the [ActiveRe
 
     gem install highrise
 
-### Dependencies (see the Rakefile or run <code>rake check_dependencies</code>)
+### Dependencies (see <code>highrise.gemspec</code> or run <code>bundle check</code>)
 
 ### Documentation
 
-  I'm on [rdoc.info][rdoc] and here're some [metrics][caliper]
+  I'm on [rdoc.info][rdoc]
 
 ### Configure your key
     
-    require 'rubygems'
     require 'highrise'
     
     Highrise::Base.site = 'http://your_site.highrisehq.com'
     Highrise::Base.user = 'api-auth-token'
 
-and, if you want [caching][c]:
-
-    Highrise::Base.connection.cache_store= <your normal ActiveSupport::Caching options>
-    
 If you are using this in a Rails application, putting this code in a config/initializers/highrise.rb
 file is recommended. See config_initializers_highrise.rb in the examples/ directory.
 
@@ -49,36 +44,33 @@ This code is free to be used under the terms of the [MIT license][mit].
 
 Comments are welcome. Send your feedback through the [issue tracker on GitHub][i]
 
+If you have fixes: Submit via pull requests. Do not include version changes to the 
+version file. 
+
 ## Authors
 
-* [Marcos Tapajós][mt]
-* [Ken Mayer][km]
+* [Marcos Tapajós][tapajos]
+* [Ken Mayer][kmayer]
 
 ## Contributors
 
-* [Nicolas Bianco][nb]
-* [Luis Gustavo][lg]
-* [Thiago Lelis][tl]
-
-## Special Thanks
+* [Nicolas Bianco][slainer86]
+* [Luis Gustavo][luisbebop]
+* [Thiago Lelis][ThiagoLelis]
+* [Denis Odorcic][odorcicd]
 
-[Rails Envy Podcast Episode #77][re] for mentioning
-[How to Cache Anything With ActiveSupport][rh] on the very *day* I started writing the cache code. Thank you, Rein
-for writing an excellent tutorial and [posting your source][e] on GitHub.
+## References
 
 [api]: http://developer.37signals.com/highrise
 [ar]: http://api.rubyonrails.org/classes/ActiveResource/Base.html
 [c]:  http://api.rubyonrails.org/classes/ActiveSupport/Cache
-[e]:  http://github.com/primedia/endeca/tree/master
 [h]:  http://www.highrisehq.com/
-[i]:  http://github.com/tapajos/highrise/issues
-[km]: http://github.com/kmayer
-[lg]: http://github.com/luisbebop
+[i]:  https://github.com/tapajos/highrise/issues
+[kmayer]: https://github.com/kmayer
+[lg]: https://github.com/luisbebop
 [mit]:http://www.opensource.org/licenses/mit-license.php
-[mt]: http://www.improveit.com.br/en/company/tapajos
-[nb]: http://github.com/slainer86
-[re]: http://www.railsenvy.com/2009/4/29/rails-envy-podcast-episode-077-04-29-2009
-[rh]: http://reinh.com/blog/2009/04/27/how-to-cache-anything-with-activesupport.html
-[tl]: http://github.com/ThiagoLelis
+[nb]: https://github.com/slainer86
+[odorcicd]: https://github.com/odorcicd
 [rdoc]: http://rdoc.info/projects/tapajos/highrise
-[caliper]: https://devver.net/caliper/project?repo=git%3A%2F%2Fgithub.com%2Ftapajos%2Fhighrise.git
+[tapajos]: http://www.improveit.com.br/en/company/tapajos
+[tl]: https://github.com/ThiagoLelis

data/Rakefile

@@ -1,39 +1,14 @@
 # encoding: utf-8
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-gem 'rspec', ">= 1.3.0"
-require 'spec/rake/spectask'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "highrise"
-    gemspec.summary = "Ruby wrapper around Highrise API"
-    gemspec.email = ["marcos@tapajos.me", "kmayer@bitwrangler.com"]
-    gemspec.homepage = "http://github.com/tapajos/highrise"
-    gemspec.description = %{
-Based on the original API module from DHH, http://developer.37signals.com/highrise/, this
-gem is a cleaned up, tested version of the same. Contributors have added support for tags 
-which are not supported by the API directly
-
-Configure by adding the following:
-
-require 'highrise'
-Highrise::Base.site = 'http://your_site.highrisehq.com/'
-Highrise::Base.user = 'your_api_auth_token'
-                          }
-    gemspec.authors = ["Marcos Tapajós", "Ken Mayer"]
-    gemspec.add_dependency('activeresource', '>= 2.1')
-    gemspec.add_dependency('activesupport', '>= 2.1')
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler -s http://gems.github.com"
-end
+require 'rspec/core/rake_task'
 
 desc 'Default: run unit tests.'
 task :default => :spec
 
 desc "Run all specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['--options', 'spec/spec.opts']
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rspec_opts = ["-c", "-f progress"]
 end

data/autotest/discover.rb

@@ -1,3 +1 @@
-Autotest.add_discovery do
-  "rspec"
-end
+Autotest.add_discovery { "rspec2" }

data/examples/config_initializers_highrise.rb

@@ -1,12 +1,4 @@
 if Rails.env != 'test' then
   Highrise::Base.site = 'https://example.com.i'
-  # For backward compatability
-  if Highrise::Base.respond_to? :user
-    Highrise::Base.user = 'my_fancy_auth_token'
-  else 
-    Highrise::Base.site = 'https://my_fancy_auth_token@example.com.i'
-  end
-  # The cache store can be anything that ActiveSupport can handle
-  Highrise::Base.connection.cache_store = ActiveSupport::Cache.lookup_store :mem_cache_store
-  Highrise::Base.connection.store_options = { :expires_in => 60.seconds }
+  Highrise::Base.user = 'my_fancy_auth_token'
 end

data/examples/sample.rb

@@ -3,7 +3,6 @@ require 'pp'
 
 Highrise::Base.site = 'https://yoursite.highrisehq.com'
 Highrise::Base.user = 'xxx'
-Highrise::Base.connection.cache_store = :memory_store
 
 @tags = Highrise::Tag.find(:all)
 

data/highrise.gemspec

@@ -1,126 +1,33 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "highrise/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{highrise}
-  s.version = "2.0.1"
+  s.name        = "highrise"
+  s.version     = Highrise::VERSION
+  s.platform    = Gem::Platform::RUBY
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marcos Tapaj\303\263s", "Ken Mayer"]
-  s.date = %q{2010-08-25}
-  s.description = %q{
-Based on the original API module from DHH, http://developer.37signals.com/highrise/, this
-gem is a cleaned up, tested version of the same. Contributors have added support for tags 
-which are not supported by the API directly
+  s.required_rubygems_version = ">= 1.3.6"
+  s.add_dependency "activeresource", "~>3.0.0"
+  s.add_development_dependency "rspec"
 
-Configure by adding the following:
-
-require 'highrise'
-Highrise::Base.site = 'http://your_site.highrisehq.com/'
-Highrise::Base.user = 'your_api_auth_token'
-                          }
-  s.email = ["marcos@tapajos.me", "kmayer@bitwrangler.com"]
-  s.extra_rdoc_files = [
-    "README.mkdn"
-  ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "MIT-LICENSE",
-     "README.mkdn",
-     "Rakefile",
-     "VERSION.yml",
-     "autotest/discover.rb",
-     "examples/config_initializers_highrise.rb",
-     "examples/extending.rb",
-     "examples/sample.rb",
-     "highrise.gemspec",
-     "install.rb",
-     "lib/cachable.rb",
-     "lib/highrise.rb",
-     "lib/highrise/account.rb",
-     "lib/highrise/base.rb",
-     "lib/highrise/comment.rb",
-     "lib/highrise/company.rb",
-     "lib/highrise/deal.rb",
-     "lib/highrise/email.rb",
-     "lib/highrise/group.rb",
-     "lib/highrise/kase.rb",
-     "lib/highrise/membership.rb",
-     "lib/highrise/note.rb",
-     "lib/highrise/pagination.rb",
-     "lib/highrise/person.rb",
-     "lib/highrise/subject.rb",
-     "lib/highrise/tag.rb",
-     "lib/highrise/taggable.rb",
-     "lib/highrise/task.rb",
-     "lib/highrise/user.rb",
-     "spec/cachable_spec.rb",
-     "spec/highrise/account_spec.rb",
-     "spec/highrise/base_spec.rb",
-     "spec/highrise/comment_spec.rb",
-     "spec/highrise/company_spec.rb",
-     "spec/highrise/deal_spec.rb",
-     "spec/highrise/email_spec.rb",
-     "spec/highrise/group_spec.rb",
-     "spec/highrise/kase_spec.rb",
-     "spec/highrise/membership_spec.rb",
-     "spec/highrise/note_spec.rb",
-     "spec/highrise/pagination_spec.rb",
-     "spec/highrise/person_spec.rb",
-     "spec/highrise/subject_spec.rb",
-     "spec/highrise/tag_spec.rb",
-     "spec/highrise/task_spec.rb",
-     "spec/highrise/user_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "uninstall.rb"
-  ]
-  s.homepage = %q{http://github.com/tapajos/highrise}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.files         =  `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features,examples}/*`.split("\n")
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Ruby wrapper around Highrise API}
-  s.test_files = [
-    "spec/cachable_spec.rb",
-     "spec/highrise/account_spec.rb",
-     "spec/highrise/base_spec.rb",
-     "spec/highrise/comment_spec.rb",
-     "spec/highrise/company_spec.rb",
-     "spec/highrise/deal_spec.rb",
-     "spec/highrise/email_spec.rb",
-     "spec/highrise/group_spec.rb",
-     "spec/highrise/kase_spec.rb",
-     "spec/highrise/membership_spec.rb",
-     "spec/highrise/note_spec.rb",
-     "spec/highrise/pagination_spec.rb",
-     "spec/highrise/person_spec.rb",
-     "spec/highrise/subject_spec.rb",
-     "spec/highrise/tag_spec.rb",
-     "spec/highrise/task_spec.rb",
-     "spec/highrise/user_spec.rb",
-     "spec/spec_helper.rb",
-     "examples/config_initializers_highrise.rb",
-     "examples/extending.rb",
-     "examples/sample.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.authors       = ["Marcos Tapaj\303\263s", "Ken Mayer"]
+  s.email         = ["marcos@tapajos.me", "kmayer@bitwrangler.com"]
+  s.homepage      = "http://github.com/tapajos/highrise"
+  s.summary       = %q{Ruby wrapper around Highrise API}
+  s.description   = <<-EOT
+    Based on the original API module from DHH, http://developer.37signals.com/highrise/, this
+    gem is a cleaned up, tested version of the same. 
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activeresource>, [">= 2.1"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.1"])
-    else
-      s.add_dependency(%q<activeresource>, [">= 2.1"])
-      s.add_dependency(%q<activesupport>, [">= 2.1"])
-    end
-  else
-    s.add_dependency(%q<activeresource>, [">= 2.1"])
-    s.add_dependency(%q<activesupport>, [">= 2.1"])
-  end
-end
+    Configure by adding the following:
 
+    require 'highrise'
+    Highrise::Base.site = 'http://your_site.highrisehq.com/'
+    Highrise::Base.user = 'your_api_auth_token'
+  EOT
+
+end

data/lib/highrise.rb

@@ -1,10 +1,7 @@
-gem 'activeresource', " >= 2.3.8"
-require 'active_resource'
-$:.unshift(File.dirname(__FILE__))
-
 require 'highrise/base'
 require 'highrise/pagination'
 require 'highrise/taggable'
+require 'highrise/searchable'
 require 'highrise/subject'
 require 'highrise/comment'
 require 'highrise/company'
@@ -18,4 +15,8 @@ require 'highrise/task'
 require 'highrise/user'
 require 'highrise/tag'
 require 'highrise/deal'
-require 'highrise/account'
+require 'highrise/account'
+require 'highrise/deal_category'
+require 'highrise/task_category'
+require 'highrise/party'
+require 'highrise/recording'

data/lib/highrise/account.rb

@@ -1,7 +1,6 @@
 module Highrise
   class Account < Base
     def self.me
-      user = Account.new()
       find(:one, :from => "/account.xml")
     end
   end

data/lib/highrise/base.rb

@@ -1,7 +1,19 @@
-require File.dirname(__FILE__) + '/../cachable'
+require 'active_resource'
 
 module Highrise
   class Base < ActiveResource::Base
-    include ::Cachable
+    protected
+    # Dynamic finder for attributes
+    def self.method_missing(method, *args)
+      if method.to_s =~ /^find_(all_)?by_([_a-zA-Z]\w*)$/
+        raise ArgumentError, "Dynamic finder method must take an argument." if args.empty?
+        options = args.extract_options!
+        resources = respond_to?(:find_all_across_pages) ? send(:find_all_across_pages, options) : send(:find, :all)
+        resources.send($1 == 'all_' ? 'select' : 'detect') { |container| container.send($2) == args.first }
+      else
+        super
+      end
+    end
+
   end
-end
+end

data/lib/highrise/comment.rb

@@ -1,4 +1,3 @@
 module Highrise
-  class Comment < Base
-  end
+  class Comment < Base; end
 end

data/lib/highrise/company.rb

@@ -2,13 +2,14 @@ module Highrise
   class Company < Subject
     include Pagination
     include Taggable
+    include Searchable
 
     def self.find_all_across_pages_since(time)
-      find_all_across_pages(:params => { :since => time.utc.to_s(:db).gsub(/[^\d]/, '') })
+      find_all_across_pages(:params => { :since => time.utc.strftime("%Y%m%d%H%M%S") })
     end
 
     def people
-      Person.find(:all, :from => "/companies/#{id}/people.xml")
+      Person.find_all_across_pages(:from => "/companies/#{id}/people.xml")
     end
     
     def label