committee-rails 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68a3f68dc9ba8e438ce54582ea99d45e64371adc7d5a264d68004a6408a67782
-  data.tar.gz: edd5b6a33ba746b5693ae42c6e0c7381a216de4b4287a48d66f5e58429b20875
+  metadata.gz: b640c3b77a994b7172de11d4d3cc0e207d869d11576bb2747ff6b6530be792d3
+  data.tar.gz: f6ba370310d7fbb0cdc5e60f67cea8e99eafb99b1970d2bd3649046aca60c7ae
 SHA512:
-  metadata.gz: 69292ca6e1c5dddc9a0473aab8418fc20d5fcd8e517cfd989bda4cb262000fc373c903f4ac024e82981d26351caa65e3b329124e875f09b489479081b14933ae
-  data.tar.gz: 0566b55c0fdc9d6403effb7a9816fb5feafe9cfb939a6c2525bfeba8a63313312afc4bd87361272cd5e9a40fa5333670792e036ab672dc7bfce925413adc50bf
+  metadata.gz: 6df47e899656d8a8d397d74a1548ddc1106e73806508ed01469afca839dfe4f0c9fc0252a6a89780da3511e07bbc35b1197b380a1035efaa3d0767d38fba093d
+  data.tar.gz: 47d2ff2e4d8ea5a343d08223c994cefb3298e30596b9b7b298a69e85549ccf85185975d4e717cf7bcfb577a758011d6832a87d88416869e90a60ab603db69840

data/.travis.yml

@@ -4,4 +4,7 @@ rvm:
   - 2.3
   - 2.4
   - 2.5
-before_install: gem install bundler
+  - 2.6
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'

data/README.md

@@ -17,23 +17,25 @@ And then execute:
 
     $ bundle
 
+
+If you use committee prior to 2.4, you have to use committee-rails 0.3.x. Please see below.
+
+[0.3 (0-3-stable) documentation](https://github.com/willnet/committee-rails/tree/0-3-stable)
+
 If you use committee prior to 2.0, you have to use committee-rails 0.1.x. Please see below.
 
 [0.1 (0-1-stable) documentation](https://github.com/willnet/committee-rails/tree/0-1-stable)
 
-
 ## Usage
 
+### normal usage
+
 ```ruby
 describe 'request spec' do
   include Committee::Rails::Test::Methods
 
-  def committee_schema
-    @committee_schema ||= begin
-      driver = Committee::Drivers::HyperSchema.new
-      schema_hash = JSON.parse(File.read(Rails.root.join('schema', 'schema.json'))) # default to docs/schema/schema.json
-      driver.parse(schema_hash)
-    end
+  def committee_options
+    @committee_options ||= { schema_path: Rails.root.join('schema', 'schema.json').to_s }
   end
 
   describe 'GET /' do
@@ -45,6 +47,16 @@ describe 'request spec' do
 end
 ```
 
+### rspec setting
+If you use rspec, you can use very simple.
+
+```ruby
+RSpec.configure do |config|
+  config.add_setting :committee_options
+  config.committee_options = { schema_path: Rails.root.join('schema', 'schema.json').to_s }
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/committee-rails.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_dependency 'committee', '>= 2.0.0'
+  spec.add_dependency 'committee', '>= 2.4.0'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'actionpack'
   spec.add_dependency 'railties'

data/lib/committee/rails/test/methods.rb

@@ -4,65 +4,32 @@ module Committee::Rails
       include Committee::Test::Methods
 
       def committee_schema
-        @committee_schema = committee_options[:schema]
-
-        @committee_schema ||= begin
-
-          driver = Committee::Drivers::HyperSchema.new
-          schema_hash = JSON.parse(File.read(Rails.root.join('docs', 'schema', 'schema.json')))
-          driver.parse(schema_hash)
-        end
+        # this code for 2.4.0, committee 3.x use committee_options
+        @committee_schema ||= Committee::Middleware::Base.new(nil, committee_options).send(:get_schema, committee_options)
       end
 
       def committee_options
-        {}
-      end
-
-      def assert_schema_conform
-        @committee_schema ||= begin
-          # The preferred option. The user has already parsed a schema elsewhere
-          # and we therefore don't have to worry about any performance
-          # implications of having to do it for every single test suite.
-          if committee_schema
-            committee_schema
-          else
-            schema = schema_contents
-
-            if schema.is_a?(String)
-              warn_string_deprecated
-            elsif schema.is_a?(Hash)
-              warn_hash_deprecated
-            end
-
-            if schema.is_a?(String)
-              schema = JSON.parse(schema)
-            end
-
-            if schema.is_a?(Hash) || schema.is_a?(JsonSchema::Schema)
-              driver = Committee::Drivers::HyperSchema.new
-
-              # The driver itself has its own special cases to be able to parse
-              # either a hash or JsonSchema::Schema object.
-              schema = driver.parse(schema)
-            end
-
-            schema
-          end
+        if defined?(RSpec) && (options = RSpec.try(:configuration).try(:committee_options))
+          options
+        elsif !defined?(@committee_schema)
+          { schema: default_schema }
+        else
+          # schema_url_prefix method call this but the user overrite comittee_schema, we got error
+          # we can remove in comittee 3.x
+          { schema: committee_schema }
         end
+      end
 
-        @committee_router ||= Committee::Router.new(@committee_schema,
-          prefix: schema_url_prefix)
+      def default_schema
+        @default_schema ||= Committee::Drivers.load_from_file(Rails.root.join('docs', 'schema', 'schema.json').to_s)
+      end
 
-        link, _ = @committee_router.find_request_link(request)
-        unless link
-          invalid_response = "`#{request.request_method} #{request.path_info}` undefined in schema."
-          raise Committee::InvalidResponse.new(invalid_response)
-        end
+      def request_object
+        request
+      end
 
-        if validate_response?(response.response_code)
-          data = JSON.parse(response.body)
-          Committee::ResponseValidator.new(link).call(response.response_code, response.headers, data)
-        end
+      def response_data
+        [response.status, response.headers, response.body]
       end
     end
   end

data/lib/committee/rails/version.rb

@@ -1,5 +1,5 @@
 module Committee
   module Rails
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: committee-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - willnet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-26 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: committee
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement