metasploit_data_models 0.20.1 → 0.21.0.pre.engine.pre.requires

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmM0ZmRiYjg4NWVhNWI5NzY1ZDk4Y2JjMTQwMGJiNTVmMmNhODVjZQ==
+    NGE0OTY0MGZmZjg4MDE2ZGVjMjRlOGVhOThiN2U1YjAxY2E0YTZjZQ==
   data.tar.gz: !binary |-
-    MmFmNzA2YTJjYjZkNjI3ZjBlNGNhYzQxOTU4N2MwMzA2MDdiNjUwOA==
+    YjUzYzQ5NjNkZmZkYTUwNjExZGYzZGIwNTg2YmMzYTMxYzgxMjg1OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTlkNjNkMjE0ZmU4ZWRhY2MwZWIyMmE3M2M3YzRhZjg3OTg2MmU1YmY3MmJj
-    NWNmNTk4MWM0MzM5ZGRjZTg4OGFiYWMwNTMzOWY0ZGMwNWMwZjgwZjc3ODI3
-    NjdkNWExZThkNGE0MzY2ZTkwZGJlYTcxOTlhMjEyZWQ4ODFmNTA=
+    YTc4NDQwNTVlYmY0MDFmODU0ZjQ5ZmRhNTg5Yjc3MjQxNGI1ZWI4ZWY1NTEw
+    M2FiOTA2NDkwODU5ZGMyOWNjODU2MGEyMTljZDFkZmQ4Yjg3YjBlZmRiZGQ3
+    ZTNjMmNkMzEzZmIzMTYzZjVjMmJkMDE0ZmRiNTBlYzVjMmMwYjI=
   data.tar.gz: !binary |-
-    ZmE4YzgzZjUwNDM5YjJjMzUwOGYwYjk0NzJhYTNmZDkzNDA1ZjhlOGZjMTBl
-    NjJlZDlmZjlmNTNlZDlmOWQ5YTM0MmQ4MzRlZjQyYjVkMGQ5NWIxYzZhMWRm
-    ZWJiMDRiNDY2Nzk0MmI2ZmI3ZGJkZmE2ZTk3MTY2M2NiNDJkMjE=
+    OTUyZDVkMGYyOTE1ZGE0MTMzZGYwZWZhZDE1NjIwNDQ2NjhiMWI3N2Q0YTlk
+    ZTY2YzJlYmE3YmM5ODg4M2FhNWZhMDE4OWU5ZjA3ZTJjZDg4ZTQ0Yzc5ODJk
+    ODg0ZDNhZTRmZmY4NjE0NDQ2YTA3ZGQzOTY5ZjBiNGVmNzk0NDc=

data/Gemfile

@@ -8,6 +8,9 @@ group :development do
   gem 'yard-metasploit-erd', '~> 0.0.2'
 end
 
+gem 'metasploit-concern', git: 'https://github.com/rapid7/metasploit-concern.git', branch: 'bug/MSP-11412/engine-requires'
+gem 'metasploit-model', git: 'https://github.com/rapid7/metasploit-model.git', branch: 'bug/MSP-11412/engine-requires'
+
 # used by dummy application
 group :development, :test do
   # supplies factories for producing model instance for specs

data/README.md

@@ -19,24 +19,28 @@ __MetasploitDataModels__ exists to do several key things:
 
 In a Rails application, MetasploitDataModels acts a
 [Rails Engine](http://edgeapi.rubyonrails.org/classes/Rails/Engine.html) and the models are available to application
-just as if they were defined under app/models.  If your Rails appliation needs to modify the models, this can be done
-using ActiveSupport.on_load hooks in initializers.  The block passed to on_load hook is evaluated in the context of the
+just as if they were defined under `app/models`.  If your Rails appliation needs to modify the models, this can be done
+using `ActiveSupport.on_load` hooks in initializers.  The block passed to on_load hook is evaluated in the context of the
 model class, so defining method and including modules will work just like reopeninng the class, but
-ActiveSupport.on_load ensures that the monkey patches will work after reloading in development mode.  Each class has a
-different on_load name, which is just the class name converted to an underscored symbol, so Mdm::ApiKey runs the
-:mdm_api_key load hooks, etc.
+`ActiveSupport.on_load` ensures that the monkey patches will work after reloading in development mode.  Each class has a
+different `on_load` name, which is just the class name converted to an underscored symbol, so `Mdm::ApiKey` runs the
+`:mdm_api_key` load hooks, etc.
 
     # Gemfile
     gem :metasploiit_data_models, :git => git://github.com/rapid7/metasploit_data_models.git, :tag => 'v0.3.0'
 
     # config/initializers/metasploit_data_models.rb
     ActiveSupport.on_load(:mdm_api_key) do
-        # Returns the String obfuscated token for display. Meant to avoid CSRF
-        # api-key stealing attackes.
-        def obfuscated_token
-          token[0..3] + "****************************"
-        end
+      # Returns the String obfuscated token for display. Meant to avoid CSRF
+      # api-key stealing attackes.
+      def obfuscated_token
+        token[0..3] + "****************************"
+      end
     end
+    
+**This gem's `Rails::Engine` is not required automatically.** You'll need to also add the following to your `config/application.rb`:
+
+    require 'metasploit_data_models/engine'
 
 ### Metasploit Framework
 

data/lib/metasploit_data_models.rb

@@ -24,7 +24,6 @@ require 'arel-helpers'
 require 'mdm'
 require 'mdm/module'
 require 'metasploit_data_models/base64_serializer'
-require 'metasploit_data_models/engine'
 require 'metasploit_data_models/serialized_prefs'
 require 'metasploit_data_models/version'
 

data/lib/metasploit_data_models/version.rb

@@ -4,9 +4,10 @@ module MetasploitDataModels
     # The major version number.
     MAJOR = 0
     # The minor version number, scoped to the {MAJOR} version number.
-    MINOR = 20
+    MINOR = 21
     # The patch number, scoped to the {MINOR} version number.
-    PATCH = 1
+    PATCH = 0
+    PRERELEASE = 'engine-requires'
 
     # 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_data_models.gemspec

@@ -39,8 +39,8 @@ Gem::Specification.new do |s|
   # @see MSP-2971
   s.add_runtime_dependency 'activerecord', '>= 3.2.13', '< 4.0.0'
   s.add_runtime_dependency 'activesupport'
-  s.add_runtime_dependency 'metasploit-concern', '~> 0.2.1'
-  s.add_runtime_dependency 'metasploit-model', '~> 0.27.0'
+  s.add_runtime_dependency 'metasploit-concern'#, '~> 0.3.0'
+  s.add_runtime_dependency 'metasploit-model'#, '~> 0.28.0'
   s.add_runtime_dependency 'railties', '< 4.0.0'
 
   # arel-helpers: Useful tools to help construct database queries with ActiveRecord and Arel.

data/spec/dummy/config/application.rb

@@ -6,6 +6,9 @@ Bundler.require(*Rails.groups)
 # require the engine being tested.  In a non-dummy app this would be handled by the engine's gem being in the Gemfile
 # for real app and Bundler.require requiring the gem.
 require 'metasploit_data_models'
+require 'metasploit_data_models/engine'
+require 'metasploit/concern/engine'
+require 'metasploit/model/engine'
 
 module Dummy
   class Application < Rails::Application

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0.pre.engine.pre.requires
 platform: ruby
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -93,30 +93,30 @@ dependencies:
   name: metasploit-concern
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: metasploit-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -582,9 +582,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2