committee-rails 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4a2263a61bd5a5f7c2d8bff36a09af540921266
-  data.tar.gz: e2eaab13de294adc2d25e384d71987c0520fba74
+  metadata.gz: 89064ee81b1800d5ae8770a4cd6cdb2a286df8e8
+  data.tar.gz: b275fccf8926680cb347b105aa14ed6cb4d4d554
 SHA512:
-  metadata.gz: 7f46e87c5c1c8081b48f16fe48ccb83b2dc1f32c3cb3227ec7fa2a24dbdbf15745ead93be66ab44e14f94a825205a27e049b38c748d616bb13392b2efb9a00ad
-  data.tar.gz: 23c169a420bd3f2eeae9eed570b2978bafad5ec37b0f162374696540e0c03bffed1f34d95c4b037ef73ef87876971740e67f793a5695017f673b795db651870b
+  metadata.gz: 823dc012fbf74036300bb0b90417ca0dc984275e87a59cc2c86b73181959cc91298dec780b3a46150c14ca10e90c113f87d1554c3f911c3479ee8233c1beb34e
+  data.tar.gz: ae936d832f006c4b097495e40f078f575631b96cbdb79730885482877387e67aa566d80f9b2e8f8ecf968b54fae703a9cbbbbe2dfc43d4511c64c0226f8b9978

data/README.md

@@ -17,9 +17,10 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+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)
 
-    $ gem install committee-rails
 
 ## Usage
 
@@ -27,8 +28,12 @@ Or install it yourself as:
 describe 'request spec' do
   include Committee::Rails::Test::Methods
 
-  def schema_path
-    Rails.root.join('path', 'to', 'schema.json') # default to docs/schema/schema.json
+  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
   end
 
   describe 'GET /' do

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.0.0.pre6'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'actionpack'
   spec.add_dependency 'railties'

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

@@ -3,24 +3,51 @@ module Committee::Rails
     module Methods
       include Committee::Test::Methods
 
-      def schema_path
-        Rails.root.join('docs', 'schema', 'schema.json')
+      def committee_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
       end
 
       def assert_schema_conform
-        if (data = schema_contents).is_a?(String)
-          warn_string_deprecated
-          data = JSON.parse(data)
-        end
+        @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
 
-        @schema ||= begin
-          schema = JsonSchema.parse!(data)
-          schema.expand_references!
-          schema
+            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
         end
-        @router ||= Committee::Router.new(@schema, prefix: schema_url_prefix)
 
-        unless link = @router.find_request_link(request)
+        @committee_router ||= Committee::Router.new(@committee_schema,
+          prefix: schema_url_prefix)
+
+        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

data/lib/committee/rails/version.rb

@@ -1,5 +1,5 @@
 module Committee
   module Rails
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - willnet
@@ -14,16 +14,16 @@ dependencies:
   name: committee
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.pre6
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement