webflow-ruby 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5da6e30284ec5f7d0405ffc811ad16673285b7e8ed5da6a58caf88827eac7c6a
-  data.tar.gz: bf3e9fd18fd3daa7d16dee83e5bc71d6b73acc04249d7e07dad1f71b1a4ba776
+  metadata.gz: 0f0ae105e0b3751752fb45b19468c361c969c283565bc604ee99a534f3bc93a3
+  data.tar.gz: d81ca44d2625e44a07b67fe7e71f8b7cb7133a89e861dc62abaa0fb1da22e35f
 SHA512:
-  metadata.gz: 152445fe454407cb702852bbdd2735887b5bdebec6db1a1fbb669b328f3304e5439ea62c13fccbf650a2b4ff1855f6039eedf7c30b4d0f5a5333906f555540c5
-  data.tar.gz: 261d7ac28dd3680da3320f15fbebd1a009627a0ea6ccba321fdf2b04fa0880736818db5a9a125fcddbad0cd734c2653de99d6782bc63c2f7131536e557a72bec
+  metadata.gz: 1c458dee0176fc2a97b6df6d67415a6c3ed88d83afb6e7991857db100bbd193a0208501e8c11b0d0628260af641630fd943536d885d9716277a54c11d76dff0f
+  data.tar.gz: de5e2448a9121fd9320f38ef74996a9201fd0d802079332e0666d0744bb8643019c1e007d4e59ef20e095e4dc7decc7b542c92edcdce24dd7682c8a49dfa95d8

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/.irbrc

@@ -0,0 +1,6 @@
+$:.unshift File.expand_path('lib')
+
+require 'webflow'
+
+TEST_API_TOKEN = '1f0da5c9368af9cb2dcd65d22a6600a8ffa069f70729e129a09787203bc2c2be'
+@client = Webflow::Client.new(TEST_API_TOKEN)

data/.ruby-version

@@ -0,0 +1 @@
+2.5.3

data/.travis.yml

@@ -1,5 +1,3 @@
 sudo: false
-rvm:
-  - 2.4.0
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.0
+
+* [CHANGE] Use pure ruby dependencies
+
 ## 0.5.0
 
 * [FEATURE] Pagination https://github.com/penseo/webflow-ruby/pull/2 😍 @cohesiveneal

data/Gemfile.lock

@@ -1,34 +1,41 @@
 PATH
   remote: .
   specs:
-    webflow-ruby (0.5.0)
-      oj
-      typhoeus
+    webflow-ruby (0.6.0)
+      http
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    byebug (10.0.2)
+    byebug (11.0.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    ffi (1.10.0)
-    hashdiff (0.3.8)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    hashdiff (1.0.0)
+    http (4.1.1)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.0)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (2.1.1)
+    http_parser.rb (0.6.0)
     minitest (5.11.3)
-    oj (3.7.7)
-    public_suffix (3.0.3)
-    rake (12.3.2)
-    safe_yaml (1.0.4)
-    typhoeus (1.3.1)
-      ethon (>= 0.9.0)
-    vcr (4.0.0)
-    webmock (3.5.1)
+    public_suffix (3.1.1)
+    rake (12.3.3)
+    safe_yaml (1.0.5)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+    vcr (5.0.0)
+    webmock (3.6.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   ruby
@@ -43,4 +50,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/README.md

@@ -20,9 +20,14 @@ Or install it yourself as:
 
 Have a look at the tests, seriously!
 
+### Quick Start
+```ruby
+    client = Webflow::Client.new(WEBFLOW_API_TOKEN)
+    sites = client.sites
+```
+
 ## Todo
 
-* Use HTTPRB
 * Error handling, it's all JSON for now
 * Resource mapping, it's plain hashes for now
 * Proper docs

data/lib/webflow/client.rb

@@ -1,10 +1,8 @@
-require 'typhoeus'
-require 'oj'
+require 'http'
 
 module Webflow
   class Client
     HOST = 'https://api.webflow.com'
-    OJ_OPTIONS = {mode: :strict, nilnil: true}
 
     def initialize(token)
       @token = token
@@ -19,10 +17,6 @@ module Webflow
       get("/info")
     end
 
-    def info
-      get("/info")
-    end
-
     def sites
       get("/sites")
     end
@@ -72,7 +66,7 @@ module Webflow
       per_page      = limit > 100 ? 100 : limit
 
       num_pages.times do |i|
-        resp = paginate_items(collection_id, per_page: (limit > 100 ? 100 : limit), page: i+1)
+        resp = paginate_items(collection_id, per_page: per_page, page: i+1)
         fetched_items += resp['items']
         limit -= resp['count']
         break if limit <= 0 || resp['total'] <= fetched_items.length
@@ -119,38 +113,19 @@ module Webflow
     end
 
     def request(path, method: :get, params: nil, data: nil)
-      json = Oj.dump(data, OJ_OPTIONS) if data
-
-      response = http(path, method: method, params: params, headers: request_headers, body: json)
-      track_rate_limit(response.headers)
+      url = URI.join(HOST, path)
+      bearer = "Bearer #{@token}"
+      headers = {'Accept-Version' => '1.0.0'}
 
-      Oj.load(response.body, OJ_OPTIONS)
-    end
+      response = HTTP.auth(bearer).headers(headers).request(method, url, params: params, json: data)
 
-    def http(path, method: :get, params: nil, headers: nil, body: nil)
-      url = File.join(HOST, path)
+      rate_limit = response.headers.select { |key, value| key =~ /X-Ratelimit/ }.to_h
+      @rate_limit = rate_limit unless rate_limit.empty?
 
-      request = Typhoeus::Request.new(
-        url,
-        method: method,
-        params: params,
-        headers: headers,
-        body: body,
-      )
-      request.run
+      JSON.parse(response.body)
     end
 
     def track_rate_limit(headers)
-      rate_limit = headers.select { |key, value| key =~ /X-Ratelimit/ }
-      @rate_limit = rate_limit unless rate_limit.empty?
-    end
-
-    def request_headers
-      {
-        'Authorization' => "Bearer #{@token}",
-        'Content-Type' => 'application/json',
-        'Accept-Version' => '1.0.0',
-      }
     end
 
     # https://developers.webflow.com/#errors

data/lib/webflow/version.rb

@@ -1,3 +1,3 @@
 module Webflow
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/webflow.gemspec

@@ -21,8 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "typhoeus"
-  spec.add_dependency "oj"
+  spec.add_dependency "http"
 
   spec.add_development_dependency "bundler", "> 1.13"
   spec.add_development_dependency "rake", "> 10.0"

metadata

@@ -1,31 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: webflow-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - phoet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: typhoeus
-  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: oj
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,6 +116,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".irbrc"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md