metasploit-model 0.29.0-java → 0.29.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6fd8588b44d2db517e862dfcc6a992e67ed7911
-  data.tar.gz: eff2999cb386b96f608c4f8223890e48bc2767a2
+  metadata.gz: b150c41b2ca68b5d851bf1861493f2b53e5d0d1d
+  data.tar.gz: 66cceb2757470aa2e26efcdb41d8cd0d665212f7
 SHA512:
-  metadata.gz: 5b0cb8525e65fdc000f439b28dc12bace602b07278d5345ee91c34c16692caa462bfa35b95c809dc4a52680e7793f0b3e740ffdf4943c3bb8b31b6ffea149884
-  data.tar.gz: f23fc173b6e153b39fa537b488dcc1345521c92e9bd350118f760e6b0e5e4698a39e58ce9280f6cea4bfb08ff1a8ca076c3072c4cf7a05afe7ead7dd002245fb
+  metadata.gz: 4a270f0baf6f4763df5ac967078687d648bb4acdb48e03d7bd16c945feadd188d8a682e2ff7fdf6f741a6754dba1450b4429c3c6d16f66abd0f11443678459e3
+  data.tar.gz: 47d3cde65dd04c7569f9783ce0f2ec9cd4c92a8a4e4118195550ca63fb7686a858d8c92342f703a65526eb96d4a2135275520d329ffef36e940a1e2c45677f77

data/.simplecov

@@ -7,7 +7,7 @@ unless ENV['RM_INFO']
 end
 
 SimpleCov.configure do
-  load_adapter('rails')
+  load_profile('rails')
 
   # ignore this file
 	add_filter '.simplecov'

data/.travis.yml

@@ -1,8 +1,6 @@
 cache: bundler
 language: ruby
 rvm:
-  - '1.9.3'
-  - '2.0'
   - '2.1'
   # < 1.7.14
   - 'jruby-1.7.13'

data/CONTRIBUTING.md

@@ -148,7 +148,7 @@ If your changes are incompatible with the previous branch's API, then increment
 - [ ] `rake release`
 
 ## MRI Ruby
-- [ ] `rvm use ruby-1.9.3@metasploit-model`
+- [ ] `rvm use ruby-2.1@metasploit-model`
 - [ ] `rm Gemfile.lock`
 - [ ] `bundle install`
 - [ ] `rake release`

data/lib/metasploit/model/version.rb

@@ -6,8 +6,8 @@ module Metasploit
       MAJOR = 0
       # The minor version number, scoped to the {MAJOR} version number.
       MINOR = 29
-      # The patch number, scoped to the {MINOR} version number.
-      PATCH = 0
+      # The patch number, scoped to the {MAJOR} and {MINOR} version numbers.
+      PATCH = 2
 
       # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
       # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.

data/metasploit-model.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w{app/models app/validators lib}
 
+  spec.required_ruby_version = '>= 2.1'
+
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
 

data/spec/dummy/config/environments/development.rb

@@ -6,8 +6,8 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/dummy/config/environments/production.rb

@@ -4,6 +4,8 @@ Dummy::Application.configure do
   # Code is not reloaded between requests
   config.cache_classes = true
 
+  config.eager_load = true
+
   # Full error reports are disabled and caching is turned on
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true

data/spec/dummy/config/environments/test.rb

@@ -7,12 +7,12 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
+  config.eager_load = true
+
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true

data/spec/matchers/validate_nilness_of_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+RSpec.describe 'validate_nilness_of' do
+  let(:record) {
+    record_class.new
+  }
+
+  context 'a model with a nil validation' do
+    let(:attribute) {
+      :nil_thing
+    }
+
+    let(:record_class) {
+      # capture attribute for Class.new scope
+      attribute = self.attribute
+
+      Class.new do
+        include ActiveModel::Validations
+
+        #
+        # Attributes
+        #
+
+        attr_accessor attribute
+
+        #
+        # Validations
+        #
+
+        validates attribute,
+                  nil: true
+      end
+    }
+
+    it 'accepts' do
+      expect(record).to validate_nilness_of(attribute)
+    end
+
+    it 'provides correct error message when negated' do
+      expect {
+        expect(record).not_to validate_nilness_of(attribute)
+      }.to raise_error(
+               RSpec::Expectations::ExpectationNotMetError,
+               "Expected errors not to include 'must be nil' when #{attribute} is set"
+           )
+    end
+  end
+
+  context 'a model without a nil validation' do
+    let(:attribute) {
+      :non_nil_thing
+    }
+
+    let(:record_class) {
+      # capture attribute for Class.new scope
+      attribute = self.attribute
+
+      Class.new do
+        include ActiveModel::Validations
+
+        #
+        # Attributes
+        #
+
+        attr_accessor attribute
+      end
+    }
+
+    it 'rejects' do
+      expect(record).not_to validate_nilness_of(attribute)
+    end
+
+    it 'provides the correct failure message' do
+      expect {
+        expect(record).to validate_nilness_of(attribute)
+      }.to raise_error(
+               RSpec::Expectations::ExpectationNotMetError,
+               "Expected errors to include 'must be nil' when #{attribute} is set to an arbitrary string"
+           )
+    end
+  end
+end

data/spec/support/matchers/validate_nilness_of.rb

@@ -0,0 +1,46 @@
+RSpec::Matchers.define :validate_nilness_of do |attribute|
+  description do
+    "require nil for #{attribute}"
+  end
+
+  failure_message_method = :failure_message_for_should
+
+  # RSpec compatibility without deprecation warnings
+  if respond_to?(:failure_message)
+    failure_message_method = :failure_message
+  end
+
+  send(failure_message_method) do |instance|
+    "Expected errors to include 'must be nil' when #{attribute} is set to an arbitrary string"
+  end
+
+  failure_message_when_negated_method = :failure_message_for_should_not
+
+  # RSpec compatibility without deprecation warnings
+  if respond_to?(:failure_message_when_negated)
+    failure_message_when_negated_method = :failure_message_when_negated
+  end
+
+  send(failure_message_when_negated_method) do |instance|
+    "Expected errors not to include 'must be nil' when #{attribute} is set"
+  end
+
+  match do |instance|
+    writer = :"#{attribute}="
+    instance.send(writer, nil)
+    instance.valid?
+    allow_nil = instance.errors[attribute].empty?
+
+    empty = ''
+    instance.send(writer, empty)
+    instance.valid?
+    disallow_empty = instance.errors[attribute].include?('must be nil')
+
+    present = 'present'
+    instance.send(writer, present)
+    instance.valid?
+    disallow_present = instance.errors[attribute].include?('must be nil')
+
+    allow_nil && disallow_empty && disallow_present
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.29.2
 platform: java
 authors:
 - Luke Imhoff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -284,7 +284,10 @@ files:
 - spec/lib/metasploit/model/translation_spec.rb
 - spec/lib/metasploit/model/version_spec.rb
 - spec/lib/metasploit/model/visitation/visit_spec.rb
+- spec/matchers/validate_nilness_of_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/allow_attribute.rb
+- spec/support/matchers/validate_nilness_of.rb
 - spec/support/shared/contexts/metasploit/model/search/operator/union/children.rb
 - spec/support/shared/examples/metasploit/model/search/operation/value/integer.rb
 - spec/support/shared/examples/metasploit/model/search/operation/value/string.rb
@@ -294,7 +297,6 @@ files:
 - spec/support/shared/examples/search_association.rb
 - spec/support/shared/examples/search_attribute.rb
 - spec/support/shared/examples/search_with.rb
-- spec/support/shared/matchers/allow_attribute.rb
 homepage:
 licenses: []
 metadata: {}
@@ -308,7 +310,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -316,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: Metasploit Model Mixins and Validators
@@ -413,7 +415,10 @@ test_files:
 - spec/lib/metasploit/model/translation_spec.rb
 - spec/lib/metasploit/model/version_spec.rb
 - spec/lib/metasploit/model/visitation/visit_spec.rb
+- spec/matchers/validate_nilness_of_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers/allow_attribute.rb
+- spec/support/matchers/validate_nilness_of.rb
 - spec/support/shared/contexts/metasploit/model/search/operator/union/children.rb
 - spec/support/shared/examples/metasploit/model/search/operation/value/integer.rb
 - spec/support/shared/examples/metasploit/model/search/operation/value/string.rb
@@ -423,5 +428,4 @@ test_files:
 - spec/support/shared/examples/search_association.rb
 - spec/support/shared/examples/search_attribute.rb
 - spec/support/shared/examples/search_with.rb
-- spec/support/shared/matchers/allow_attribute.rb
 has_rdoc: