wolas_channel 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 942f44e2a41df7ee1fa6500da3e212fe5e930b29
-  data.tar.gz: a4f77f7a1f88567806429a55d5f909c2357bdabc
+  metadata.gz: a138673a8f4ee2e0a4c7581c56b17175ee64d469
+  data.tar.gz: ff4807df9dfecd03f862f7561b84619cf0f43089
 SHA512:
-  metadata.gz: 294ed97309a5c43373265923f1a3fb6ccb9a4c3f7d92118bb0e388a80ed7fcfbcb677d6f2d8dd6eb1da330a6890a549adfc27d9feedebcb7bd1f6cecdceb6b4c
-  data.tar.gz: 6e43291d6b2daed3290ba0db8a5d5c2038ccaed41d999d8d003999ee5879d866af14ad5b6dd858ef9cb8d956fa245bbd236db46612a00362496b35ad8943b911
+  metadata.gz: e79bd8153d18315091ee71e836704898fa861b0c8cc7ea162314f869c9cc5f5e6bf5722e05b2182b8cb3280b5b4ceb6115ba5f325061f88ea1e760646c612631
+  data.tar.gz: 8ab0c9ecaee0f3747e813a12d12ab0c9ec92c6b7de29dedef09295f03a7eadb71bb93c47e77ae598bebf0c38208b5b215831ba088aec96307935875d0629ac1a

data/lib/wolas_channel/version.rb

@@ -1,3 +1,3 @@
 class WolasChannel
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/wolas_channel.rb

@@ -79,11 +79,11 @@ class WolasChannel
       return nil if type == nil
       
       # Now the entities are requested
-      ent_q = "SELECT `entities`.`entity_id`, `entities`.`body`, `entities`.`created`, `entities`.`type` FROM `channel`.`entities` \
+      ent_q = "SELECT `entities`.`entity_id`, `entities`.`body`, `entities`.`created` FROM `channel`.`entities` \
       INNER JOIN `channel`.`channel_entities` on `entities`.`entity_id` = `channel_entities`.`entity_id` \
       INNER JOIN `channel`.`channels` on `channel_entities`.`channel_id` = `channels`.`channel_id` \
-      WHERE `channels`.`channel_id` = ?"
-      ent = prepare_exe(@connect, ent_q, channel_id)
+      WHERE `channels`.`channel_id` = ? AND `entities`.`active` = ?"
+      ent = prepare_exe(@connect, ent_q, channel_id, 1)
 
       # And their metadata
       data_q = "SELECT `data`.`entity_id`, `data`.`key`, `data`.`value` FROM `channel`.`data` \
@@ -114,12 +114,12 @@ class WolasChannel
       return nil if type == nil
       
       # Now the 20 most recent entities are requested 
-      ent_q = "SELECT `entities`.`entity_id`, `entities`.`body`, `entities`.`created`, `entities`.`type` FROM `channel`.`entities` \
+      ent_q = "SELECT `entities`.`entity_id`, `entities`.`body`, `entities`.`created` FROM `channel`.`entities` \
       INNER JOIN `channel`.`channel_entities` on `entities`.`entity_id` = `channel_entities`.`entity_id` \
       INNER JOIN `channel`.`channels` on `channel_entities`.`channel_id` = `channels`.`channel_id` \
-      WHERE `channels`.`channel_id` = ? \
+      WHERE `channels`.`channel_id` = ? AND `entities`.`active` = ? \
       ORDER BY `entities`.`created` DESC LIMIT 20"
-      ent = prepare_exe(@connect, ent_q, channel_id)
+      ent = prepare_exe(@connect, ent_q, channel_id, 1)
 
       # All meta data is selected for the channel as the entity_ids are unknown.
       # However any data that does not match an entity id from the query above will
@@ -152,7 +152,6 @@ class WolasChannel
       type = tenant_channel(channel_id)
       return nil if type == nil
       return nil if kv.length == 0
-      byebug
 
       # This count determines the number of key / value matches that exist per
       # entity. If the number of matches equals the number of kvs passed to the 
@@ -161,7 +160,7 @@ class WolasChannel
       INNER JOIN `channel`.`data` ON `entities`.`entity_id` = `data`.`entity_id` \
       INNER JOIN `channel`.`channel_entities` ON `data`.`entity_id` = `channel_entities`.`entity_id` \
       INNER JOIN `channel`.`channels` ON `channel_entities`.`channel_id` = `channels`.`channel_id` \
-      WHERE `channels`.`channel_id` = ? AND ("
+      WHERE `channels`.`channel_id` = ? AND `entities`.`active` = ? AND ("
       kv_arr = []
       kv.each_with_index do |hash, index|
         if index != kv.length - 1
@@ -170,11 +169,11 @@ class WolasChannel
           match_q = match_q + "(`data`.`key` = ? AND `data`.`value` = ?))"
         end
         # Push the key followed by the value into the array to match ?s
-        hash[:key] ? kv_arr << hash[:key] : kv_arr << hash['key'] 
-        hash[:value] ? kv_arr << hash[:value] : kv_arr << hash['value'] 
+        kv_arr << hash[:key]
+        kv_arr << hash[:value] 
       end
       match_q = match_q + "GROUP BY `entities`.`entity_id`"
-      match = prepare_exe(@connect, match_q, channel_id, *kv_arr)
+      match = prepare_exe(@connect, match_q, channel_id, 1, *kv_arr)
 
       match_raw = match.map{ |e| e }
       entity_ids = []
@@ -194,7 +193,7 @@ class WolasChannel
       q_marks = in_prepare(entity_ids)
 
       # Now the entities are requested
-      ent_q = "SELECT `entities`.`entity_id`, `entities`.`body`, `entities`.`created`, `entities`.`type` FROM `channel`.`entities` \
+      ent_q = "SELECT `entities`.`entity_id`, `entities`.`body`, `entities`.`created` FROM `channel`.`entities` \
       INNER JOIN `channel`.`channel_entities` on `entities`.`entity_id` = `channel_entities`.`entity_id` \
       INNER JOIN `channel`.`channels` on `channel_entities`.`channel_id` = `channels`.`channel_id` \
       WHERE `channels`.`channel_id` = ? AND `entities`.`entity_id` IN (#{q_marks})"
@@ -250,8 +249,8 @@ class WolasChannel
         raise ErrorHandling::InvalidObject, 'The entity object must include a body field'
       end
 
-      insert = "INSERT INTO `channel`.`entities` (`body`, `created`, `type`) VALUES (?, ?, ?)"
-      insert_sql = prepare_exe(@connect, insert, body, created, type)
+      insert = "INSERT INTO `channel`.`entities` (`body`, `created`, `active`) VALUES (?, ?, ?, ?)"
+      insert_sql = prepare_exe(@connect, insert, body, created, 1)
       # The last_id mysql2 method provides direct access to the last id inserted
       entity_id = @connect.last_id
 
@@ -331,6 +330,29 @@ class WolasChannel
     end
   end
 
+  # This method sets an entity to inactive, stoping it from being returned on 
+  # requests
+   # This method allows the update of an entity
+  def delete_entity(entity_id)
+    begin
+      # Connect to the database. Instance variable used to pass connection to
+      # private methods
+      @connect = Connection.new.open(@database, @host, @user, @pw)
+      # Determine if the tenant has access to the entity requested
+      tenant_entity(entity_id)
+
+      # update the existing entity body
+      update = "UPDATE `channel`.`entities` SET `entities`.`active` = ? WHERE `entities`.`entity_id` = ?"
+      prepare_exe(@connect, update, 0, entity_id)
+
+      # Return the updated entity to the
+      entity = entity_construct(entity_id)
+     
+      return entity
+    ensure
+      @connect.close
+    end
+  end
 
   private
   # This method constructs a single object from key-values returned from a 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wolas_channel
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - WOLAS
@@ -99,7 +99,6 @@ files:
 - lib/connection.rb
 - lib/wolas_channel.rb
 - lib/wolas_channel/version.rb
-- wolas_channel-0.1.2.gem
 - wolas_channel.gemspec
 homepage: https://bitbucket.org/wolas-revolution/srvc-channel
 licenses: []