json_test_data 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8b504f8d9d91c11e1d6156bca0adc72de0dc979
-  data.tar.gz: 01da131cf99954fc4df345c51504905e727fa7b9
+  metadata.gz: cd5fc0f13b45a7b50daab986818743a431b880cb
+  data.tar.gz: 40aa2874ac448a29b96e7e078ed33785b20b1804
 SHA512:
-  metadata.gz: 95edfc2a3c2d61754970ac84071b2128a239fca4cac4831193138da4b67117147523bd96b8fd0100393b5ba902a8674de79f86746bd94eb3cce704038d324d1f
-  data.tar.gz: 2959a3460b76d7f148eb0ba491e188113cb28e84a6c98c3958c4636aa8cdc6681bba1ea6896c49e37a886c6b23dbcb95292ed493080640cb4dc2fcaa41bd9666
+  metadata.gz: 9f20126004662b200b649b8ce669c706ee76f4c6a658932b58ef0ef91fa664ef78a06621c57691cd4d129f41be6cd20190cf3d18c9e0a760afb5026518c6f503
+  data.tar.gz: e9664ea19d7bffbebee080bd1ec7ecfbf439f4e4897dcffb4fc2dd5348a8de2d213aff9028f724226b91e3b82485b4c227ed812cb1c2a4f03445778ad83d9a88

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    json_test_data (0.6.0)
+    json_test_data (0.7.0)
       regxing (~> 0.1.0.beta)
 
 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,15 +30,12 @@ GEM
     docile (1.1.5)
     gherkin (3.2.0)
     json (1.8.3)
-    method_source (0.8.2)
+    json-schema (2.6.1)
+      addressable (~> 2.3.8)
     multi_json (1.11.3)
     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.beta)
+    regxing (0.1.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -57,7 +54,6 @@ 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)
@@ -70,11 +66,10 @@ DEPENDENCIES
   coveralls (~> 0.7)
   cucumber (~> 2.1)
   json (~> 1.7)
+  json-schema (~> 2.6)
   json_test_data!
-  pry (~> 0.10)
   rake (~> 11.0)
   rspec (~> 3.4)
-  simplecov (~> 0.11)
 
 BUNDLED WITH
    1.11.2

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.5.1"
+gem "json_test_data", "~> 0.6.0"
 ```
 To use it, first require it, then generate the test data using:
 ```ruby

data/features/array_constraints.feature

@@ -7,13 +7,24 @@ Feature: Array constraints
         "type": "array",
         "minItems": 4,
         "items": {
-          "type": "number",
-          "minLength": 3
+          "type": "number"
         }
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
+    Then the output should match the schema
+
+  Scenario: Unique items
+    Given the following JSON schema:
       """json
-      [1,1,1,1]
+      {
+        "$schema": "http://json-schema.org/draft-04/schema#",
+        "type": "array",
+        "minItems": 4,
+        "items": {
+          "type": "number"
+        }
+      }
       """
+    When I run the JSON data generator
+    Then the output should match the schema

data/features/data_types.feature

@@ -17,7 +17,7 @@ Feature: Handling data types
       }
       """
     When I run the JSON data generator
-    Then the "name" property of the JSON output should be a String
+    Then the output should match the schema
 
   Scenario: Numbers
     Given the following JSON schema:
@@ -33,10 +33,7 @@ Feature: Handling data types
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      {"id":1}
-      """
+    Then the output should match the schema
 
   Scenario: Booleans
     Given the following JSON schema:
@@ -52,7 +49,4 @@ Feature: Handling data types
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      {"admin":true}
-      """
+    Then the output should match the schema

data/features/generate_data.feature

@@ -13,10 +13,7 @@ Feature: Generate test data
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      {"id":1}
-      """
+    Then the output should match the schema
 
   Scenario: Simple array
     Given the following JSON schema:
@@ -30,7 +27,4 @@ Feature: Generate test data
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      [1]
-      """
+    Then the output should match the schema

data/features/generate_empty_objects.feature

@@ -9,10 +9,7 @@ Feature: Generating empty objects
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      {}
-      """
+    Then the output should match the schema
 
   Scenario: Array with null
     Given the following JSON schema:
@@ -24,10 +21,7 @@ Feature: Generating empty objects
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      [null]
-      """
+    Then the output should match the schema
 
   Scenario: Ruby hash
     Given the following JSON schema:

data/features/nested_objects_and_arrays.feature

@@ -20,10 +20,7 @@ Feature: Support nested objects and arrays
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      [{"id":1,"admin":true}]
-      """
+    Then the output should match the schema
 
   Scenario: Array in an object
     Given the following JSON schema:
@@ -42,10 +39,7 @@ Feature: Support nested objects and arrays
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      {"users":[1]}
-      """
+    Then the output should match the schema
 
   Scenario: Array in an array
     Given the following JSON schema:
@@ -62,10 +56,7 @@ Feature: Support nested objects and arrays
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      [[1]]
-      """
+    Then the output should match the schema
 
   Scenario: More complex nested object
     Given the following JSON schema:
@@ -101,7 +92,4 @@ Feature: Support nested objects and arrays
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      [{"id":1,"dossier":{"height_in_feet":1,"favorite_foods":[1]},"admin":true}]
-      """
+    Then the output should match the schema

data/features/numeric_constraints.feature

@@ -14,10 +14,7 @@ Feature: Numeric constraints
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      {"widgets":2}
-      """
+    Then the output should match the schema
 
   Scenario: Number has a maximum value
     Given the following JSON schema:
@@ -34,10 +31,7 @@ Feature: Numeric constraints
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      {"proportion":0.0}
-      """
+    Then the output should match the schema
 
   Scenario: Number has a minimum value
     Given the following JSON schema:
@@ -54,10 +48,7 @@ Feature: Numeric constraints
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      {"quantity":3}
-      """
+    Then the output should match the schema
 
   Scenario: Maximum and minimum
     Given the following JSON schema:
@@ -76,10 +67,7 @@ Feature: Numeric constraints
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      {"proportion":0.83}
-      """
+    Then the output should match the schema
 
   Scenario: Multiple with minimum
     Given the following JSON schema:
@@ -97,7 +85,4 @@ Feature: Numeric constraints
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      {"wheels":20}
-      """
+    Then the output should match the schema

data/features/object_constraints.feature

@@ -8,10 +8,7 @@ Feature: Object constraints
       }
       """
     When I run the JSON data generator
-    Then the JSON output should be:
-      """json
-      {}
-      """
+    Then the output should match the schema
 
   Scenario: Minimum number of properties
     Given the following JSON schema:
@@ -25,4 +22,4 @@ Feature: Object constraints
       }
       """
     When I run the JSON data generator
-    Then JSON output should have 3 properties
+    Then the output should match the schema

data/features/step_definitions/json_test_data_steps.rb

@@ -10,8 +10,8 @@ When(/^I run the JSON data generator with the "ruby" option$/) do
   @output = JsonTestData.generate!(@schema, ruby: true)
 end
 
-Then(/^the JSON output should be:$/) do |json|
-  expect(@output).to eq json
+Then(/^the output should match the schema$/) do
+  expect(@output).to match_schema(@schema)
 end
 
 Then(/^the output should be a Ruby hash$/) do
@@ -21,17 +21,3 @@ end
 Then(/^the output should be a Ruby array$/) do
   expect(@output).to be_a(Array)
 end
-
-Then(/^the "([^" ]*)" property of the JSON output should be a ([^ ]*)$/) do |prop, type|
-  klass = Class.const_get(type)
-  expect(JSON.parse(@output).fetch(prop).class).to eql klass
-end
-
-Then(/^the "([^"]*)" property of the JSON output should be a string of length (\d+)$/) do |prop, length|
-  expect(JSON.parse(@output).fetch(prop).class).to eql String
-  expect(JSON.parse(@output).fetch(prop).length).to eql length.to_i
-end
-
-Then(/^JSON output should have (\d+) properties$/) do |number|
-  expect(JSON.parse(@output).length).to eql number.to_i
-end

data/features/string_constraints.feature

@@ -14,7 +14,7 @@ Feature: String constraints
       }
       """
     When I run the JSON data generator
-    Then the "name" property of the JSON output should be a string of length 2
+    Then the output should match the schema
 
   Scenario: Minimum length is long
     Given the following JSON schema:
@@ -31,4 +31,4 @@ Feature: String constraints
       }
       """
     When I run the JSON data generator
-    Then the "name" property of the JSON output should be a string of length 8
+    Then the output should match the schema

data/features/support/env.rb

@@ -2,6 +2,6 @@ require "coveralls"
 
 Coveralls.wear!
 
-require "pry"
 require_relative "../../lib/json_test_data"
 require_relative "../../lib/json_test_data/json_schema"
+require_relative "../../spec/matchers/json_schema_matchers"

data/json_test_data.gemspec

@@ -7,20 +7,19 @@ Gem::Specification.new do |s|
   s.authors               = ["Dana Scheider"]
   s.description           = "Generate test data from JSON schema"
   s.summary               = "json_test_data-#{s.version}"
-  s.email                 = 'dana.scheider@gmail.com'
-  s.license               = 'MIT'
+  s.email                 = "dana.scheider@gmail.com"
+  s.license               = "MIT"
   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.beta"
 
-  s.add_development_dependency 'cucumber', '~> 2.1'
-  s.add_development_dependency 'rspec', '~> 3.4'
-  s.add_development_dependency 'json', '~> 1.7'
-  s.add_development_dependency 'rake', '~> 11.0'
-  s.add_development_dependency 'simplecov', '~> 0.11'
-  s.add_development_dependency 'coveralls', '~> 0.7'
-  s.add_development_dependency 'pry', '~> 0.10'
+  s.add_development_dependency "cucumber", "~> 2.1"
+  s.add_development_dependency "rspec", "~> 3.4"
+  s.add_development_dependency "json", "~> 1.7"
+  s.add_development_dependency "json-schema", "~> 2.6"
+  s.add_development_dependency "rake", "~> 11.0"
+  s.add_development_dependency "coveralls", "~> 0.7"
 
   s.rubygems_version   = ">= 1.6.1"
   s.files              = `git ls-files`.split("\n").reject {|path| path =~ /\.gitignore$/ }

data/lib/json_test_data/data_structures/number.rb

@@ -12,19 +12,13 @@ module JsonTestData
         num = new(min: minimum, max: maximum, factor: factor, type: schema.fetch(:type, "number").to_sym)
         num.adjust!
       end
-
-      private
-
-      def ensure_multiple_of(number, factor=1)
-        number % factor == 0 ? number : number * factor
-      end
     end
 
     attr_accessor :value, :maximum, :minimum, :type, :factor
 
     def initialize(min: nil, max: nil, factor: nil, value: nil, type: nil)
       @factor, @minimum, @maximum = factor, min, max
-      @value = value || @factor || 1
+      @value = value || @factor || rand(1000)
       @type  = type || :number
     end
 
@@ -35,10 +29,6 @@ module JsonTestData
       is_int? ? @step_size.to_i : @step_size.round(2)
     end
 
-    def ensure_multiple_of!
-      @value *= factor unless value % factor == 0
-    end
-
     def adjust_for_divisibility!
       return if value_divisible_by_factor?
       @value *= factor
@@ -76,7 +66,6 @@ module JsonTestData
       end
 
       @value ||= 1
-      puts "TYPE: #{type}"
       @type == :number ? @value : @value.to_i
     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), generate(object.fetch(:items))).compact
+          Array.new(object.fetch(:minItems)).map {|item| generate(object.fetch(:items)) }
         else
           Array.new(object.fetch(:minItems))
         end

data/spec/json_test_data/data_structures/number_spec.rb

@@ -7,8 +7,8 @@ describe JsonTestData::Number do
         }
       end
 
-      it "returns 1" do
-        expect(described_class.create(object)).to eql 1
+      it "returns a number" do
+        expect(described_class.create(object)).to be_a Numeric
       end
     end
 

data/spec/json_test_data/json_schema_spec.rb

@@ -73,13 +73,14 @@ describe JsonTestData::JsonSchema do
           }.to_json
         end
 
-        let(:output) do
-          { :name => 1 }.to_json
+        it "generates an object" do
+          output = JsonTestData::JsonSchema.new(schema).generate_example
+          expect(JSON.parse(output)).to be_a Hash
         end
 
-        it "generates the right object" do
-          json_schema = JsonTestData::JsonSchema.new(schema)
-          expect(json_schema.generate_example).to eql output
+        it "contains the right type of objects" do
+          output = JsonTestData::JsonSchema.new(schema).generate_example
+          expect(JSON.parse(output).fetch("name")).to be_a(Numeric)
         end
       end
 
@@ -94,13 +95,15 @@ describe JsonTestData::JsonSchema do
           }.to_json
         end
 
-        let(:output) do
-          [1].to_json
+        it "generates an array" do
+          json_schema = JsonTestData::JsonSchema.new(schema)
+          expect(JSON.parse(json_schema.generate_example)).to be_a Array
         end
 
-        it "generates the right object" do
-          json_schema = JsonTestData::JsonSchema.new(schema)
-          expect(json_schema.generate_example).to eql output
+        it "contains the right kind of objects" do
+          array = JSON.parse(JsonTestData::JsonSchema.new(schema).generate_example)
+          all_numbers = array.all? {|item| item.is_a?(Numeric) }
+          expect(all_numbers).to be true
         end
       end
     end
@@ -120,13 +123,9 @@ describe JsonTestData::JsonSchema do
           }.to_json
         end
 
-        let(:output) do
-          {:id => 1}.to_json
-        end
-
         it "uses the correct data type" do
-          json_schema = JsonTestData::JsonSchema.new(schema)
-          expect(json_schema.generate_example).to eql output
+          example = JsonTestData::JsonSchema.new(schema).generate_example
+          expect(JSON.parse(example).fetch("id")).to be_a Numeric
         end
       end
 
@@ -170,13 +169,13 @@ describe JsonTestData::JsonSchema do
           }.to_json
         end
 
-        let(:output) do
-          [{:id => 1}].to_json
-        end
-
         it "nests the object" do
-          json_schema = JsonTestData::JsonSchema.new(schema)
-          expect(json_schema.generate_example).to eql output
+          example = JSON.parse(JsonTestData::JsonSchema.new(schema).generate_example)
+          aggregate_failures do
+            expect(example).to be_a Array
+            expect(example.first).to be_a Hash
+            expect(example.first.fetch("id")).to be_a Numeric
+          end
         end
       end
 
@@ -201,8 +200,12 @@ describe JsonTestData::JsonSchema do
         end
 
         it "nests the object" do
-          json_schema = JsonTestData::JsonSchema.new(schema)
-          expect(json_schema.generate_example).to eql output
+          example = JSON.parse(JsonTestData::JsonSchema.new(schema).generate_example)
+          aggregate_failures do
+            expect(example).to be_a Hash
+            expect(example.fetch("users")).to be_a Array
+            expect(example.fetch("users").first).to be_a Numeric
+          end
         end
       end
 
@@ -220,13 +223,13 @@ describe JsonTestData::JsonSchema do
           }.to_json
         end
 
-        let(:output) do
-          [[1]].to_json
-        end
-
         it "returns a nested array" do
-          json_schema = JsonTestData::JsonSchema.new(schema)
-          expect(json_schema.generate_example).to eql output
+          example = JSON.parse(JsonTestData::JsonSchema.new(schema).generate_example)
+          aggregate_failures do
+            expect(example).to be_a Array
+            expect(example.first).to be_a Array
+            expect(example.first.first).to be_a Numeric
+          end
         end
       end
     end

data/spec/matchers/json_schema_matchers.rb

@@ -0,0 +1,8 @@
+require "rspec/expectations"
+require "json-schema"
+
+RSpec::Matchers.define :match_schema do |expected|
+  match do |actual|
+    JSON::Validator.validate(expected, actual)
+  end
+end

data/spec/spec_helper.rb

@@ -2,13 +2,12 @@ require "coveralls"
 
 Coveralls.wear!
 
-require "pry"
-
 require_relative "../lib/json_test_data"
 require_relative "../lib/json_test_data/json_schema"
 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"
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

data/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_test_data
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Dana Scheider
@@ -67,33 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
 description: Generate test data from JSON schema
 email: dana.scheider@gmail.com
 executables: []
@@ -157,6 +143,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/json_schema_matchers.rb
 - spec/matchers/number_matchers.rb
 - spec/spec_helper.rb
 - version.rb
@@ -184,7 +171,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: json_test_data-0.6.0
+summary: json_test_data-0.7.0
 test_files:
 - features/array_constraints.feature
 - features/data_types.feature
@@ -200,5 +187,6 @@ 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/json_schema_matchers.rb
 - spec/matchers/number_matchers.rb
 - spec/spec_helper.rb