shoulda-matchers 2.8.0.rc2 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32080268ac2a3012ac2aa244c3ac77423ed70476
-  data.tar.gz: 4ceeb77988ab6611c4d969a1c4e8c4a05c9cbca4
+  metadata.gz: e8d1979af1b53164efe4a312705f9879f599b123
+  data.tar.gz: 4f95461b3a1327e5ccf9d233f466cab9ff0e41d0
 SHA512:
-  metadata.gz: b96f693aec168e4fa7e19991b0b0e8622b2e568d6ae052f8c2ad109b80f6e3b04ad354cf80db62378ccd7f77618f7eb1df1354195e12adcb473e1b2ba8d45403
-  data.tar.gz: c2c33d4404bd7dfa62f3fb72fa7f1a554cf414bcea7204fd691659dc55c4b82a86be6af059b58e7954194a7a348de37a2f0dadf23d9fb62f3503a0ed233a53db
+  metadata.gz: 9ce8af4fa7d9b70636ee576221f15646621900908f9e351a9cff54de47514e4f01242b4d7ce5340e8dc0c053341e82e9c90afe991d55a1b35af74853a0a2d0f8
+  data.tar.gz: 1c8fb02675836314efc0c43c3054b16a02b6b56d36070472f1780a3b677de74f47281c01290902f5c81bc8051ed06982e17ddaf159ed44c3098470882130125b

data/.gitignore

@@ -1,13 +1,11 @@
-*.rbc
-*.swo
-*.swp
 .bundle
 .gh-pages
-.svn/
+.thoughtbot-gh-pages
+.mcmire-gh-pages
 .yardoc
 coverage
+build
 doc
 pkg
-tags
-test/*/log/*.log
+source
 tmp

data/.travis.yml

@@ -1,4 +1,11 @@
 language: ruby
+sudo: false
+script: "bundle exec rake"
+
+branches:
+  except:
+    - site
+    - gh-pages
 
 rvm:
   - 1.9.2
@@ -9,10 +16,6 @@ gemfile:
   - gemfiles/3.1.gemfile
   - gemfiles/3.2.gemfile
 
-sudo: false
-
-script: "bundle exec rake"
-
 matrix:
   allow_failures:
     - rvm: rbx-19mode

data/NEWS.md

@@ -1,28 +1,4 @@
-# 2.8.0.rc2
-
-### Bug fixes
-
-* Fix `allow_value`, `validate_numericality_of` and `validate_inclusion_of` so
-  that they handle RangeErrors emitted from ActiveRecord 4.2. These exceptions
-  arise whenever we attempt to set an attribute using a value that lies outside
-  the range of the column (assuming the column is an integer). RangeError is now
-  treated specially, failing the test instead of bubbling up as an error.
-  ([#634], [#637], [#642])
-
-### Features
-
-* Update `dependent` qualifier on association matchers to support `:destroy`,
-  `:delete`, `:nullify`, `:restrict`, `:restrict_with_exception`, and
-  `:restrict_with_error`. You can also pass `true` or `false` to assert that
-  the association has (or has not) been declared with *any* dependent option.
-  ([#631])
-
-[#631]: https://github.com/thoughtbot/shoulda-matchers/pull/631
-[#634]: https://github.com/thoughtbot/shoulda-matchers/pull/634
-[#637]: https://github.com/thoughtbot/shoulda-matchers/pull/637
-[#642]: https://github.com/thoughtbot/shoulda-matchers/pull/642
-
-# 2.8.0.rc1
+# 2.8.0
 
 ### Deprecations
 
@@ -73,6 +49,13 @@
   notation (e.g. `posts#show`), route parameters such as `id` do not need to be
   specified as a string but may be specified as a number as well. ([#602])
 
+* Fix `allow_value`, `validate_numericality_of` and `validate_inclusion_of` so
+  that they handle RangeErrors emitted from ActiveRecord 4.2. These exceptions
+  arise whenever we attempt to set an attribute using a value that lies outside
+  the range of the column (assuming the column is an integer). RangeError is now
+  treated specially, failing the test instead of bubbling up as an error.
+  ([#634], [#637], [#642])
+
 ### Features
 
 * Add ability to test `:primary_key` option on associations. ([#597])
@@ -94,6 +77,12 @@
 * Add support for Rails 4.2, especially fixing `serialize` matcher to remove
   warning about `serialized_attributes` being deprecated. ([#627])
 
+* Update `dependent` qualifier on association matchers to support `:destroy`,
+  `:delete`, `:nullify`, `:restrict`, `:restrict_with_exception`, and
+  `:restrict_with_error`. You can also pass `true` or `false` to assert that
+  the association has (or has not) been declared with *any* dependent option.
+  ([#631])
+
 ### Improvements
 
 * Tweak `allow_value` failure message so that it reads a bit nicer when listing
@@ -111,6 +100,10 @@
 [#543]: https://github.com/thoughtbot/shoulda-matchers/pull/543
 [#622]: https://github.com/thoughtbot/shoulda-matchers/pull/622
 [#627]: https://github.com/thoughtbot/shoulda-matchers/pull/627
+[#631]: https://github.com/thoughtbot/shoulda-matchers/pull/631
+[#634]: https://github.com/thoughtbot/shoulda-matchers/pull/634
+[#637]: https://github.com/thoughtbot/shoulda-matchers/pull/637
+[#642]: https://github.com/thoughtbot/shoulda-matchers/pull/642
 
 # 2.7.0
 

data/README.md

@@ -183,7 +183,7 @@ and may be redistributed under the terms specified in the
 [travis-badge]: http://img.shields.io/travis/thoughtbot/shoulda-matchers/master.svg
 [travis]: http://travis-ci.org/thoughtbot/shoulda-matchers
 [downloads-badge]: http://img.shields.io/gem/dtv/shoulda-matchers.svg
-[rubydocs]: http://thoughtbot.github.io/shoulda-matchers
+[rubydocs]: http://matchers.shoulda.io/docs
 [community]: http://thoughtbot.com/community
 [contributors]: https://github.com/thoughtbot/shoulda-matchers/contributors
 [shoulda]: http://github.com/thoughtbot/shoulda

data/Rakefile

@@ -2,10 +2,7 @@ require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'appraisal'
-require 'erb'
-require_relative 'lib/shoulda/matchers/version'
-
-CURRENT_VERSION = Shoulda::Matchers::VERSION
+require_relative 'tasks/documentation'
 
 RSpec::Core::RakeTask.new('spec:unit') do |t|
   t.ruby_opts = '-w -r ./spec/report_warnings'
@@ -34,106 +31,6 @@ task :appraise do
   exec 'appraisal install && appraisal rake'
 end
 
-GH_PAGES_DIR = '.gh-pages'
-
-namespace :docs do
-  file GH_PAGES_DIR do
-    sh "git clone git@github.com:thoughtbot/shoulda-matchers.git #{GH_PAGES_DIR} --branch gh-pages"
-  end
-
-  task :setup => GH_PAGES_DIR do
-    within_gh_pages do
-      sh 'git fetch origin'
-      sh 'git reset --hard origin/gh-pages'
-    end
-  end
-
-  desc 'Generate docs for a particular version'
-  task :generate, [:version, :latest_version] => :setup do |t, args|
-    generate_docs(args.version, latest_version: latest_version)
-  end
-
-  desc 'Generate docs for a particular version and push them to GitHub'
-  task :publish, [:version, :latest_version] => :setup do |t, args|
-    generate_docs(args.version, latest_version: latest_version)
-    publish_docs(args.version, latest_version: latest_version)
-  end
-
-  desc "Generate docs for version #{CURRENT_VERSION} and push them to GitHub"
-  task :publish_latest => :setup do
-    version = Gem::Version.new(CURRENT_VERSION)
-
-    unless version.prerelease?
-      latest_version = version.to_s
-    end
-
-    generate_docs(CURRENT_VERSION, latest_version: latest_version)
-    publish_docs(CURRENT_VERSION, latest_version: latest_version)
-  end
-
-  def rewrite_index_to_inject_version(ref, version)
-    within_gh_pages do
-      filename = "#{ref}/index.html"
-      content = File.read(filename)
-      content.sub!(%r{<h1>shoulda-matchers.+</h1>}, "<h1>shoulda-matchers (#{version})</h1>")
-      File.open(filename, 'w') {|f| f.write(content) }
-    end
-  end
-
-  def generate_docs(version, options = {})
-    ref = determine_ref_from(version)
-
-    sh "rm -rf #{GH_PAGES_DIR}/#{ref}"
-    sh "bundle exec yard -o #{GH_PAGES_DIR}/#{ref}"
-
-    rewrite_index_to_inject_version(ref, version)
-
-    within_gh_pages do
-      sh "git add #{ref}"
-    end
-
-    if options[:latest_version]
-      generate_file_that_redirects_to_latest_version(options[:latest_version])
-    end
-  end
-
-  def publish_docs(version, options = {})
-    message = build_commit_message(version)
-
-    within_gh_pages do
-      sh 'git clean -f'
-      sh "git commit -m '#{message}'"
-      sh 'git push'
-    end
-  end
-
-  def generate_file_that_redirects_to_latest_version(version)
-    ref = determine_ref_from(version)
-    locals = { ref: ref }
-
-    erb = ERB.new(File.read('doc_config/gh-pages/index.html.erb'))
-
-    within_gh_pages do
-      File.open('index.html', 'w') { |f| f.write(erb.result(binding)) }
-      sh 'git add index.html'
-    end
-  end
-
-  def determine_ref_from(version)
-    if version =~ /^\d+\.\d+\.\d+/
-      'v' + version
-    else
-      version
-    end
-  end
-
-  def build_commit_message(version)
-    "Regenerated docs for version #{version}"
-  end
-
-  def within_gh_pages(&block)
-    Dir.chdir(GH_PAGES_DIR, &block)
-  end
-end
+Shoulda::Matchers::DocumentationTasks.create
 
 task release: 'docs:publish_latest'

data/doc_config/gh-pages/index.html.erb

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>shoulda-matchers Documentation - latest</title>
-    <meta http-equiv="refresh" content="0;URL=http://thoughtbot.github.io/shoulda-matchers/<%= locals[:ref] %>">
+    <meta http-equiv="refresh" content="0;URL=<%= locals[:ref] %>">
   </head>
   <body>
   </body>

data/lib/shoulda/matchers/version.rb

@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
     # @private
-    VERSION = '2.8.0.rc2'.freeze
+    VERSION = '2.8.0'.freeze
   end
 end

data/tasks/documentation.rb

@@ -0,0 +1,171 @@
+require_relative '../lib/shoulda/matchers/version'
+require 'erb'
+
+module Shoulda
+  module Matchers
+    module DocumentationTasks
+      extend Rake::DSL
+
+      def self.create
+        publisher = DocumentationPublisher.new
+
+        namespace :docs do
+          file DocumentationPublisher.gh_pages_dir do
+            publisher.create_reference_to_gh_pages_branch
+          end
+
+          file DocumentationPublisher.docs_dir => DocumentationPublisher.gh_pages_dir
+
+          task :setup => DocumentationPublisher.docs_dir do
+            publisher.reset_repo_directory
+          end
+
+          desc 'Generate docs for a particular version'
+          task :generate, [:version, :latest_version] => :setup do |t, args|
+            unless args.version
+              raise ArgumentError, "Missing version"
+            end
+
+            unless args.latest_version
+              raise ArgumentError, "Missing latest_version"
+            end
+
+            publisher.generate_docs_for(args.version, latest_version: args.latest_version)
+          end
+
+          desc 'Generate docs for a particular version and push them to GitHub'
+          task :publish, [:version, :latest_version] => :setup do |t, args|
+            unless args.version
+              raise ArgumentError, "Missing version"
+            end
+
+            unless args.latest_version
+              raise ArgumentError, "Missing latest_version"
+            end
+
+            publisher.generate_docs_for(args.version, latest_version: args.latest_version)
+            publisher.publish_docs_for(args.version, latest_version: args.latest_version)
+          end
+
+          desc "Generate docs for version #{DocumentationPublisher.current_version} and push them to GitHub"
+          task :publish_latest => :setup do
+            publisher.publish_latest_version
+          end
+        end
+      end
+    end
+
+    class DocumentationPublisher
+      CURRENT_VERSION = Shoulda::Matchers::VERSION
+      GITHUB_USERNAME = 'thoughtbot'
+      # GITHUB_USERNAME = 'mcmire'
+      GH_PAGES_DIR = ".#{GITHUB_USERNAME}-gh-pages"
+      DOCS_DIR = "#{GH_PAGES_DIR}/docs"
+
+      def self.current_version
+        CURRENT_VERSION
+      end
+
+      def self.gh_pages_dir
+        GH_PAGES_DIR
+      end
+
+      def self.docs_dir
+        DOCS_DIR
+      end
+
+      def create_reference_to_gh_pages_branch
+        system "git clone git@github.com:#{GITHUB_USERNAME}/shoulda-matchers.git #{GH_PAGES_DIR} --branch gh-pages"
+      end
+
+      def reset_repo_directory
+        within_gh_pages_dir do
+          system 'git fetch origin'
+          system 'git reset --hard origin/gh-pages'
+        end
+      end
+
+      def generate_docs_for(version, options = {})
+        ref = determine_ref_from(version)
+
+        system "rm -rf #{DOCS_DIR}/#{ref}"
+        system "bundle exec yard -o #{DOCS_DIR}/#{ref}"
+
+        add_version_to_index_page_for(ref, version)
+
+        within_docs_dir do
+          system "git add #{ref}"
+        end
+
+        if options[:latest_version]
+          generate_file_that_redirects_to_latest_version(options[:latest_version])
+        end
+      end
+
+      def publish_docs_for(version, options = {})
+        message = build_commit_message(version)
+
+        within_gh_pages_dir do
+          system 'git clean -f'
+          system "git commit -m '#{message}'"
+          system 'git push origin gh-pages'
+        end
+      end
+
+      def publish_latest_version
+        version = Gem::Version.new(CURRENT_VERSION)
+        options = {}
+
+        unless version.prerelease?
+          options[:latest_version] = version.to_s
+        end
+
+        generate_docs_for(CURRENT_VERSION, options)
+        publish_docs_for(CURRENT_VERSION, options)
+      end
+
+      private
+
+      def add_version_to_index_page_for(ref, version)
+        within_docs_dir do
+          filename = "#{ref}/index.html"
+          content = File.read(filename)
+          content.sub!(%r{<h1>shoulda-matchers.+</h1>}, "<h1>shoulda-matchers (#{version})</h1>")
+          File.open(filename, 'w') {|f| f.write(content) }
+        end
+      end
+
+      def generate_file_that_redirects_to_latest_version(version)
+        ref = determine_ref_from(version)
+        locals = { ref: ref, github_username: GITHUB_USERNAME }
+
+        erb = ERB.new(File.read('doc_config/gh-pages/index.html.erb'))
+
+        within_docs_dir do
+          File.open('index.html', 'w') { |f| f.write(erb.result(binding)) }
+          system 'git add index.html'
+        end
+      end
+
+      def determine_ref_from(version)
+        if version =~ /^\d+\.\d+\.\d+/
+          'v' + version
+        else
+          version
+        end
+      end
+
+      def build_commit_message(version)
+        "Regenerated docs for version #{version}"
+      end
+
+      def within_gh_pages_dir(&block)
+        Dir.chdir(GH_PAGES_DIR, &block)
+      end
+
+      def within_docs_dir(&block)
+        Dir.chdir(DOCS_DIR, &block)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 2.8.0.rc2
+  version: 2.8.0
 platform: ruby
 authors:
 - Tammer Saleh
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -287,6 +287,7 @@ files:
 - spec/warnings_spy/partitioner.rb
 - spec/warnings_spy/reader.rb
 - spec/warnings_spy/reporter.rb
+- tasks/documentation.rb
 homepage: http://thoughtbot.com/community/
 licenses:
 - MIT
@@ -302,9 +303,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2