active_attr 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e7717fb674e5367b4efbf9111a43d415cdf9990
-  data.tar.gz: 2a4c558585e028d88e996ceb09ff0cf00d793ec9
+  metadata.gz: 6dc8fa69550b2e151dc19682c3121c8a8af38f11
+  data.tar.gz: 2bbe9510e69ce389f4a26d8da23aa217f7e07375
 SHA512:
-  metadata.gz: 2b97ca3621aacdae046b8c8425cf2fe80c399213a40c841eb239d9cfadea797dc5da2aa6902ef4992fbe00f9121f61d835deccc745556050bdd288d606b99ec9
-  data.tar.gz: 8b8d57b8d9ed25e904e4a1927e9fe41764c225325ad1e342d8d005b94735a9d89bcaa2db71ceea033f903a091da94026d14cbb288077f73f8c019f5cd4d2b31f
+  metadata.gz: 90d657426d8724926c8d8b25eaa0cff6fee7fac91d8426c6dcebb067fe0cdc924585ba3ac78ffc64e8906bde7b93af628f0846cfc648d8c84f6bd99140f7d892
+  data.tar.gz: 865dad5d49f8819da54b3c944267b09e00cf07974f2807d36fd40266fd5c5c740f325107fd10b758c5dddf227db200b0a79d9b02a9edcd7fe9c07a71f45a5f8e

data/.gitignore

@@ -2,6 +2,7 @@
 .bundle
 .rvmrc
 .yardoc
+/.ruby-gemset
 coverage
 doc
 Gemfile.lock

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format nested
+--format documentation

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.0@active_attr
+2.1.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# ActiveAttr 0.8.4 (July 11, 2014) #
+
+* ActiveAttr now supports RSpec 3.0.0 (Aaron Mc Adam)
+
 # ActiveAttr 0.8.3 (April 8, 2014) #
 
 * ActiveAttr now supports Rails 4.1.0

data/Gemfile

@@ -8,7 +8,8 @@ gem "actionpack",    "~> 4.1.0", :group => :test
 gem "protected_attributes", :group => :test
 
 group :development do
-  gem "debugger",  :platforms => :mri_19
+  gem "debugger", :platforms => :mri_19
+  gem "debugger2", :platforms => [:mri_20, :mri_21]
   gem "growl"
   gem "guard"
   gem "guard-bundler"
@@ -17,7 +18,7 @@ group :development do
   gem "rdiscount"
   gem "rdoc"
   gem "ruby-debug", :platforms => :mri_18
-  gem "spec_coverage", :platforms => :mri_19
+  gem "spec_coverage", :platforms => [:mri_19, :mri_20, :mri_21], :git => "https://github.com/getaroom/spec_coverage.git"
   gem "travis-lint"
   gem "yard"
 end

data/Guardfile

@@ -3,7 +3,7 @@ guard "bundler" do
   watch(/^.+\.gemspec/)
 end
 
-guard "rspec", :cli => "--format nested --debugger" do
+guard "rspec", :cli => "--format documentation --debugger" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$}) { |m| ["spec/unit/#{m[1]}_spec.rb", "spec/functional/#{m[1]}_spec.rb"] }
   watch("spec/spec_helper.rb") { "spec" }

data/Rakefile

@@ -11,7 +11,7 @@ task :spec => %w(spec:units spec:functionals)
 namespace :spec do
   desc "Run RSpec specs with code coverate analysis"
   RSpec::Core::RakeTask.new(:cov) do |spec|
-    spec.rspec_opts = "--format nested --format SpecCoverage"
+    spec.rspec_opts = "--format documentation --format SpecCoverage"
   end
 
   desc "Run RSpec unit specs"

data/active_attr.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "bundler",      "~> 1.0"
   gem.add_development_dependency "factory_girl", ">= 2.2", "< 5.0"
-  gem.add_development_dependency "rake",         ">= 0.9.0", "< 10.2"
-  gem.add_development_dependency "rspec",        "~> 2.11"
+  gem.add_development_dependency "rake",         ">= 0.9.0", "< 10.4"
+  gem.add_development_dependency "rspec",        "~> 3.0"
   gem.add_development_dependency "tzinfo"
 end

data/gemfiles/rails_head.gemfile

@@ -9,3 +9,4 @@ git "git://github.com/rails/rails.git" do
 end
 
 gem "protected_attributes", :git => "git://github.com/rails/protected_attributes.git", :group => :test
+gem "rack", :git => "git://github.com/rack/rack.git", :group => :test

data/lib/active_attr/matchers/have_attribute_matcher.rb

@@ -107,10 +107,11 @@ module ActiveAttr
 
       # @return [String] Negative failure message
       # @private
-      def negative_failure_message
+      def failure_message_when_negated
         "expected not: #{expected_attribute_definition.inspect}\n" +
         "         got: #{actual_attribute_definition.inspect}"
       end
+      alias_method :negative_failure_message, :failure_message_when_negated
 
       private
 

data/lib/active_attr/version.rb

@@ -1,5 +1,5 @@
 module ActiveAttr
   # Complete version string
   # @since 0.1.0
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

data/spec/functional/active_attr/attributes_spec.rb

@@ -188,8 +188,8 @@ module ActiveAttr
 
     context "defining dangerous attributes" do
       shared_examples "a dangerous attribute" do
-        it ".dangerous_attribute? is true" do
-          model_class.dangerous_attribute?(attribute_name).should be_true
+        it ".dangerous_attribute? is truthy" do
+          model_class.dangerous_attribute?(attribute_name).should be_truthy
         end
 
         it ".attribute raises DangerousAttributeError" do
@@ -202,8 +202,8 @@ module ActiveAttr
       end
 
       shared_examples "a whitelisted attribute" do
-        it ".dangerous_attribute? is false" do
-          model_class.dangerous_attribute?(attribute_name).should be_false
+        it ".dangerous_attribute? is falsey" do
+          model_class.dangerous_attribute?(attribute_name).should be_falsey
         end
 
         it ".attribute does not raise" do

data/spec/functional/active_attr/chainable_initialization_spec.rb

@@ -9,7 +9,7 @@ module ActiveAttr
     shared_examples "chained initialization" do
       describe "#initialize" do
         it { expect { model }.not_to raise_error }
-        it { model.initialized?.should be_true }
+        it { model.initialized?.should == true }
       end
     end
 
@@ -73,7 +73,7 @@ module ActiveAttr
       include_examples "chained initialization"
     end
 
-    if defined?(BasicObject)
+    if defined?(BasicObject) && BasicObject.superclass.nil?
       context "mixed into a class that inherits from BasicObject with an argument to initialize" do
         let :model_class do
           Class.new(BasicObject) do

data/spec/functional/active_attr/matchers/have_attribute_matcher_spec.rb

@@ -30,7 +30,7 @@ module ActiveAttr
         end
 
         describe "#matches?" do
-          it { matcher.matches?(model_class).should be_false }
+          it { matcher.matches?(model_class).should == false }
         end
 
         describe "#failure_message" do
@@ -52,7 +52,7 @@ module ActiveAttr
         end
 
         describe "#matches?" do
-          it { matcher.matches?(model_class).should be_false }
+          it { matcher.matches?(model_class).should == false }
         end
 
         describe "#failure_message" do
@@ -74,7 +74,7 @@ module ActiveAttr
         end
 
         describe "#matches?" do
-          it { matcher.matches?(model_class).should be_false }
+          it { matcher.matches?(model_class).should == false }
         end
 
         describe "#failure_message" do
@@ -93,24 +93,26 @@ module ActiveAttr
           before { model_class.attribute :first_name }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_true }
+            it { matcher.matches?(model_class).should == true }
           end
 
-          describe "#negative_failure_message" do
-            before { matcher.matches?(model_class) }
+          [:negative_failure_message, :failure_message_when_negated].each do |method|
+            describe "##{method}" do
+              before { matcher.matches?(model_class) }
 
-            it do
-              matcher.negative_failure_message.should == <<-MESSAGE.strip_heredoc.chomp
-                expected not: attribute :first_name
-                         got: attribute :first_name
-              MESSAGE
+              it do
+                matcher.send(method).should == <<-MESSAGE.strip_heredoc.chomp
+                  expected not: attribute :first_name
+                           got: attribute :first_name
+                MESSAGE
+              end
             end
           end
         end
 
         context "a class without the attribute" do
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_false }
+            it { matcher.matches?(model_class).should == false }
           end
 
           describe "#failure_message" do
@@ -131,7 +133,7 @@ module ActiveAttr
           before { model_class.attribute :first_name }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_false }
+            it { matcher.matches?(model_class).should == false }
           end
 
           describe "#failure_message" do
@@ -150,7 +152,7 @@ module ActiveAttr
           before { model_class.attribute :first_name, :default => "Doe" }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_false }
+            it { matcher.matches?(model_class).should == false }
           end
 
           describe "#failure_message" do
@@ -169,17 +171,19 @@ module ActiveAttr
           before { model_class.attribute :first_name, :default => "John" }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_true }
+            it { matcher.matches?(model_class).should == true }
           end
 
-          describe "#negative_failure_message" do
-            before { matcher.matches?(model_class) }
+          [:negative_failure_message, :failure_message_when_negated].each do |method|
+            describe "##{method}" do
+              before { matcher.matches?(model_class) }
 
-            it do
-              matcher.negative_failure_message.should == <<-MESSAGE.strip_heredoc.chomp
-                expected not: attribute :first_name, :default => "John"
-                         got: attribute :first_name, :default => "John"
-              MESSAGE
+              it do
+                matcher.send(method).should == <<-MESSAGE.strip_heredoc.chomp
+                  expected not: attribute :first_name, :default => "John"
+                           got: attribute :first_name, :default => "John"
+                MESSAGE
+              end
             end
           end
         end
@@ -195,7 +199,7 @@ module ActiveAttr
           before { model_class.attribute :admin }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_false }
+            it { matcher.matches?(model_class).should == false }
           end
 
           describe "#failure_message" do
@@ -214,7 +218,7 @@ module ActiveAttr
           before { model_class.attribute :admin, :default => nil }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_false }
+            it { matcher.matches?(model_class).should == false }
           end
 
           describe "#failure_message" do
@@ -233,17 +237,19 @@ module ActiveAttr
           before { model_class.attribute :admin, :default => false }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_true }
+            it { matcher.matches?(model_class).should == true }
           end
 
-          describe "#negative_failure_message" do
-            before { matcher.matches?(model_class) }
+          [:negative_failure_message, :failure_message_when_negated].each do |method|
+            describe "##{method}" do
+              before { matcher.matches?(model_class) }
 
-            it do
-              matcher.negative_failure_message.should == <<-MESSAGE.strip_heredoc.chomp
-                expected not: attribute :admin, :default => false
-                         got: attribute :admin, :default => false
-              MESSAGE
+              it do
+                matcher.send(method).should == <<-MESSAGE.strip_heredoc.chomp
+                  expected not: attribute :admin, :default => false
+                           got: attribute :admin, :default => false
+                MESSAGE
+              end
             end
           end
         end
@@ -259,17 +265,19 @@ module ActiveAttr
           before { model_class.attribute :first_name }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_true }
+            it { matcher.matches?(model_class).should == true }
           end
 
-          describe "#negative_failure_message" do
-            before { matcher.matches?(model_class) }
+          [:negative_failure_message, :failure_message_when_negated].each do |method|
+            describe "##{method}" do
+              before { matcher.matches?(model_class) }
 
-            it do
-              matcher.negative_failure_message.should == <<-MESSAGE.strip_heredoc.chomp
-                expected not: attribute :first_name, :default => nil
-                         got: attribute :first_name
-              MESSAGE
+              it do
+                matcher.send(method).should == <<-MESSAGE.strip_heredoc.chomp
+                  expected not: attribute :first_name, :default => nil
+                           got: attribute :first_name
+                MESSAGE
+              end
             end
           end
         end
@@ -278,7 +286,7 @@ module ActiveAttr
           before { model_class.attribute :first_name, :default => false }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_false }
+            it { matcher.matches?(model_class).should == false }
           end
 
           describe "#failure_message" do
@@ -297,17 +305,19 @@ module ActiveAttr
           before { model_class.attribute :first_name, :default => nil }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_true }
+            it { matcher.matches?(model_class).should == true }
           end
 
-          describe "#negative_failure_message" do
-            before { matcher.matches?(model_class) }
+          [:negative_failure_message, :failure_message_when_negated].each do |method|
+            describe "##{method}" do
+              before { matcher.matches?(model_class) }
 
-            it do
-              matcher.negative_failure_message.should == <<-MESSAGE.strip_heredoc.chomp
-                expected not: attribute :first_name, :default => nil
-                         got: attribute :first_name, :default => nil
-              MESSAGE
+              it do
+                matcher.send(method).should == <<-MESSAGE.strip_heredoc.chomp
+                  expected not: attribute :first_name, :default => nil
+                           got: attribute :first_name, :default => nil
+                MESSAGE
+              end
             end
           end
         end
@@ -323,7 +333,7 @@ module ActiveAttr
           before { model_class.attribute :first_name }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_false }
+            it { matcher.matches?(model_class).should == false }
           end
 
           describe "#failure_message" do
@@ -342,7 +352,7 @@ module ActiveAttr
           before { model_class.attribute :first_name, :type => Symbol }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_false }
+            it { matcher.matches?(model_class).should == false }
           end
 
           describe "#failure_message" do
@@ -361,17 +371,19 @@ module ActiveAttr
           before { model_class.attribute :first_name, :type => String }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_true }
+            it { matcher.matches?(model_class).should == true }
           end
 
-          describe "#negative_failure_message" do
-            before { matcher.matches?(model_class) }
+          [:negative_failure_message, :failure_message_when_negated].each do |method|
+            describe "##{method}" do
+              before { matcher.matches?(model_class) }
 
-            it do
-              matcher.negative_failure_message.should == <<-MESSAGE.strip_heredoc.chomp
-                expected not: attribute :first_name, :type => String
-                         got: attribute :first_name, :type => String
-              MESSAGE
+              it do
+                matcher.send(method).should == <<-MESSAGE.strip_heredoc.chomp
+                  expected not: attribute :first_name, :type => String
+                           got: attribute :first_name, :type => String
+                MESSAGE
+              end
             end
           end
         end
@@ -387,17 +399,19 @@ module ActiveAttr
           before { model_class.attribute :first_name }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_true }
+            it { matcher.matches?(model_class).should == true }
           end
 
-          describe "#negative_failure_message" do
-            before { matcher.matches?(model_class) }
+          [:negative_failure_message, :failure_message_when_negated].each do |method|
+            describe "##{method}" do
+              before { matcher.matches?(model_class) }
 
-            it do
-              matcher.negative_failure_message.should == <<-MESSAGE.strip_heredoc.chomp
-                expected not: attribute :first_name, :type => Object
-                         got: attribute :first_name
-              MESSAGE
+              it do
+                matcher.send(method).should == <<-MESSAGE.strip_heredoc.chomp
+                  expected not: attribute :first_name, :type => Object
+                           got: attribute :first_name
+                MESSAGE
+              end
             end
           end
         end
@@ -406,7 +420,7 @@ module ActiveAttr
           before { model_class.attribute :first_name, :type => String }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_false }
+            it { matcher.matches?(model_class).should == false }
           end
 
           describe "#failure_message" do
@@ -425,17 +439,19 @@ module ActiveAttr
           before { model_class.attribute :first_name, :type => Object }
 
           describe "#matches?" do
-            it { matcher.matches?(model_class).should be_true }
+            it { matcher.matches?(model_class).should == true }
           end
 
-          describe "#negative_failure_message" do
-            before { matcher.matches?(model_class) }
+          [:negative_failure_message, :failure_message_when_negated].each do |method|
+            describe "##{method}" do
+              before { matcher.matches?(model_class) }
 
-            it do
-              matcher.negative_failure_message.should == <<-MESSAGE.strip_heredoc.chomp
-                expected not: attribute :first_name, :type => Object
-                         got: attribute :first_name, :type => Object
-              MESSAGE
+              it do
+                matcher.send(method).should == <<-MESSAGE.strip_heredoc.chomp
+                  expected not: attribute :first_name, :type => Object
+                           got: attribute :first_name, :type => Object
+                MESSAGE
+              end
             end
           end
         end

data/spec/functional/active_attr/model_spec.rb

@@ -36,9 +36,9 @@ module ActiveAttr
     end
 
     it "can query attributes" do
-      model.first_name?.should be_false
+      model.first_name?.should eq false
       model.first_name = "Chris"
-      model.first_name?.should be_true
+      model.first_name?.should == true
     end
 
     it "initializes with a block that can use attributes" do
@@ -55,14 +55,14 @@ module ActiveAttr
 
     it "has a logger" do
       logger = double("logger")
-      model_class.logger?.should be_false
-      model.logger?.should be_false
+      model_class.logger?.should eq false
+      model.logger?.should eq false
 
       model_class.logger = logger
 
-      model_class.logger?.should be_true
+      model_class.logger?.should eq true
       model_class.logger.should eq logger
-      model.logger?.should be_true
+      model.logger?.should eq true
       model.logger.should == logger
     end
 

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require "bundler/setup"
-require "rspec/autorun"
 require "active_model/version"
 
 # Requires supporting files with custom matchers and macros, etc,
@@ -7,10 +6,22 @@ require "active_model/version"
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |file| require file }
 
 RSpec.configure do |config|
-  config.mock_framework = :rspec
-  config.treat_symbols_as_metadata_keys_with_true_values = true # default in RSpec 3
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
 
   config.filter_run_excluding :active_model_version => lambda { |requirement|
     !Gem::Requirement.create(requirement).satisfied_by?(Gem::Version.new(ActiveModel::VERSION::STRING))
   }
+
+  config.order = :random
+  Kernel.srand config.seed
+
+  config.expect_with :rspec do |expectations|
+    expectations.syntax = [:expect, :should]
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.syntax = :should
+    mocks.verify_partial_doubles = true
+  end
 end

data/spec/support/mass_assignment_shared_examples.rb

@@ -40,7 +40,7 @@ shared_examples "mass assignment method" do
   end
 end
 
-shared_examples "#assign_attribures", :assign_attributes => true do
+shared_examples "#assign_attributes", :assign_attributes => true do
   def mass_assign_attributes(attributes)
     person.assign_attributes attributes
     person

data/spec/unit/active_attr/attributes_spec.rb

@@ -93,7 +93,7 @@ module ActiveAttr
             include Attributes
             attribute :name
             attribute :name
-          end.should have(1).attributes
+          end.attributes.size.should == 1
         end
 
         it "redefining an attribute replaces the attribute definition" do
@@ -103,7 +103,7 @@ module ActiveAttr
             attribute :name, :type => String
           end
 
-          klass.should have(1).attributes
+          klass.attributes.size.should eq 1
           klass.attributes[:name].should == AttributeDefinition.new(:name, :type => String)
         end
       end

data/spec/unit/active_attr/version_spec.rb

@@ -11,8 +11,8 @@ module ActiveAttr
       let(:gem_version) { Gem::Version.new VERSION }
       subject(:version) { gem_version }
 
-      it { version.should have_at_least(3).segments }
-      it { version.should have_at_most(5).segments }
+      it { version.segments.size.should >= 3 }
+      it { version.segments.size.should <= 5 }
 
       describe "major version" do
         subject { gem_version.segments[0] }
@@ -36,7 +36,7 @@ module ActiveAttr
         subject(:pre_release_version) { VERSION.split(".")[3] }
 
         it "is nil or starts with a letter and is alphanumeric" do
-          (pre_release_version.nil? || pre_release_version =~ /^[A-Za-z][0-9A-Za-z]*?/).should be_true
+          (pre_release_version.nil? || pre_release_version =~ /^[A-Za-z][0-9A-Za-z]*?/).should == true
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_attr
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Chris Griego
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -94,7 +94,7 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,21 +104,21 @@ dependencies:
         version: 0.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement