json_test_data 0.3.0.beta → 0.4.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85db2f952ca98ddbca0f39241f90ea5669ef7bac
-  data.tar.gz: 3cefe7526dc7b105bb76b743a84248332f776cee
+  metadata.gz: 71ba5da3a2348f2065d4163a0530a5d8c6a6eff4
+  data.tar.gz: d36bbc1dc9474d5c76bb798b11aa3a9679a2d0ac
 SHA512:
-  metadata.gz: 3a3b9d10f9a62e8b49c79e5c4db3a91e4b4ee1394ad5ae9414659c2daa974a381b56540f8f3da032ffa6ce2d838dccca20c741ffb1d798440ddb432ba40bca2d
-  data.tar.gz: 4dbbfa3e6edca85a32844bc0c516a06c8c1ad4ea693fac7a207e3d3a984ccb26d5cc92a1c1e0f30d7b5d3a876ea073fa153900cca22b437c44a24d947f61f0a2
+  metadata.gz: 664eb22114d96a3e9065a28d68df01cae560d4746f53207c56453b52910043f64d1a2144d87c342dfa435dfb34fcd3aa3b20d4d7116b9389570484937b052384
+  data.tar.gz: a731a6ea79cedba2e929c6d2785071886e749a32e88108da5d7cbdae38c2f74be5f492950c20c8e35ca6b69966cbb8734c4c4f7afc683fa3d690926755bedad9

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 rvm:
   - 2.1.8
-  - 2.2.2
+  - 2.2.4
   - 2.3.0
 sudo: false
+before_install:
+  - gem install regxing --version 0.1.0.beta
 branches:
   only:
     - master

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_test_data (0.2.0.beta)
+    json_test_data (0.4.0.beta)
       regxing (~> 0.1.0.beta)
 
 GEM

data/README.md

@@ -12,7 +12,11 @@ gem "json_test_data", "~> 0.0.1"
 ```
 To use it, first require it, then generate the test data using:
 ```ruby
-data = JsonTestData.generate!
+data = JsonTestData.generate!(schema)
+```
+If you would prefer to return a Ruby object instead of a JSON object, simply include the `:ruby` option:
+```ruby
+data = JsonTestData.generate!(schema, ruby: true)
 ```
 
 The input that you put into it must be valid [JSON schema](http://json-schema.org). The top-level object must have a `:type` key indicating the type of object to be generated ("object", "array", "string", etc.).

data/features/generate_empty_objects.feature

@@ -28,3 +28,28 @@ Feature: Generating empty objects
       """json
       [null]
       """
+
+  Scenario: Ruby hash
+    Given the following JSON schema:
+      """json
+      {
+        "$schema": "http://json-schema.org/draft-04/schema#",
+        "type": "object",
+        "properties": {}
+      }
+      """
+    When I run the JSON data generator with the "ruby" option
+    Then the output should be a Ruby hash
+
+
+  Scenario: Ruby array
+    Given the following JSON schema:
+      """json
+      {
+        "$schema": "http://json-schema.org/draft-04/schema#",
+        "type": "array",
+        "items": {}
+      }
+      """
+    When I run the JSON data generator with the "ruby" option
+    Then the output should be a Ruby array

data/features/step_definitions/json_test_data_steps.rb

@@ -6,10 +6,22 @@ When(/^I run the JSON data generator$/) do
   @output = JsonTestData.generate!(@schema)
 end
 
+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
 end
 
+Then(/^the output should be a Ruby hash$/) do
+  expect(@output).to be_a(Hash)
+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

data/lib/json_test_data/data_structures/helpers/number_helper.rb

@@ -7,7 +7,7 @@ module JsonTestData
       adjust_for_maximum(number: num, maximum: maximum, step_size: step_size)
     end
 
-    def adjust_for_minimum(number:, minimum:, step_size: nil)
+    def adjust_for_minimum(number:, minimum: nil, step_size: nil)
       return number unless minimum && minimum >= number
 
       num = !!step_size ? number + step_size : minimum + 1
@@ -15,15 +15,11 @@ module JsonTestData
     end
 
     def between(min:, max:, integer: false)
-      return integer ? mean(min, max).to_i : mean(min, max)
+      return integer ? mean(min, max).round(0) : mean(min, max)
     end
 
     def mean(*numbers)
       numbers.inject(:+).to_f.quo(numbers.length)
     end
-
-    def infinity
-      Math.atanh(1)
-    end
   end
 end

data/lib/json_test_data/data_structures/string.rb

@@ -1,5 +1,3 @@
-require "regxing"
-
 module JsonTestData
   class String
     extend RegXing

data/lib/json_test_data.rb

@@ -1,9 +1,11 @@
 require 'json'
+require 'regxing'
 
 require_relative './json_test_data/json_schema'
 
 module JsonTestData
-  def self.generate!(schema)
-    JsonSchema.new(schema).generate_example
+  def self.generate!(schema, opts={})
+    schema = JsonSchema.new(schema).generate_example
+    opts[:ruby] ? JSON.parse(schema) : schema
   end
 end

data/spec/json_test_data/data_structures/helpers/number_helper_spec.rb

@@ -0,0 +1,146 @@
+describe JsonTestData::NumberHelper do
+  include JsonTestData::NumberHelper
+
+  describe "#adjust_for_maximum" do
+    context "no maximum" do
+      let(:number) { 3 }
+
+      it "returns the given number" do
+        expect(adjust_for_maximum(number: number)).to eql number
+      end
+    end
+
+    context "number less than maximum" do
+      let(:number) { 3 }
+      let(:maximum) { 4 }
+
+      it "returns the given number" do
+        expect(adjust_for_maximum(number: number, maximum: maximum)).to eql number
+      end
+    end
+
+    context "number greater than or equal to maximum" do
+      let(:number) { 3 }
+      let(:maximum) { 3 }
+
+      it "returns one less than the maximum" do
+        expect(adjust_for_maximum(number: number, maximum: maximum)).to eql maximum - 1
+      end
+    end
+
+    context "step size greater than 1" do
+      let(:number) { 3 }
+      let(:maximum) { 3 }
+      let(:step_size) { 2 }
+
+      it "returns the number reduced by step size" do
+        expect(
+          adjust_for_maximum(number: number, maximum: maximum, step_size: step_size)
+        ).to eql maximum - step_size
+      end
+    end
+
+    context "step size less than 1" do
+      let(:number) { 3 }
+      let(:maximum) { 3 }
+      let(:step_size) { 0.25 }
+
+      it "returns the number reduced by step size" do
+        expect(
+          adjust_for_maximum(number: number, maximum: maximum, step_size: step_size)
+        ).to eql maximum - step_size
+      end
+    end
+  end
+
+  describe "#adjust_for_minimum" do
+    context "no minimum" do
+      let(:number) { 1 }
+
+      it "returns the given number" do
+        expect(adjust_for_minimum(number: number)).to eql number
+      end
+    end
+
+    context "number is greater than minimum" do
+      let(:number) { 1 }
+      let(:minimum) { 0 }
+
+      it "returns the number" do
+        expect(adjust_for_minimum(number: number, minimum: minimum)).to eql number
+      end
+    end
+
+    context "number is less than or equal to minimum" do
+      let(:number) { 2 }
+      let(:minimum) { 2 }
+
+      it "returns one more than the minimum" do
+        expect(adjust_for_minimum(number: number, minimum: minimum)).to eql minimum + 1
+      end
+    end
+
+    context "step size greater than 1" do
+      let(:number) { 2 }
+      let(:minimum) { 2 }
+      let(:step_size) { 2 }
+
+      it "returns the number increased by step size" do
+        expect(
+          adjust_for_minimum(number: number, minimum: minimum, step_size: step_size)
+        ).to eql minimum + step_size
+      end
+    end
+
+    context "step size less than 1" do
+      let(:number) { 2 }
+      let(:minimum) { 2 }
+      let(:step_size) { 0.5 }
+
+      it "returns the number reduced by step size" do
+        expect(
+          adjust_for_minimum(number: number, minimum: minimum, step_size: step_size)
+        ).to eql minimum + step_size
+      end
+    end
+  end
+
+  describe "#between" do
+    context "when it doesn't have to be an integer" do
+      let(:min) { 1 }
+      let(:max) { 2 }
+      let(:result) { 1.5 }
+
+      it "returns the mean" do
+        expect(between(min: min, max: max)).to be_within(0.0002).of(result)
+      end
+
+      it "is less than the max" do
+        expect(between(min: min, max: max)).to be_less_than(max)
+      end
+
+      it "is greater than the min" do
+        expect(between(min: min, max: max)).to be_greater_than(min)
+      end
+    end
+
+    context "when it has to be an integer" do
+      let(:min) { 2 }
+      let(:max) { 5 }
+      let(:result) { 4 }
+
+      it "returns the nearest integer" do
+        expect(between(min: min, max: max, integer: true)).to eql result
+      end
+    end
+  end
+
+  describe "#mean" do
+    let(:numbers) { [ 3, 4, 5, 6 ] }
+    let(:avg) { 4.5 }
+
+    it "returns the mean" do
+      expect(mean(*numbers)).to be_within(0.0002).of(avg)
+    end
+  end
+end

data/spec/matchers/number_matchers.rb

@@ -12,6 +12,12 @@ RSpec::Matchers.define :be_greater_than do |expected|
   end
 end
 
+RSpec::Matchers.define :be_less_than do |expected|
+  match do |actual|
+    actual < expected
+  end
+end
+
 RSpec::Matchers.define :be_less_than_or_equal_to do |expected|
   match do |actual|
     actual <= expected

data/version.rb

@@ -1,3 +1,3 @@
 module JsonTestData
-  VERSION = '0.3.0.beta'
+  VERSION = '0.4.0.beta'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_test_data
 version: !ruby/object:Gem::Version
-  version: 0.3.0.beta
+  version: 0.4.0.beta
 platform: ruby
 authors:
 - Dana Scheider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regxing
@@ -151,6 +151,7 @@ files:
 - lib/json_test_data/data_structures/number.rb
 - lib/json_test_data/data_structures/string.rb
 - lib/json_test_data/json_schema.rb
+- spec/json_test_data/data_structures/helpers/number_helper_spec.rb
 - 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
@@ -181,7 +182,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: rambo-0.3.0.beta
+summary: rambo-0.4.0.beta
 test_files:
 - features/array_constraints.feature
 - features/data_types.feature
@@ -193,6 +194,7 @@ test_files:
 - features/step_definitions/json_test_data_steps.rb
 - features/string_constraints.feature
 - features/support/env.rb
+- spec/json_test_data/data_structures/helpers/number_helper_spec.rb
 - 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