inat-get 0.8.0.11 → 0.8.0.13

data/lib/inat/data/types/location.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-class Location
+module INat::Data; end
+module INat::Data::Types; end
+
+class INat::Data::Types::Location
 
   class << self
 
@@ -53,7 +56,7 @@ class Location
 
 end
 
-class Radius
+class INat::Data::Types::Radius
 
   attr_reader :latitude, :longitude, :radius
 
@@ -66,7 +69,7 @@ class Radius
 
 end
 
-class Sector
+class INat::Data::Types::Sector
 
   attr_reader :north, :east, :south, :west
 
@@ -80,10 +83,16 @@ class Sector
 
 end
 
-def radius latitude, longitude, radius
-  Radius::new latitude, longitude, radius
-end
+module INat::Data::Types
+
+  def radius latitude, longitude, radius
+    Radius::new latitude, longitude, radius
+  end
+
+  def sector north, east, south, west
+    Sector::new north, east, south, west
+  end
+
+  module_function :radius, :sector
 
-def sector north, east, south, west
-  Sector::new north, east, south, west
 end

data/lib/inat/data/types/std.rb

@@ -1,170 +1,186 @@
 # frozen_string_literal: true
 
-require 'time'
-require 'date'
-require 'uri'
+require "time"
+require "date"
+require "uri"
 
-class Integer
+module INat::Types; end
 
-  def self.parse src
-    return nil if src == nil
-    return src if Integer === src
-    return src.to_i if String === src
-    raise TypeError, "Source must be a String!", caller
-  end
-
-  def self.ddl
-    :INTEGER
-  end
-
-  def self.from_db src
-    return nil if src == nil
-    return src if Integer === src
-    raise TypeError, "Source must be an Integer!", caller
-  end
-
-  def to_db
-    self
-  end
+module Boolean
+end
 
-  def to_query
-    to_s
-  end
+class TrueClass
+  include Boolean
+end
 
+class FalseClass
+  include Boolean
 end
 
-class String
+# TODO: возможно, разбить по функционалу
 
-  def self.parse src
-    return nil if src == nil
-    return src if String === src
-    raise TypeError, "Source must be a String!", caller
-  end
+module INat::Types::Std
+  refine Boolean do
+    def to_db
+      self && 1 || 0
+    end
 
-  def self.ddl
-    :TEXT
+    def to_query
+      inspect
+    end
   end
 
-  def self.from_db src
-    return nil if src == nil
-    return src if String === src
-    raise TypeError, "Source must be a String!", caller
-  end
+  refine Boolean.singleton_class do
+    def parse(src)
+      return nil if src == nil
+      return src if Boolean === src
+      raise TypeError, "Source must be a Boolean!", caller
+    end
 
-  def to_db
-    self
-  end
+    def ddl
+      :INTEGER
+    end
 
-  def to_query
-    self
+    def from_db(src)
+      return nil if src == nil
+      return src if Boolean === src
+      return src != 0 if Integer === src
+      raise TypeError, "Source must be an Integer!", caller
+    end
   end
 
-end
-
-class Symbol
+  refine Integer do
+    def to_db
+      self
+    end
 
-  def self.parse src
-    return nil if src == nil
-    return src if Symbol === src
-    return src.intern if String === src
-    raise TypeError, "Source must be a String!", caller
+    def to_query
+      to_s
+    end
   end
 
-  def self.ddl
-    :TEXT
-  end
+  refine Integer.singleton_class do
+    def parse(src)
+      return nil if src == nil
+      return src if Integer === src
+      return src.to_i if String === src
+      raise TypeError, "Source must be a String!", caller
+    end
 
-  def self.from_db src
-    return nil if src == nil
-    return src if Symbol === src
-    return src.intern if String === src
-    raise TypeError, "Source must be a String!", caller
-  end
+    def ddl
+      :INTEGER
+    end
 
-  def to_db
-    self.to_s
+    def from_db(src)
+      return nil if src == nil
+      return src if Integer === src
+      raise TypeError, "Source must be an Integer!", caller
+    end
   end
 
-  def to_query
-    to_s
-  end
+  refine String do
+    def to_db
+      self
+    end
 
-end
+    def to_query
+      self
+    end
+  end
 
-class Float
+  refine String.singleton_class do
+    def parse(src)
+      return nil if src == nil
+      return src if String === src
+      raise TypeError, "Source must be a String!", caller
+    end
 
-  def self.parse src
-    return nil if src == nil
-    return src if Float === src
-    return src.to_f if String === src || Integer === src
-    raise TypeError, "Source must be a String!", caller
-  end
+    def ddl
+      :TEXT
+    end
 
-  def self.ddl
-    :REAL
+    def from_db(src)
+      return nil if src == nil
+      return src if String === src
+      raise TypeError, "Source must be a String!", caller
+    end
   end
 
-  def self.from_db src
-    return nil if src == nil
-    return src if Float === src
-    raise TypeError, "Source must be a Float!", caller
-  end
+  refine Symbol do
+    def to_db
+      self.to_s
+    end
 
-  def to_db
-    self
+    def to_query
+      to_s
+    end
   end
 
-  def to_query
-    to_s
-  end
+  refine Symbol.singleton_class do
+    def parse(src)
+      return nil if src == nil
+      return src if Symbol === src
+      return src.intern if String === src
+      raise TypeError, "Source must be a String!", caller
+    end
 
-end
+    def ddl
+      :TEXT
+    end
 
-class Time
+    def from_db(src)
+      return nil if src == nil
+      return src if Symbol === src
+      return src.intern if String === src
+      raise TypeError, "Source must be a String!", caller
+    end
+  end
 
-  class << self
+  refine Float do
+    def to_db
+      self
+    end
 
-    alias :std_parse :parse
+    def to_query
+      to_s
+    end
+  end
 
-    def parse src
+  refine Float.singleton_class do
+    def parse(src)
       return nil if src == nil
-      return src if Time === src
-      return std_parse(src) if String === src
+      return src if Float === src
+      return src.to_f if String === src || Integer === src
       raise TypeError, "Source must be a String!", caller
     end
 
     def ddl
-      :INTEGER
+      :REAL
     end
 
-    def from_db src
+    def from_db(src)
       return nil if src == nil
-      return src if Time === src
-      return Time::at(src) if Integer === src
-      raise TypeError, "Source must be an Integer!", caller
+      return src if Float === src
+      raise TypeError, "Source must be a Float!", caller
     end
-
   end
 
-  def to_db
-    to_i
-  end
+  refine Time do
+    def to_db
+      to_i
+    end
 
-  def to_query
-    xmlschema
+    def to_query
+      xmlschema
+    end
   end
 
-end
-
-class Date
-
-  class << self
-
+  refine Time.singleton_class do
     alias :std_parse :parse
 
-    def parse src
+    def parse(src)
       return nil if src == nil
-      return src if Date === src
+      return src if Time === src
       return std_parse(src) if String === src
       raise TypeError, "Source must be a String!", caller
     end
@@ -173,79 +189,62 @@ class Date
       :INTEGER
     end
 
-    def from_db src
+    def from_db(src)
       return nil if src == nil
-      return src if Date === src
-      return Time::at(src).to_date if Integer === src
+      return src if Time === src
+      return Time::at(src) if Integer === src
       raise TypeError, "Source must be an Integer!", caller
     end
-
   end
 
-  def to_db
-    to_time.to_i
-  end
+  refine Date do
+    def to_db
+      to_time.to_i
+    end
 
-  def to_query
-    xmlschema
+    def to_query
+      xmlschema
+    end
   end
 
-end
-
-module Boolean
-
-  class << self
+  refine Date.singleton_class do
+    alias :std_parse :parse
 
-    def parse src
+    def parse(src)
       return nil if src == nil
-      return src if Boolean === src
-      raise TypeError, "Source must be a Boolean!", caller
+      return src if Date === src
+      return std_parse(src) if String === src
+      raise TypeError, "Source must be a String!", caller
     end
 
     def ddl
       :INTEGER
     end
 
-    def from_db src
+    def from_db(src)
       return nil if src == nil
-      return src if Boolean === src
-      return src != 0 if Integer === src
+      return src if Date === src
+      return Time::at(src).to_date if Integer === src
       raise TypeError, "Source must be an Integer!", caller
     end
-
   end
 
-  def to_db
-    self && 1 || 0
-  end
-
-  def to_query
-    inspect
+  refine URI do
+    def to_db
+      to_s
+    end
   end
 
-end
-
-class TrueClass
-  include Boolean
-end
-
-class FalseClass
-  include Boolean
-end
-
-module URI
-
-  class << self
-
+  refine URI.singleton_class do
     pre_verbose = $VERBOSE
     $VERBOSE = nil
 
     alias :std_parse :parse
 
-    def parse src
+    def parse(src)
       return nil if src == nil
       return src if URI === src
-      url = URI::DEFAULT_PARSER.escape(src).gsub('+', '%2B')
+      url = URI::DEFAULT_PARSER.escape(src).gsub("+", "%2B")
       return std_parse(url) if String === src
       raise TypeError, "Source must be a String!", caller
     end
@@ -256,38 +255,34 @@ module URI
       :TEXT
     end
 
-    def from_db src
+    def from_db(src)
       parse src
       # return nil if src == nil
       # return src if URI === src
       # return URI(URI::DEFAULT_PARSER.escape(src)) if String === src
       # raise TypeError, "Source must be a String!", caller
     end
-
-  end
-
-  def to_db
-    to_s
   end
 
-end
-
-class NilClass
+  refine NilClass do
+    def self.parse(src)
+      nil
+    end
 
-  def self.parse src
-    nil
+    def to_db
+      nil
+    end
   end
 
-  def to_db
-    nil
+  refine Array do
+    def to_query
+      map { |i| i.to_query }.join(",")
+    end
   end
 
-end
-
-class Array
-
-  def to_query
-    map { |i| i.to_query }.join(',')
+  refine Module do
+    def short_name
+      name.split("::").last
+    end
   end
-
 end