netdocuments 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 524fb3b97fa5307755f2f2a81668f3e414e10971
-  data.tar.gz: 2e4e46cfcbd2c596e2e09d65c42415d85406fa6a
+  metadata.gz: b6238d70c0a0c4691c514b63aa7661d2e5b5cf87
+  data.tar.gz: ef2cc92ebe68c13d163df48a937272c98bfa557f
 SHA512:
-  metadata.gz: 51fc1b7fd8db20e1456d98676a04f1aa2c03263d95a6e8d2b467603c5d409f517323258d230b731867ae52e0de091b251e34ea2b7ffbc3b2382a7156bfb1b1eb
-  data.tar.gz: e3f15645aa06a84ec62ec20c1a6262a3f884757e01e71c9598dbbe79e65b98e23b071f8f1349202ac8c173d3ed6291e26b6e0b1078c6bb05adea626a21c7f92a
+  metadata.gz: 003bd29507a95d63746e729d34e404c249d61ea2a1e72637ae0564574b3ebc7b4f0abc470906428407da883fc3b5bfa5d5da0b15cfdd3ed30093ec45dd52fcb7
+  data.tar.gz: 4e85d9c5671deccf8ef0ae839f163fbbb0d1bf46411452e0dd26b8e8b80e9a03fc9829831dd3f2537e290e350aa41def2f53c9751daf9ccff575110e3aeac782

data/lib/netdocuments.rb

@@ -12,6 +12,7 @@ require_relative 'netdocuments/path_formatter'
 require_relative 'netdocuments/configuration'
 require_relative 'netdocuments/client'
 require_relative 'netdocuments/access_token_master'
+require_relative 'netdocuments/logger'
 
 module Netdocuments
 
@@ -27,5 +28,3 @@ module Netdocuments
     yield(configuration)
   end
 end
-
-$logger = Logger.new(Netdocuments.configuration.log_path)

data/lib/netdocuments/base.rb

@@ -6,14 +6,16 @@ module Netdocuments
     def post(opts = {})
       HTTParty.post(END_POINT + opts[:url],
                     :body => opts[:body],
-                    :headers => opts[:headers])
+                    :headers => opts[:headers],
+                    :timeout => 180)
     end
 
 
     def get(opts = {})
       HTTParty.get(END_POINT + opts[:url],
                    query: opts[:query],
-                   headers: opts[:headers])
+                   headers: opts[:headers],
+                   timeout: 180)
     end
 
     def put(opts = {})
@@ -23,15 +25,22 @@ module Netdocuments
     end
 
 
+    def delete(opts = {})
+    end
+
+
+    def client
+      Netdocuments::Client.instance
+    end
+
     def validate_config!
-      #$logger.info "Token is: #{@client.access_token.valid? ? 'valid' : 'invalid'} ..Last generated: #{@client.access_token.last_generated_minutes_ago} minutes ago. "
-      if @client.access_token.valid?
-        true
-      else
-        $logger.info "Fetching new token..."
-        @client.get_token!
+      if client.access_token.nil?
+        puts "--- Fetching first time token---"
+        client.get_token
+      elsif !client.access_token.valid?
+        puts "--- Fetching New token ---"
+        client.get_token
       end
     end
-
   end
 end

data/lib/netdocuments/cabinet.rb

@@ -3,20 +3,19 @@ module Netdocuments
 
     attr_reader :id
 
-    def initialize(client,opts = {})
-      @client = client
+    def initialize(opts = {})
       validate_config!
-      @headers = {'Authorization' => "Bearer #{@client.access_token.token}"}
       @id = opts[:id] if opts[:id]
     end
 
 
     def find_folder_tree_and_update_file_path
+      Netdocuments.logger.info "Starting: find_folder_tree_and_update_file_path"
       subfolders_count = 0
       Parallel.map(folders,in_threads: 50) do |folder|
         subfolders = folder.subfolders
-        $logger.info "Collected: #{subfolders.count}"
-        subfolders_count += subfolders.count #folder.subfolders.flatten.count
+        Netdocuments.logger.info "Collected: #{subfolders.count} subfolders in #{folder.name}"
+        subfolders_count += subfolders.count
         Parallel.map(subfolders,in_threads: 75){|node| node.update }
       end
       subfolders_count
@@ -27,16 +26,20 @@ module Netdocuments
     end
 
     def folders
-      $logger.info "Fetching folders..."
+      Netdocuments.logger.info "Fetching folders..."
       response = get(url: "/v1/Cabinet/#{@id}/folders",
                      query: {'$select' => "standardAttributes"},
-                     headers: @headers)
-      response["ndList"]["standardList"]["ndProfile.DocumentStat"].collect {|i| Netdocuments::Folder.new(@client,{id: i['id'],name: i['name']})}
+                     headers: headers)
+      response["ndList"]["standardList"]["ndProfile.DocumentStat"].collect {|i| Netdocuments::Folder.new(id: i['id'],name: i['name'])}
     end
 
 
     def info
-      get(url: "/v1/Cabinet/#{@id}/info",headers: @headers)
+      get(url: "/v1/Cabinet/#{@id}/info",headers: headers)
+    end
+
+    def headers
+      {'Authorization' => "Bearer #{client.access_token.token}"}
     end
   end
 end

data/lib/netdocuments/client.rb

@@ -1,6 +1,8 @@
 module Netdocuments
   class Client
 
+    include Singleton
+
     attr_reader :refresh_token,:client_secret,:access_token
 
 

data/lib/netdocuments/configuration.rb

@@ -1,15 +1,19 @@
 module Netdocuments
   class Configuration
 
-    attr_accessor :cabinet_id,:client_secret,:refresh_token,:log_path,:folder_path_id
+    attr_accessor :cabinet_id,:client_secret,:refresh_token,:log_path,:folder_path_id,
+      :cabinet_name,:logger
 
     def initialize
       log_dir = create_log_dir
       @cabinet_id = 'abc'
-      @client_secret = 'xxxxx'
-      @refresh_token = '1291271823781273712'
+      @client_secret = '1291271823781273712129127182378127371212912718237812737121291271823781273712'
+      @refresh_token = '1291271823781273712129127182378127371212912718237812737121291271823781273712'
       @log_path = "#{log_dir}/netdocuments.log"
       @folder_path_id = '48'
+      @cabinet_id = 'NG-12345'
+      @cabinet_name ='Test'
+      @logger = Logger.new(STDOUT)
     end
 
     def create_log_dir

data/lib/netdocuments/document.rb

@@ -1,10 +1,10 @@
 module Netdocuments
   class Document < Base
 
-    def initialize(client,opts = {})
-      @client = client
+    attr_reader :id,:name
+
+    def initialize(opts = {})
       validate_config!
-      @headers = {'Authorization' => "Bearer #{@client.access_token.token}"}
       @id     = opts[:id] if opts[:id]
       @name   = opts[:name] if opts[:name]
       @query  = opts[:query] if opts[:query]
@@ -13,14 +13,18 @@ module Netdocuments
 
 
     def info
-      get(url: "/v1/Document/#{@id}/info",headers: @headers)
+      get(url: "/v1/Document/#{@id}/info",headers: headers)
     end
 
     def update_info(opts = {})
       put(url: "/v1/Document/#{@id}/info",
           query: opts[:query],
-          headers: @headers.merge({'Content-Type' => 'application/json'}))
+          headers: headers.merge({'Content-Type' => 'application/json'}))
     end
 
+
+    def headers
+      {'Authorization' => "Bearer #{client.access_token.token}"}
+    end
   end
 end

data/lib/netdocuments/folder.rb

@@ -1,20 +1,16 @@
 module Netdocuments
   class Folder < Base
 
-    attr_reader :id,:name,:query,:parent,:cabinet_id,:client
+    attr_reader :id,:name,:query,:parent
 
-    def initialize(client,opts = {})
-      @client = client
+    def initialize(opts = {})
       validate_config!
-      @headers = {'Authorization' => "Bearer #{@client.access_token.token}"}
-      @id      = opts[:id]     if opts[:id]
+      @id      = URI::encode(opts[:id])  if opts[:id]
       @name    = opts[:name]   if opts[:name]
       @query   = opts[:query]  if opts[:query]
       @parent  = opts[:parent] if opts[:parent]
-
     end
 
-
     def cabinet_id
       Netdocuments.configuration.cabinet_id
     end
@@ -25,23 +21,23 @@ module Netdocuments
              name: @name,
              parent: @parent
            },
-           headers: @headers)
+           headers: headers)
     end
 
     def info
       get(url: "/v1/Folder/#{@id}/info",
-          headers: @headers)
+          headers: headers)
     end
 
     def folder_content
       begin
         response = get(url: "/v1/Folder/#{id}",
                        query: {'$select' => 'standardAttributes'},
-                       headers: @headers)
+                       headers: headers)
         response["ndList"]["standardList"].nil? ? [] : [response["ndList"]["standardList"]["ndProfile.DocumentStat"]].flatten
       rescue Exception => e
-        $logger.error "********* #{id} ********* #{e.message}"
-        $logger.error e.backtrace.join("\n")
+        #puts "********* #{id} ********* #{e.message}"
+        #puts e.backtrace.join("\n")
         []
       end
 
@@ -49,23 +45,23 @@ module Netdocuments
 
 
     def folder_extraction(opts = {})
-      contents = Netdocuments::Folder.new(@client, {id: opts[:id]}).folder_content.compact
+      contents = Netdocuments::Folder.new(id: opts[:id]).folder_content.compact
       col = contents.collect do |folder|
-        obj = Netdocuments::Node.new(@client,name: folder['name'],
+        obj = Netdocuments::Node.new(name: folder['name'],
                                      id: folder['id'],
                                      extension: folder['extension'],
-                                     parent: opts[:parent])
+                                     parent: opts[:parent],
+                                     folder_path: "#{opts[:parent]}/#{folder['name']}")
         obj
       end
     end
 
 
     def subfolders
-      $logger.info "Starting subfolder collection for: #{name}"
+      Netdocuments.logger.info "Starting subfolders collection for: #{name}"
       nodes = []
-      ids = [{id: @id, parent: "WorkspaceResetTest/#{name}"}]
+      ids = [{id: @id, parent: "#{Netdocuments.configuration.cabinet_name}/#{name}"}]
       loop do
-        sleep 0.5
         r =  ids.collect do |id|
           folder_extraction(id)
         end.flatten!
@@ -79,15 +75,42 @@ module Netdocuments
 
 
     def ancestry
-      response = get(url: "/v1/Folder/#{@id}/ancestry",headers: @headers)
+      response = get(url: "/v1/Folder/#{@id}/ancestry",headers: headers)
     end
 
     def update_info(opts = {})
       response = put(url: "/v1/Folder/#{@id}/info",
                      query: opts[:query],
-                     headers: @headers.merge({'Content-Type' => 'application/json'}))
+                     headers: headers.merge({'Content-Type' => 'application/json'}))
+    end
+
+    #udpating nodes via sidekiq worker
+    def find_subfolders_and_update_nodes
+      stats = {nodes_count: 0,folder_name: name}
+      puts "---- Starting subfolders collection for - #{name} ---- "
+      nodes = []
+      ids = [{id: @id, parent: "#{Netdocuments.configuration.cabinet_name}/#{name}"}]
+      loop do
+        r =  ids.collect do |id|
+          folder_extraction(id)
+        end.flatten!
+        nodes << r
+        stats[:nodes_count] = stats[:nodes_count] + nodes.flatten.count
+        nodes.flatten.each do |node|
+          puts "---- Pushing: #{node.folder_path} in node queue ----"
+          NodeWorker.perform_async(node.id,node.extension,node.folder_path)
+        end
+        nodes = []
+        folders = r.select {|i| i.extension == 'ndfld'}
+        ids = folders.collect {|o| {id: o.id,parent: "#{o.parent}/#{o.name}"}}
+        break if ids.count == 0
+      end
+      stats
     end
 
 
+    def headers
+      {'Authorization' => "Bearer #{client.access_token.token}"}
+    end
   end
 end

data/lib/netdocuments/node.rb

@@ -2,25 +2,25 @@ module Netdocuments
   class Node < Base
 
 
-    attr_reader :name,:id,:extension,:parent,:client
+    attr_reader :name,:id,:extension,:parent,:folder_path
 
-    def initialize(client,opts = {})
-      @client = client
+    def initialize(opts = {})
       validate_config!
       @name = opts[:name]
       @id = opts[:id]
       @extension = opts[:extension]
       @parent = opts[:parent]
+      @folder_path = opts[:folder_path]
     end
 
     def update
-      $logger.info "Updating #{name} with file path as #{parent}"
+      # Netdocuments.logger.info "Updating #{name} with file path as #{folder_path}"
       if extension == 'ndfld'
-        q1  = {'customAttributes' => [{"id" => "48","value" => Netdocuments::PathFormatter.new(parent).format}]}
-        Netdocuments::Folder.new(@client,id: id).update_info({query: q1.to_json})
+        q1  = {'customAttributes' => [{"id" => Netdocuments.configuration.folder_path_id,"value" => Netdocuments::PathFormatter.new(folder_path).format}]}
+        Netdocuments::Folder.new(id: id).update_info({query: q1.to_json})
       else
-        q1  = {'customAttributes' => [{"id" => "48","value" => Netdocuments::PathFormatter.new(parent).format}]}
-        Netdocuments::Document.new(@client,id: id).update_info({query: q1.to_json})
+        q1  = {'customAttributes' => [{"id" => Netdocuments.configuration.folder_path_id,"value" => Netdocuments::PathFormatter.new(folder_path).format}]}
+        Netdocuments::Document.new(id: id).update_info({query: q1.to_json})
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netdocuments
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - ankit8898
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -133,3 +133,4 @@ signing_key:
 specification_version: 4
 summary: Ruby wrapper for Netdocuments REST API
 test_files: []
+has_rdoc: