mediawiki-butt 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f09a41fd00c3ff2e7f5bc1cafa03ed5d950b5cc
-  data.tar.gz: 60402f6721be863aeb428c13933cfdcc5e9214ed
+  metadata.gz: 8287cc51bbd45b0b63fb8c16b5b86b74848b3e85
+  data.tar.gz: 33b65213c477787cbfbf00ae5c834cf2d24705f0
 SHA512:
-  metadata.gz: f4023e04f09486f94ad4b6af55d889e6b5aa39af713842c5b1574ddd2c0929d847c0d2581e2e6933676b9fb3877d3e0b577fa19ce11e4cbfa2d2b85b2b79252d
-  data.tar.gz: deea5c87cdf91d334f97e62f6c065ae6f71fed9ca9ac1ae56a512c17ebbfb207eaab7fd6f80ff032cc7bd5f900f90e832bab5534b23ca7822c9542239f79afd2
+  metadata.gz: c14f1a0202eb3e5c4614fb1c43e59556162215162cdb1b22f570e00030254377f5cf3c61fbabbc2d4a75ffb38081f9f6e8674648262a1a2431c0834fb828df1e
+  data.tar.gz: 5fb48bb4ef5ab53fa247581a05132e46e7de00a7a81a90a03c87d1024bdd52210fd159032b12659fe3002cb3dfa2980e329cc5f444047644158efffe093993c8

data/lib/mediawiki/administration.rb

@@ -16,7 +16,7 @@ module MediaWiki
 
       token = get_token('block')
       params[:reason] = reason unless reason.nil?
-      params[:nocreate] = '1' if nocreate == true
+      params[:nocreate] = '1' if nocreate
       params[:token] = token
 
       response = post(params)

data/lib/mediawiki/auth.rb

@@ -14,7 +14,7 @@ module MediaWiki
         @logged_in = true
         return true
       when 'NeedToken'
-        fail MediaWiki::Butt::NeedTokenMoreThanOnceError if secondtry == true
+        fail MediaWiki::Butt::NeedTokenMoreThanOnceError if secondtry
       when 'NoName'
         fail MediaWiki::Butt::NoNameError
       when 'Illegal'

data/lib/mediawiki/butt.rb

@@ -9,6 +9,7 @@ require 'json'
 module MediaWiki
   class Butt
     include MediaWiki::Auth
+    include MediaWiki::Query
     include MediaWiki::Query::Meta::SiteInfo
     include MediaWiki::Query::Meta::FileRepoInfo
     include MediaWiki::Query::Meta::UserInfo
@@ -75,10 +76,10 @@ module MediaWiki
     #   the currently logged in user if nil.
     # @return [Boolean] true if logged in as a bot, false if not logged in or
     #   logged in as a non-bot
-    def user_bot?(*username)
+    def user_bot?(username = nil)
       groups = false
 
-      if defined? username
+      if !username.nil?
         groups = get_usergroups(username)
       else
         groups = get_usergroups if @logged_in

data/lib/mediawiki/query/lists.rb

@@ -1,4 +1,5 @@
 require_relative '../constants'
+require_relative 'query'
 
 module MediaWiki
   module Query
@@ -14,7 +15,7 @@ module MediaWiki
           action: 'query',
           list: 'backlinks',
           bltitle: title,
-          bllimit: MediaWiki::Query.get_limited(limit)
+          bllimit: get_limited(limit)
         }
 
         ret = []
@@ -37,7 +38,7 @@ module MediaWiki
           action: 'query',
           list: 'categorymembers',
           cmprop: 'title',
-          cmlimit: MediaWiki::Query.get_limited(limit)
+          cmlimit: get_limited(limit)
         }
 
         if category =~ /[Cc]ategory\:/
@@ -63,7 +64,7 @@ module MediaWiki
         params = {
           action: 'query',
           list: 'random',
-          rnlimit: MediaWiki::Query.get_limited(number_of_pages, 10, 20)
+          rnlimit: get_limited(number_of_pages, 10, 20)
         }
 
         if @namespaces.value?(namespace)
@@ -275,7 +276,7 @@ module MediaWiki
         params = {
           action: 'query',
           list: 'allcategories',
-          aclimit: MediaWiki::Query.get_limited(limit)
+          aclimit: get_limited(limit)
         }
 
         response = post(params)
@@ -294,7 +295,7 @@ module MediaWiki
         params = {
           action: 'query',
           list: 'allimages',
-          ailimit: MediaWiki::Query.get_limited(limit)
+          ailimit: get_limited(limit)
         }
 
         response = post(params)
@@ -314,7 +315,7 @@ module MediaWiki
           action: 'query',
           list: 'allpages',
           apnamespace: namespace,
-          aplimit: MediaWiki::Query.get_limited(limit)
+          aplimit: get_limited(limit)
         }
 
         response = post(params)
@@ -333,7 +334,7 @@ module MediaWiki
         params = {
           action: 'query',
           list: 'allusers',
-          aulimit: MediaWiki::Query.get_limited(limit)
+          aulimit: get_limited(limit)
         }
         params[:augroup] = group unless group.nil?
 
@@ -353,7 +354,7 @@ module MediaWiki
         params = {
           action: 'query',
           list: 'blocks',
-          bklimit: MediaWiki::Query.get_limited(limit),
+          bklimit: get_limited(limit),
           bkprop: 'id'
         }
 
@@ -374,7 +375,7 @@ module MediaWiki
           action: 'query',
           list: 'embeddedin',
           eititle: page,
-          eilimit: MediaWiki::Query.get_limited(limit)
+          eilimit: get_limited(limit)
         }
 
         response = post(params)
@@ -393,7 +394,7 @@ module MediaWiki
         params = {
           action: 'query',
           list: 'filearchive',
-          falimit: MediaWiki::Query.get_limited(limit)
+          falimit: get_limited(limit)
         }
 
         response = post(params)
@@ -412,7 +413,7 @@ module MediaWiki
         params = {
           action: 'query',
           list: 'protectedtitles',
-          ptlimit: MediaWiki::Query.get_limited(limit)
+          ptlimit: get_limited(limit)
         }
         params[:ptlevel] = protection_level unless protection_level.nil?
 
@@ -435,7 +436,7 @@ module MediaWiki
           action: 'query',
           list: 'usercontribs',
           ucuser: user,
-          uclimit: MediaWiki::Query.get_limited(limit),
+          uclimit: get_limited(limit),
           ucprop: 'ids|title|comment|size|sizediff|flags|patrolled'
         }
 

data/lib/mediawiki/query/properties/contributors.rb

@@ -1,3 +1,5 @@
+require_relative '../query'
+
 module MediaWiki
   module Query
     module Properties
@@ -46,7 +48,7 @@ module MediaWiki
             action: 'query',
             prop: 'contributors',
             titles: title,
-            pclimit: MediaWiki::Query.get_limited(limit)
+            pclimit: get_limited(limit)
           }
 
           post(params)

data/lib/mediawiki/query/properties/files.rb

@@ -1,3 +1,5 @@
+require_relative '../query'
+
 module MediaWiki
   module Query
     module Properties
@@ -12,7 +14,7 @@ module MediaWiki
             action: 'query',
             prop: 'duplicatefiles',
             titles: title,
-            dflimit: MediaWiki::Query.get_limited(limit)
+            dflimit: get_limited(limit)
           }
 
           response = post(params)
@@ -34,7 +36,7 @@ module MediaWiki
             action: 'query',
             generator: 'allimages',
             prop: 'duplicatefiles',
-            dflimit: MediaWiki::Query.get_limited(limit)
+            dflimit: get_limited(limit)
           }
 
           response = post(params)

data/lib/mediawiki/query/properties/pages.rb

@@ -1,3 +1,5 @@
+require_relative '../query'
+
 module MediaWiki
   module Query
     module Properties
@@ -85,7 +87,7 @@ module MediaWiki
             action: 'query',
             titles: page,
             prop: 'extlinks',
-            ellimit: MediaWiki::Query.get_limited(limit)
+            ellimit: get_limited(limit)
           }
 
           response = post(params)
@@ -302,7 +304,7 @@ module MediaWiki
             action: 'query',
             prop: 'images',
             titles: page,
-            imlimit: MediaWiki::Query.get_limited(limit)
+            imlimit: get_limited(limit)
           }
 
           response = post(params)
@@ -330,7 +332,7 @@ module MediaWiki
             action: 'query',
             prop: 'templates',
             titles: page,
-            tllimit: MediaWiki::Query.get_limited(limit)
+            tllimit: get_limited(limit)
           }
 
           response = post(params)
@@ -358,7 +360,7 @@ module MediaWiki
             action: 'query',
             prop: 'iwlinks',
             titles: page,
-            tllimit: MediaWiki::Query.get_limited(limit)
+            tllimit: get_limited(limit)
           }
 
           response = post(params)
@@ -388,7 +390,7 @@ module MediaWiki
             action: 'query',
             prop: 'langlinks',
             titles: page,
-            lllimit: MediaWiki::Query.get_limited(limit),
+            lllimit: get_limited(limit),
             llprop: 'url|langname|autonym'
           }
 
@@ -422,7 +424,7 @@ module MediaWiki
             action: 'query',
             prop: 'links',
             titles: page,
-            pllimit: MediaWiki::Query.get_limited(limit)
+            pllimit: get_limited(limit)
           }
 
           response = post(params)

data/lib/mediawiki/query/properties/properties.rb

@@ -16,7 +16,7 @@ module MediaWiki
       # @return [String] The token. If the butt isn't logged in, it returns
       #   with '+\\'.
       def get_token(type, title = nil)
-        if @logged_in == true
+        if @logged_in
           # There is some weird thing with MediaWiki where you must pass a valid
           #   inprop parameter in order to get any response at all. This is why
           #   there is a displaytitle inprop as well as gibberish in the titles

data/lib/mediawiki/query/query.rb

@@ -10,8 +10,6 @@ module MediaWiki
 
     protected
 
-    module_function
-
     # Gets the limited version of the integer, to ensure nobody provides an int
     #   that is too large.
     # @param integer [Int] The number to limit.
@@ -19,15 +17,15 @@ module MediaWiki
     # @param max_bot [Int] The maximum limit for bot users.
     # @return [Int] The capped number.
     def get_limited(integer, max_user = 500, max_bot = 5000)
-      if integer > 500
-        if user_bot? == true
-          if integer > 5000
-            return 5000
+      if integer > max_user
+        if user_bot?
+          if integer > max_bot
+            return max_bot
           else
             return integer
           end
         else
-          return 500
+          return max_user
         end
       else
         return integer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediawiki-butt
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Eli Foster
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -25,9 +25,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.6.0.1
-description: "    MediaWiki::Butt is a Ruby Gem that provides a fully-featured MediaWiki
-  API     interface. It includes methods for changing wiki content, authentication,
-  \    and queries.\n\n"
+description: |2+
+      MediaWiki::Butt provides a fully-featured interface to the MediaWiki API.     It includes methods for changing wiki content, authentication,     and queries.
+
 email: elifosterwy@gmail.com
 executables: []
 extensions: []