pipejump 0.2.0 → 0.3.0

data/.gitignore

@@ -22,4 +22,7 @@ pkg
 spec/connection.yml
 coverage
 coverage.data
-test*.rb
+test*.rb
+
+.bundle
+bin

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -1,7 +1,8 @@
 #!/usr/bin/ruby
 source "http://rubygems.org"
 
-gem 'rspec', '1.3.0'
+gem 'rspec'
 gem 'rake'
-gem 'jeweler'
-gem 'rcov'
+gem 'rcov'
+gem 'vcr'
+gem "webmock"

data/Gemfile.lock

@@ -1,25 +1,30 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    gemcutter (0.5.0)
-      json_pure
-    git (1.2.5)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
-    rake (0.8.7)
-    rcov (0.9.8)
-    rspec (1.3.0)
-    rubyforge (2.0.3)
-      json_pure (>= 1.1.7)
+    addressable (2.2.6)
+    crack (0.1.8)
+    diff-lcs (1.1.3)
+    rake (0.9.2)
+    rcov (0.9.10)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    vcr (1.11.2)
+    webmock (1.7.5)
+      addressable (~> 2.2, > 2.2.5)
+      crack (>= 0.1.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  jeweler
   rake
   rcov
-  rspec (= 1.3.0)
+  rspec
+  vcr
+  webmock

data/Rakefile

@@ -1,32 +1,12 @@
-require "rubygems"
-require "bundler/setup"
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "pipejump"
-    gem.summary = %Q{Pipejump API Ruby client}
-    gem.description = %Q{Pipejump API Ruby client}
-    gem.email = "marcin@pipejump.com"
-    gem.homepage = "http://github.com/pipejump/pipejump"
-    gem.authors = ["Marcin Bunsch"]
-    gem.add_development_dependency "bundler", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 begin
   require 'rcov/rcovtask'
-  
+
   desc "Run rcov for rspec"
   Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_files = FileList['spec/pipejump/**/*_spec.rb']
+    t.spec_files = FileList['spec/pipejump/*_spec.rb', 'spec/pipejump/resources/*_spec.rb']
     t.spec_opts = %w{--color}
     t.rcov = true
     t.rcov_opts = %w{--html --exclude osx\/objc,gems\/,spec\/}
@@ -39,13 +19,6 @@ rescue LoadError
   end
 end
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/pipejump/*_spec.rb', 'spec/pipejump/**/*_spec.rb']
-  t.spec_opts = %w{--color}
-end
-
-task :default => :spec
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/pipejump/base/collection.rb

@@ -1,7 +1,7 @@
 module Pipejump
-  
+
   # Represents a collection Resources available in the Pipejump API
-  # 
+  #
   # ==== Available Collections:
   # * Clients
   #     @session.clients
@@ -29,7 +29,7 @@ module Pipejump
   #   @session.sources.size
   #   @session.sources.each { |source| }
   class Collection
-    
+
     class << self
       # Disable methods specified as arguments
       def disable(*methods) #:nodoc:
@@ -51,27 +51,27 @@ module Pipejump
     #   @session.clients
     # or
     #   @deal.notes
-    # 
+    #
     def initialize(session, resource, owner = nil)
       @session = session
       @resource = resource
       @owner = owner
       @prefix = owner ? owner.element_path : ''
     end
-    
+
     # Returns a path to the collection of Resource objects
     def collection_path
-      @prefix + '/' + @resource.collection_path.to_s 
+      @prefix + '/' + @resource.collection_path.to_s
     end
 
     # Returns a path to a single Resource
     def element_path(id)
-      @prefix + '/' + @resource.collection_path.to_s + '/' + id.to_s 
+      @prefix + '/' + @resource.collection_path.to_s + '/' + id.to_s
     end
-    
+
     # Returns a single Resource object, based on its _id_
     # ==== Arguments
-    # * _id_ - id of Resource 
+    # * _id_ - id of Resource
     def find(id)
       code, data = @session.get(element_path(id) + '.json')
       if code == 200
@@ -81,7 +81,7 @@ module Pipejump
         raise ResourceNotFound
       end
     end
-    
+
     # Returns an Array of Resource objects
     def all
       code, data = @session.get(collection_path + '.json')
@@ -90,7 +90,7 @@ module Pipejump
         @resource.new(data[key].merge(:session => @session, :prefix => @prefix))
       }
     end
-    
+
     # Creates and returns a Resource object
     # ==== Arguments
     # * _attrs_ - a Hash of attributes passed to the constructor of the Resource
@@ -99,11 +99,11 @@ module Pipejump
       resource.save
       resource
     end
-    
+
     def inspect
       all.inspect
     end
-    
+
     ['first', 'last', 'each', 'size', 'collect', 'reject'].each do |method|
       class_eval <<-STR
         def #{method}(*args, &block)
@@ -111,7 +111,7 @@ module Pipejump
         end
       STR
     end
-        
+
   end
-  
+
 end

data/lib/pipejump/base/connection.rb

@@ -1,40 +1,40 @@
 require 'uri'
 module Pipejump
-  
+
   class Connection #:nodoc:
-    
+
     attr_accessor :session, :endpoint
 
     def initialize(session, endpoint = nil)
       @session = session
-      @endpoint = endpoint || 'https://api.pipejump.com'
+      @endpoint = endpoint || 'https://sales.futuresimple.com'
     end
-       
+
     def site
       parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
       parser.parse(self.endpoint)
     end
-    
+
     def post(path, data)
-      http.post(path, data, headers)
+      http.post(session.version_prefix(path), data, headers)
     end
 
     def put(path, data)
-      http.put(path, data, headers)
+      http.put(session.version_prefix(path), data, headers)
     end
 
     def get(path)
-      http.get(path, headers)
+      http.get(session.version_prefix(path), headers)
     end
 
     def delete(path)
-      http.delete(path, headers)
+      http.delete(session.version_prefix(path), headers)
     end
-    
+
     def headers
       { 'X-Pipejump-Auth' => session.token.to_s }
     end
-    
+
     def http
       instance ||= Net::HTTP.new(site.host, site.port)
       if @endpoint.match(/^https:/)
@@ -43,12 +43,12 @@ module Pipejump
       end
       instance
     end
-    
+
     def inspect
       "#<#{self.class} endpoint: \"#{endpoint}\">"
     end
-    
-    
+
+
   end
 
 end

data/lib/pipejump/base/resource.rb

@@ -1,7 +1,7 @@
 module Pipejump
   #
   # Represents a Resource available in the Pipejump API
-  # 
+  #
   # The following Resources are available:
   # * Account via @session.account
   # * Client via @session.clients
@@ -10,70 +10,71 @@ module Pipejump
   # * Note via @deal.notes
   # * Reminder via @deal.reminders
   # * Source via @deal.sources
-  # 
+  #
   # === Retrieving Resources
   # For information on retrieving resources, please consult the Collection class
   #
-  # === Creating a Resource 
+  # === Creating a Resource
   # To create a resource, call the create method on the appropriate collection.
-  # 
+  #
   # For example, to create a client, you would do the following:
   #   @client = @session.clients.create(:name => 'Google')
-  # This will return an instance of Pipejump::Client 
-  # 
+  # This will return an instance of Pipejump::Client
+  #
   # You can access the attributes of the instance via the attributes method:
   #   @client.attributes # => { 'id' => 1, 'name' => 'Google' }
-  # 
+  #
   # Pipejump::Resource also provides shortcut accessors for these attributes, similarly to ActiveRecord:
   #   @client.name = 'Yahoo'
   #   @client.name # => 'Yahoo'
-  # 
+  #
   # If the create fails, errors are available via the errors method
   #   @client = @session.clients.create(:name => '')
   #   @client.errors # => {"client"=>[{"error"=>{"code"=>"E0001", "field"=>"name", "description"=>"Please enter a client name"}}]}
-  # 
+  #
   # For more information on errors, please consult the Pipejump API documentation
   #
   # === Updating a Resource
   # To update a resource, change the desired attributes and call the save method
   #   @client.name = 'Yahoo'
   #   @client.save
-  # 
+  #
   # The save method returns the instance on successful save.
   #
   # If the update fails, save returns false and errors are available via the errors method
   #   @client.name = ''
   #   @client.save # => false
   #   @client.errors # => {"client"=>[{"error"=>{"code"=>"E0001", "field"=>"name", "description"=>"Please enter a client name"}}]}
-  # 
+  #
   # For more information on errors, please consult the Pipejump API documentation
-  # 
+  #
   # === Removing a resource
   # To remove a resource, call the destroy method on the Pipejump::Resource instance
   #   @client.destroy # => true
   #
   class Resource
-       
+
     class << self
       # Returns the pluralized name of the resource used for the collection
       def collection_path(path = nil)
         @collection_path = path if path
         @collection_path || "#{self.to_s.split('::').last.downcase}s"
       end
-      
+
       # Naive implementation of belongs_to association
-      def belongs_to(klass) #:nodoc:
+      def belongs_to(klass, options = {}) #:nodoc:
+        klass_name = options[:class_name] || klass
         class_eval <<-STR
           def #{klass}
             if @attributes['#{klass}'].is_a?(Hash)
-              Pipejump::#{klass.to_s.capitalize}.new(@attributes['#{klass}'].merge(:session => @session))
+              Pipejump::#{klass_name.to_s.capitalize}.new(@attributes['#{klass}'].merge(:session => @session))
             elsif @attributes['#{klass}_id']
-              @session.#{klass}s.find(@attributes['#{klass}_id'])
+              @session.#{klass_name.to_s.downcase}s.find(@attributes['#{klass}_id'])
             end
           end
         STR
       end
-      
+
       # Naive implementation of has_many association
       attr_accessor :has_many_blocks #:nodoc:
       def has_many(collection, &block) #:nodoc:
@@ -87,11 +88,11 @@ module Pipejump
             collection
           end
         STR
-        
+
       end
-      
+
     end
-    
+
     attr_accessor :attributes
     # Constructor for the Resource
     def initialize(attrs)
@@ -100,19 +101,19 @@ module Pipejump
       @attributes = {}
       load(attrs)
     end
-    
+
     def id
       @attributes['id']
     end
-    
+
     def load(attrs = {}) #:nodoc:
       attrs.each_pair do |key, value|
         @attributes[key.to_s] = value
-      end      
+      end
     end
-    
+
     def method_missing(meth, *args) #:nodoc:
-      if meth.to_s[-1].chr == '=' and @attributes[meth.to_s[0..-2]]
+      if meth.to_s[-1].chr == '=' and @attributes.has_key?(meth.to_s[0..-2])
         @attributes[meth.to_s[0..-2]] = args.first
       elsif @attributes.has_key?(meth.to_s)
         @attributes[meth.to_s]
@@ -120,15 +121,15 @@ module Pipejump
         super(meth, args)
       end
     end
-    
+
     def klassname #:nodoc:
       self.class.to_s.split('::').last.downcase
     end
-    
+
     def to_query
       @attributes.collect { |pair| pair[0] = "#{klassname}[#{pair[0]}]"; pair.join('=') }.join('&')
     end
-    
+
     def save
       before_save if respond_to?(:before_save)
       @errors = {}
@@ -141,42 +142,49 @@ module Pipejump
         true
       end
     end
-    
+
     def inspect
       "#<#{self.class} #{@attributes.collect { |pair| pair[1] = "\"#{pair[1]}\""; pair.join(': ') }.join(', ')}>"
     end
-    
+
     def element_path
       @prefix + '/' + self.class.collection_path.to_s + '/' + id.to_s
     end
-    
+
     def collection_path
-      @prefix + '/' + self.class.collection_path.to_s 
+      @prefix + '/' + self.class.collection_path.to_s
     end
-    
+
     def create #:nodoc:
-      @session.post(collection_path + '.json', to_query)      
+      @session.post(collection_path + '.json', to_query)
     end
 
     def update #:nodoc:
-      @session.put(element_path + '.json', to_query)      
+      @session.put(element_path + '.json', to_query)
     end
-    
+
     # Destroys the Resource
     def destroy
       code, data = @session.delete(element_path + '.json')
       code.to_i == 200
     end
-    
+
+    # Reloads the resource data from the API
+    def reload
+      code, data = @session.get(element_path + '.json')
+      load(data[klassname])
+      self
+    end
+
     # Returns a Hash of errors
     def errors
       @errors ||= {}
     end
-    
+
     def created?
       !!id
     end
-    
+
   end
-  
+
 end