refactor

src/mechanize/form.cr

@@ -8,9 +8,10 @@ require "./form/button"
 require "./form/select_list"
 require "./utils/element_matcher"
 
-# This class represents the form tag of html.
-class Mechanize::Form
-  include Mechanize::ElementMatcher
+class Mechanize
+  # This class represents the form tag of html.
+  class Form
+    include ElementMatcher
 
     getter node : Node | Lexbor::Node
     # returns hoge array of `Mechanize::FormContent::Field` in the form.
@@ -32,20 +33,20 @@ class Mechanize::Form
     # return form's 'action' attribute.
     property action : String
     # returns the page which includes the form.
-  getter page : Mechanize::Page?
+    getter page : Page?
 
-  def initialize(node : Node | Lexbor::Node, page : Mechanize::Page? = nil)
+    def initialize(node : Node | Lexbor::Node, page : Page? = nil)
       @enctype = node.fetch("enctype", "application/x-www-form-urlencoded")
       @node = node
-    @fields = Array(Mechanize::FormContent::Field).new
-    @checkboxes = Array(Mechanize::FormContent::CheckBox).new
-    @radiobuttons = Array(Mechanize::FormContent::RadioButton).new
-    @selectboxes = Array(Mechanize::FormContent::MultiSelectList).new
-    @buttons = Array(Mechanize::FormContent::Button).new
+      @fields = Array(FormContent::Field).new
+      @checkboxes = Array(FormContent::CheckBox).new
+      @radiobuttons = Array(FormContent::RadioButton).new
+      @selectboxes = Array(FormContent::MultiSelectList).new
+      @buttons = Array(FormContent::Button).new
       @action = node.fetch("action", "")
       @method = node.fetch("method", "GET").upcase
       @name = node.fetch("name", "")
-    @clicked_buttons = Array(Mechanize::FormContent::Button).new
+      @clicked_buttons = Array(FormContent::Button).new
       @page = page
       # @mech             = mech
 
@@ -79,25 +80,25 @@ class Mechanize::Form
         type = (html_node["type"]? || "text").downcase
         case type
         when "checkbox"
-        checkboxes << Mechanize::FormContent::CheckBox.new(html_node, self)
+          checkboxes << FormContent::CheckBox.new(html_node, self)
         when "radio"
-        radiobuttons << Mechanize::FormContent::RadioButton.new(html_node, self)
+          radiobuttons << FormContent::RadioButton.new(html_node, self)
         when "button"
-        buttons << Mechanize::FormContent::Button.new(html_node, @node)
+          buttons << FormContent::Button.new(html_node, @node)
         when "submit"
-        buttons << Mechanize::FormContent::SubmitButton.new(html_node, @node)
+          buttons << FormContent::SubmitButton.new(html_node, @node)
         when "reset"
-        buttons << Mechanize::FormContent::ResetButton.new(html_node, @node)
+          buttons << FormContent::ResetButton.new(html_node, @node)
         when "image"
-        buttons << Mechanize::FormContent::ImageButton.new(html_node, @node)
+          buttons << FormContent::ImageButton.new(html_node, @node)
         when "text"
-        fields << Mechanize::FormContent::Text.new(html_node)
+          fields << FormContent::Text.new(html_node)
         when "hidden"
-        fields << Mechanize::FormContent::Hidden.new(html_node)
+          fields << FormContent::Hidden.new(html_node)
         when "textarea"
-        fields << Mechanize::FormContent::Textarea.new(html_node)
+          fields << FormContent::Textarea.new(html_node)
         else
-        fields << Mechanize::FormContent::Field.new(html_node)
+          fields << FormContent::Field.new(html_node)
         end
       end
 
@@ -160,7 +161,7 @@ class Mechanize::Form
           # raise Mechanize::Error,
           #      "radiobuttons #{values} are checked in the #{name} group, " \
           #      "only one is allowed"
-        raise Mechanize::Error.new
+          raise Error.new
         else
           successful_controls << checked.first unless checked.empty?
         end
@@ -201,4 +202,5 @@ class Mechanize::Form
 
       @clicked_buttons << button
     end
+  end
 end

src/mechanize/history.cr

@@ -7,11 +7,11 @@ class Mechanize
     # max page size history can save. default is 100.
     # as same as `agent.max_history`.
     property max_size : Int32
-    property array : Array(Mechanize::Page)
+    property array : Array(Page)
 
     delegate :size, :empty?, :last, to: array
 
-    def initialize(max_size = 100, array = Array(Mechanize::Page).new)
+    def initialize(max_size = 100, array = Array(Page).new)
       @max_size = max_size
       @array = array
     end

src/mechanize/http/agent.cr

@@ -9,12 +9,12 @@ class Mechanize
     class Agent
       property request_headers : ::HTTP::Headers
       property context : Mechanize?
-      property history : Mechanize::History
+      property history : History
       property user_agent : String
       property request_cookies : ::HTTP::Cookies
 
       def initialize(@context : Mechanize? = nil)
-        @history = Mechanize::History.new
+        @history = History.new
         @request_headers = ::HTTP::Headers.new
         @context = context
         @request_cookies = ::HTTP::Cookies.new
@@ -73,7 +73,7 @@ class Mechanize
       # ```
       # agent.current_page
       # ```
-      def current_page : Mechanize::Page
+      def current_page : Page
         @history.last
       end
 
@@ -81,7 +81,7 @@ class Mechanize
       # ```
       # agent.back
       # ```
-      def back : Mechanize::Page
+      def back : Page
         @history.pop
       end
 
@@ -116,7 +116,7 @@ class Mechanize
       end
 
       # Sets a Referer header.
-      def set_request_referer(referer : Mechanize::Page?)
+      def set_request_referer(referer : Page?)
         return unless referer
 
         request_headers["Referer"] = referer.uri.to_s

src/mechanize/page.cr

@@ -7,7 +7,7 @@ class Mechanize
   # If you send a request, it returns the instance of `Mechanize::Page`.
   # You can get status code, title, and page body, and search html node using css selector from page instance.
   class Page < Mechanize::File
-    include Mechanize::ElementMatcher
+    include ElementMatcher
 
     # look at lexbor document.(https://github.com/kostya/lexbor#readme)
     delegate :css, to: parser
@@ -42,7 +42,7 @@ class Mechanize
     # ```
     # page.forms # => Array(Mechanize::Form)
     # ```
-    def forms : Array(Mechanize::Form)
+    def forms : Array(Form)
       forms = css("form").map do |html_form|
         form = Form.new(html_form, self)
         form.action ||= @uri.to_s
@@ -54,7 +54,7 @@ class Mechanize
     # ```
     # page.links # => Array(Mechanize::PageContent::Link)
     # ```
-    def links : Array(Mechanize::PageContent::Link)
+    def links : Array(PageContent::Link)
       links = %w{a area}.map do |tag|
         css(tag).map do |node|
           PageContent::Link.new(node, @mech, self)

src/mechanize/page/link.cr

@@ -1,8 +1,9 @@
 # This class represents link element like <a> and <area>.
 # The instance of this class is clickable.
-class Mechanize::PageContent::Link
+class Mechanize
+  class PageContent::Link
     getter node : Lexbor::Node
-  getter page : Mechanize::Page
+    getter page : Page
     getter mech : Mechanize
     getter href : String
     getter text : String
@@ -19,4 +20,5 @@ class Mechanize::PageContent::Link
     def click
       @mech.click self
     end
+  end
 end

src/mechanize/utils/element_matcher.cr

@@ -65,7 +65,7 @@ class Mechanize
       def {{singular.id}}_with(criteria)
         f = {{plural.id}}_with(criteria)
         # TODO: Write correct error message.
-        raise Mechanize::ElementNotFoundError.new(:{{singular.id}}, "") if f.empty?
+        raise ElementNotFoundError.new(:{{singular.id}}, "") if f.empty?
         f.first
       end
     end