mediawiktory 0.0.1 → 0.0.2

data/lib/mediawiktory/generated/userinfo.rb

@@ -2,6 +2,6 @@ module MediaWiktory
   class Userinfo < MWModule
     symbol :userinfo
     prefix "ui"
-    param :prop, Params::List[Params::Enum["blockinfo", "hasmsg", "groups", "implicitgroups", "rights", "changeablegroups", "options", "preferencestoken", "editcount", "ratelimits", "email", "realname", "acceptlang", "registrationdate", "unreadcount"]]
+    param :prop, Params::List[Params::Enum[:blockinfo, :hasmsg, :groups, :implicitgroups, :rights, :changeablegroups, :options, :preferencestoken, :editcount, :ratelimits, :email, :realname, :acceptlang, :registrationdate, :unreadcount]]
   end
 end

data/lib/mediawiktory/generated/userrights.rb

@@ -4,8 +4,8 @@ module MediaWiktory
     post!
     param :user, Params::String
     param :userid, Params::Integer
-    param :add, Params::List[Params::Enum["bot", "sysop", "bureaucrat", "reviewer", "steward", "accountcreator", "import", "transwiki", "ipblock-exempt", "oversight", "founder", "rollbacker", "autoreviewer", "researcher", "filemover", "checkuser", "templateeditor", "massmessage-sender", "abusefilter", "epcoordinator", "eponline", "epcampus", "epinstructor", "suppress", "flow-bot", "confirmed"]]
-    param :remove, Params::List[Params::Enum["bot", "sysop", "bureaucrat", "reviewer", "steward", "accountcreator", "import", "transwiki", "ipblock-exempt", "oversight", "founder", "rollbacker", "autoreviewer", "researcher", "filemover", "checkuser", "templateeditor", "massmessage-sender", "abusefilter", "epcoordinator", "eponline", "epcampus", "epinstructor", "suppress", "flow-bot", "confirmed"]]
+    param :add, Params::List[Params::Enum[:bot, :sysop, :bureaucrat, :reviewer, :steward, :accountcreator, :import, :transwiki, :"ipblock-exempt", :oversight, :founder, :rollbacker, :autoreviewer, :researcher, :filemover, :checkuser, :templateeditor, :"massmessage-sender", :abusefilter, :epcoordinator, :eponline, :epcampus, :epinstructor, :suppress, :"flow-bot", :confirmed]]
+    param :remove, Params::List[Params::Enum[:bot, :sysop, :bureaucrat, :reviewer, :steward, :accountcreator, :import, :transwiki, :"ipblock-exempt", :oversight, :founder, :rollbacker, :autoreviewer, :researcher, :filemover, :checkuser, :templateeditor, :"massmessage-sender", :abusefilter, :epcoordinator, :eponline, :epcampus, :epinstructor, :suppress, :"flow-bot", :confirmed]]
     param :reason, Params::String
     param :token, Params::String
   end

data/lib/mediawiktory/generated/users.rb

@@ -2,8 +2,8 @@ module MediaWiktory
   class Users < MWModule
     symbol :users
     prefix "us"
-    param :prop, Params::List[Params::Enum["blockinfo", "groups", "implicitgroups", "rights", "editcount", "registration", "emailable", "gender"]]
+    param :prop, Params::List[Params::Enum[:blockinfo, :groups, :implicitgroups, :rights, :editcount, :registration, :emailable, :gender]]
     param :users, Params::List[Params::String]
-    param :token, Params::List[Params::Enum["userrights"]]
+    param :token, Params::List[Params::Enum[:userrights]]
   end
 end

data/lib/mediawiktory/generated/videoinfo.rb

@@ -2,7 +2,7 @@ module MediaWiktory
   class Videoinfo < MWModule
     symbol :videoinfo
     prefix "vi"
-    param :prop, Params::List[Params::Enum["timestamp", "user", "userid", "comment", "parsedcomment", "canonicaltitle", "url", "size", "dimensions", "sha1", "mime", "thumbmime", "mediatype", "metadata", "commonmetadata", "extmetadata", "archivename", "bitdepth", "uploadwarning", "derivatives"]]
+    param :prop, Params::List[Params::Enum[:timestamp, :user, :userid, :comment, :parsedcomment, :canonicaltitle, :url, :size, :dimensions, :sha1, :mime, :thumbmime, :mediatype, :metadata, :commonmetadata, :extmetadata, :archivename, :bitdepth, :uploadwarning, :derivatives]]
     param :limit, Params::IntegerOrMax
     param :start, Params::Timestamp
     param :end, Params::Timestamp

data/lib/mediawiktory/generated/view-header.rb

@@ -2,7 +2,7 @@ module MediaWiktory
   class ViewHeader < MWModule
     symbol :"view-header"
     prefix "vh"
-    param :format, Params::Enum["html", "wikitext", "fixed-html"]
+    param :format, Params::Enum[:html, :wikitext, :"fixed-html"]
     param :revId, Params::String
   end
 end

data/lib/mediawiktory/generated/view-post-history.rb

@@ -3,6 +3,6 @@ module MediaWiktory
     symbol :"view-post-history"
     prefix "vph"
     param :postId, Params::String
-    param :format, Params::Enum["html", "wikitext", "fixed-html"]
+    param :format, Params::Enum[:html, :wikitext, :"fixed-html"]
   end
 end

data/lib/mediawiktory/generated/view-post.rb

@@ -3,6 +3,6 @@ module MediaWiktory
     symbol :"view-post"
     prefix "vp"
     param :postId, Params::String
-    param :format, Params::Enum["html", "wikitext", "fixed-html"]
+    param :format, Params::Enum[:html, :wikitext, :"fixed-html"]
   end
 end

data/lib/mediawiktory/generated/view-topic-history.rb

@@ -2,6 +2,6 @@ module MediaWiktory
   class ViewTopicHistory < MWModule
     symbol :"view-topic-history"
     prefix "vth"
-    param :format, Params::Enum["html", "wikitext", "fixed-html"]
+    param :format, Params::Enum[:html, :wikitext, :"fixed-html"]
   end
 end

data/lib/mediawiktory/generated/view-topic-summary.rb

@@ -2,7 +2,7 @@ module MediaWiktory
   class ViewTopicSummary < MWModule
     symbol :"view-topic-summary"
     prefix "vts"
-    param :format, Params::Enum["html", "wikitext", "fixed-html"]
+    param :format, Params::Enum[:html, :wikitext, :"fixed-html"]
     param :revId, Params::String
   end
 end

data/lib/mediawiktory/generated/view-topic.rb

@@ -2,6 +2,6 @@ module MediaWiktory
   class ViewTopic < MWModule
     symbol :"view-topic"
     prefix "vt"
-    param :format, Params::Enum["html", "wikitext", "fixed-html"]
+    param :format, Params::Enum[:html, :wikitext, :"fixed-html"]
   end
 end

data/lib/mediawiktory/generated/view-topiclist.rb

@@ -2,14 +2,14 @@ module MediaWiktory
   class ViewTopiclist < MWModule
     symbol :"view-topiclist"
     prefix "vtl"
-    param :"offset-dir", Params::Enum["fwd", "rev"]
-    param :sortby, Params::Enum["newest", "updated", "user"]
+    param :"offset-dir", Params::Enum[:fwd, :rev]
+    param :sortby, Params::Enum[:newest, :updated, :user]
     param :savesortby, Params::Boolean
     param :"offset-id", Params::String
     param :offset, Params::String
     param :"include-offset", Params::Boolean
     param :limit, Params::IntegerOrMax
     param :toconly, Params::Boolean
-    param :format, Params::Enum["html", "wikitext", "fixed-html"]
+    param :format, Params::Enum[:html, :wikitext, :"fixed-html"]
   end
 end

data/lib/mediawiktory/generated/visualeditor.rb

@@ -2,8 +2,8 @@ module MediaWiktory
   class Visualeditor < Action
     symbol :visualeditor
     param :page, Params::String
-    param :format, Params::Enum["json", "jsonfm"]
-    param :paction, Params::Enum["parse", "metadata", "parsefragment", "serialize", "serializeforcache", "diff", "getlanglinks"]
+    param :format, Params::Enum[:json, :jsonfm]
+    param :paction, Params::Enum[:parse, :metadata, :parsefragment, :serialize, :serializeforcache, :diff, :getlanglinks]
     param :wikitext, Params::String
     param :oldid, Params::String
     param :html, Params::String

data/lib/mediawiktory/generated/watchlist.rb

@@ -5,14 +5,14 @@ module MediaWiktory
     param :allrev, Params::Boolean
     param :start, Params::Timestamp
     param :end, Params::Timestamp
-    param :namespace, Params::List[Params::Enum["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "100", "101", "108", "109", "118", "119", "2300", "2301", "2302", "2303", "710", "711", "446", "447", "2600", "828", "829"]]
+    param :namespace, Params::List[Params::Enum[:"0", :"1", :"2", :"3", :"4", :"5", :"6", :"7", :"8", :"9", :"10", :"11", :"12", :"13", :"14", :"15", :"100", :"101", :"108", :"109", :"118", :"119", :"2300", :"2301", :"2302", :"2303", :"710", :"711", :"446", :"447", :"2600", :"828", :"829"]]
     param :user, Params::String
     param :excludeuser, Params::String
-    param :dir, Params::Enum["newer", "older"]
+    param :dir, Params::Enum[:newer, :older]
     param :limit, Params::IntegerOrMax
-    param :prop, Params::List[Params::Enum["ids", "title", "flags", "user", "userid", "comment", "parsedcomment", "timestamp", "patrol", "sizes", "notificationtimestamp", "loginfo"]]
-    param :show, Params::List[Params::Enum["minor", "!minor", "bot", "!bot", "anon", "!anon", "patrolled", "!patrolled", "unread", "!unread"]]
-    param :type, Params::List[Params::Enum["edit", "external", "new", "log"]]
+    param :prop, Params::List[Params::Enum[:ids, :title, :flags, :user, :userid, :comment, :parsedcomment, :timestamp, :patrol, :sizes, :notificationtimestamp, :loginfo]]
+    param :show, Params::List[Params::Enum[:minor, :"!minor", :bot, :"!bot", :anon, :"!anon", :patrolled, :"!patrolled", :unread, :"!unread"]]
+    param :type, Params::List[Params::Enum[:edit, :external, :new, :log]]
     param :owner, Params::String
     param :token, Params::String
     param :continue, Params::String

data/lib/mediawiktory/generated/watchlistraw.rb

@@ -3,13 +3,13 @@ module MediaWiktory
     symbol :watchlistraw
     prefix "wr"
     param :continue, Params::String
-    param :namespace, Params::List[Params::Enum["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "100", "101", "108", "109", "118", "119", "2300", "2301", "2302", "2303", "710", "711", "446", "447", "2600", "828", "829"]]
+    param :namespace, Params::List[Params::Enum[:"0", :"1", :"2", :"3", :"4", :"5", :"6", :"7", :"8", :"9", :"10", :"11", :"12", :"13", :"14", :"15", :"100", :"101", :"108", :"109", :"118", :"119", :"2300", :"2301", :"2302", :"2303", :"710", :"711", :"446", :"447", :"2600", :"828", :"829"]]
     param :limit, Params::IntegerOrMax
-    param :prop, Params::List[Params::Enum["changed"]]
-    param :show, Params::List[Params::Enum["changed", "!changed"]]
+    param :prop, Params::List[Params::Enum[:changed]]
+    param :show, Params::List[Params::Enum[:changed, :"!changed"]]
     param :owner, Params::String
     param :token, Params::String
-    param :dir, Params::Enum["newer", "older"]
+    param :dir, Params::Enum[:newer, :older]
     param :fromtitle, Params::String
     param :totitle, Params::String
   end

data/lib/mediawiktory/generated/wikibase.rb

@@ -2,6 +2,6 @@ module MediaWiktory
   class Wikibase < MWModule
     symbol :wikibase
     prefix "wb"
-    param :prop, Params::List[Params::Enum["url", "siteid"]]
+    param :prop, Params::List[Params::Enum[:url, :siteid]]
   end
 end

data/lib/mediawiktory/generated/wikisets.rb

@@ -3,7 +3,7 @@ module MediaWiktory
     symbol :wikisets
     prefix "ws"
     param :from, Params::String
-    param :prop, Params::List[Params::Enum["type", "wikisincluded", "wikisnotincluded"]]
+    param :prop, Params::List[Params::Enum[:type, :wikisincluded, :wikisnotincluded]]
     param :limit, Params::IntegerOrMax
     param :orderbyname, Params::Boolean
   end

data/lib/mediawiktory/generated/zeroconfig.rb

@@ -1,7 +1,7 @@
 module MediaWiktory
   class Zeroconfig < Action
     symbol :zeroconfig
-    param :type, Params::Enum["config", "message"]
+    param :type, Params::Enum[:config, :message]
     param :agent, Params::String
   end
 end

data/lib/mediawiktory/mw_module.rb

@@ -100,12 +100,16 @@ module MediaWiktory
         attr_accessor :member_type
 
         def inspect
-          "#<List#{member_type}>"
+          "#<List[#{member_type}]>"
         end
 
         alias_method :to_s, :inspect
       end
 
+      def value=(val)
+        super([*val])
+      end
+
       def self.valid?(val)
         member_type or fail(NotImplementedError, "Abstract list used as param type")
         val.is_a?(Array) && val.all?{|v| member_type.valid?(v)}
@@ -188,7 +192,7 @@ module MediaWiktory
 
       def coerce_modules(value)
         # making array of 1-item hashes
-        value.map{|val|
+        [*value].map{|val|
           case val
           when Symbol
             {val => {}}

data/lib/mediawiktory/page.rb

@@ -0,0 +1,46 @@
+module MediaWiktory
+  class Page
+    attr_reader :id, :title, :raw
+
+    def initialize(raw)
+      @raw = raw
+      @title = raw.title
+      @id = raw.pageid
+    end
+
+    def content
+      revisions.first['*']
+    end
+
+    def missing?
+      !!raw.missing
+    end
+
+    def invalid?
+      !!raw.invalid
+    end
+
+    def exists?
+      !missing? && !invalid?
+    end
+
+    def merge!(other)
+      id == other.id or
+        fail(ArgumentError, "Trying to merge different pageids: #{id}/#{other.id}")
+        
+      other.raw.each do |key, value|
+        raw.key?(key) or fail(ArgumentError, "Unknown key in continued page: #{key}")
+        next unless raw[key].is_a?(Array)
+        raw[key].concat(value)
+      end
+    end
+
+    def method_missing(sym, *args)
+      super unless args.empty?
+      exists? or
+        fail("Page #{title} is missing, can't access #{sym}")
+        
+      raw.fetch(sym)
+    end
+  end
+end

data/lib/mediawiktory/query.rb

@@ -1,4 +1,4 @@
-require_relative 'array_with_keys'
+require_relative 'page'
 
 module MediaWiktory
   class Query
@@ -7,18 +7,27 @@ module MediaWiktory
     end
   
     class Response < Action::Response
-      def pages
-        @pages ||= ArrayWithKeys.from_hash(raw.query.pages || {})
+      attr_reader :pages, :continue_params
+      
+      def initialize(*)
+        super
+        @pages = ((raw.query.pages if raw.query) || {}).values.map(&Page.method(:new))
+        @continue_params = raw.continue && raw.continue.dup
+      end
+
+      def initialize_copy(other)
+        super(other)
+        @pages = other.pages.dup
       end
 
       def continue?
-        !raw.continue.nil?
+        !@continue_params.nil?
       end
 
       def continue!
         continue? or fail(RuntimeError, "Response can not be continued")
         
-        merge!(action.perform(raw.continue))
+        merge!(action.perform(@continue_params))
 
         self
       end
@@ -32,28 +41,17 @@ module MediaWiktory
       def merge!(other)
         # FIXME: not the brightest code in my life, faithfully
         # FIXME2: after this merge, only @pages are updated, but @raw.query.pages IS NOT
-        other.pages.to_h.each do |k, p|
-          if (existing = pages[k])
-            merge_page(existing, p)
+        other.pages.each do |other_page|
+          existing = pages.detect{|p| p.id == other_page.id}
+          
+          if existing
+            existing.merge!(other_page)
           else
-            pages.push(p, p.id)
+            pages.push(other_page)
           end
         end
 
-        raw.continue = other.raw.continue
-      end
-
-      def merge_page(existing, other)
-        other.each do |k, v|
-          case existing[k]
-          when Array
-            existing[k].concat(v)
-          when Hash
-            existing[k].merge!(v)
-          else
-            existing[k] = v
-          end
-        end
+        @continue_params = other.continue_params
       end
     end
   end

data/lib/mediawiktory/version.rb

@@ -1,3 +1,6 @@
 module MediaWiktory
-  VERSION = '0.0.1'
+  MAJOR = 0
+  MINOR = 0
+  PATCH = 2
+  VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

data/script/lib/parameter.rb

@@ -106,7 +106,7 @@ module ApiParser
           vals.map(&:module).each{|m| m.write(base_path)}
           "Params::Modules#{vals.map(&:name).map(&:to_sym)}"
         else
-          "Params::List[Params::Enum#{vals.map(&:name).map(&:to_s)}]"
+          "Params::List[Params::Enum#{vals.map(&:name).map(&:to_sym)}]"
         end
       when 'list of integers'
         'Params::List[Params::Integer]'
@@ -114,14 +114,11 @@ module ApiParser
         'Params::List[Params::Timestamp]'
       when 'enum'
         case
-        #when name == 'generator'
-          #vals.map(&:module).each{|m| m.write(base_path)}
-          #"Params::Module#{vals.map(&:name).map{|n| ('g' + n).to_sym}}"
         when vals.first.module
           vals.map(&:module).each{|m| m.write(base_path)}
           "Params::Module#{vals.map(&:name).map(&:to_sym)}"
         else
-          "Params::Enum#{vals.map(&:name).map(&:to_s)}"
+          "Params::Enum#{vals.map(&:name).map(&:to_sym)}"
         end
       else
         fail("Unrecognized param type: #{type}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediawiktory
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -72,7 +72,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile.lock
+- CHANGELOG.md
+- CONTRIBUTING.md
+- LICENSE.txt
 - README.md
 - bin/mediawiktory
 - doc/mediawiki_api_types.md
@@ -82,7 +84,6 @@ files:
 - lib/media_wiktory.rb
 - lib/mediawiktory.rb
 - lib/mediawiktory/action.rb
-- lib/mediawiktory/array_with_keys.rb
 - lib/mediawiktory/client.rb
 - lib/mediawiktory/generated/abusefiltercheckmatch.rb
 - lib/mediawiktory/generated/abusefilterchecksyntax.rb
@@ -303,6 +304,7 @@ files:
 - lib/mediawiktory/generated/wikisets.rb
 - lib/mediawiktory/generated/zeroconfig.rb
 - lib/mediawiktory/mw_module.rb
+- lib/mediawiktory/page.rb
 - lib/mediawiktory/query.rb
 - lib/mediawiktory/version.rb
 - lib/nokogiri/more.rb

data/Gemfile.lock

@@ -1,63 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mediawiktory (0.0.1)
-      addressable
-      faraday
-      faraday_middleware
-      hashie
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.3.8)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    faker (1.5.0)
-      i18n (~> 0.5)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    hashie (3.4.2)
-    i18n (0.7.0)
-    mini_portile (0.6.2)
-    multipart-post (2.0.0)
-    naught (1.1.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.3.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubygems-tasks (0.2.4)
-    safe_yaml (1.0.4)
-    webmock (1.21.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  faker
-  mediawiktory!
-  naught
-  nokogiri
-  rspec
-  rspec-its
-  rubygems-tasks
-  webmock