json_test_data 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd5fc0f13b45a7b50daab986818743a431b880cb
-  data.tar.gz: 40aa2874ac448a29b96e7e078ed33785b20b1804
+  metadata.gz: 9b86fdfb10c18e8084d78373027dde9f12496835
+  data.tar.gz: 86d998ef02cb7fd786d8940d5fe076066ae90d77
 SHA512:
-  metadata.gz: 9f20126004662b200b649b8ce669c706ee76f4c6a658932b58ef0ef91fa664ef78a06621c57691cd4d129f41be6cd20190cf3d18c9e0a760afb5026518c6f503
-  data.tar.gz: e9664ea19d7bffbebee080bd1ec7ecfbf439f4e4897dcffb4fc2dd5348a8de2d213aff9028f724226b91e3b82485b4c227ed812cb1c2a4f03445778ad83d9a88
+  metadata.gz: 9ba51ec9788cdb8d85ad7d18333858c1a6a8458c88fb7a2985376de15b7dcc02f98060fd925cf4aaeac1c370bf88546df728783a207adff0660db742702f179e
+  data.tar.gz: 99b1056605ed53221ad7a273c9ab41ad60e58b780a75248cf9265882f12e0cd8b1d37b84bb29c3d5b79c02a928f69010a6d0c72587f39f5114363d9a66e343e0

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 2.1.8
   - 2.2.4
-  - 2.3.0
+  - 2.3.1
 sudo: false
 before_install:
   - gem install regxing --version 0.1.0.beta

data/Gemfile

@@ -1,3 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem 'pry'

data/Gemfile.lock

@@ -1,14 +1,15 @@
 PATH
   remote: .
   specs:
-    json_test_data (0.7.0)
-      regxing (~> 0.1.0.beta)
+    json_test_data (0.8.0)
+      regxing (~> 0.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.8)
     builder (3.2.2)
+    coderay (1.1.1)
     coveralls (0.8.13)
       json (~> 1.8)
       simplecov (~> 0.11.0)
@@ -30,10 +31,15 @@ GEM
     docile (1.1.5)
     gherkin (3.2.0)
     json (1.8.3)
-    json-schema (2.6.1)
+    json-schema (2.6.2)
       addressable (~> 2.3.8)
-    multi_json (1.11.3)
+    method_source (0.8.2)
+    multi_json (1.12.1)
     multi_test (0.1.2)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     rake (11.1.2)
     regxing (0.1.0)
     rspec (3.4.0)
@@ -54,6 +60,7 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    slop (3.6.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
@@ -68,6 +75,7 @@ DEPENDENCIES
   json (~> 1.7)
   json-schema (~> 2.6)
   json_test_data!
+  pry
   rake (~> 11.0)
   rspec (~> 3.4)
 

data/ISSUE_TEMPLATE.md

@@ -0,0 +1,45 @@
+## Summary
+
+<!-- This sections are meant as guidance for you. If some doesn't fit, skip them. In general: Please provide as much information as you can to help us solving your problem -->
+
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Expected Behavior
+
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+<!--- If you have got some output place it in the code block below. Otherwise remove it. -->
+~~~
+~~~
+
+## Possible Solution
+
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Context
+
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Version used:
+* Operating System and version:
+* Link to your project:

data/README.md

@@ -8,7 +8,7 @@ gem install json_test_data
 ```
 Alternatively, it can be included in your Gemfile:
 ```ruby
-gem "json_test_data", "~> 0.6.0"
+gem "json_test_data", "~> 0.7.0"
 ```
 To use it, first require it, then generate the test data using:
 ```ruby

data/features/string_constraints.feature

@@ -32,3 +32,24 @@ Feature: String constraints
       """
     When I run the JSON data generator
     Then the output should match the schema
+
+  Scenario: Possible values given
+    Given the following JSON schema:
+      """json
+      {
+        "$schema": "http://json-schema.org/draft-04/schema#",
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "enum": [
+              "foo",
+              "bar",
+              "baz"
+            ]
+          }
+        }
+      }
+      """
+    When I run the JSON data generator
+    Then the output should match the schema

data/json_test_data.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = ">= 2.1.0"
 
-  s.add_dependency "regxing", "~> 0.1.0.beta"
+  s.add_dependency "regxing", "~> 0.1.0"
 
   s.add_development_dependency "cucumber", "~> 2.1"
   s.add_development_dependency "rspec", "~> 3.4"

data/lib/json_test_data/data_structures/number.rb

@@ -6,6 +6,8 @@ module JsonTestData
 
     class << self
       def create(schema)
+        return schema.fetch(:enum).sample if schema.fetch(:enum, nil)
+
         factor = schema.fetch(:multipleOf, nil)
         minimum, maximum = schema.fetch(:minimum, nil), schema.fetch(:maximum, nil)
 
@@ -57,12 +59,15 @@ module JsonTestData
       type == :integer && !@value.is_a?(Integer)
     end
 
+    def adjust_by!(step_size)
+      @value -= step_size if value_too_high?
+      @value += step_size if value_too_low?
+    end
+
     def adjust!
       while !value_divisible_by_factor? || value_too_low? || value_too_high? || should_be_int_but_isnt?
         adjust_for_divisibility!
-
-        @value -= step_size if value_too_high?
-        @value += step_size if value_too_low?
+        adjust_by!(step_size)
       end
 
       @value ||= 1

data/lib/json_test_data/data_structures/string.rb

@@ -1,11 +1,11 @@
 module JsonTestData
   class String
-    extend RegXing
-
     class << self
       def create(schema)
+        return schema.fetch(:enum).sample if schema.fetch(:enum, nil)
+
         len = schema.fetch(:maxLength, nil) || schema.fetch(:minLength, nil) || 1
-        Generator.new(/.{#{len}}/).generate!
+        RegXing::Generator.new(/.{#{len}}/).generate!
       end
     end
   end

data/lib/json_test_data/json_schema.rb

@@ -70,7 +70,7 @@ module JsonTestData
         object.fetch(:minItems, nil) || object[:minItems] = 1
 
         if object.fetch(:items, nil) && object.fetch(:items).has_key?(:type)
-          Array.new(object.fetch(:minItems)).map {|item| generate(object.fetch(:items)) }
+          Array.new(object.fetch(:minItems)).map { generate(object.fetch(:items)) }
         else
           Array.new(object.fetch(:minItems))
         end

data/spec/json_test_data/data_structures/number_spec.rb

@@ -54,6 +54,20 @@ describe JsonTestData::Number do
       end
     end
 
+    context "enum constraint" do
+      let(:enum) { [ 5, 10, 15, 20, 25 ] }
+      let(:object) do
+        {
+          type: "number",
+          enum: enum
+        }
+      end
+
+      it "chooses from the given array" do
+        expect(described_class.create(object)).to be_in enum
+      end
+    end
+
     context "multiple constraints" do
       context "maximum and minimum" do
         let(:maximum) { 1 }

data/spec/json_test_data/data_structures/string_spec.rb

@@ -41,5 +41,20 @@ describe JsonTestData::String do
         expect(described_class.create(object).length).to eq 8
       end
     end
+
+    context "with enum" do
+      let(:enum) { ["foo", "bar", "baz"] }
+
+      let(:object) do
+        {
+          type: "string",
+          enum: enum
+        }
+      end
+
+      it "returns a string from the list" do
+        expect(described_class.create(object)).to be_in enum
+      end
+    end
   end
 end

data/spec/matchers/array_matchers.rb

@@ -0,0 +1,7 @@
+require "rspec/expectations"
+
+RSpec::Matchers.define :be_in do |expected|
+  match do |actual|
+    expected.include?(actual)
+  end
+end

data/spec/spec_helper.rb

@@ -8,6 +8,7 @@ require_relative "../lib/json_test_data/data_structures/string"
 require_relative "../lib/json_test_data/data_structures/number"
 require_relative "./matchers/number_matchers"
 require_relative "./matchers/json_schema_matchers"
+require_relative "./matchers/array_matchers"
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

data/version.rb

@@ -1,3 +1,3 @@
 module JsonTestData
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_test_data
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Dana Scheider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regxing
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.beta
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.beta
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- ISSUE_TEMPLATE.md
 - LICENSE
 - README.md
 - Rakefile
@@ -143,6 +144,7 @@ files:
 - spec/json_test_data/data_structures/number_spec.rb
 - spec/json_test_data/data_structures/string_spec.rb
 - spec/json_test_data/json_schema_spec.rb
+- spec/matchers/array_matchers.rb
 - spec/matchers/json_schema_matchers.rb
 - spec/matchers/number_matchers.rb
 - spec/spec_helper.rb
@@ -171,7 +173,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: json_test_data-0.7.0
+summary: json_test_data-0.8.0
 test_files:
 - features/array_constraints.feature
 - features/data_types.feature
@@ -187,6 +189,7 @@ test_files:
 - spec/json_test_data/data_structures/number_spec.rb
 - spec/json_test_data/data_structures/string_spec.rb
 - spec/json_test_data/json_schema_spec.rb
+- spec/matchers/array_matchers.rb
 - spec/matchers/json_schema_matchers.rb
 - spec/matchers/number_matchers.rb
 - spec/spec_helper.rb