onepagecrm 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2859dfc423493ac5aef46f2dc87faa6601d44ccb
-  data.tar.gz: d3f35388dec43c2472f12f99e9b91b418f872f38
+  metadata.gz: ea189d76157c7ff7072624e96c36cf55ed81156c
+  data.tar.gz: d99f8f3f82ee4f72b51605bc5aa4dc4d08f605a1
 SHA512:
-  metadata.gz: d9683174012ce7b0df6e3d76a81a445077910f244d762d14d8790904a6b8b92fe820acc274bf29f427e0256785d08b6e08e0120ece9057bf544ae824f2630699
-  data.tar.gz: 8d399642d5a675af251c91e6615345e4ceaa719264c57b848ce5392622ca76956000826d2ad353fd337448fe392dc8766b1a322347af975ddfd942cbf76870f2
+  metadata.gz: 15f1d9edf2f48b5e22e2cc3971e9288978cc572c090580f4769421c7cb3f315584a04395c6b1c96ef22f748fabba7ec832997c46c633803483b8b2d8eafd28cc
+  data.tar.gz: 2b4bdb12542d3ed750589a7486284878cbb314243fcbf288fc8592143beb12dacbd0edf141ae66003d618b0feffcbd656a2392c9c24c88301ca0326995d884cf

data/lib/onepagecrm.rb

@@ -8,45 +8,38 @@ require 'uri'
 class Onepagecrm
   def initialize(login = nil, password = nil)
     @url = 'https://app.onepagecrm.com/api/v3/'
-    @login = login
-    @password = password
-    log_in
+    log_in(login, password)
   end
 
   # Login user into API
-  def log_in
-    params = {
-      login: @login,
-      password: @password
-    }
-
+  def log_in(login, password)
+    params = { login: login, password: password }
     auth_data = post('login.json', params)
     @uid = auth_data['data']['user_id']
-
     @api_key = Base64.decode64(auth_data['data']['auth_key'])
   end
 
-  def return_uid
-    @uid
-  end
-
   # Send GET request
   def get(method, params = {})
     url = URI.parse(@url + method)
-    get_data = params.empty? ? '' : '?' + params.to_a.map do|x|
-      x[0] + '=' +
-      URI.escape(x[1], Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-    end.join('&').gsub(/%[0-9A-Fa-f]{2}/) { |x| x.downcase }
-
     req = Net::HTTP::Get.new(url.request_uri)
-
     add_auth_headers(req, 'GET', method, params)
+    http = Net::HTTP.new(url.host, url.port)
+    http.use_ssl = true
+    result = http.request(req).body
+    JSON.parse result
+  end
 
+    # Send DELETE request
+  def delete(method, params = {})
+    url = URI.parse(@url + method)
+    req = Net::HTTP::Delete.new(url.request_uri)
+    add_auth_headers(req, 'DELETE', method, params)
     http = Net::HTTP.new(url.host, url.port)
     http.use_ssl = true
     result = http.request(req).body
     JSON.parse result
-    end
+  end
 
   # Send POST request
   def post(method, params = {})
@@ -54,9 +47,7 @@ class Onepagecrm
     req = Net::HTTP::Post.new(url.path)
     req.body = params.to_json
     req.add_field('Content-Type', 'application/json; charset=utf-8')
-
     add_auth_headers(req, 'POST', method, params)
-
     http = Net::HTTP.new(url.host, url.port)
     http.use_ssl = true
     result = http.request(req).body
@@ -70,30 +61,12 @@ class Onepagecrm
     req.body = params.to_json
     req.add_field('Content-Type', 'application/json; charset=utf-8')
     add_auth_headers(req, 'PUT', method, params)
-
     http = Net::HTTP.new(url.host, url.port)
     http.use_ssl = true
     result = http.request(req).body
     JSON.parse result
   end
 
-  # Send DELETE request
-  def delete(method, params = {})
-    url = URI.parse(@url + method)
-
-    delete_data = params.empty? ? '' : '?' + params.to_a.map do|x|
-      x[0] + '=' +
-      URI.escape(x[1], Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-    end.join('&').gsub(/%[0-9A-Fa-f]{2}/) { |x| x.downcase }
-
-    req = Net::HTTP::Delete.new(url.request_uri)
-    add_auth_headers(req, 'DELETE', method, params)
-    http = Net::HTTP.new(url.host, url.port)
-    http.use_ssl = true
-    result = http.request(req).body
-    JSON.parse result
-    end
-
   # Add authentication headers
   def add_auth_headers(req, http_method, api_method, params)
     return if @uid.nil? || @api_key.nil?
@@ -104,20 +77,20 @@ class Onepagecrm
 
     # puts url_to_sign
     timestamp = Time.now.to_i.to_s
-
-    token = create_signature(@uid, @api_key, timestamp, http_method, url_to_sign, params)
+    token = create_token(timestamp, http_method, url_to_sign, params)
 
     req.add_field('X-OnePageCRM-UID', @uid)
     req.add_field('X-OnePageCRM-TS', timestamp)
     req.add_field('X-OnePageCRM-Auth', token)
     req.add_field('X-OnePageCRM-Source', 'lead_clip_chrome')
- end
+  end
 
-  def create_signature(uid, api_key, timestamp, request_type, request_url, request_body)
+  # Creates the token for X-OnePageCRM-Auth
+  def create_token(timestamp, request_type, request_url, request_body)
     request_url_hash = Digest::SHA1.hexdigest request_url
     request_body_hash = Digest::SHA1.hexdigest request_body.to_json
-    signature_message = [uid, timestamp, request_type.upcase, request_url_hash].join '.'
+    signature_message = [@uid, timestamp, request_type.upcase, request_url_hash].join '.'
     signature_message += ('.' + request_body_hash) unless request_body.empty?
-    OpenSSL::HMAC.hexdigest('sha256', api_key, signature_message).to_s
+    OpenSSL::HMAC.hexdigest('sha256', @api_key, signature_message).to_s
   end
 end

data/lib/onepagecrm/version.rb

@@ -1,3 +1,3 @@
 class Onepagecrm
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/onepagecrm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['peter@onepagecrm.com']
   spec.summary       = %q{Basic Gem for OnePageCRM.}
   spec.description   = %q{Basic Gem for OnePageCRM.}
-  spec.homepage      = ''
+  spec.homepage      = 'http://developer.onepagecrm.com'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'json_spec'
   spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'pry'
 end

data/spec/contacts_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 require 'json_spec'
+require 'pry'
 
 describe Onepagecrm do
   subject { Onepagecrm.new(TEST_CONFIG['login'], TEST_CONFIG['password']) }
 
-  describe '#create_contact' do
-    it 'creates a new contact' do
+  describe '#contact' do
+    it 'creates, gets, updates and deletes a contact' do
       new_contact_details = ({
         'first_name' => 'yes',
         'last_name' => 'address',
@@ -31,7 +32,7 @@ describe Onepagecrm do
 
       new_contact = subject.post('contacts.json', new_contact_details)['data']
       new_contact_id = new_contact['contact']['id']
-      got_deets = subject.get("contacts/#{new_contact_id}.json")['data']['contact']
+      got_deets = subject.get("contacts/#{new_contact_id}.json?search=yes")['data']['contact']
       expect(got_deets['first_name']).to eq(new_contact_details['first_name'])
 
       details_without_address = new_contact_details.reject { |k| k == 'address_list' }
@@ -45,6 +46,11 @@ describe Onepagecrm do
       expect(address['city']).to eq 'San Francisco'
       expect(address['state']).to eq 'CA'
 
+      subject.put("contacts/#{new_contact_id}.json", { 'partial' => true,
+                                                       'first_name' => 'Pat' })
+      got_deets = subject.get("contacts/#{new_contact_id}.json")['data']['contact']
+      expect(got_deets['first_name']).to eq 'Pat'
+
       # delete contact
       subject.delete("contacts/#{new_contact_id}.json")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onepagecrm
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Peter Armstrong
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Basic Gem for OnePageCRM.
 email:
 - peter@onepagecrm.com
@@ -99,7 +113,7 @@ files:
 - spec/contacts_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
-homepage: ''
+homepage: http://developer.onepagecrm.com
 licenses:
 - MIT
 metadata: {}