stupidedi 1.2.5 → 1.2.6

data/lib/stupidedi/versions/functional_groups/003010/element_types/string_val.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyTen
@@ -103,7 +105,6 @@ module Stupidedi
               include Comparable
 
               # (string any* -> any)
-              extend Forwardable
               def_delegators :value, :to_d, :to_s, :to_f, :to_c, :to_r, :to_sym, :to_str,
                 :hex, :oct, :ord, :sum, :length, :count, :index, :rindex,
                 :lines, :bytes, :chars, :each, :upto, :split, :scan, :unpack,
@@ -138,12 +139,7 @@ module Stupidedi
               def coerce(other)
                 # me, he = other.coerce(self)
                 # me <OP> he
-                if other.respond_to?(:to_str)
-                  return copy(:value => other.to_str), self
-                else
-                  raise TypeError,
-                    "cannot coerce StringVal to #{other.class}"
-                end
+                return copy(:value => other.to_str), self
               end
 
               def value
@@ -193,7 +189,6 @@ module Stupidedi
               attr_reader :value
 
               # (string any* -> any)              
-              extend Forwardable
               def_delegators :@value, :to_d, :to_s, :to_f, :to_c, :to_r, :to_sym, :to_str,
                 :hex, :oct, :ord, :sum, :length, :count, :index, :rindex,
                 :lines, :bytes, :chars, :each, :upto, :split, :scan, :unpack,
@@ -233,12 +228,7 @@ module Stupidedi
               def coerce(other)
                 # me, he = other.coerce(self)
                 # me <OP> he
-                if other.respond_to?(:to_str)
-                  return copy(:value => other.to_str), self
-                else
-                  raise TypeError,
-                    "cannot coerce StringVal to #{other.class}"
-                end
+                return copy(:value => other.to_str), self
               end
 
               def too_long?
@@ -376,11 +366,11 @@ module Stupidedi
             def value(object, usage, position)
               if object.blank?
                 self::Empty.new(usage, position)
-              elsif object.respond_to?(:to_s)
-                self::NonEmpty.new(object.to_s.rstrip, usage, position)
               else
-                self::Invalid.new(object, usage, position)
+                self::NonEmpty.new(object.to_s.rstrip, usage, position)
               end
+            rescue
+              self::Invalid.new(object, usage, position)
             end
 
             # @endgroup

data/lib/stupidedi/versions/functional_groups/003010/element_types/time_val.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyTen

data/lib/stupidedi/versions/functional_groups/003010/functional_group_def.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyTen

data/lib/stupidedi/versions/functional_groups/003010/segment_defs.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyTen

data/lib/stupidedi/versions/functional_groups/003010/segment_reqs.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyTen

data/lib/stupidedi/versions/functional_groups/003010/syntax_notes.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyTen

data/lib/stupidedi/versions/functional_groups/003010/transaction_set_defs.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyTen

data/lib/stupidedi/versions/functional_groups/003040.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
 

data/lib/stupidedi/versions/functional_groups/003040/element_defs.rb

@@ -1,6 +1,7 @@
 # encoding: ISO-8859-1
-
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyForty

data/lib/stupidedi/versions/functional_groups/003040/element_reqs.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyForty

data/lib/stupidedi/versions/functional_groups/003040/element_types.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyForty

data/lib/stupidedi/versions/functional_groups/003040/element_types/date_val.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyForty
@@ -165,7 +167,6 @@ module Stupidedi
               include Comparable
 
               # (date any* -> any)
-              extend Forwardable
               def_delegators :@value, :year, :month, :day, :cwday, :cweek, :downto, :upto,
                 :step, :httpdate, :to_s, :to_i, :strftime, :iso8601, :rfc2822,
                 :rfc3339, :rfc822, :leap?, :julian?, :gregorian?, :mday, :mon,
@@ -203,12 +204,7 @@ module Stupidedi
               def coerce(other)
                 # me, he = other.coerce(self)
                 # me <OP> he
-                if other.respond_to?(:to_date)
-                  return DateVal.value(other, usage, position), self
-                else
-                  raise TypeError,
-                    "cannot coerce DateVal to #{other.class}"
-                end
+                return DateVal.value(other, usage, position), self
               end
 
               def valid?

data/lib/stupidedi/versions/functional_groups/003040/element_types/fixnum_val.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyForty
@@ -193,7 +195,6 @@ module Stupidedi
               # @return [BigDecimal]
               attr_reader :value
 
-              extend Forwardable
               def_delegators :@value, :to_i, :to_d, :to_f, :to_r, :to_c   
               
               def initialize(value, usage, position)
@@ -212,12 +213,7 @@ module Stupidedi
               def coerce(other)
                 # self', other' = other.coerce(self)
                 # self' * other'
-                if other.respond_to?(:to_d)
-                  return copy(:value => other.to_d), self
-                else
-                  raise TypeError,
-                    "cannot coerce FixnumVal to #{other.class}"
-                end
+                return copy(:value => other.to_d), self
               end
 
               def valid?
@@ -294,15 +290,13 @@ module Stupidedi
             def value(object, usage, position)
               if object.blank?
                 self::Empty.new(usage, position)
-              elsif object.respond_to?(:to_d)
+              else
                 # The number of fractional digits is implied by usage.precision
                 factor = 10 ** usage.definition.precision
 
                 self::NonEmpty.new(object.to_d / factor, usage, position)
-              else
-                self::Invalid.new(object, usage, position)
               end
-            rescue ArgumentError
+            rescue
               self::Invalid.new(object, usage, position)
             end
 

data/lib/stupidedi/versions/functional_groups/003040/element_types/float_val.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyForty
@@ -182,7 +184,6 @@ module Stupidedi
               # @return [BigDecimal]
               attr_reader :value
 
-              extend Forwardable
               def_delegators :@value, :to_i, :to_d, :to_f, :to_r, :to_c   
 
               
@@ -202,12 +203,7 @@ module Stupidedi
               def coerce(other)
                 # self', other' = other.coerce(self)
                 # self' * other'
-                if other.respond_to?(:to_d)
-                  return copy(:value => other.to_d), self
-                else
-                  raise TypeError,
-                    "cannot coerce FloatVal to #{other.class}"
-                end
+                return copy(:value => other.to_d), self
               end
 
               def valid?
@@ -328,15 +324,11 @@ module Stupidedi
             def value(object, usage, position)
               if object.blank?
                 self::Empty.new(usage, position)
-              elsif object.respond_to?(:to_d)
-                begin
-                  self::NonEmpty.new(object.to_d, usage, position)
-                rescue ArgumentError
-                  self::Invalid.new(object, usage, position)
-                end
               else
-                self::Invalid.new(object, usage, position)
+                self::NonEmpty.new(object.to_d, usage, position)
               end
+            rescue ArgumentError
+              self::Invalid.new(object, usage, position)
             end
 
             # @endgroup

data/lib/stupidedi/versions/functional_groups/003040/element_types/identifier_val.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyForty
@@ -144,7 +146,6 @@ module Stupidedi
               include Comparable
 
               # (string any* -> any)
-              extend Forwardable
               def_delegators :value, :to_d, :to_s, :to_f, :to_c, :to_r, :to_sym, :to_str,
                 :hex, :oct, :ord, :sum, :length, :count, :index, :rindex,
                 :lines, :bytes, :chars, :each, :upto, :split, :scan, :unpack,
@@ -179,12 +180,7 @@ module Stupidedi
               def coerce(other)
                 # me, he = other.coerce(self)
                 # me <OP> he
-                if other.respond_to?(:to_str)
-                  return copy(:value => other.to_str), self
-                else
-                  raise TypeError,
-                    "cannot coerce IdentifierVal to #{other.class}"
-                end
+                return copy(:value => other.to_str), self
               end
 
               def value
@@ -233,7 +229,6 @@ module Stupidedi
               # @return [String]
               attr_reader :value
               # (string any* -> any)
-              extend Forwardable
               def_delegators :value, :to_d, :to_s, :to_f, :to_c, :to_r, :to_sym, :to_str,
                 :hex, :oct, :ord, :sum, :length, :count, :index, :rindex,
                 :lines, :bytes, :chars, :each, :upto, :split, :scan, :unpack,
@@ -273,12 +268,7 @@ module Stupidedi
               def coerce(other)
                 # me, he = other.coerce(self)
                 # me <OP> he
-                if other.respond_to?(:to_str)
-                  return copy(:value => other.to_str), self
-                else
-                  raise TypeError,
-                    "cannot coerce IdentifierVal to #{other.class}"
-                end
+                return copy(:value => other.to_str), self
               end
 
               def valid?
@@ -344,10 +334,8 @@ module Stupidedi
             def value(object, usage, position)
               if object.blank?
                 self::Empty.new(usage, position)
-              elsif object.respond_to?(:to_s)
-                self::NonEmpty.new(object.to_s.rstrip, usage, position)
               else
-                self::Invalid.new(object, usage, position)
+                self::NonEmpty.new(object.to_s.rstrip, usage, position)
               end
             rescue
               self::Invalid.new(object, usage, position)

data/lib/stupidedi/versions/functional_groups/003040/element_types/operators.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyForty
@@ -13,7 +15,7 @@ module Stupidedi
                 ops.each do |op|
                   class_eval(<<-RUBY, file, line.to_i - 1)
                     def #{op}(&block)
-                      copy(:value => value.__send__(:#{op}, &block))
+                      copy(:value => value.#{op}(&block))
                     end
                   RUBY
                 end
@@ -39,17 +41,24 @@ module Stupidedi
                     "must pass :coerce => :method"
                 end
 
+                # Note that we can't test respond_to?(coerce) because coerce is
+                # often a refinement method, like #to_d, #to_time, etc. Currently
+                # respond_to? returns false on refinment methods, so we just call
+                # the method and assume a NoMethodError is due to coerce (hopefully
+                # not some other missing method)
                 ops.each do |op|
                   class_eval(<<-RUBY, file, line.to_i - 1)
                     def #{op}(other, &block)
-                      if other.respond_to?(:#{coerce})
-                        copy(:value => value.__send__(:#{op}, other.#{coerce}, &block))
-                      elsif other.respond_to?(:coerce)
-                        me, he = other.coerce(self)
-                        copy(:value => me.__send__(:#{op}, he, &block).#{coerce})
-                      else
-                        raise TypeError,
-                          "cannot coerce \#{other.class} to \#{self.class}"
+                      begin
+                        copy(:value => value.#{op}(other.#{coerce}, &block))
+                      rescue NoMethodError
+                        begin
+                          me, he = other.coerce(self)
+                          copy(:value => me.#{op}(he, &block).#{coerce})
+                        rescue NoMethodError
+                          raise TypeError,
+                            "cannot coerce \#{other.class} to \#{self.class}"
+                        end
                       end
                     end
                   RUBY
@@ -76,17 +85,24 @@ module Stupidedi
                     "must pass :coerce => :method"
                 end
 
+                # Note that we can't test respond_to?(coerce) because coerce is
+                # often a refinement method, like #to_d, #to_time, etc. Currently
+                # respond_to? returns false on refinment methods, so we just call
+                # the method and assume a NoMethodError is due to coerce (hopefully
+                # not some other missing method)
                 ops.each do |op|
                   class_eval(<<-RUBY, file, line.to_i - 1)
                     def #{op}(other, &block)
-                      if other.respond_to?(:#{coerce})
-                        value.__send__(:#{op}, other.#{coerce}, &block)
-                      elsif other.respond_to?(:coerce)
-                        me, he = other.coerce(self)
-                        me.__send__(:#{op}, he, &block)
-                      else
-                        raise TypeError,
-                          "cannot coerce \#{other.class} to \#{self.class}"
+                      begin
+                        value.#{op}(other.#{coerce}, &block)
+                      rescue NoMethodError
+                        begin
+                          me, he = other.coerce(self)
+                          me.#{op}(he, &block)
+                        rescue NoMethodError
+                          raise TypeError,
+                            "cannot coerce \#{other.class} to \#{self.class}"
+                        end
                       end
                     end
                   RUBY
@@ -101,7 +117,7 @@ module Stupidedi
                 ops.each do |op|
                   class_eval(<<-RUBY, file, line.to_i - 1)
                     def #{op}(*args, &block)
-                      copy(:value => value.__send__(:#{op}, *args, &block))
+                      copy(:value => value.#{op}(*args, &block))
                     end
                   RUBY
                 end

data/lib/stupidedi/versions/functional_groups/003040/element_types/string_val.rb

@@ -1,4 +1,6 @@
 module Stupidedi
+  using Refinements
+
   module Versions
     module FunctionalGroups
       module ThirtyForty
@@ -103,7 +105,6 @@ module Stupidedi
               include Comparable
 
               # (string any* -> any)
-              extend Forwardable
               def_delegators :value, :to_d, :to_s, :to_f, :to_c, :to_r, :to_sym, :to_str,
                 :hex, :oct, :ord, :sum, :length, :count, :index, :rindex,
                 :lines, :bytes, :chars, :each, :upto, :split, :scan, :unpack,
@@ -138,12 +139,7 @@ module Stupidedi
               def coerce(other)
                 # me, he = other.coerce(self)
                 # me <OP> he
-                if other.respond_to?(:to_str)
-                  return copy(:value => other.to_str), self
-                else
-                  raise TypeError,
-                    "cannot coerce StringVal to #{other.class}"
-                end
+                return copy(:value => other.to_str), self
               end
 
               def value
@@ -193,7 +189,6 @@ module Stupidedi
               attr_reader :value
 
               # (string any* -> any)
-              extend Forwardable      
               def_delegators :@value, :to_d, :to_s, :to_f, :to_c, :to_r, :to_sym, :to_str,
                 :hex, :oct, :ord, :sum, :length, :count, :index, :rindex,
                 :lines, :bytes, :chars, :each, :upto, :split, :scan, :unpack,
@@ -234,12 +229,7 @@ module Stupidedi
               def coerce(other)
                 # me, he = other.coerce(self)
                 # me <OP> he
-                if other.respond_to?(:to_str)
-                  return copy(:value => other.to_str), self
-                else
-                  raise TypeError,
-                    "cannot coerce StringVal to #{other.class}"
-                end
+                return copy(:value => other.to_str), self
               end
 
               def too_long?
@@ -377,11 +367,11 @@ module Stupidedi
             def value(object, usage, position)
               if object.blank?
                 self::Empty.new(usage, position)
-              elsif object.respond_to?(:to_s)
-                self::NonEmpty.new(object.to_s.rstrip, usage, position)
               else
-                self::Invalid.new(object, usage, position)
+                self::NonEmpty.new(object.to_s.rstrip, usage, position)
               end
+            rescue NoMethodError
+              self::Invalid.new(object, usage, position)
             end
 
             # @endgroup