wolas_channel 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cae176f6087ce6fd8f9c2a75b545231e94738c72
-  data.tar.gz: 8c6195c0ad5ec9af9ea849f529967c3b2ab38f70
+  metadata.gz: 9ad159ec4acd5e1fa0f357a2160848dc651525f8
+  data.tar.gz: 268d8324e8ede3207fcda9a549e764238aa63bd4
 SHA512:
-  metadata.gz: 302805f4fbb7bad2a197400ce659d7a501debaf6443ed887cb6f30c8a6cba58060f9e34a7b45c366853eec2dcc0e527185001dc5fd04c0b3ae88c1afff254a2c
-  data.tar.gz: 0ad7b705d138ffe972b683ed85563fa0b614c5f7738e3c1230f53d4b7b316d04d204c6f0863bde6810f4251f5c910421e4e400d9663c9e4441bb5efd173828fc
+  metadata.gz: dc09ceb2f397fbf6b758a50b349b410a70d9d99a355c4d2a5f77d58f5eaa2fea9adad49af055404947d35e720db01876b535f2073b782be1d89db03680687790
+  data.tar.gz: c5f3c9d7d7ba8b95c0672b6f9dfaa3b8a8bfcb94ecc2de51886f6d8ec0b3449b063e5eaa9e2245aa118c5e9c2e10aed502ea9f84096b729545a8ac687b80173b

data/lib/connection.rb

@@ -1,12 +1,15 @@
 require 'mysql2'
 # Establish connection to mysql2
 class Connection
-  def open(database, host, username, password)
+  def open
+    # Read the database credentials from local file
+    creds = YAML.load_file(File.expand_path('~/.wolas/credentials.yml'))
+
     @connection = Mysql2::Client.new(
-      :database => database,
-      :host => host, 
-      :username => username,
-      :password => password,
+      :database => creds['channel_service']['database'],
+      :host => creds['channel_service']['host'], 
+      :username => creds['channel_service']['username'],
+      :password => creds['channel_service']['password'],
       :connect_timeout => 20
     )
   end

data/lib/wolas_channel/version.rb

@@ -1,3 +1,3 @@
 class WolasChannel
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/wolas_channel.rb

@@ -18,19 +18,15 @@ end
 # This class handles mapping the channel items from and to the database
 class WolasChannel
   # Initialize a tenant_id when the channel service is instantiated
-  def initialize(tenant_id, database, host, username, password)
+  def initialize(tenant_id)
     @tenant_id = tenant_id
-    @database = database
-    @host = host
-    @user = username
-    @pw = password
   end
 
   # This method allows a tenant to add a channel to their tenancy
   def add_channel(type = 'Not Specified')
     begin
       # Connect to the database
-      connect = Connection.new.open(@database, @host, @user, @pw)
+      connect = Connection.new.open
 
       insert = "INSERT INTO `channel`.`channels` (`tenant_id`, `type`) VALUES (?, ?)"
       # This method performs the insert. Mysql2 does not return an object on a successful
@@ -52,7 +48,7 @@ class WolasChannel
     begin
       # Connect to the database. Instance variable used to pass the connection to
       # private methods
-      @connect = Connection.new.open(@database, @host, @user, @pw)
+      @connect = Connection.new.open
       # Determine if the tenant is able to view this entity based off the
       # channel and return the type of the entity
       check = tenant_entity(entity_id)
@@ -73,7 +69,7 @@ class WolasChannel
     begin
       # Connect to the database. Instance variable used to pass connection to
       # private methods
-      @connect = Connection.new.open(@database, @host, @user, @pw)
+      @connect = Connection.new.open
       # Determine if this channel is valid for the tenant and returns its type
       type = tenant_channel(channel_id)
       return nil if type == nil
@@ -108,7 +104,7 @@ class WolasChannel
     begin
       # Connect to the database. Instance variable used to pass connection to
       # private methods
-      @connect = Connection.new.open(@database, @host, @user, @pw)
+      @connect = Connection.new.open
       # Determine if this channel is valid for the tenant and returns its type
       type = tenant_channel(channel_id)
       return nil if type == nil
@@ -146,7 +142,7 @@ class WolasChannel
     begin
       # Connect to the database. Instance variable used to pass the connection to
       # private methods
-      @connect = Connection.new.open(@database, @host, @user, @pw)
+      @connect = Connection.new.open
       # Determine if the tenant is able to view this entity based off the
       # channel and return the type of the entity
       type = tenant_channel(channel_id)
@@ -221,7 +217,7 @@ class WolasChannel
     begin
       # Connect to the database. Instance variable used to pass connection to
       # private methods
-      @connect = Connection.new.open(@database, @host, @user, @pw)
+      @connect = Connection.new.open
       # Determine if the tenant has access to all channels requested
       channel_ids.each do |channel_id|
         tenant_channel(channel_id)
@@ -287,7 +283,7 @@ class WolasChannel
     begin
       # Connect to the database. Instance variable used to pass connection to
       # private methods
-      @connect = Connection.new.open(@database, @host, @user, @pw)
+      @connect = Connection.new.open
       # Determine if the tenant has access to the entity requested
       check = tenant_entity(entity_id)
 
@@ -338,7 +334,7 @@ class WolasChannel
     begin
       # Connect to the database. Instance variable used to pass connection to
       # private methods
-      @connect = Connection.new.open(@database, @host, @user, @pw)
+      @connect = Connection.new.open
       # Determine if the tenant has access to the entity requested
       tenant_entity(entity_id)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wolas_channel
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - WOLAS
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,8 +99,6 @@ files:
 - lib/connection.rb
 - lib/wolas_channel.rb
 - lib/wolas_channel/version.rb
-- wolas_channel-0.1.4.gem
-- wolas_channel-0.1.5.gem
 - wolas_channel.gemspec
 homepage: https://bitbucket.org/wolas-revolution/srvc-channel
 licenses: []