onepagecrm 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea189d76157c7ff7072624e96c36cf55ed81156c
-  data.tar.gz: d99f8f3f82ee4f72b51605bc5aa4dc4d08f605a1
+  metadata.gz: af6d0d2b43457fbf7e400f2aecd5b417e77ea3c6
+  data.tar.gz: d507d507240c193a41c48ea00c56a253af1ae191
 SHA512:
-  metadata.gz: 15f1d9edf2f48b5e22e2cc3971e9288978cc572c090580f4769421c7cb3f315584a04395c6b1c96ef22f748fabba7ec832997c46c633803483b8b2d8eafd28cc
-  data.tar.gz: 2b4bdb12542d3ed750589a7486284878cbb314243fcbf288fc8592143beb12dacbd0edf141ae66003d618b0feffcbd656a2392c9c24c88301ca0326995d884cf
+  metadata.gz: 64a3ce994c2dbafe5112c8780b7bd020db87ca58618073a6ba3f3376b839c1c4d147730e62c9e6f122ef11ddf7b313bd24053a9b449d9dd57fa834eeed1b39fa
+  data.tar.gz: 49268667cf1e52a763311a41f729f8df9334b9b5d101e55e683bd4dd4a86a53b608d92c326ff656031a996eecc7cf63322fe501d0763e77b141fb6830bc43415

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { 'spec' }
+end
+

data/lib/onepagecrm.rb

@@ -1,96 +1,65 @@
 require 'onepagecrm/version'
-require 'net/http'
-require 'openssl'
 require 'base64'
 require 'json'
-require 'uri'
+require 'faraday'
 
+# OnePageCRM API Client Object
 class Onepagecrm
   def initialize(login = nil, password = nil)
     @url = 'https://app.onepagecrm.com/api/v3/'
+    @conn = Faraday.new(url: @url)
     log_in(login, password)
   end
 
-  # Login user into API
+  # Log user into API
   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'])
+    @auth_key = Base64.decode64(auth_data['data']['auth_key'])
   end
 
-  # Send GET request
-  def get(method, params = {})
-    url = URI.parse(@url + method)
-    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
+  # defines get and delete methods
+  %w(get delete).each do |http_method|
+    define_method http_method do |endpoint, params = {}|
+      @conn.headers = auth_header(http_method, @url + endpoint, params)
+      response = @conn.send(http_method, endpoint, params)
+      JSON.parse response.body
+    end
   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
+  # Defines put and post methods
+  %w(post put).each do |http_method|
+    define_method http_method do |endpoint, params = {}|
+      @conn.headers = auth_header(http_method, @url + endpoint, params)
+      response = @conn.send(http_method, endpoint, params.to_json)
+      JSON.parse response.body
+    end
   end
 
-  # Send POST request
-  def post(method, params = {})
-    url = URI.parse(@url + method)
-    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
-    JSON.parse result
-  end
-
-  # Send PUT request
-  def put(method, params = {})
-    url = URI.parse(@url + method)
-    req = Net::HTTP::Put.new(url.path)
-    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
+  # Returns headers required for API authentication
+  def auth_header(http_method, url, parameters)
+    http_method = http_method.upcase
+    op_headers = { 'Content-Type' => 'application/json' }
+    return op_headers if @uid.nil? || @auth_key.nil?
+    if parameters.any? && %w(GET DELETE).include?(http_method)
+      url += '?' + URI.encode_www_form(parameters)
+    end
 
-  # Add authentication headers
-  def add_auth_headers(req, http_method, api_method, params)
-    return if @uid.nil? || @api_key.nil?
-
-    url_to_sign = @url + api_method
-    params_to_sign = params.empty? ? nil : URI.encode_www_form(params)
-    url_to_sign += '?' + params_to_sign unless params_to_sign.nil? || %w(POST PUT).include?(http_method)
-
-    # puts url_to_sign
     timestamp = Time.now.to_i.to_s
-    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')
+    token = create_auth_token(http_method, url, parameters, timestamp)
+    { 'X-OnePageCRM-UID' => @uid,
+      'X-OnePageCRM-TS' => timestamp,
+      'X-OnePageCRM-Auth' => token
+     }.merge op_headers
   end
 
-  # Creates the token for X-OnePageCRM-Auth
-  def create_token(timestamp, request_type, request_url, request_body)
+  # Creates the auth token for the X-OnePageCRM-Auth header
+  def create_auth_token(http_method, request_url, request_body, timestamp)
     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 += ('.' + request_body_hash) unless request_body.empty?
-    OpenSSL::HMAC.hexdigest('sha256', @api_key, signature_message).to_s
+    signature = [@uid, timestamp, http_method.upcase, request_url_hash].join '.'
+    signature += ('.' + request_body_hash) if %w(POST PUT).include?(http_method)
+    OpenSSL::HMAC.hexdigest('sha256', @auth_key, signature).to_s
   end
 end

data/lib/onepagecrm/version.rb

@@ -1,3 +1,4 @@
+# Version for Oneapgecrm gem
 class Onepagecrm
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/onepagecrm.gemspec

@@ -18,10 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'faraday'
+
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'json_spec'
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'awesome_print'
+  spec.add_development_dependency 'vcr'
 end

data/spec/contacts_spec.rb

@@ -1,12 +1,16 @@
 require 'spec_helper'
 require 'json_spec'
 require 'pry'
+require 'awesome_print'
 
 describe Onepagecrm do
   subject { Onepagecrm.new(TEST_CONFIG['login'], TEST_CONFIG['password']) }
 
   describe '#contact' do
     it 'creates, gets, updates and deletes a contact' do
+
+      contacts = subject.get('contacts.json')
+      expect(contacts['status']).to eq 0
       new_contact_details = ({
         'first_name' => 'yes',
         'last_name' => 'address',
@@ -29,7 +33,6 @@ describe Onepagecrm do
           'state' => 'CA'
         ]
       })
-
       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?search=yes")['data']['contact']

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'yaml'
-require 'codeclimate-test-reporter'
+# require 'codeclimate-test-reporter'
 TEST_CONFIG = YAML.load_file("#{File.dirname(__FILE__)}/../config/config.yml")
 
-ENV['CODECLIMATE_REPO_TOKEN'] = TEST_CONFIG['codeclimate_key']
-CodeClimate::TestReporter.start
+# ENV['CODECLIMATE_REPO_TOKEN'] = TEST_CONFIG['codeclimate_key']
+# CodeClimate::TestReporter.start
 require 'onepagecrm'

data/tasks/rspec.rake

@@ -1,3 +1,5 @@
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new do |task|
+  task.rspec_opts = ['--color', '--format', 'doc']
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onepagecrm
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Peter Armstrong
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2014-11-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  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'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  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'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  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
@@ -103,6 +173,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile