@@ -25,8 +25,8 @@ defmodule BACnet.Protocol.DateRange do
2525 """
2626 @ spec get_date_range ( t ( ) ) :: { :ok , Date.Range . t ( ) } | { :error , term ( ) }
2727 def get_date_range ( % __MODULE__ { } = date_range ) do
28- if is_date_specific_enough_for_date_range ( date_range . start_date ) and
29- is_date_specific_enough_for_date_range ( date_range . end_date ) do
28+ if date_specific_enough_for_date_range? ( date_range . start_date ) and
29+ date_specific_enough_for_date_range? ( date_range . end_date ) do
3030 with { :ok , start_date } <- BACnetDate . to_date ( date_range . start_date ) ,
3131 { :ok , end_date } <- BACnetDate . to_date ( date_range . end_date ) do
3232 { :ok , Date . range ( start_date , end_date ) }
@@ -88,15 +88,15 @@ defmodule BACnet.Protocol.DateRange do
8888 } = _t
8989 ) do
9090 BACnetDate . valid? ( start_date ) and BACnetDate . valid? ( end_date ) and
91- is_valid_date_range ( start_date , end_date )
91+ valid_date_range? ( start_date , end_date )
9292 end
9393
9494 def valid? ( % __MODULE__ { } = _t ) , do: false
9595
96- @ spec is_valid_date_range ( BACnetDate . t ( ) , BACnetDate . t ( ) ) :: boolean ( )
97- defp is_valid_date_range ( % BACnetDate { } = start_date , % BACnetDate { } = end_date ) do
98- { any1 , all1 } = is_date_any_unspecified ( start_date )
99- { any2 , all2 } = is_date_any_unspecified ( end_date )
96+ @ spec valid_date_range? ( BACnetDate . t ( ) , BACnetDate . t ( ) ) :: boolean ( )
97+ defp valid_date_range? ( % BACnetDate { } = start_date , % BACnetDate { } = end_date ) do
98+ { any1 , all1 } = date_any_unspecified? ( start_date )
99+ { any2 , all2 } = date_any_unspecified? ( end_date )
100100
101101 # ASHRAE 135-2012: A date may be unspecific or a specific date only
102102 ( not any1 and not any2 and BACnetDate . compare ( start_date , end_date ) != :gt ) or
@@ -107,22 +107,22 @@ defmodule BACnet.Protocol.DateRange do
107107
108108 @ date_keys Map . keys ( Map . from_struct ( BACnetDate . __struct__ ( ) ) )
109109
110- defp is_date_any_unspecified ( % BACnetDate {
110+ defp date_any_unspecified? ( % BACnetDate {
111111 unquote_splicing ( Enum . map ( @ date_keys , & { & 1 , :unspecified } ) )
112112 } ) ,
113113 do: { true , true }
114114
115115 for key <- @ date_keys do
116- defp is_date_any_unspecified ( % BACnetDate { unquote ( key ) => :unspecified } ) , do: { true , false }
116+ defp date_any_unspecified? ( % BACnetDate { unquote ( key ) => :unspecified } ) , do: { true , false }
117117 end
118118
119- defp is_date_any_unspecified ( % BACnetDate { month: :odd } ) , do: { true , false }
120- defp is_date_any_unspecified ( % BACnetDate { month: :even } ) , do: { true , false }
121- defp is_date_any_unspecified ( % BACnetDate { day: :odd } ) , do: { true , false }
122- defp is_date_any_unspecified ( % BACnetDate { day: :even } ) , do: { true , false }
123- defp is_date_any_unspecified ( % BACnetDate { } = _date ) , do: { false , false }
119+ defp date_any_unspecified? ( % BACnetDate { month: :odd } ) , do: { true , false }
120+ defp date_any_unspecified? ( % BACnetDate { month: :even } ) , do: { true , false }
121+ defp date_any_unspecified? ( % BACnetDate { day: :odd } ) , do: { true , false }
122+ defp date_any_unspecified? ( % BACnetDate { day: :even } ) , do: { true , false }
123+ defp date_any_unspecified? ( % BACnetDate { } = _date ) , do: { false , false }
124124
125- defp is_date_specific_enough_for_date_range ( % BACnetDate {
125+ defp date_specific_enough_for_date_range? ( % BACnetDate {
126126 year: year ,
127127 month: mon ,
128128 day: day ,
@@ -131,5 +131,5 @@ defmodule BACnet.Protocol.DateRange do
131131 when is_integer ( year ) and is_integer ( mon ) and ( is_integer ( day ) or day == :last ) ,
132132 do: true
133133
134- defp is_date_specific_enough_for_date_range ( % BACnetDate { } = _date ) , do: false
134+ defp date_specific_enough_for_date_range? ( % BACnetDate { } = _date ) , do: false
135135end
0 commit comments