junklet 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Zjc3YzlmNzVjYTc3YmZhNTIwZjZlNTE4Y2I1ZTQ2YWM0ZmNmODk3ZQ==
+    MTJlN2QwZTEyOGU1OThhMzBmYzMwY2RhYTAzM2E1NzQzNWJhNGM4MQ==
   data.tar.gz: !binary |-
-    NTI1YTRjZWJkMmFiMmI3ZWNhOGM2NTBhNDRkZmNjYWZiMzJjNGM4ZQ==
+    MjA3MDU1MDhlNzE4YmI2NGJlN2RmYmZjNGU2ZDIxMjIzMmQzMDIxNw==
 SHA512:
   metadata.gz: !binary |-
-    OGM0ZDRjYTkxYjdhNTdlNzA5YTM3MjU5MGEyZDk3ZWQwYTQ0YjU5NjczMGE2
-    ZGU0NmIxNjk4ZDc1Yzg5NDAxOTU2NTM4NmJlNTE3NjIwMmM4NWZhMDM2MTNk
-    OTFmN2FiNjAwMThiYTBlNTFkYTM3M2I4NjE5NDQzMDZiZjIxZjk=
+    MTg2NTc3MzJmNTBiYmM4OGI4NTZjZGU0MDA3MDgzNjg1NWY4ZDY5MDlmMGQ5
+    Mjc0MGRjYjY0ZWE2N2E1M2ZiM2E1MmVhOTBlYjk3NjdhZWQ4NGQ0YTk5YzQw
+    MDBjZDQxYmI0YzE2NGVkN2RiMmNlY2YwMTFkY2JkMzJmZmU1MGY=
   data.tar.gz: !binary |-
-    OWIxNDM5ZGUyOWRhODg1YmM5NDFiMWZhMjNjNGY0MTRlZGQ1ZDNmY2JhNGJh
-    Nzk5MzVlZTk4NDJhYWIwM2E0ZDUyNmI1NzEyZGQ2NGIyYjM0M2VhOWM5YTAx
-    MmJiNTg0MGY3ZDY2NGNlNjJlYTU4NmViMmM2OWY5ZmNjZjlhYmU=
+    OWNhZDNlNjQ0NmZlNDdmNDg1N2U3YWZlOWMzMjIyNmUzZGY5ZGM0NDJhOWIx
+    OWZiYzk4ZDRjYmRkNTNlZTg0YjM5YmQxZGFlMDgwMGI5N2ZmODZkNGFmODI3
+    YmE5MTZhY2E5ZTAyMjc3NmZlNzYzYWExZDcwOTcwYWEzOTI5NGU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    junklet (1.0.2)
+    junklet (1.0.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -135,6 +135,14 @@ junk(:int) # returns a random, positive ruby Fixnum between 0 and
 junk(:int, min: 5, max: 9) # returns a number from 5 to 9
 junk(:int, max: 1) # returns 0 or 1
 
+# If you just know how many digits you need, use size:
+
+junk(:int, size: 3) # generates number between 100 and 999
+
+# min and max can further constrain size (but not expand it):
+junk(:int, size: 3, min: 425) # number from 425 to 999
+junk(:int, size: 3, max: 425) # number from 100 to 425
+
 junk(:bool) # returns true or false
 
 junk([:a, :b, :c]) # samples from the Array

data/lib/junklet.rb

@@ -78,11 +78,23 @@ module RSpec
           # available here?
           case type
           when :int
-            # Fun fact: you can get back an arbitrarily large number
-            # by specifying a max value >= 2**62 so that Ruby promotes
-            # it to a BigNum.
-            min = opts[:min] || 0
-            max = (opts[:max] || 2**62-2) + 1
+            # min,max cooperate with size to further constrain it. So
+            # size: 2, min: 30 would be min 30, max 99.
+            if opts[:size]
+              sized_min = 10**(opts[:size]-1)
+              sized_max = 10**opts[:size]-1
+            end
+            explicit_min = opts[:min] || 0
+            explicit_max = (opts[:max] || 2**62-2) + 1
+
+            if sized_min
+              min = [sized_min, explicit_min].max
+              max = [sized_max, explicit_max].min
+            else
+              min = sized_min || explicit_min
+              max = sized_max || explicit_max
+            end
+
             min,max = max,min if min>max
 
             generator = -> { rand(max-min) + min }

data/lib/junklet/version.rb

@@ -1,3 +1,3 @@
 module Junklet
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/lib/junklet_spec.rb

@@ -111,6 +111,11 @@ describe Junklet do
         specify { expect([0,1]).to include(coin) }
       end
 
+      context "with size" do
+        let(:digit) { junk :int, size: 1 }
+        specify { expect(digit).to be < 10 }
+      end
+
       context "with exclude proc" do
         let(:junk_evens) { junk :int, min: 0, max: 10, exclude: ->(x) { x % 2 == 1 } }
         specify { expect(junk_evens % 2).to eq(0) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junklet
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Dave Brady
@@ -97,7 +97,6 @@ files:
 - junklet.gemspec
 - lib/junklet.rb
 - lib/junklet/version.rb
-- lib/junklet_upgrade_parser.rb
 - lib/line.rb
 - spec/fixtures/block1_after.txt
 - spec/fixtures/block1_before.txt
@@ -110,7 +109,6 @@ files:
 - spec/fixtures/old_skool_after.txt
 - spec/fixtures/old_skool_before.txt
 - spec/lib/junklet_spec.rb
-- spec/lib/junklet_upgrade_parser_spec.rb
 - spec/lib/line_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -149,6 +147,5 @@ test_files:
 - spec/fixtures/old_skool_after.txt
 - spec/fixtures/old_skool_before.txt
 - spec/lib/junklet_spec.rb
-- spec/lib/junklet_upgrade_parser_spec.rb
 - spec/lib/line_spec.rb
 - spec/spec_helper.rb

data/lib/junklet_upgrade_parser.rb

@@ -1,151 +0,0 @@
-# What it does:
-# Find blocks of mixed lets and "junklets", a special DSL term we use here for
-# junk data. It then rewrites the block so that the lets come first in
-# original order, then a newline, then the junklets in order. So it turns this
-# code:
-#
-# let(:name) { "Bob" }
-# junklet :address
-# let(:city) { "Faketown" }
-# junklet :state
-# junklet :zip
-# let(:extra) { true }
-# let(:pants) { ON_FIRE }
-#
-# Into THIS code, leaving the rest of the file unaltered:
-#
-# let(:name) { "Bob" }
-# let(:city) { "Faketown" }
-# let(:extra) { true }
-# let(:pants) { ON_FIRE }
-#
-# junklet :address
-# junklet :state
-# junklet :zip
-#
-
-require_relative 'line'
-
-# As with all parsers, this is easy if we allow peeking.
-class JunkletUpgradeParser
-  attr_reader :lines, :lets, :junklets, :mode, :current_line
-
-  INACTIVE = 'inactive'
-  MAYBE_ACTIVE = 'maybe_active'
-  ACTIVE = 'active'
-
-  def initialize
-  end
-
-  def inactive; INACTIVE; end
-  def maybe_active; MAYBE_ACTIVE; end
-  def active; ACTIVE; end
-
-  def inactive?; mode == inactive; end
-  def maybe_active?; mode == maybe_active; end
-  def active?; mode == active; end
-
-  def upgraded_lines(lines)
-    @lines = lines
-    return unless junky?
-    we_are_inactive!
-    emitted_lines = []
-    lines.each do |line|
-      self.current_line = imblart_line(line)
-      case mode
-      when inactive
-        if current_line.let?
-          lets << parse_line(current_line)
-          we_are_maybe_active!
-        elsif current_line.junklet?
-          junklets << current_line
-          we_are_active!
-        elsif current_line.code?
-          emitted_lines << parse_line(current_line)
-        end
-      when maybe_active
-        if current_line.let?
-          lets << parse_line(current_line)
-        elsif current_line.junklet?
-          junklets << current_line
-          we_are_active!
-        elsif current_line.code?
-          emitted_lines += lets
-          emitted_lines << parse_line(current_line)
-          we_are_inactive!
-        end
-      when active
-        if current_line.let?
-          lets << parse_line(current_line)
-        elsif current_line.junklet?
-          junklets << current_line
-        elsif current_line.code?
-          emitted_lines += reordered_block
-          emitted_lines << parse_line(current_line)
-          reset
-          we_are_inactive!
-        end
-      end
-    end
-
-    # if lets || junklets we've hit EOF while active
-    emitted_lines += reordered_block if active?
-    emitted_lines
-  end
-
-  def parse_line(line)
-    numeric_range_match = /(\s*)SecureRandom.(hex|uuid)\[(\d+)\.\.(\d+)\](\s*)/
-    range_match = /(\s*)SecureRandom.(hex|uuid)\[(\d+)\.\.(.+?)\](\s*)/
-    simple_match = /(\s*)SecureRandom.(hex|uuid)(\s*)/
-
-    # match these in order--simple match will match all complicated matches.
-    line \
-      .gsub(numeric_range_match) {|s| "#{$1}junk(#{$4.to_i-$3.to_i})#{$5}" } \
-      .gsub(range_match) {|s| "#{$1}junk(#{$4})#{$5}" } \
-      .gsub(simple_match) {|s| "#{$1}junk#{$3}" }
-  end
-
-  def reordered_block
-    lets << "\n" unless lets.empty? || lets.last == "\n" || junklets.empty?
-    lets + sort_junklets
-  end
-
-  def sort_junklets
-    return if junklets.empty?
-    indent = junklets.first.indent
-    ["#{indent}junklet #{(junklets.map(&:names).sort * ', ')}\n"]
-  end
-
-  def imblart_line(line)
-    Line.new line
-  end
-
-  def we_are_inactive!
-    reset
-    @mode = INACTIVE
-  end
-
-  def we_are_maybe_active!
-    @mode = MAYBE_ACTIVE
-  end
-
-  def we_are_active!
-    @mode = ACTIVE
-  end
-
-  def reset
-    @lets, @junklets = [], []
-  end
-
-  def junky?
-    lines.any? { |line| junk_line? line }
-  end
-
-  def junk_line?(line)
-    line =~ /\bSecureRandom\./ || line =~ /\bjunklet\b/
-  end
-
-  private
-
-  attr_accessor :current_line
-end

data/spec/lib/junklet_upgrade_parser_spec.rb

@@ -1,99 +0,0 @@
-require 'spec_helper'
-require_relative '../../lib/junklet_upgrade_parser'
-
-
-describe JunkletUpgradeParser do
-  specify { expect(JunkletUpgradeParser).to be }
-
-  let(:parser) { JunkletUpgradeParser.new }
-
-  # Process test files
-  context "with test fixtures" do
-    # TODO: Mothballing upgrader for now. Embedded gives a good
-    # example of how the parser is fascinatingly broken.
-    #%w(block1 mixed_code combined old_skool embedded).each do |name|
-    %w(block1 mixed_code combined old_skool).each do |name|
-      describe "processing #{name}_before.txt -> #{name}_after.txt" do
-        let(:fixture_path) { File.expand_path(File.join(File.dirname(__FILE__), '../fixtures')) }
-        let(:lines) { IO.readlines("#{fixture_path}/#{name}_before.txt") }
-        let(:output_file) { "#{fixture_path}/#{name}_after.txt" }
-        let(:output_lines) { IO.readlines(output_file) }
-
-        specify { expect(parser.upgraded_lines(lines)).to eq(output_lines) }
-        specify { expect(parser.upgraded_lines(lines) * '').to eq(File.read(output_file)) }
-
-        # This dumps a purty colorized diff of what we expected to get
-        # on the left against what we actually got on the right. It's
-        # a very helpful visual aid when the spec is acting up. It's a
-        # fork in the eyeballs* if you just want to see green dots.
-        #
-        # * two forks, if you're into async
-        # it "dumps the file diff (no-op spec)" do
-        #   parsed_lines = parser.upgraded_lines(lines)
-
-        #   puts '-' * 80
-        #   dump_diff(output_lines, parser.upgraded_lines(lines))
-        #   puts '-' * 80
-        #   puts parser.inspect
-        # end
-      end
-    end
-  end
-
-  # TODO: replace this with a hash of line => replacement pairs and a single spec
-  describe '#parse_line' do
-    context 'when line contains no SecureRandom.uuid or SecureRandom.hex calls' do
-      let(:line) { SecureRandom.hex(100) }
-      specify { expect(subject.parse_line(line)).to eq(line) }
-    end
-
-    # context "when line contains SecureRandom.hex(int)" do
-    #   let(:line) { '    emit_noise("#{SecureRandom.hex(12)")' }
-    #   it { pending "write me you clods" }
-    # end
-
-    # context "when line contains SecureRandom.hex int" do
-    #   it { pending "write me you clods" }
-    # end
-
-    [:hex, :uuid].each do |method|
-      context "when line contains SecureRandom.#{method}" do
-        let(:line) { "        let(:extra_fields) { Array.new(2) { SecureRandom.#{method} }  }" }
-        it "replaces SecureRandom.#{method} with junk" do
-          expect(parser.parse_line(line)).to eq('        let(:extra_fields) { Array.new(2) { junk }  }')
-        end
-      end
-
-      context "when extra whitespace is present around SecureRandom.#{method}" do
-        let(:line) { "        let(:extra_fields) { Array.new(2) {      SecureRandom.#{method}  }  }" }
-        it "replaces SecureRandom.#{method} with junk" do
-          expect(parser.parse_line(line)).to eq('        let(:extra_fields) { Array.new(2) {      junk  }  }')
-        end
-      end
-
-      context "when line contains SecureRandom.#{method}[range]" do
-        context "and range is [int..int] (e.g. [0..10])" do
-          let(:line) { "question_id: SecureRandom.#{method}[0..10]" }
-          it "replaces SecureRandom.#{method}[0..10] with junk(10)" do
-            expect(parser.parse_line(line)).to eq('question_id: junk(10)')
-          end
-        end
-
-        context "and range is of form [n..int]" do
-          let(:line) { "question_id: SecureRandom.#{method}[3..10]" }
-          it "replaces SecureRandom.#{method}[0..10] with junk(7)" do
-            expect(parser.parse_line(line)).to eq('question_id: junk(7)')
-          end
-        end
-
-        context "and range is [0..var] (e.g. [0..MAX_QUESTION_ID_LEN-1]" do
-          let(:line) { "SecureRandom.#{method}[0..Mogrifier::NcpdpScriptStandard::MAX_QUESTION_ID_LEN-1]" }
-          it "replaces SecureRandom.#{method}[0..n] with junk(n)" do
-            expect(parser.parse_line(line)).to eq('junk(Mogrifier::NcpdpScriptStandard::MAX_QUESTION_ID_LEN-1)')
-          end
-        end
-        # TODO: three-dot ranges not yet supported due to rarity.
-      end
-    end
-  end
-end