sharefile_connect 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2854e6d977b443111a4302d4e140767adcc31f51
-  data.tar.gz: 46f1156230026391f189c1f354e7189134f9f751
+  metadata.gz: 3c8c189c1d7ea9716956665ff4d7fd8e20540873
+  data.tar.gz: 2d89993887add8a3c7ebc873bd683f99aed831e1
 SHA512:
-  metadata.gz: ce70f2a748da3d6b402409201fb1259e04a3d2d59f2bc9fbb4738b873df625471a8cae9b3d3229496f983818684b022eca1b55dca94567ac8e0d4251851251e6
-  data.tar.gz: fec1c11dac80359826044705b07c8469df1ea233c6d7435ee211f6d9b2798eed94656ac31390f053eabe283ebcb980ad95ab746bab14f37c932d08c21c82df7d
+  metadata.gz: 09a97f3a62411a4e5f0a8d66869f5c63f854219a8765484fd64f977ba04d13a201a37cca56d39f413491aaca8fa201e04f282d0ecffba520031955188a3da870
+  data.tar.gz: d51bf175514dbaf13498e6b1fdcd566f08410ddf4dbdfd7d5c0fcd9ae230864154ffb93083304091ce4efb72632090c3d8510317ba0d84784976a2d4291d4fb3

data/lib/sharefile_connect.rb

@@ -1,7 +1,6 @@
-require 'dotenv'
-Dotenv.load
+# require 'dotenv'
+# Dotenv.load
 require 'httparty'
-require 'oauth2'
 require 'net/https'
 require 'uri'
 
@@ -10,6 +9,5 @@ Dir[File.dirname(__FILE__) + '/sharefile_connect/*.rb'].each do |file|
 end
 
 module SharefileConnect
-  BASE_URI = "https://#{ENV['API_ENDPOINT_DOMAIN']}.sf-api.com/sf/v3"
 end
 

data/lib/sharefile_connect/config.rb

@@ -0,0 +1,8 @@
+module SharefileConnect
+  class Config
+    attr_accessor :sharefile_key, :sharefile_secret, :sharefile_user, :sharefile_user_pass, :domain
+    def initialize(sharefile_key, sharefile_secret, sharefile_user, sharefile_user_pass, domain)
+      @sharefile_key, @sharefile_secret, @sharefile_user, @sharefile_user_pass, @domain = sharefile_key, sharefile_secret, sharefile_user, sharefile_user_pass, domain
+    end
+  end
+end

data/lib/sharefile_connect/connection.rb

@@ -1,16 +1,17 @@
 module SharefileConnect
   class Connection
-    attr_reader :token
+    attr_reader :token, :config
     include HTTParty
     # base_uri "https://#{ENV['API_ENDPOINT_DOMAIN']}.sf-api.com"
 
-    def initialize
+    def initialize(config)
+      @config = config  # || SharefileConnect::Config.new(ENV['SHAREFILE_KEY'],  ENV['SHAREFILE_SECRET'], ENV['SHAREFILE_USER_NAME'], ENV['SHAREFILE_USER_PASS'], ENV['API_ENDPOINT_DOMAIN'])
       response = HTTParty.post(authentication_uri, authentication_content)
       @token = JSON.parse response.body
     end
 
     def hostname
-      "#{ENV['API_ENDPOINT_DOMAIN']}.sf-api.com"
+      "#{config.domain}.sf-api.com"
     end
 
     def authentication_uri
@@ -22,10 +23,10 @@ module SharefileConnect
       {
       :body => {
           "grant_type"    => "password",
-          "client_id"     => ENV['SHAREFILE_KEY'],
-          "client_secret" => ENV['SHAREFILE_SECRET'],
-          "username"      => ENV['SHAREFILE_USER_NAME'],
-          "password"      => ENV['SHAREFILE_USER_PASS']
+          "client_id"     => config.sharefile_key,
+          "client_secret" => config.sharefile_secret,
+          "username"      => config.sharefile_user,
+          "password"      => config.sharefile_user_pass
       },
           :headers => {
           "Content-Type" => "application/x-www-form-urlencoded"

data/lib/sharefile_connect/data.rb

@@ -1,7 +1,13 @@
 module SharefileConnect
   class Data
+    attr_accessor :config
     include HTTParty
 
+
+    def initialize(config = nil)
+      @config = config || SharefileConnect::Config.new(ENV['SHAREFILE_KEY'], ENV['SHAREFILE_SECRET'], ENV['SHAREFILE_USER_NAME'], ENV['SHAREFILE_USER_PASS'], ENV['API_ENDPOINT_DOMAIN'])
+    end
+
     def root(id = nil)
       parse_get("/Items(#{id || 'allshared'})?$expand=Children&$select=Id,Name,Children/Id,Children/Name").body
     end
@@ -95,11 +101,11 @@ module SharefileConnect
 
 
     def connection
-      @connection ||= SharefileConnect::Connection.new.token
+      @connection ||= SharefileConnect::Connection.new(config).token
     end
 
     def full path
-      "#{BASE_URI}#{path}"
+      "https://#{config.domain}.sf-api.com/sf/v3#{path}"
     end
 
     def parse_get(path)
@@ -114,6 +120,5 @@ module SharefileConnect
       return { "Authorization" => "Bearer #{connection['access_token']}" }
     end
 
-
   end
 end

data/lib/sharefile_connect/version.rb

@@ -1,3 +1,3 @@
 module SharefileConnect
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sharefile_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - tubedude
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -104,6 +104,7 @@ files:
 - bin/console
 - bin/setup
 - lib/sharefile_connect.rb
+- lib/sharefile_connect/config.rb
 - lib/sharefile_connect/connection.rb
 - lib/sharefile_connect/data.rb
 - lib/sharefile_connect/version.rb