hcutil 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cda8f8722f1082df41310321a8247b8d774faa9a
-  data.tar.gz: 5735490131e3f9a06e4e2530fcbccbad902edb66
+  metadata.gz: 1b2d4db37dec70fc55763424aeb341cae0a595ee
+  data.tar.gz: f1b7ae56e3ebc44be84c593d73a2f2cd0162149f
 SHA512:
-  metadata.gz: 237efc41d13f825978b7b2be90dbb4b94ecf53233c0cc642b664aae9e8bb6c3f923013f1d6063aa0262bc16d4509aa3b3bcca02cb6f756c453425e9aa6083a4a
-  data.tar.gz: c3f95714e3a609b3b9ddf790db4e57c2dc35e16a23e1c6c0e0224702b779859440789dea14c5ef862407cbf791ba767b25a02efee1531dd9cc75cb03ece8ce2f
+  metadata.gz: 3f5112d7905de4e6f90c8160b1320ad82cfee7605e4c4fbbbab667606614e3f35ebdabfbd9686a0b65ecfb9a26aee0ba7a57583be49beec709b1552ebe94e45c
+  data.tar.gz: a2968479fcc425d637b87df4d056c34c0c3502f5c9b21c9be588801e14dd5193f1905eb1cc0ce551905d65a6d8de2c70607b6071c45a27ed2c6b499f1ce74ef1

data/lib/hcutil/cli.rb

@@ -29,7 +29,7 @@ module HCUtil
            :desc => 'Date from which to copy messages',
            :type => :string,
            :aliases => '-d',
-           :default => Time.now)
+           :default => Time.now.utc)
     option(:num_items,
            :desc => 'Number of chat messages to copy',
            :aliases => '-n',

data/lib/hcutil/copier.rb

@@ -1,4 +1,5 @@
 require 'hcutil/errors'
+require 'hcutil/extensions'
 require 'hcutil/op_base'
 require 'uri'
 require 'cgi'
@@ -9,7 +10,7 @@ module HCUtil
     def initialize(room_name = 'Client Services', options = {})
       super(options)
       @room_name = room_name
-      @num_items = @options[:num_items] ||25
+      @num_items = @options[:num_items] || 25
     end
 
     def get_room_id(start_index=0)
@@ -81,21 +82,15 @@ module HCUtil
       return room_id
     end
 
-    def copy
-      room_id = get_room_id
-      if room_id == 0
-        raise(Errors::CopierError, "Room with name '#{@room_name}' could not be found")
-      end
-
-      chat_date = @options[:date]
-      $stderr.puts("Getting history for #{chat_date.to_s}") if @verbose
+    def get_history(room_id, chat_date, msg_count, start_index, jsons)
 
       param_arg = {
         :accept => :json,
         :params => {
           :auth_token => @auth.auth_token,
           :date => chat_date,
-          'max-results' => @num_items
+          'start-index' => start_index,
+          'max-results' => 100
         }
       }
 
@@ -104,28 +99,74 @@ module HCUtil
       RestClient.get(uri, param_arg) do |response, request, result|
         if result.is_a? Net::HTTPSuccess
           json = JSON.parse(response.body)
+          jsons.unshift(json)
+          items = json['items']
+          unless items.nil?
+            msg_count += items.count
+            links = json['links']
+            if msg_count >= @num_items or links.nil?
+              return jsons
+            else
+              next_uri = links['next']
+              unless next_uri.nil_or_empty?
+                query = URI.parse(next_uri).query
+                query_params = CGI.parse(query)
+                start_index = query_params['start-index'].first
+                $stderr.puts("retrieving history for room '#{room_id}' with start_index #{start_index} next_uri #{next_uri}") if @verbose
+                return get_history(room_id, chat_date, msg_count, start_index, jsons)
+              end
+            end
+          else
+            raise(Errors::CopierError, "Room with id '#{room_id}' - could not parse history JSON - missing 'items'")
+          end
         else
           raise(Errors::RESTError.new(result, uri, response))
         end
       end
+      return jsons
+    end
+
+    def copy
+      room_id = get_room_id
+      if room_id == 0
+        raise(Errors::CopierError, "Room with name '#{@room_name}' could not be found")
+      end
+
+      opt_date = @options[:date]
+      if opt_date.is_a?(Time)
+        chat_date = opt_date
+      else
+        chat_date = Time.parse(opt_date)
+      end
+      chat_date_utc_iso8601_s = chat_date.dup.utc.iso8601.to_s
+      $stderr.puts("Getting history for date #{chat_date.to_s} utc/iso8601 #{chat_date_utc_iso8601_s}") if @verbose
+
+      jsons = []
+      get_history(room_id, chat_date_utc_iso8601_s, 0, 0, jsons)
 
       if @debug
         chat_json_file = "messages-#{room_id}-#{chat_date.strftime('%Y-%m-%d')}.json"
-        File.open(chat_json_file, 'w') { |f| f.write(json.inspect) }
+        File.open(chat_json_file, 'w') do |f|
+          jsons.each do |json|
+            f.write(json.inspect)
+          end
+        end
         $stderr.puts "Chat JSON saved to #{chat_json_file}"
       end
 
-      items = json['items']
-      items.each do |item|
-        date = Time.parse(item['date']).strftime('%Y-%m-%d %H:%M:%S')
-        from = item['from']
-        if from.is_a?(Hash)
-          name = from['name']
-        else
-          name = from
+      jsons.each do |json|
+        items = json['items']
+        items.each do |item|
+          date = Time.parse(item['date']).strftime('%Y-%m-%d %H:%M:%S')
+          from = item['from']
+          if from.is_a?(Hash)
+            name = from['name']
+          else
+            name = from
+          end
+          message = item['message']
+          puts "#{date} #{name}: #{message}"
         end
-        message = item['message']
-        puts "#{date} #{name}: #{message}"
       end
     end
   end

data/lib/hcutil/version.rb

@@ -1,3 +1,3 @@
 module HCUtil
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcutil
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Luke Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor