json_test_data 0.5.1 → 0.6.0

data/Gemfile.lock

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

data/features/numeric_constraints.feature

@@ -78,7 +78,7 @@ Feature: Numeric constraints
     When I run the JSON data generator
     Then the JSON output should be:
       """json
-      {"proportion":0.5}
+      {"proportion":0.83}
       """
 
   Scenario: Multiple with minimum
@@ -89,7 +89,7 @@ Feature: Numeric constraints
         "type": "object",
         "properties": {
           "wheels": {
-            "type": "number",
+            "type": "integer",
             "multipleOf": 4,
             "minimum": 5
           }
@@ -99,5 +99,5 @@ Feature: Numeric constraints
     When I run the JSON data generator
     Then the JSON output should be:
       """json
-      {"wheels":8}
+      {"wheels":20}
       """

data/json_test_data.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version               = JsonTestData::VERSION
   s.authors               = ["Dana Scheider"]
   s.description           = "Generate test data from JSON schema"
-  s.summary               = "rambo-#{s.version}"
+  s.summary               = "json_test_data-#{s.version}"
   s.email                 = 'dana.scheider@gmail.com'
   s.license               = 'MIT'
   s.platform              = Gem::Platform::RUBY

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

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

data/lib/json_test_data/data_structures/number.rb

@@ -9,17 +9,75 @@ module JsonTestData
         factor = schema.fetch(:multipleOf, nil)
         minimum, maximum = schema.fetch(:minimum, nil), schema.fetch(:maximum, nil)
 
-        num = if maximum && minimum
-                between(min: minimum, max: maximum, integer: schema.fetch(:type) == "")
-              else
-                factor || 1
-              end
+        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
+      @type  = type || :number
+    end
+
+    def step_size
+      return @step_size ||= is_int? ? 1 : 0.5 unless minimum && maximum
+
+      @step_size ||= Number.between(min: minimum, max: maximum, integer: type == :integer) / 3
+      is_int? ? @step_size.to_i : @step_size.round(2)
+    end
+
+    def ensure_multiple_of!
+      @value *= factor unless value % factor == 0
+    end
 
-        step_size = schema.fetch(:type) == "integer" ? 1 : 0.5
+    def adjust_for_divisibility!
+      return if value_divisible_by_factor?
+      @value *= factor
+    end
+
+    def is_int?
+      type == :integer
+    end
+
+    def value_too_low?
+      return false unless minimum
+      @value <= minimum
+    end
+
+    def value_too_high?
+      return false unless maximum
+      @value >= maximum
+    end
 
-        num = adjust_for_maximum(number: num, maximum: maximum, step_size: factor || step_size)
-        adjust_for_minimum(number: num, minimum: minimum, step_size: factor || step_size)
+    def value_divisible_by_factor?
+      return true unless factor
+      @value % factor == 0
+    end
+
+    def should_be_int_but_isnt?
+      type == :integer && !@value.is_a?(Integer)
+    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?
       end
+
+      @value ||= 1
+      puts "TYPE: #{type}"
+      @type == :number ? @value : @value.to_i
     end
   end
 end

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

@@ -1,110 +1,6 @@
 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 }

data/spec/json_test_data/data_structures/number_spec.rb

@@ -17,12 +17,12 @@ describe JsonTestData::Number do
       let(:object) do
         {
           type: "number",
-          multipleOf: factor
+          multipleOf: 2
         }
       end
 
       it "returns a multiple of the given number" do
-        expect(described_class.create(object)).to be_a_multiple_of(factor)
+        expect(described_class.create(object)).to be_a_multiple_of(2)
       end
     end
 
@@ -93,6 +93,26 @@ describe JsonTestData::Number do
           end
         end
       end
+
+      context "minimum not a multiple of multiple" do
+        let(:minimum) { 3 }
+        let(:factor) { 5 }
+        let(:object) do
+          {
+            type: "number",
+            minimum: minimum,
+            multipleOf: factor
+          }
+        end
+
+        it "returns a multiple of the given factor" do
+          expect(described_class.create(object)).to be_a_multiple_of(factor)
+        end
+
+        it "returns a number higher than the minimum" do
+          expect(described_class.create(object)).to be_greater_than_or_equal_to(minimum)
+        end
+      end
     end
   end
 end

data/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_test_data
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Dana Scheider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: regxing
@@ -128,7 +128,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -182,7 +184,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: rambo-0.5.1
+summary: json_test_data-0.6.0
 test_files:
 - features/array_constraints.feature
 - features/data_types.feature