groupme 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: beee1256374c71c931f8ce107f28005b1da3aacf
-  data.tar.gz: 46c04187b65b33274566b40d85499837d9573e46
+  metadata.gz: bafcaeb016ef037170f43fda32b853bed245c110
+  data.tar.gz: efb6d55971014bc124440f97eebab2d2d90a0485
 SHA512:
-  metadata.gz: e44752ae6a85469077509891d97005744309705185db4d3712a2d968a17237be227c2c0b10f8d8d7104988a8788dd144aaecb4cec7ce86ab31d4de9eabda8672
-  data.tar.gz: adf70ee47a11e9d7dfddce253443f80fab005b92b6fb9a3b138941e35415d8bb963d936881f40dbf85f890cf5934aa99dc9dcdbf9971fdb0e70d555ae6312a16
+  metadata.gz: 9d449e05ae02a1cd20cff7efab595b140e10a1ed223c5b27953d9d7cab28c588e4894a606b351691b1fef31999ca903159ca2403978f9bfb404f6c8eb3a3bb29
+  data.tar.gz: 17a4040f1de23972ea45fcae450ea5fe6f8e39edbf9d5be750db62d0963634ff0ccd8405312a0782d2d79f143284f2d90fcc16e6faf13174c6afe81c50f20215

data/.rubocop.yml

@@ -16,3 +16,7 @@ Style/SpecialGlobalVars:
   Enabled: false
 Style/EmptyLinesAroundBlockBody:
   Enabled: false
+
+# Disabled until RuboCop > 0.36.0
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/.travis.yml

@@ -2,8 +2,9 @@ language: ruby
 sudo: false
 rvm:
   - 2.0
-  - 2.1.6
-  - 2.2.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - ruby-head
   - rbx-2
   - jruby

data/groupme.gemspec

@@ -20,12 +20,11 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 3.0'
-  gem.add_development_dependency 'webmock', '~> 1.19.0'
+  gem.add_development_dependency 'webmock', '~> 1.21.0'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'json', '~> 1.7'
-  gem.add_development_dependency 'timecop', '~> 0.7'
-  gem.add_development_dependency 'rubocop', '~> 0.33'
+  gem.add_development_dependency 'rubocop', '~> 0.36.0'
 
   gem.add_dependency 'faraday', '~> 0.9.0'
   gem.add_dependency 'faraday_middleware', '~> 0.9.0'

data/lib/groupme.rb

@@ -2,5 +2,5 @@ require 'groupme/version'
 require 'groupme/client'
 
 module GroupMe
-  USER_AGENT = "dwradcliffe/groupme/#{GroupMe::VERSION}"
+  USER_AGENT = "dwradcliffe/groupme/#{GroupMe::VERSION}".freeze
 end

data/lib/groupme/bots.rb

@@ -10,7 +10,7 @@ module GroupMe
     def bots
       get('/bots')
     end
-    alias_method :list_bots, :bots
+    alias list_bots bots
 
     # Post a message from a bot.
     #

data/lib/groupme/client.rb

@@ -22,8 +22,8 @@ module GroupMe
 
     private
 
-    def get(path)
-      request(:get, path)
+    def get(path, options = {})
+      request(:get, path, options)
     end
 
     def post(path, data = {})
@@ -33,9 +33,9 @@ module GroupMe
     def request(method, path, data = {})
       res = connection.send(method, "v3/#{path}", data)
       if res.success? && !res.body.empty? && res.body != ' '
-        return res.body.response
+        res.body.response
       else
-        return res
+        res
       end
     end
 

data/lib/groupme/groups.rb

@@ -10,7 +10,7 @@ module GroupMe
     def groups
       get '/groups'
     end
-    alias_method :list_groups, :groups
+    alias list_groups groups
 
     # Load a specific group.
     #
@@ -34,7 +34,7 @@ module GroupMe
     def former_groups
       get '/groups/former'
     end
-    alias_method :list_former_groups, :former_groups
+    alias list_former_groups former_groups
 
     # Create a new group.
     #
@@ -46,7 +46,7 @@ module GroupMe
     # @option options [String] :image_url GroupMe Image Service URL
     # @option options [Boolean] :share If you pass a true value, a share URL will be generated
     def create_group(name, options = {})
-      options.merge! :name => name
+      options[:name] = name
       post '/groups', options
     end
 

data/lib/groupme/messages.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module GroupMe
   module Messages
     # Create a message for a group
@@ -10,7 +12,7 @@ module GroupMe
     def create_message(group_id, text, attachments = [])
       data = {
         :message => {
-          :source_guid => Time.now.to_s,
+          :source_guid => SecureRandom.uuid,
           :text => text
         }
       }
@@ -23,8 +25,14 @@ module GroupMe
     # @return [Array<Hashie::Mash>] Array of hashes representing the messages
     # @see https://dev.groupme.com/docs/v3#messages_index
     # @param group_id [String, Integer] Id of the group
-    def messages(group_id)
-      get("/groups/#{group_id}/messages").messages
+    # @param options [Hash] options hash that will be passed to the groupme call
+    # @param fetch_all [Boolean] if true, fetches all messages for the group
+    def messages(group_id, options = {}, fetch_all = false)
+      if fetch_all
+        get_all_messages(group_id)
+      else
+        get_messages(group_id, options)
+      end
     end
 
     # Get number of messages for a group
@@ -34,6 +42,27 @@ module GroupMe
     def messages_count(group_id)
       get("/groups/#{group_id}/messages")['count']
     end
-    alias_method :message_count, :messages_count
+    alias message_count messages_count
+
+    private
+
+    def get_all_messages(group_id)
+      messages = []
+      last_id = ''
+      loop do
+        selection = get_messages(group_id, :before_id => last_id)
+        break if selection.empty?
+
+        last_id = selection.last.id
+        messages << selection
+      end
+
+      messages
+    end
+
+    def get_messages(group_id, options = {})
+      results = get("/groups/#{group_id}/messages", options)
+      results.is_a?(Faraday::Response) ? [] : results.messages
+    end
   end
 end

data/lib/groupme/version.rb

@@ -1,3 +1,3 @@
 module GroupMe
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'.freeze
 end

data/spec/groupme/messages_spec.rb

@@ -6,6 +6,7 @@ describe GroupMe::Messages do
 
   before do
     @client = GroupMe::Client.new(:token => 'TEST')
+    allow(SecureRandom).to receive(:uuid).and_return('GUID')
   end
 
   describe '.message_count' do
@@ -29,18 +30,10 @@ describe GroupMe::Messages do
 
   describe '.create_message' do
 
-    before do
-      Timecop.freeze(Time.new(2014, 10, 25, 22, 33, 44, 0000))
-    end
-
-    after do
-      Timecop.return
-    end
-
     it 'sends a text only message to a group' do
       message = {
         :message => {
-          :source_guid => '2014-10-25 22:33:44 +0000',
+          :source_guid => 'GUID',
           :text => 'Hello world ☃☃'
         }
       }
@@ -52,7 +45,7 @@ describe GroupMe::Messages do
     it 'sends a message with location to a group' do
       message = {
         :message => {
-          :source_guid => '2014-10-25 22:33:44 +0000',
+          :source_guid => 'GUID',
           :text => 'Hello world ☃☃',
           :attachments => [
             {

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'groupme'
 require 'multi_json'
 require 'webmock/rspec'
-require 'timecop'
 
 def stub_get(url)
   stub_request(:get, "https://api.groupme.com/v3#{url}")
@@ -28,7 +27,7 @@ def json_response(file, status = 200)
         :code => status,
         :errors => []
       }
-    },
+    }.to_json,
     :headers => {
       :content_type => 'application/json; charset=utf-8'
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groupme
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - David Radcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2016-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: 1.21.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -94,34 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
+        version: 0.36.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple wrapper for the GroupMe v3 API