quick-sampler 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 166249b4d99f3c75f161df7c7fcef6b0b544d407
-  data.tar.gz: efe98dc471d9e954c0159475dd2c13a8ea60c40a
+  metadata.gz: fb39b55d1e1f2a633a7b3caae39a0f0908c4de9a
+  data.tar.gz: 2e9d62fabcd8657a637fb1ea0b16946af929eee1
 SHA512:
-  metadata.gz: 1811619ab4d68251fd2f36ebf7bf23642288162dda1b2e24654e88141b69d543b72366ecd85134e8e93075873716a6547c794c7dfaa1dd8fc06a09df2cdfff17
-  data.tar.gz: 169017a885dc058a33b6cea98587c59824f6e97e9ed82c17ce121ad2a9f753bb5f47823a5a30649a9fb8ab8766dd25f957fd47bf7c62389af3dddc114952e18b
+  metadata.gz: 5182a2e7a859f535df1bfe10cc004efe6cef7beb59d124ee8e8275abcddb508cc092af3516bcc202f094279e9716a39316ed0dacadd3d7ae0e3568624e27f21c
+  data.tar.gz: ba991af6e96aa6cfa743aadd4475a8b256c92d2f959c32de0e9a42597fd3e38dff4809471b2befc7cbd2c9cf4168a5af17d1bc067c089b5c092d0e90a80b2c43

data/README.md

@@ -53,7 +53,7 @@ But [will it blend?][8]
 [8]: https://github.com/jessitron/gerald#gerald
 
 ```irb
-pry> sampler2 = Quick::Sampler.compile { config(upper_bound: 5).string(:lower) }
+pry> sampler2 = Quick::Sampler.compile { string(:lower, size: 3..5) }
 => #<Enumerator::Lazy: #<Enumerator: #<Enumerator::Generator:0x007f295fd88058>:each>>
 pry> sampler2.zip(sampler).first(5).to_h
 => {"bjm"=>-4027257104748747508,
@@ -88,15 +88,6 @@ Generators.one_of_weighted Generators.integer => 10,
                            Generators.vector_of(5, Generators.integer) => 5
 ```
 
-### Sampler configuration
-
-Some sampling parameters can be passed as arguments to a sampler function (like
-character class `:lower` in the example above). Others - that affect multiple
-sub-samplers in a definition - may be injected with a call to `config(...)` (like
-`upper_bound` above).
-
-(**Rosetta stone:** `upper_bound` is what in Haskell QuickCheck is known as `size`)
-
 ### Sampler composability
 
 The composition using Enumerable API as demonstrated above is pretty flexible and familiar to a

data/lib/quick/sampler/dsl/fluidiom.rb

@@ -6,15 +6,13 @@ module Quick
     # passed to {Quick::Sampler.compile}.
     class DSL::Fluidiom < SimpleDelegator
       # SimpleDelegator so that it can unwrap the "original" sampler with `#__getobj__`
-      include Quick::Sampler::Config
 
       # @api private
       # wraps a `sampler` into a `Fluidiom` instance so it has extra methods while
       # inside the block passed to {Quick::Sampler.compile}
-      def initialize sampler, _config = {}
+      def initialize sampler
         sampler = Base.new(sampler) unless sampler.is_a? Base
         super(sampler)
-        config.merge! _config
       end
 
       # @return [Quick::Sampler]
@@ -24,16 +22,15 @@ module Quick
       end
 
       # @return [Quick::Sampler]
-      #   wrapped sampler that starts out with the same config as this one
+      #   a new fluidiom-wrapped sampler
       def spawn sampler
-        self.class.new(sampler, config)
+        self.class.new(sampler)
       end
 
       # spawn a filtering sampler
       #
-      # The produced sampler honors the config variable `max_iterations` and stops
-      # iterating when that many original values are tested.
-      #
+      # @param [Integer] max_iterations
+      #   try at most this many values before giving up
       # @return [Quick::Sampler]
       #   a sampler that passes through only samples that satisfy the
       #   predicate given as block
@@ -41,7 +38,7 @@ module Quick
       #   a sampled value to be tested
       # @yieldreturn [Boolean]
       #   `true` to pass the value through
-      def such_that &predicate
+      def such_that max_iterations: 1000, &predicate
         spawn(unwrap.take(max_iterations).select(&predicate))
       end
 

data/lib/quick/sampler/dsl/simple_combinators.rb

@@ -45,9 +45,6 @@ module Quick
 
       # Sampler of uniform arrays
       #
-      # This sampler honors `upper_bound` config variable and samples Arrays of up to
-      # that many elements.
-      #
       # **Rosetta stone** the single argument version corresponds to QuickCheck's `listOf`.
       # Passing `non_empty: true` turns it into QuickCheck's `listOf1`.
       #
@@ -55,25 +52,22 @@ module Quick
       #   a sampler that produces arrays of values sampled from its argument
       # @param [Quick::Sampler] sampler
       #   a sampler to sample array elements from
-      # @param [Boolean] non_empty
-      #   pass true to never produce empty arrays
-      def list_of sampler, non_empty: false
-        lower_bound = non_empty ? 1 : 0
-        feed { sampler.first(rand(lower_bound..upper_bound)) }
+      def list_of sampler, size: 1..10
+        send_to(sampler, :first, size)
       end
 
-      # Sampler of uniform fixed length arrays
+      # Sampler of uniform fixed size arrays
       #
       # **Rosetta stone** this sampler corresponds to QuickCheck's `vectorOf`.
       #
       # @return [Quick::Sampler]
-      #   a sampler that produces arrays of `length` of values sampled from `sampler`
-      # @param [Integer] length
-      #   sample array length
+      #   a sampler that produces arrays of `size` of values sampled from `sampler`
+      # @param [Integer] size
+      #   sample array size
       # @param [Quick::Sampler] sampler
       #   a sampler to sample array elements from
-      def vector_of length, sampler
-        feed { sampler.take(length).force }
+      def vector_of size, sampler
+        feed { sampler.take(size).force }
       end
 
       # Sampler of arbitrary nested structures made up of `Array`s, `Hash`es, `Quick::Sampler`s and

data/lib/quick/sampler/dsl/simple_values.rb

@@ -85,7 +85,7 @@ module Quick
       # @todo document character classes
       # @param [Integer, Range, Quick::Sampler<Integer>] size:
       #   Length of the string to generate
-      def string *classes, size: pick_from(1..10)
+      def string *classes, size: 1..10
         classes = [:printable] if classes.empty?
         repertoire = DSL::CharacterClass.expand(*classes)
         size = pick_from(size) if Range === size

data/lib/quick/sampler/dsl.rb

@@ -13,7 +13,6 @@ module Quick
     # (Incidentally, {Fluidiom} instances for deeper nested sub-samplers get
     # leaked from compile at the moment)
     class DSL
-      include Quick::Sampler::Config
       include SimpleValues
       include SimpleCombinators
 
@@ -44,7 +43,7 @@ module Quick
       # @yieldreturn [<Sample>] a sampled value
       #
       def feed &block
-        Fluidiom.new(Base.new(block), config)
+        Fluidiom.new(Base.new(block))
       end
 
       private

data/lib/quick/sampler/version.rb

@@ -1,5 +1,5 @@
 module Quick
   module Sampler
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quick-sampler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Artem Baguinski
@@ -112,7 +112,6 @@ files:
 - lib/quick/sampler.rb
 - lib/quick/sampler/autoload.rb
 - lib/quick/sampler/base.rb
-- lib/quick/sampler/config.rb
 - lib/quick/sampler/dsl.rb
 - lib/quick/sampler/dsl/character_class.rb
 - lib/quick/sampler/dsl/fluidiom.rb

data/lib/quick/sampler/config.rb

@@ -1,25 +0,0 @@
-require "active_support/configurable"
-require "active_support/concern"
-
-module Quick
-  module Sampler
-    module Config
-      extend ActiveSupport::Concern
-      include ActiveSupport::Configurable
-
-      included do
-        config_accessor(:max_iterations) { 1000 }
-        config_accessor(:upper_bound) { 25 }
-      end
-
-      def config options = :none_given
-        if options == :none_given
-          super()
-        else
-          config.merge!(options)
-          self
-        end
-      end
-    end
-  end
-end