8000 fixes · metaware/waveapps-ruby@9928e06 · GitHub
[go: up one dir, main page]

Skip to content

Commit 9928e06

Browse files
fixes
1 parent 783417a commit 9928e06

File tree

7 files changed

+42
-37
lines changed

7 files changed

+42
-37
lines changed

lib/waveapps/api.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
require 'securerandom'
33
require 'net/http'
44
require 'json'
5+
require 'waveapps/object/base'
6+
require 'waveapps/http_service/base'
57

68
module WaveApps
79
class Api
@@ -10,7 +12,7 @@ def initialize(access_token)
1012
end
1113

1214
def businesses
13-
WaveApps::Wrapper::Business.new(access_token: self.access_token).all.each do |business|
15+
WaveApps::HttpService::Business.new(access_token: self.access_token).all.each do |business|
1416
WaveApps::Object::Business.new(business)
1517
end
1618
end

lib/waveapps/http_service/base.rb

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
require 'waveapps/ruby/config'
2+
require 'securerandom'
3+
require 'net/http'
4+
require 'json'
5+
require 'business'
6+
7+
module WaveApps
8+
module HttpService
9+
class Base
10+
def initialize(access_token, *args)
11+
self.access_token = access_token
12+
self.params = args
13+
end
14+
end
15+
end
16+
end

lib/waveapps/http_service/business.rb

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2+
class WaveApps::HttpService::Business < WaveApps::HttpService::Base
3+
def all
4+
params = {
5+
access_token: self.access_token
6+
}
7+
params[:redirect_uri] = config.redirect_uri if config.redirect_uri
8+
uri = URI::HTTPS.build(
9+
host: config.base_url,
10+
path: ACCESS_TOKEN_URL,
11+
query: URI.encode_www_form(params)
12+
)
13+
return JSON.parse(Net::HTTP.get(uri).body)
14+
end
15+
end

lib/waveapps/object.rb renamed to lib/waveapps/object/base.rb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
require 'securerandom'
33
require 'net/http'
44
require 'json'
5+
require 'virtus'
6+
require 'business'
57

68
module WaveApps
7-
class Object
8-
include Virtus.model
9+
module Object
10+
class Base
11+
include Virtus.model
12+
end
913
end
10-
end
14+
end

lib/waveapps/object/business.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'uri'
33
require 'json'
44

5-
class WaveApps::Object::Business < WaveApps::Object
5+
class WaveApps::Object::Business < WaveApps::Object 724C ::Base
66
attribute :name, String
77

88
end

lib/waveapps/wrapper.rb

Lines changed: 0 additions & 13 deletions
This file was deleted.

lib/waveapps/wrapper/business.rb

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0