rspectacular 0.0.1 → 0.0.2

data/lib/rspectacular.rb

@@ -1,3 +1,3 @@
 if defined? RSpec
-  require 'rspectacular/active_record'
+  require 'rspectacular/rspec'
 end

data/lib/rspectacular/active_record/date_range_matcher.rb

@@ -1,41 +1,47 @@
-class DateRangeMatcher
-  include Shoulda::ActiveRecord::Helpers
-
-  def initialize(dates)
-    @begin_field  = dates[:from].to_s
-    @end_field    = dates[:to].to_s
-
-    @begin_method = "#{dates[:from].to_s}=".to_sym
-    @end_method   = "#{dates[:to].to_s}=".to_sym
-  end
-
-  def matches?(rangeable)
-    @rangeable = rangeable
-    beginning_date = Date.today
-    ending_date = Date.today - 1
-
-    rangeable.send(@begin_method, beginning_date)
-    rangeable.send(@end_method, ending_date)
-
-    rangeable.valid?
-
-    rangeable.errors[@begin_field].include?("must be on or before #{ending_date.to_s}") &&
-    rangeable.errors[@end_field].include?("must be on or after #{beginning_date.to_s}")
+module RSpectacular
+  module ActiveRecord
+    module Matchers
+      class DateRangeMatcher
+        include Shoulda::ActiveRecord::Helpers
+
+        def initialize(dates)
+          @begin_field  = dates[:from].to_s
+          @end_field    = dates[:to].to_s
+
+          @begin_method = "#{dates[:from].to_s}=".to_sym
+          @end_method   = "#{dates[:to].to_s}=".to_sym
+        end
+
+        def matches?(rangeable)
+          @rangeable = rangeable
+          beginning_date = Date.today
+          ending_date = Date.today - 1
+
+          rangeable.send(@begin_method, beginning_date)
+          rangeable.send(@end_method, ending_date)
+
+          rangeable.valid?
+
+          rangeable.errors[@begin_field].include?("must be on or before #{ending_date.to_s}") &&
+          rangeable.errors[@end_field].include?("must be on or after #{beginning_date.to_s}")
+        end
+
+        def failure_message
+          "#{@rangeable_class} should only accept a valid date range from #{@begin_field} to #{@end_field}, got: #{pretty_error_messages(@rangeable)}"
+        end
+
+        def negative_failure_message
+          "#{@rangeable_class} shouldn't accept a valid date range from #{@begin_field} to #{@end_field}, got: #{pretty_error_messages(@rangeable)}"
+        end
+
+        def description
+          "should be contain a valid range for #{@rangeable_class}"
+        end
+      end
+
+      def validate_date_range(dates)
+        DateRangeMatcher.new(dates)
+      end
+    end
   end
-
-  def failure_message
-    "#{@rangeable_class} should only accept a valid date range from #{@begin_field} to #{@end_field}, got: #{pretty_error_messages(@rangeable)}"
-  end
-
-  def negative_failure_message
-    "#{@rangeable_class} shouldn't accept a valid date range from #{@begin_field} to #{@end_field}, got: #{pretty_error_messages(@rangeable)}"
-  end
-
-  def description
-    "should be contain a valid range for #{@rangeable_class}"
-  end
-end
-
-def validate_date_range(dates)
-  DateRangeMatcher.new(dates)
 end

data/lib/rspectacular/active_record/dateliness_matcher.rb

@@ -1,33 +1,39 @@
-class DatelinessMatcher
-  include Shoulda::ActiveRecord::Helpers
-
-  def initialize(date_field)
-    @date_field  = date_field.to_s
-    @date_method = "#{date_field.to_s}=".to_sym
-  end
-
-  def matches?(dateable)
-    @dateable = dateable
-    dateable.send(@date_method, Date.today)
-
-    dateable.valid?
-
-    !dateable.errors[@date_field].include?("is not a valid date")
-  end
-
-  def failure_message
-    "Expected #{@date_field} to contain a valid date, got: #{pretty_error_messages(@dateable)}"
+module RSpectacular
+  module ActiveRecord
+    module Matchers
+      class DatelinessMatcher
+        include Shoulda::ActiveRecord::Helpers
+
+        def initialize(date_field)
+          @date_field  = date_field.to_s
+          @date_method = "#{date_field.to_s}=".to_sym
+        end
+
+        def matches?(dateable)
+          @dateable = dateable
+          dateable.send(@date_method, Date.today)
+
+          dateable.valid?
+
+          !dateable.errors[@date_field].include?("is not a valid date")
+        end
+
+        def failure_message
+          "Expected #{@date_field} to contain a valid date, got: #{pretty_error_messages(@dateable)}"
+        end
+
+        def negative_failure_message
+          "Expected #{@date_field} to contain an invalid date, got: #{pretty_error_messages(@dateable)}"
+        end
+
+        def description
+          "should be contain a valid date"
+        end
+      end
+
+      def validate_dateliness_of(date)
+        DatelinessMatcher.new(date)
+      end
+    end
   end
-
-  def negative_failure_message
-    "Expected #{@date_field} to contain an invalid date, got: #{pretty_error_messages(@dateable)}"
-  end
-
-  def description
-    "should be contain a valid date"
-  end
-end
-
-def validate_dateliness_of(date)
-  DatelinessMatcher.new(date)
 end

data/lib/rspectacular/active_record/persistence_matcher.rb

@@ -1,29 +1,35 @@
-class PersistenceMatcher
-  def initialize(persistable_object)
-    @persistable_class = persistable_object.class
-    @desired_attributes = persistable_object.is_a?(Hash) ? persistable_object : persistable_object.attributes
-    @desired_attributes = @desired_attributes.reject {|k,v| ['id', 'created_at', 'updated_at'].include? k}
-  end
+module RSpectacular
+  module ActiveRecord
+    module Matchers
+      class PersistenceMatcher
+        def initialize(persistable_object)
+          @persistable_class = persistable_object.class
+          @desired_attributes = persistable_object.is_a?(Hash) ? persistable_object : persistable_object.attributes
+          @desired_attributes = @desired_attributes.reject {|k,v| ['id', 'created_at', 'updated_at'].include? k}
+        end
 
-  def matches?(subject)
-    @persistable_class.where(@desired_attributes).first
-  end
+        def matches?(subject)
+          @persistable_class.where(@desired_attributes).first
+        end
 
-  def failure_message
-    "Expected to find an object saved with #{@desired_attributes}, didn't find one."
-  end
+        def failure_message
+          "Expected to find an object saved with #{@desired_attributes}, didn't find one."
+        end
 
-  def negative_failure_message
-    "Didn't expect to find an object saved with #{@desired_attributes}, but got one anyway"
-  end
+        def negative_failure_message
+          "Didn't expect to find an object saved with #{@desired_attributes}, but got one anyway"
+        end
 
-  def description
-    "should be an instance of #{@expected_class_name}"
-  end
-end
+        def description
+          "should be an instance of #{@expected_class_name}"
+        end
+      end
 
-def persist(desired_object)
-  PersistenceMatcher.new(desired_object)
-end
+      def persist(desired_object)
+        PersistenceMatcher.new(desired_object)
+      end
 
-alias :persist_the :persist
+      alias :persist_the :persist
+    end
+  end
+end

data/lib/rspectacular/active_record/positivity_matcher.rb

@@ -1,33 +1,39 @@
-class PositivityMatcher < Shoulda::ActiveRecord::Matchers::ValidateNumericalityOfMatcher
-  def matches?(positivitable)
-    super(positivitable)
+module RSpectacular
+  module ActiveRecord
+    module Matchers
+      class PositivityMatcher < Shoulda::ActiveRecord::Matchers::ValidateNumericalityOfMatcher
+        def matches?(positivitable)
+          super(positivitable)
 
-    disallows_zero_values &&
-    disallows_negative_values
-  end
+          disallows_zero_values &&
+          disallows_negative_values
+        end
 
-  def failure_message
-    "Expected #{@attribute.to_s} to be a positive number, got: #{pretty_error_messages(@attribute)}"
-  end
+        def failure_message
+          "Expected #{@attribute.to_s} to be a positive number, got: #{pretty_error_messages(@attribute)}"
+        end
 
-  def negative_failure_message
-    "Expected #{@attribute.to_s} to be a negative number, got: #{pretty_error_messages(@attribute)}"
-  end
+        def negative_failure_message
+          "Expected #{@attribute.to_s} to be a negative number, got: #{pretty_error_messages(@attribute)}"
+        end
 
-  def disallows_negative_values
-    disallows_value_of(-1) &&
-    disallows_value_of(-100)
-  end
+        def disallows_negative_values
+          disallows_value_of(-1) &&
+          disallows_value_of(-100)
+        end
 
-  def disallows_zero_values
-    disallows_value_of(0)
-  end
+        def disallows_zero_values
+          disallows_value_of(0)
+        end
 
-  def description
-    "should be contain a positive number"
-  end
-end
+        def description
+          "should be contain a positive number"
+        end
+      end
 
-def validate_positivity_of(date)
-  PositivityMatcher.new(date)
+      def validate_positivity_of(date)
+        PositivityMatcher.new(date)
+      end
+    end
+  end
 end

data/lib/rspectacular/active_record/truthfulness_matcher.rb

@@ -1,29 +1,35 @@
-class TruthfulnessMatcher < Shoulda::ActiveRecord::Matchers::ValidationMatcher
-  def matches?(truthable)
-    super(truthable)
+module RSpectacular
+  module ActiveRecord
+    module Matchers
+      class TruthfulnessMatcher < Shoulda::ActiveRecord::Matchers::ValidationMatcher
+        def matches?(truthable)
+          super(truthable)
 
-    allows_true &&
-    allows_false &&
-    disallows_nil
-  end
+          allows_true &&
+          allows_false &&
+          disallows_nil
+        end
 
-  def allows_true
-    allows_value_of(true)
-  end
+        def allows_true
+          allows_value_of(true)
+        end
 
-  def allows_false
-    allows_value_of(false)
-  end
+        def allows_false
+          allows_value_of(false)
+        end
 
-  def disallows_nil
-    disallows_value_of(nil)
-  end
+        def disallows_nil
+          disallows_value_of(nil)
+        end
 
-  def description
-    "should accept only boolean true or false values"
-  end
-end
+        def description
+          "should accept only boolean true or false values"
+        end
+      end
 
-def validate_truthfulness_of(truthteller)
-  TruthfulnessMatcher.new(truthteller)
+      def validate_truthfulness_of(truthteller)
+        TruthfulnessMatcher.new(truthteller)
+      end
+    end
+  end
 end

data/lib/rspectacular/rspec.rb

@@ -0,0 +1,17 @@
+require 'rspectacular/active_record/matchers'
+
+module RSpec
+  module Matchers
+    include RSpectacular::ActiveRecord::Matchers
+  end
+
+  # module Rails
+    # module ControllerExampleGroup
+      # include Shoulda::ActionController::Matchers
+    # end
+
+    # module MailerExampleGroup
+      # include Shoulda::ActionMailer::Matchers
+    # end
+  # end
+end

data/lib/rspectacular/version.rb

@@ -1,3 +1,3 @@
 module Rspectacular
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/rspectacular.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_dependency('shoulda', '~> 2.11.0')
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rspectacular
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors: 
 - jfelchner
@@ -15,10 +11,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-30 00:00:00 -06:00
+date: 2011-05-12 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.11.0
+  type: :runtime
+  version_requirements: *id001
 description: We rock some custom RSpec matchers like it ain't nobody's bidnezz.
 email: 
 - support@thekompanee.com
@@ -33,13 +39,14 @@ files:
 - Gemfile
 - Rakefile
 - lib/rspectacular.rb
+- lib/rspectacular/active_record.rb
 - lib/rspectacular/active_record/date_range_matcher.rb
 - lib/rspectacular/active_record/dateliness_matcher.rb
 - lib/rspectacular/active_record/matchers.rb
 - lib/rspectacular/active_record/persistence_matcher.rb
 - lib/rspectacular/active_record/positivity_matcher.rb
 - lib/rspectacular/active_record/truthfulness_matcher.rb
-- lib/rspectacular/matchers.rb
+- lib/rspectacular/rspec.rb
 - lib/rspectacular/version.rb
 - rails/init.rb
 - rspectacular.gemspec
@@ -57,21 +64,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rspectacular
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Custom RSpec matchers