onepagecrm 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4adc5612ded228721cf379dbf3c151d1cb69e13c
-  data.tar.gz: a4e7ccae4fa0db6e08035437a8d33713d87f04ac
+SHA256:
+  metadata.gz: 6f43b8af18d61a41037c8f68194d03d919f7474f0dc22ddbf532c0821d52faa0
+  data.tar.gz: aaf2df2075abd43f72d288fe2e5e7018b7d9b41bd5e65c2f68a1cde3989292fc
 SHA512:
-  metadata.gz: 12c77b6739e38e78ae6ec82e6a18c4a6921580049be07d05f590746bf36f5f16f7eeea3853dafcdb2e5a7d190c4bb4f508dcf4fd271b6a610c5f6e43195b1687
-  data.tar.gz: ddee2ab11c51a33e4ac4afacf49671a9857bd71aaeb9357d63f935c3864246d74fb1adc0fd1a0c9d15451a7e43b3b23914af0683842b64037c15471a450c66a8
+  metadata.gz: 0db66e59769acc854b5a97004ab8f350294487b598ac08b2e53764ec1530910944011702d9a07dede643ef934a1ca7273901583c07adaac3cf06b71ba4d7b351
+  data.tar.gz: 57ea63f3882375254073ed092d6ebc55c7eacf2634be5da8490072506282d8e49abcc7fe522128fa231c00474e3a225323caa7ca41c2e0d7b0ed5b3d81345b05

data/.gitignore

@@ -13,4 +13,5 @@
 *.a
 mkmf.log
 config.yml
+.idea/
 

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in onepagecrm.gemspec
 gemspec
+
+group :development, :test do
+  # Better ruby interpreter
+  gem 'pry'
+end

data/Gemfile.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: .
+  specs:
+    onepagecrm (0.2.0)
+      faraday
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coderay (1.1.3)
+    faraday (1.7.1)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    method_source (1.0.0)
+    multipart-post (2.1.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (10.5.0)
+    ruby2_keywords (0.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 2.2.18)
+  onepagecrm!
+  pry
+  rake (~> 10.5)
+
+BUNDLED WITH
+   2.2.18

data/README.md

@@ -23,7 +23,7 @@ You can try out the OnePageCRM gem in an interactive ruby session
     
     $ irb
     irb:> require 'onepagecrm'
-    irb:> api_client = OnePageCRM.new('peter@xap.ie', 'p3t3r3t3p')
+    irb:> api_client = OnePageCRM.new('user_id', 'api_key')
     irb:> api_client.get('contacts.json')
     irb:> api_client.post('contacts.json', {'last_name': 'Bravo', 'first_name': 'Johnny'} )
 
@@ -44,4 +44,4 @@ We welcome any contributions.
 6. Create a new Pull Request
 
   [1]: http://developer.onepagecrm.com
-  [2]: http://forum.developer.onepagecrm.com
+  [2]: http://forum.developer.onepagecrm.com

data/lib/onepagecrm/version.rb

@@ -1,4 +1,4 @@
 # Version for OnePageCRM gem
 class OnePageCRM
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/onepagecrm.rb

@@ -5,24 +5,22 @@ 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
-
-  # 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']
-    @auth_key = Base64.decode64(auth_data['data']['auth_key'])
+  def initialize(user_id, api_key)
+    url = 'https://app.onepagecrm.com/api/v3/'
+    @conn = Faraday.new(url: url) do |conn|
+      conn.adapter Faraday.default_adapter
+      conn.basic_auth(user_id, api_key)
+      conn.headers.merge!(
+        'Content-Type' => 'application/json',
+        'X-OnePageCRM-UID' => user_id,
+        'X-OnePageCRM-Source' => 'ruby_gem'
+      )
+    end
   end
 
   # 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
@@ -31,36 +29,8 @@ class OnePageCRM
   # 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
-
-  # 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
-
-    timestamp = Time.now.to_i.to_s
-    token = create_auth_token(http_method, url, parameters, timestamp)
-    { 'X-OnePageCRM-UID' => @uid,
-      'X-OnePageCRM-TS' => timestamp,
-      'X-OnePageCRM-Auth' => token,
-      'X-OnePageCRM-Source' => 'ruby_gem'
-     }.merge op_headers
-  end
-
-  # 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 = [@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/onepagecrm.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.2.18'
+  spec.add_development_dependency 'rake', '~> 10.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onepagecrm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter Armstrong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.2.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.2.18
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.5'
 description: Basic Gem for the OnePageCRM API
 email:
 - devteam@onepagecrm.com
@@ -61,10 +61,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- config/config_orig.yml
 - lib/onepagecrm.rb
 - lib/onepagecrm/version.rb
 - onepagecrm.gemspec
@@ -87,10 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Basic Gem for OnePageCRM
 test_files: []
-has_rdoc: 

data/config/config_orig.yml

@@ -1,2 +0,0 @@
-login: "login@example.com"
-password: "Password?Goes?Here?Ok?"