twilio_ruby_wrapper 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 924bffada1a1256c22c4945fac3d52c413bbc993
-  data.tar.gz: cf435476fa8f3046de7ccc2b54c37822c026ae9e
+  metadata.gz: f6eb10bfa327be622857b079d462bbc8007327fb
+  data.tar.gz: 4614314bd49fc7d6a8634639b05029264e5c5a79
 SHA512:
-  metadata.gz: eb25c23fec971709742d97fd5c429ae9acffcaad86c8fb4b04df43d902d720b9de34e34dabeffd6256d48092a09678c91de8e13e6e32492eaac2bb65b4f6f728
-  data.tar.gz: 04c7c9ff241abc11fdf5919105a8fd6d9e7b6497aee467799c386d59accfd707e454b7151f27e1a2a878959b9def919b0a2086a992c2c6f2e27b127e567e81e4
+  metadata.gz: f458c145c1b327615422a52983e75077d6716ecc676fb42a793f9dadd0a24ff61899cacc0611e62231607658c139135ef1af43a6d6613824bac104e8bb9cb182
+  data.tar.gz: d5b596807738aa24d0bc1e35754bfb66cfca9e4938b154ae5e594ffa24b34f96ec56396401a6f98a9d2363d49348217edd559805eb51569b6ce2f53cbf3d6ff0

data/README.md

@@ -34,7 +34,7 @@ queues = queue_condition.condition(:gt).where(date_updated: "2017-05-31 0:0:0")
 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")
+calls = call_condition.filter(start_time_after: "2017-05-31").condition(:eq).where(from: "PHONE NUMBER")
 ```
 
 ## Development

data/lib/twilio_ruby_wrapper/call_condition.rb

@@ -10,7 +10,7 @@ module TwilioRubyWrapper
       true
     end
 
-    def initialize(condition: nil, filter: {}, page_number: 0, page_size: 50)
+    def initialize(condition: nil, filter: {}, page_number: 0, page_size: nil)
       @condition = condition
       @filter = filter
       @page_number = page_number
@@ -28,15 +28,10 @@ module TwilioRubyWrapper
       key = hash.keys.first
       value = build_value(hash[key], key)
 
-      params = {page: @page_number, page_size: @page_size}
+      params = {page_size: @page_size}
       params.merge!(@filter) unless @filter.empty?
       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 = twilio_calls.select{|twilio_call| @condition[value][build_value(twilio_call.send(key), key)] }.map{|twilio_call| Call.new(twilio_call) }
 
       calls
     end
@@ -53,15 +48,10 @@ module TwilioRubyWrapper
       key = hash.keys.first
       value = build_value(hash[key], key)
 
-      params = {page: @page_number, page_size: @page_size}
+      params = {page_size: @page_size}
       params.merge!(@filter) unless @filter.empty?
       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 = twilio_calls.select {|twilio_call| @condition[value][build_value(twilio_call.send(key), key)] }.map{|twilio_call| Call.new(twilio_call) }.first
 
       call
     end
@@ -117,7 +107,7 @@ module TwilioRubyWrapper
 
       def set_twilio_account
         @twilio_client = Twilio::REST::Client.new(@@account_sid, @@auth_token)
-        @twilio_call_list = @twilio_client.account.calls
+        @twilio_call_list = @twilio_client.api.account.calls
       end
   end
 end

data/lib/twilio_ruby_wrapper/queue.rb

@@ -25,7 +25,7 @@ module TwilioRubyWrapper
 
     def calls
       @queue_instance.members.list().map do |member|
-        Call.new(@twilio_client.account.calls.get(member.call_sid))
+        Call.new(@twilio_client.api.v2010.account.calls(member.call_sid).fetch)
       end
     end
   end

data/lib/twilio_ruby_wrapper/queue_condition.rb

@@ -27,14 +27,9 @@ module TwilioRubyWrapper
       key = hash.keys.first
       value = build_value(hash[key], key)
 
-      params = {page: @page_number, page_size: @page_size}
+      params = {page_size: @page_size}
       twilio_queues = @twilio_queue_list.list(params)
-      queues = []
-      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 = twilio_queues.select{|twilio_queue| @condition[value][build_value(twilio_queue.send(key), key)] }.map{|twilio_queue| Queue.new(twilio_queue) }
 
       queues
     end
@@ -51,14 +46,9 @@ module TwilioRubyWrapper
       key = hash.keys.first
       value = build_value(hash[key], key)
 
-      params = {page: @page_number, page_size: @page_size}
+      params = {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
+      queue = twilio_queues.select{|twilio_queue| @condition[value][build_value(twilio_queue.send(key), key)] }.map{|twilio_queue| Queue.new(twilio_queue) }.first
 
       queue
     end
@@ -108,7 +98,7 @@ module TwilioRubyWrapper
 
       def set_twilio_account
         @twilio_client = Twilio::REST::Client.new(@@account_sid, @@auth_token)
-        @twilio_queue_list = @twilio_client.account.queues
+        @twilio_queue_list = @twilio_client.api.account.queues
       end
   end
 end

data/lib/twilio_ruby_wrapper/version.rb

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

data/twilio_ruby_wrapper.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "twilio-ruby", '~> 4.13'
-  spec.add_development_dependency "bundler", "~> 1.14"
+  spec.add_dependency "twilio-ruby", "~> 5.0"
+  spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twilio_ruby_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - FUNABARA Masao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-31 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twilio-ruby
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.13'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.13'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement