lib/rspec/expect_it/helpers.rb in rspec-expect_it-1.1.0 vs lib/rspec/expect_it/helpers.rb in rspec-expect_it-2.0.0

@@ -1,22 +1,22 @@
 module RSpec
   module ExpectIt
     module Helpers
       def expect_it
         if block_given?
-          ExpectItExpectationTarget.new(self, lambda { self.subject })
+          RSpec::ExpectIt::ExpectationTargets::ExpectIt.new(self, lambda { self.subject })
         else
-          ExpectItExpectationTarget.new(self)
+          RSpec::ExpectIt::ExpectationTargets::ExpectIt.new(self)
         end
       end
 
       def expect_it!
         expect(subject)
       end
 
       def expect_its(method)
-        ExpectItsExpectationTarget.new(self, method)
+        RSpec::ExpectIt::ExpectationTargets::ExpectIts.new(self, method)
       end
 
       def expect_its!(method)
         expect(subject.send(method))
       end
@@ -28,72 +28,12 @@
               self.subject
             rescue Exception
               nil
             end
           end
-          ExpectItExpectationTarget.new(self, safe_lambda)
+          RSpec::ExpectIt::ExpectationTargets::ExpectIt.new(self, safe_lambda)
         else
-          ExpectItSafeExpectationTarget.new(self)
-        end
-      end
-
-      def expect_it_safe!
-        result = begin
-          self.subject
-        rescue Exception
-          nil
-        end
-
-        expect(result)
-      end
-
-      class ExpectItExpectationTarget
-        attr_accessor :context, :subject
-
-        def initialize(context, subject = nil)
-          self.context = context
-          self.subject = subject
-        end
-
-        def to(matcher)
-          context.expect(get_subject).to(matcher)
-        end
-
-        def to_not(matcher)
-          context.expect(get_subject).to_not(matcher)
-        end
-
-        private
-
-        def get_subject
-          subject || context.subject
-        end
-      end
-
-      class ExpectItSafeExpectationTarget < ExpectItExpectationTarget
-        private
-
-        def get_subject
-          begin
-            subject || context.subject
-          rescue Exception
-            nil
-          end
-        end
-      end
-
-      class ExpectItsExpectationTarget < ExpectItExpectationTarget
-        attr_accessor :method
-
-        def initialize(context, method)
-          super(context)
-          self.method = method
-        end
-
-        private
-
-        def get_subject
-          context.subject.send(method)
+          raise ArgumentError, "method must be called as expect_it_safe{}"
         end
       end
     end
   end
 end
\ No newline at end of file