me_sd 0.0.3beta → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 941dc0362e5bc77e988b58c63f85819035a7b4a1
-  data.tar.gz: d67a49a6fc43bd400f51a08770a3c613e69f049c
+  metadata.gz: 09e0015bf0a216a04d39abdc9a2a62c3cdd34b57
+  data.tar.gz: 466b40aff46b4f08550f7b16e700a445ea8ce7e0
 SHA512:
-  metadata.gz: 5fe673eefd73e36425110010575f8e4fccc89a6de38c045843e24d2439b69ba54ffcf48fb97a9e26eb932a222e42df98d83131ed81fa81123f66f41de735bb7b
-  data.tar.gz: 85f5debddf474d137ee6e29574a23a0c943ddca418f4ce70b99ad0d96e12a58fb1fcded640e40610953012debe34b2995e4c61f57ad77322565e515582a55661
+  metadata.gz: e48b1af3bbe22d39538391f77696ca0154a85b5c5db20074640324491dc02569facb6f612dfe403f85656d77c2a5c330e37daf15ab1ddb313c443c7c739d86c1
+  data.tar.gz: 1f8bef934778c97b6c49fd148788587a648ed9be00c89ce4ff1e5d3711d8dd77c3f45a93e7d62b0ad7f742070ea5fde9e60170a213f07e89539aa6955a339d27

data/lib/me_sd.rb

@@ -1,17 +1,3 @@
-# sd = MESD.new({ host: "192.168.0.150", port: "8080", username: "user", password: "P@ssw0rd" })
-# # default port is "80"
-# => true
-# unless sd.errors
-#   requests = sd.get_all_requests
-#   requests[0].data
-# end
-# => #<MESD::Request:0x0000000265d360 @id="29", ..., @description="request decription", @resolution="request resolution", ...>
-# request = Request.new({ session: sd.session, id: 29 })
-# request.data(:name, :resolution)
-# => #<MESD::Request:0x000000023b6800 @id="29", ..., @name="request name", @resolution="request resolution">
-# request.get_resolution
-# => "request resolution"
-
 class MESD
   attr_accessor :session, :last_error, :curobj, :current_body
 
@@ -84,15 +70,29 @@ class MESD
   end
 
   def get_all_requests
-    requests = Array.new
+    get_last_requests(0)
+  end
+
+  def get_last_requests(number)
+    if number < 0
+      @last_error = "wrong requests number"
+      return false
+    end
     select_all_requests
-    puts "Getting total #{@curobj['_TL']} requests:"
+    if number == 0
+      puts "Getting total #{@curobj['_TL']} requests:"
+    else
+      puts "Getting last #{number} of maximum #{@curobj['_TL']} requests:"
+    end
+    requests = Array.new
     get_requests_urls(@current_body).each { |url| requests.push(Request.new({ session: @session, url: url })) }
     begin
-      not_last_page = next_page
+      there_are_more_pages = next_page
       get_requests_urls(@current_body).each { |url| requests.push(Request.new({ session: @session, url: url })) }
-    end while not_last_page
-    requests
+      break unless requests.size < number
+      break unless there_are_more_pages
+    end while true
+    requests[0..number-1]
   end
 
   def select_all_requests
@@ -129,7 +129,7 @@ class MESD
         request.add_field("Referer", "http://#{session[:host]}:#{session[:port]}/WOListView.do")
         @curobj = get_curobj
         return false unless @curobj
-        print "#{(@curobj["_FI"].to_f / @curobj["_TL"].to_f * 100).round}%.."
+        print "#{@curobj["_PN"]}/#{(@curobj["_TL"].to_i / @curobj["_PL"].to_f).ceil}.."
         # increment page number
         @curobj["_PN"] = (@curobj["_PN"].to_i + 1).to_s
         # update first item
@@ -150,10 +150,7 @@ class MESD
     rescue *EXCEPTIONS => @last_error
     end
     # if (first item + per page) > total items then it is the last page
-    if (@curobj["_FI"].to_i + @curobj["_PL"].to_i) > @curobj["_TL"].to_i
-      puts "100%"
-      return false
-    end
+    return false if (@curobj["_FI"].to_i + @curobj["_PL"].to_i) > @curobj["_TL"].to_i
     true
   end
 
@@ -208,7 +205,7 @@ class Request < MESD
       @id = args[:id]
     elsif args[:url]
       if args[:url] =~ /WorkOrder\.do\?woMode=viewWO&woID=(?<ID>\d+)&&fromListView=true/
-        @id = Regexp.last_match("ID").to_i
+        @id = Regexp.last_match("ID")
       else
         return false
       end
@@ -218,7 +215,10 @@ class Request < MESD
   end
 
   def data(*args)
-    return false unless self.id
+    unless self.id
+      @last_error = "id error"
+      return false
+    end
     if args.size == 0
       only = []
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: me_sd
 version: !ruby/object:Gem::Version
-  version: 0.0.3beta
+  version: '0.2'
 platform: ruby
 authors:
 - Alexander Morozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -47,9 +47,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1