peterosullivan-highrise 3.0.6 → 3.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    highrise (3.0.1)
+    peterosullivan-highrise (3.0.6)
       activeresource (~> 3.0)
 
 GEM
@@ -41,6 +41,6 @@ PLATFORMS
 
 DEPENDENCIES
   activeresource (~> 3.0)
-  highrise!
+  peterosullivan-highrise!
   rake (= 0.8.7)
   rspec (~> 2.0.1)

data/README.md

@@ -18,7 +18,7 @@ This fork is very close to the orginal gem. I have added a few features and shor
 ###Highrise Custom Fields read only (called "subject_datas" in the Highrise API)
 
     p = Highrise::Person.find(123)
-    p.subject_data_fields #{"favourite_color"=>"red"}
+    p.subject_data_hash #{"favourite_color"=>"red"}
     p.field("FavouriteColor") #<Highrise::SubjectData:0xb5e3442c @attributes={"subject_field_label"=>"FavouriteColor", "id"=>12065552, "value"=>"red", "subject_field_id"=>123}, @prefix_options={}>
     p.favourite_color #"red"
 

data/lib/highrise.rb

@@ -1,24 +1,35 @@
-require 'highrise/base'
-require 'highrise/pagination'
-require 'highrise/taggable'
-require 'highrise/searchable'
-require 'highrise/subject_data'
-require 'highrise/subject'
-require 'highrise/comment'
-require 'highrise/company'
-require 'highrise/email'
-require 'highrise/group'
-require 'highrise/kase'
-require 'highrise/membership'
-require 'highrise/note'
-require 'highrise/person'
-require 'highrise/task'
-require 'highrise/user'
-require 'highrise/tag'
-require 'highrise/deal'
-require 'highrise/account'
-require 'highrise/deal_category'
-require 'highrise/task_category'
-require 'highrise/party'
-require 'highrise/recording'
+%w[
+  base
+  version
+  rfc822
+  
+  pagination
+  taggable
+  searchable
+  has_subject_data
+  
+  subject
+  
+  comment
+  company
+  email
+  group
+  kase
+  membership
+  note
+  person
+  task
+  user
+  tag
+  deal
+  account
+  deal_category
+  task_category
+  party
+  recording
+  subject_field
+  subject_data
 
+].each do |lib|
+  require File.join(File.dirname(__FILE__), 'highrise', lib)
+end

data/lib/highrise/base.rb

@@ -16,8 +16,13 @@ module Highrise
       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 }
+        if respond_to? :search
+          resources = search $2 => args.first
+          $1 == 'all_' ? resources : resources.first
+        else
+          resources = respond_to?(:find_all_across_pages) ? find_all_across_pages(options) : find(:all)
+          resources.send($1 == 'all_' ? 'select' : 'detect') { |container| container.send($2) == args.first }
+        end
       else
         super
       end

data/lib/highrise/company.rb

@@ -12,4 +12,4 @@ module Highrise
       'Party'
     end
   end
-end
+end

data/lib/highrise/has_subject_data.rb

@@ -0,0 +1,19 @@
+module Highrise
+  module HasSubjectData
+
+    def subject_data_hash
+      if attributes.has_key?(:subject_datas)
+        Hash[subject_datas.map(&:attributes).map {|attrs| [attrs[:subject_field_label].to_s.underscore, attrs[:value]] }]
+      else
+        {}
+      end
+    end
+
+    def field(field_name)
+      (attributes["subject_datas"] || []).detect do |sd|
+        sd.subject_field_label == field_name.to_s
+      end
+    end
+    
+  end
+end

data/lib/highrise/pagination.rb

@@ -38,7 +38,8 @@ module Highrise
         options[:params][:n] = 0
 
         loop do
-          if (records = self.find(:all, options)).try(:any?)
+          records = find(:all, options)
+          if records && records.any?
             records.each { |record| yield record }
             options[:params][:n] += records.size
           else

data/lib/highrise/person.rb

@@ -1,15 +1,9 @@
 module Highrise
   class Person < Subject
-    require 'highrise/rfc822'
     include Pagination
     include Taggable
     include Searchable
-    include SubjectData::Mixin
-    
-    def initialize(*args)
-      super(*args)
-      create_subject_fields_accessors
-    end 
+    include HasSubjectData
     
     def company
       Company.find(company_id) if company_id
@@ -58,16 +52,5 @@ module Highrise
       end
     end
     
-    def create_subject_fields_accessors  
-      subject_data_fields.each do |subject_field_name, value|
-        # for this instance only
-        singleton_class.instance_eval do
-          define_method subject_field_name do
-            value 
-          end
-        end
-      end
-    end
-    
   end
 end

data/lib/highrise/searchable.rb

@@ -10,12 +10,13 @@ module Highrise
       # Available criteria are: city, state, country, zip, phone, email
       def search(options = {})
         raise ArgumentError, "cannot convert #{options}:#{options.class} to hash" if options.kind_of?(String)
-        search_params = options.inject({}) { |h, (k, v)| h["criteria[#{k}]"] = v; h }
         # This might have to be changed in the future if other non-pagable resources become searchable
-        if self.respond_to?(:find_all_across_pages)
-          self.find_all_across_pages(:from => "/#{self.collection_name}/search.xml", :params => search_params)
+        options[:kind] ||= collection_name
+        find_options = {:from => "/parties/search.xml", :params => options}
+        if respond_to?(:find_all_across_pages)
+          find_all_across_pages(find_options)
         else
-          self.find(:all, {:from => "/#{self.collection_name}/search.xml", :params => search_params})
+          find(:all, find_options)
         end
       end
     end

data/lib/highrise/subject_data.rb

@@ -1,23 +1,5 @@
 module Highrise
   class SubjectData < Base
-    
-    module Mixin
-  
-      def subject_data_fields
-        if attributes.has_key?(:subject_datas)
-          Hash[subject_datas.map(&:attributes).map {|attrs| [attrs[:subject_field_label].to_s.underscore, attrs[:value]] }]
-        else
-          {}
-        end
-      end
-
-      def field(field_name)
-        (attributes["subject_datas"] || []).detect do |sd|
-          sd.subject_field_label == field_name.to_s
-        end
-      end
-      
-    end
-
   end
 end
+

data/lib/highrise/subject_field.rb

@@ -0,0 +1,5 @@
+module Highrise
+  class SubjectField < Base
+  end
+end
+

data/lib/highrise/version.rb

@@ -1,3 +1,3 @@
 module Highrise
-  VERSION = "3.0.6"
+  VERSION = "3.0.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: peterosullivan-highrise
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 3
   - 0
-  - 6
-  version: 3.0.6
+  - 7
+  version: 3.0.7
 platform: ruby
 authors: 
 - "Marcos Tapaj\xC3\xB3s"
@@ -100,6 +100,7 @@ files:
 - lib/highrise/deal_category.rb
 - lib/highrise/email.rb
 - lib/highrise/group.rb
+- lib/highrise/has_subject_data.rb
 - lib/highrise/kase.rb
 - lib/highrise/membership.rb
 - lib/highrise/note.rb
@@ -111,6 +112,7 @@ files:
 - lib/highrise/searchable.rb
 - lib/highrise/subject.rb
 - lib/highrise/subject_data.rb
+- lib/highrise/subject_field.rb
 - lib/highrise/tag.rb
 - lib/highrise/taggable.rb
 - lib/highrise/task.rb