twilio_ruby_wrapper 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0bc866e19e937a0b77a7a986ff6ce8c26b0912
-  data.tar.gz: dbf3419849f64de81490dd047f9b2589e6de1d7f
+  metadata.gz: 924bffada1a1256c22c4945fac3d52c413bbc993
+  data.tar.gz: cf435476fa8f3046de7ccc2b54c37822c026ae9e
 SHA512:
-  metadata.gz: 10ed80d3ec6f160597c2e8cfdeda9e4d2b0dde13c778d42b655d535ae07be9dde0106a106b1e5d255f4225635b3aca53abd26d547843e905be5e37c52d2a4a92
-  data.tar.gz: 77867963cd72df0e966c84f0bed2a6cf9ab646e0586863567c99a1de1b3215439de4e3b92a4990175b7a412a73964b41557546b03c4b845839cf4237354a4a25
+  metadata.gz: eb25c23fec971709742d97fd5c429ae9acffcaad86c8fb4b04df43d902d720b9de34e34dabeffd6256d48092a09678c91de8e13e6e32492eaac2bb65b4f6f728
+  data.tar.gz: 04c7c9ff241abc11fdf5919105a8fd6d9e7b6497aee467799c386d59accfd707e454b7151f27e1a2a878959b9def919b0a2086a992c2c6f2e27b127e567e81e4

data/README.md

@@ -23,15 +23,18 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-queues = TwilioRubyWrapper::Queue.new(account_sid: "Twilio ACCOUNT SID", auth_token: "Twilio AUTH TOKEN")
-queues.find_by(sid: "Queue SID") # return <Twilio::REST::Queue> object
-queues.find_by(friendly_name: "Queue friendly name") # return <Twilio::REST::Queue> object
-queues.condition(:gt).where(date_updated: "2017-05-31 0:0:0") # [<Twilio::REST::Queue>] array object
+TwilioRubyWrapper::QueueCondition.set_twilio_params(account_sid: "Twilio ACCOUNT SID", auth_token: "Twilio AUTH TOKEN")
+queue_condition = TwilioRubyWrapper::QueueCondition.new
+queue = queue_condition.find_by(sid: "Queue SID") # return <TwilioRubyWrapper::Queue> object
+queue = queue_condition.find_by(friendly_name: "Queue friendly name") # return <TwilioRubyWrapper::Queue> object
+queues = queue_condition.condition(:gt).where(date_updated: "2017-05-31 0:0:0") # [<TwilioRubyWrapper::Queue>] array object
 # The following is an error.
-# queues.condition(:lt).where(date_updated: "2017-05-31 0:0:0").condition(:gt).where(date_updated: "2017-05-31 23:59:59")
+# queue_condition.condition(:lt).where(date_updated: "2017-05-31 0:0:0").condition(:gt).where(date_updated: "2017-05-31 23:59:59")
 
-calls = TwilioRubyWrapper::Call.new(account_sid: "Twilio ACCOUNT SID", auth_token: "Twilio AUTH TOKEN")
-calls.filter(:"start_time>" => "2017-05-32").condition(:eq).where(from: "PHONE NUMBER")
+TwilioRubyWrapper::CallCondition.set_twilio_params(account_sid: Rails.application.secrets.twilio_account_sid, auth_token: Rails.application.secrets.twilio_auth_token)
+call_condition = TwilioRubyWrapper::CallCondition.new
+call = call_condition.find_by(from: "PHONE NUMBER")
+calls = call_condition.filter(:"start_time>" => "2017-05-32").condition(:eq).where(from: "PHONE NUMBER")
 ```
 
 ## Development

data/lib/twilio_ruby_wrapper/call.rb

@@ -1,55 +1,30 @@
 module TwilioRubyWrapper
   class Call
-    attr_accessor :page_number, :page_size, :calls
-
-    def initialize(account_sid:, auth_token:)
-      client = Twilio::REST::Client.new(account_sid, auth_token)
-      @calls = client.account.calls
-      @filter = {}
-      @page_number = 0
-      @page_size = 50
-    end
-
-    def find_by(*args)
-      hash = args.first
-
-      if !(Hash === hash) || hash.values.any? {|v| v.nil? || Array === v || Hash === v } || hash.size >= 2
-        raise
-      end
-
-      condition = self.condition(:eq)
-      condition.find_by(*args)
-    end
-
-    def filter(*args)
-      hash = args.first
-      @filter = hash
-      self
-    end
-
-    def condition(value, filter: { page: @page_number, page_size: @page_size })
-      if !(Symbol === value)
-        raise
-      end
-
-      condition = nil
-      case value
-      when :eq
-        condition  = -> (x) { -> (y) { y == x }}
-      when :lt
-        condition  = -> (x) { -> (y) { y < x }}
-      when :lteq
-        condition  = -> (x) { -> (y) { y <= x }}
-      when :gt
-        condition  = -> (x) { -> (y) { y > x }}
-      when :gteq
-        condition  = -> (x) { -> (y) { y >= x }}
-      else
-        raise
-      end
-
-      filter = @filter unless @filter.empty?
-      CallCondition.new(calls: @calls, condition: condition, filter: filter)
+    attr_reader :sid, :parent_call_sid, :account_sid, :to, :from, :phone_number_sid, :status, :price_unit, :direction, :answered_by, :forwarded_from, :to_formatted, :from_formatted, :caller_name, :duration, :price, :date_created, :date_updated, :start_time, :end_time
+    attr_reader :call_instance
+
+    def initialize(twilio_call_instance)
+      @call_instance = twilio_call_instance
+      @sid = @call_instance.sid
+      @parent_call_sid = @call_instance.parent_call_sid
+      @account_sid = @call_instance.account_sid
+      @to = @call_instance.to
+      @from = @call_instance.from
+      @phone_number_sid = @call_instance.phone_number_sid
+      @status = @call_instance.status
+      @price_unit = @call_instance.price_unit
+      @direction = @call_instance.direction
+      @answered_by = @call_instance.answered_by
+      @forwarded_from = @call_instance.forwarded_from
+      @to_formatted = @call_instance.to_formatted
+      @from_formatted = @call_instance.from_formatted
+      @caller_name = @call_instance.caller_name
+      @duration = @call_instance.duration
+      @price = @call_instance.price
+      @date_created = @call_instance.date_created
+      @date_updated = @call_instance.date_updated
+      @start_time = @call_instance.start_time
+      @end_time = @call_instance.end_time
     end
   end
 end

data/lib/twilio_ruby_wrapper/call_condition.rb

@@ -1,16 +1,24 @@
 module TwilioRubyWrapper
   class CallCondition
     attr_accessor :page_number, :page_size, :calls
+    @@account_sid = nil
+    @@auth_token = nil
 
-    def initialize(calls:, condition:, filter: {})
-      @calls = calls
+    def self.set_twilio_params(account_sid:, auth_token:)
+      @@account_sid = account_sid
+      @@auth_token = auth_token
+      true
+    end
+
+    def initialize(condition: nil, filter: {}, page_number: 0, page_size: 50)
       @condition = condition
       @filter = filter
-      @page_number = 0
-      @page_size = 50
+      @page_number = page_number
+      @page_size = page_size
     end
 
     def where(*args)
+      set_twilio_account()
       hash = args.first
 
       if !(Hash === hash) || hash.values.any? {|v| v.nil? || Array === v || Hash === v } || hash.size >= 2
@@ -20,20 +28,22 @@ module TwilioRubyWrapper
       key = hash.keys.first
       value = build_value(hash[key], key)
 
-      calls = []
       params = {page: @page_number, page_size: @page_size}
       params.merge!(@filter) unless @filter.empty?
-      queue_set = @calls.list(params)
-      until queue_set.empty? do
-        t = queue_set.select {|queue| @condition[value][build_value(queue.send(key), key)] }
-        calls.concat(t) unless t.empty?
-        queue_set = queue_set.next_page
+      twilio_calls = @twilio_call_list.list(params)
+      calls = []
+      until twilio_calls.empty? do
+        sub_calls = twilio_calls.select{|twilio_call| @condition[value][build_value(twilio_call.send(key), key)] }.map{|twilio_call| Call.new(twilio_call) }
+        calls.concat(sub_calls) unless sub_calls.empty?
+        twilio_calls = twilio_calls.next_page
       end
-      
+
       calls
     end
 
     def find_by(*args)
+      set_twilio_account()
+      condition(:eq)
       hash = args.first
 
       if !(Hash === hash) || hash.values.any? {|v| v.nil? || Array === v || Hash === v } || hash.size >= 2
@@ -45,15 +55,47 @@ module TwilioRubyWrapper
 
       params = {page: @page_number, page_size: @page_size}
       params.merge!(@filter) unless @filter.empty?
-      queue_set = @calls.list(params)
-      t = nil
-      until queue_set.empty? do
-        t = queue_set.select {|queue| @condition[value][build_value(queue.send(key), key)] }.first
-        break unless t.nil?
-        queue_set = queue_set.next_page
+      twilio_calls = @twilio_call_list.list(params)
+      call = nil
+      until twilio_calls.empty? do
+        call = twilio_calls.select {|twilio_call| @condition[value][build_value(twilio_call.send(key), key)] }.map{|twilio_call| Call.new(twilio_call) }.first
+        break call.nil?
+        twilio_calls = twilio_calls.next_page
+      end
+
+      call
+    end
+
+    def filter(*args)
+      hash = args.first
+      @filter = hash
+      self
+    end
+
+    def condition(value)
+      if !(Symbol === value)
+        raise
+      end
+
+      condition = nil
+      case value
+      when :eq
+        condition  = -> (x) { -> (y) { y == x }}
+      when :lt
+        condition  = -> (x) { -> (y) { y < x }}
+      when :lteq
+        condition  = -> (x) { -> (y) { y <= x }}
+      when :gt
+        condition  = -> (x) { -> (y) { y > x }}
+      when :gteq
+        condition  = -> (x) { -> (y) { y >= x }}
+      else
+        raise
       end
-      
-      t
+
+      @condition = condition
+
+      self
     end
 
     private
@@ -73,5 +115,9 @@ module TwilioRubyWrapper
         value
       end
 
+      def set_twilio_account
+        @twilio_client = Twilio::REST::Client.new(@@account_sid, @@auth_token)
+        @twilio_call_list = @twilio_client.account.calls
+      end
   end
 end

data/lib/twilio_ruby_wrapper/queue.rb

@@ -1,47 +1,32 @@
 module TwilioRubyWrapper
   class Queue
-    attr_accessor :page_number, :page_size, :queues
+    attr_reader :sid, :account_sid, :friendly_name, :uri, :current_size, :average_wait_time, :max_size, :date_created, :date_updated
+    attr_accessor :queue_instance
 
-    def initialize(account_sid:, auth_token:)
-      client = Twilio::REST::Client.new(account_sid, auth_token)
-      @queues = client.account.queues
-      @page_number = 0
-      @page_size = 50
+    def self.set_twilio_params(account_sid:, auth_token:)
+      @@account_sid = account_sid
+      @@auth_token = auth_token
+      true
     end
 
-    def find_by(*args)
-      hash = args.first
-
-      if !(Hash === hash) || hash.values.any? {|v| v.nil? || Array === v || Hash === v } || hash.size >= 2
-        raise
-      end
-
-      condition = self.condition(:eq)
-      condition.find_by(*args)
+    def initialize(twilio_queue_instance)
+      @twilio_client = Twilio::REST::Client.new(@@account_sid, @@auth_token)
+      @queue_instance = twilio_queue_instance
+      @sid = @queue_instance.sid
+      @account_sid = @queue_instance.account_sid
+      @friendly_name = @queue_instance.friendly_name
+      @uri = @queue_instance.uri
+      @current_size = @queue_instance.current_size
+      @average_wait_time = @queue_instance.average_wait_time
+      @max_size = @queue_instance.max_size
+      @date_created = @queue_instance.date_created
+      @date_updated = @queue_instance.date_updated
     end
 
-    def condition(value)
-      if !(Symbol === value)
-        raise
+    def calls
+      @queue_instance.members.list().map do |member|
+        Call.new(@twilio_client.account.calls.get(member.call_sid))
       end
-
-      condition = nil
-      case value
-      when :eq
-        condition  = -> (x) { -> (y) { y == x }}
-      when :lt
-        condition  = -> (x) { -> (y) { y < x }}
-      when :lteq
-        condition  = -> (x) { -> (y) { y <= x }}
-      when :gt
-        condition  = -> (x) { -> (y) { y > x }}
-      when :gteq
-        condition  = -> (x) { -> (y) { y >= x }}
-      else
-        raise
-      end
-
-      QueueCondition.new(queues: @queues, condition: condition)
     end
   end
 end

data/lib/twilio_ruby_wrapper/queue_condition.rb

@@ -1,15 +1,23 @@
 module TwilioRubyWrapper
   class QueueCondition
     attr_accessor :page_number, :page_size, :queues
+    @@account_sid = nil
+    @@auth_token = nil
 
-    def initialize(queues: , condition: )
+    def self.set_twilio_params(account_sid:, auth_token:)
+      @@account_sid = account_sid
+      @@auth_token = auth_token
+      true
+    end
+
+    def initialize(condition: nil, page_number: 0, page_size: 50)
       @condition = condition
-      @page_number = 0
-      @page_size = 50
-      @queues = queues
+      @page_number = page_number
+      @page_size = page_size
     end
 
     def where(*args)
+      set_twilio_account()
       hash = args.first
 
       if !(Hash === hash) || hash.values.any? {|v| v.nil? || Array === v || Hash === v } || hash.size >= 2
@@ -19,18 +27,21 @@ module TwilioRubyWrapper
       key = hash.keys.first
       value = build_value(hash[key], key)
 
+      params = {page: @page_number, page_size: @page_size}
+      twilio_queues = @twilio_queue_list.list(params)
       queues = []
-      queue_set = @queues.list(page: @page_number, page_size: @page_size)
-      until queue_set.empty? do
-        t = queue_set.select {|queue| @condition[value][build_value(queue.send(key), key)] }
-        queues.concat(t) unless t.empty?
-        queue_set = queue_set.next_page
+      until twilio_queues.empty? do
+        sub_queues = twilio_queues.select{|twilio_queue| @condition[value][build_value(twilio_queue.send(key), key)] }.map{|twilio_queue| Queue.new(twilio_queue) }
+        queues.concat(sub_queues) unless sub_queues.empty?
+        twilio_queues = twilio_queues.next_page
       end
-      
+
       queues
     end
 
     def find_by(*args)
+      set_twilio_account()
+      condition(:eq)
       hash = args.first
 
       if !(Hash === hash) || hash.values.any? {|v| v.nil? || Array === v || Hash === v } || hash.size >= 2
@@ -40,15 +51,42 @@ module TwilioRubyWrapper
       key = hash.keys.first
       value = build_value(hash[key], key)
 
-      queue_set = @queues.list(page: @page_number, page_size: @page_size)
-      t = nil
-      until queue_set.empty? do
-        t = queue_set.select {|queue| @condition[value][build_value(queue.send(key), key)] }.first
-        break unless t.nil?
-        queue_set = queue_set.next_page
+      params = {page: @page_number, page_size: @page_size}
+      twilio_queues = @twilio_queue_list.list(params)
+      queue = nil
+      until twilio_queues.empty? do
+        queue = twilio_queues.select{|twilio_queue| @condition[value][build_value(twilio_queue.send(key), key)] }.map{|twilio_queue| Queue.new(twilio_queue) }.first
+        break queue.nil?
+        twilio_queues = twilio_queues.next_page
       end
-      
-      t
+
+      queue
+    end
+
+    def condition(value)
+      if !(Symbol === value)
+        raise
+      end
+
+      condition = nil
+      case value
+      when :eq
+        condition  = -> (x) { -> (y) { y == x }}
+      when :lt
+        condition  = -> (x) { -> (y) { y < x }}
+      when :lteq
+        condition  = -> (x) { -> (y) { y <= x }}
+      when :gt
+        condition  = -> (x) { -> (y) { y > x }}
+      when :gteq
+        condition  = -> (x) { -> (y) { y >= x }}
+      else
+        raise
+      end
+
+      @condition = condition
+
+      self
     end
 
     private
@@ -68,5 +106,9 @@ module TwilioRubyWrapper
         value
       end
 
+      def set_twilio_account
+        @twilio_client = Twilio::REST::Client.new(@@account_sid, @@auth_token)
+        @twilio_queue_list = @twilio_client.account.queues
+      end
   end
 end

data/lib/twilio_ruby_wrapper/version.rb

@@ -1,3 +1,3 @@
 module TwilioRubyWrapper
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twilio_ruby_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - FUNABARA Masao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-06 00:00:00.000000000 Z
+date: 2017-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twilio-ruby
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: twilio-ruby wrapper