speculation 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19dd9abfde4552ea62d19dda2714f9dd0e6f33a8
-  data.tar.gz: 112bed767778c508470b5d3303937580158bd649
+  metadata.gz: 11bb7e3c5871a34e1419aa9b02bfce56bdc334a2
+  data.tar.gz: b4d3470f9bb704a94b61f333a632f193a8baa21d
 SHA512:
-  metadata.gz: 1e0d5b36cb7c3e868004e4e62b408bc1a80c144759791c2ae138fefcef90a345106fde0780c7ac8b1fee36c0049c3e8f922af8a72e9ceeed9c133337d494514f
-  data.tar.gz: fb3eb18c1a8a4e1be72a0223f30c11dd05170a1b9225bfd73bebb6a2f27bda4255d51ae952597bf5bf3dd8301ce6990cac1fbe481d3897caf9f54e5b531cc7ef
+  metadata.gz: 1db14032f7e8755385fcd56346c8d04e712b3faf496caa9ecd77784f2ae7442edd0addea2d757d19e418970cbf7a408e82cef6291436f20dc18420312c893092
+  data.tar.gz: '096a7f073629269c834a691a2ad370b9e8722ffdc97fd8885a60b2ec299c29cfb3ce90be6d43b8414a5669afe31468cd6f3a8b3fa2f588a2991a7272cbc7fe22'

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/bin/

data/Gemfile

@@ -1,7 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
 
-gem "test-queue", :github => "bboe/test-queue", :ref => "578e1ebe47b171b9d488c61ba112742e32ee0cfc"
-
-# Specify your gem's dependencies in speculation.gemspec
 gemspec

data/README.md

@@ -2,34 +2,19 @@
 
 A Ruby port of Clojure's `clojure.spec`. See [clojure.spec - Rationale and Overview](https://clojure.org/about/spec). All advantages/disadvantages for clojure.spec should apply to Speculation too. This library is largely a copy-and-paste from clojure.spec so all credit goes to the clojure.spec authors.
 
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'speculation'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install speculation
-
 ## Project Goals
 
-The goal of this project is to match clojure.spec as closely as possible, from design to features to API. This decision comes with the trade-off that the library may not necessarily be idiomatic Ruby, however there's nothing stopping other libraries from being built atop Speculation to bring a more Ruby-like feel. This library won't introduce features that do not exist in clojure.spec.
+The goal of this project is to match clojure.spec as closely as possible, from design to features to API. This decision comes with the trade-off that the library may not necessarily be idiomatic Ruby, however there's nothing stopping other libraries from being built on top of Speculation to bring a more Ruby-like feel. This library won't introduce features that do not exist in clojure.spec.
 
 ## Examples
 
+- [sinatra-web-app](examples/sinatra-web-app): A small sinatra web application demonstrating model validation and API error message generation.
 - [spec_guide.rb](examples/spec_guide.rb): Speculation port of Clojure's [spec guide](https://clojure.org/guides/spec)
 - [codebreaker.rb](examples/codebreaker.rb): Speculation port of the 'codebreaker' game described in [Interactive development with clojure.spec](http://blog.cognitect.com/blog/2016/10/5/interactive-development-with-clojurespec)
 
 ## Usage
 
-The API is more-or-less the same as `clojure.spec`. If you're already familiar with then you should be write at home with Speculation. Clojure and Ruby and quite different languages, so naturally there are some differences:
+The API is more-or-less the same as `clojure.spec`. If you're already familiar clojure.spec with then you should feel at home with Speculation. Clojure and Ruby and quite different languages, so naturally there are some differences:
 
 ### Built in predicates
 
@@ -46,18 +31,20 @@ S.valid?(Set[:foo, :bar, :baz], :foo)
 
 ### Namespaced keywords/symbols
 
-Namespaced keywords are at the core of `clojure.spec`. Since spec utilises a global spec registry, namespaced keywords allow libraries to register specs with the same names but under different namespaces, thus removing accidental collisions. Ruby's equivalent to Clojure's keywords are Symbols. Ruby Symbol's don't have namespaces.
+Namespaced keywords are at the core of `clojure.spec`. Since clojure.spec utilises a global spec registry, namespaced keywords allow libraries to register specs with the same names but under different namespaces, thus removing accidental collisions. Ruby's equivalent to Clojure's keywords are Symbols. Ruby Symbol's don't have namespaces.
 
-In order keep the global spec registry architecture in Speculation, we utilise a helper method `ns` achieve similar behaviour:
+In order keep the global spec registry architecture in Speculation, we utilise a helper method `ns` to achieve similar behaviour:
 
 ```rb
-extend Speculation::NamespacedSymbols
+module MyModule
+  extend Speculation::NamespacedSymbols
 
-p ns(:foo)
-# => :"MyModule/foo"
+  p ns(:foo)
+  # => :"MyModule/foo"
 
-p ns(AnotherModule, :foo)
-# => :"AnotherModule/foo"
+  p ns(AnotherModule, :foo)
+  # => :"AnotherModule/foo"
+end
 ```
 
 ### FSpecs
@@ -90,9 +77,9 @@ S.fdef(method(:hello), :args => S.cat(:name => String),
 
 #### Generators and quick check
 
-Speculation uses [`Rantly`](https://github.com/abargnesi/rantly) for random data generation. Generator functions in Speculation are Procs that take one argument (Rantly instance) and return random value. While clojure's test.check generators generate values that start small and continue to grow and get more complex as a property holds true, Rantly always generates random values.
+Speculation uses [`Rantly`](https://github.com/abargnesi/rantly) for random data generation. Generator functions in Speculation are Procs that take one argument (Rantly instance) and return a random value. While clojure's test.check generators generate values that start small and continue to grow and get more complex as a property holds true, Rantly always generates random values.
 
-Rantly gives Speculation the ability to shrink a failing test case down to a its smallest failing case, however in Speculation we limit this to Integers and Strings. This is an area where Speculation may currently be significantly weaker than clojure.spec.
+Rantly gives Speculation the ability to shrink a failing test case down to its smallest failing case, however in Speculation we limit this to Integers and Strings. This is an area where Speculation may currently be significantly weaker than clojure.spec.
 
 ## Development
 

data/bin/console

@@ -23,9 +23,9 @@ def reload!
   load "./lib/speculation/utils.rb"
   load "./lib/speculation/error.rb"
 
-  load "./lib/speculation/spec_impl.rb"
+  load "./lib/speculation/spec.rb"
 
-  Dir["lib/speculation/spec_impl/*.rb"].each do |f|
+  Dir["lib/speculation/spec/*.rb"].each do |f|
     load f
   end
 

data/examples/sinatra-web-app/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+gem 'sinatra'
+gem 'sequel'
+gem 'bcrypt'
+gem 'sqlite3'
+gem 'speculation', :git => "https://github.com/english/speculation.git", :ref => "ae3ee09"
+gem 'pry'

data/examples/sinatra-web-app/Gemfile.lock

@@ -0,0 +1,46 @@
+GIT
+  remote: https://github.com/english/speculation.git
+  revision: ae3ee095765816a8d5bfa5b29c808439f04633b0
+  ref: ae3ee09
+  specs:
+    speculation (0.2.0)
+      concurrent-ruby (~> 1.0)
+      rantly (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bcrypt (3.1.11)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.5)
+    method_source (0.8.2)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rack (1.6.5)
+    rack-protection (1.5.3)
+      rack
+    rantly (1.0.0)
+    sequel (4.44.0)
+    sinatra (1.4.8)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    sqlite3 (1.3.13)
+    tilt (2.0.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bcrypt
+  pry
+  sequel
+  sinatra
+  speculation!
+  sqlite3
+
+BUNDLED WITH
+   1.14.6

data/examples/sinatra-web-app/app.rb

@@ -0,0 +1,153 @@
+require 'bundler/setup'
+require 'sinatra'
+require 'sequel'
+require 'bcrypt'
+require 'sqlite3'
+require 'speculation'
+require 'speculation/gen'
+require 'json'
+
+S = Speculation
+Gen = S::Gen
+DB = Sequel.sqlite
+
+DB.create_table :users do
+  primary_key :id
+  String :username
+  String :email
+  String :hashed_password
+end
+
+post '/users' do
+  user_attrs = symbolize_keys(params["user"])
+
+  if User.valid?(user_attrs)
+    User.create!(DB, user_attrs)
+  else
+    User.serialize_validation_errors(user_attrs).to_json
+  end
+end
+
+get '/users' do
+  users = User.all(DB)
+  users.to_json
+end
+
+get '/fake-user' do
+  User.fake
+end
+
+def symbolize_keys(hash)
+  hash.map { |k, v| [k.to_sym, v] }.to_h
+end
+
+module User
+  extend Speculation::NamespacedSymbols
+
+  def self.valid?(user)
+    S.valid?(ns(:user), user)
+  end
+
+  def self.create!(db, user)
+    hashed_password = BCrypt::Password.create(user[:password])
+
+    db[:users].insert(:email           => user[:email],
+                      :username        => user[:username],
+                      :hashed_password => hashed_password)
+
+    "success!"
+  end
+
+  def self.all(db)
+    db[:users].all
+  end
+
+  def self.serialize_validation_errors(user)
+    data = S.explain_data(ns(:user), user)
+    data[ns(S, :problems)].map { |problem| Validation.serialize_problem(problem) }
+  end
+
+  def self.fake
+    Gen.generate(S.gen(ns(User, :user))).to_json
+  end
+
+  module Generators
+    def self.email(rantly)
+      local_part = rantly.sized(rantly.range(1, 64)) { string(:alnum) }
+      subdomain = rantly.sized(rantly.range(1, 10)) { string(:alnum) }
+      tld = rantly.sized(3) { string(:alpha).downcase }
+
+      "#{local_part}@#{subdomain}.#{tld}"
+    end
+
+    def self.username(rantly)
+      rantly.sized(rantly.range(5, 20)) { rantly.string }
+    end
+
+    def self.password(rantly)
+      [
+        rantly.sized(rantly.range(2, 5)) { rantly.string(:upper) },
+        rantly.sized(rantly.range(2, 5)) { rantly.string(:lower) },
+        rantly.sized(rantly.range(2, 5)) { rantly.string(:digit) },
+        rantly.sized(rantly.range(2, 5)) { rantly.string(:punct) }
+      ].join.split("").shuffle.join
+    end
+  end
+
+  module Validation
+    def self.serialize_problem(problem)
+      path = problem[:path]
+      predicate, args = problem[:pred]
+
+      message = USER_ERROR_MESSAGE_MAP.fetch(path).fetch(predicate)
+      message = message.call(args) if message.respond_to?(:call)
+
+      { :error => message }
+    end
+
+    def self.validate_username_length(username)
+      username.length.between?(5, 20)
+    end
+
+    def self.validate_password_length(password)
+      password.length.between?(8, 50)
+    end
+
+    def self.validate_password_complexity(password)
+      [/[A-Z]/, /[a-z]/, /\d/, /\W/].all? { |re| password.match(re) }
+    end
+
+    EMAIL_REGEX = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,63}$/
+
+    USER_ERROR_MESSAGE_MAP = {
+      [] => {
+        S::Utils.method(:key?) => ->(args) {
+          key = args.first
+          if key == S.or_keys(:email, :username)
+            "email or username is required"
+          else
+            "#{key} is required"
+          end
+        }
+      },
+      [:username] => {
+        String                            => "username must be a string",
+        method(:validate_username_length) => "username must be between 5 and 20 characters",
+      },
+      [:email] => {
+        String      => "email must be a string",
+        EMAIL_REGEX => "email must be a valid email address"
+      },
+      [:password] => {
+        String                                => "password must be a string",
+        method(:validate_password_length)     => "password must be between 8 and 50 characters",
+        method(:validate_password_complexity) => "password must contain at least one of each: upper case, lower case, numeric and special characters"
+      }
+    }
+  end
+
+  S.def ns(:email), S.with_gen(S.and(String, Validation::EMAIL_REGEX), Generators.method(:email))
+  S.def ns(:username), S.with_gen(S.and(String, Validation.method(:validate_username_length)), Generators.method(:username))
+  S.def ns(:password), S.with_gen(S.and(String, Validation.method(:validate_password_length), Validation.method(:validate_password_complexity)), Generators.method(:password))
+  S.def ns(:user), S.keys(:req_un => [S.or_keys(ns(:email), ns(:username)), ns(:password)])
+end

data/examples/sinatra-web-app/test

@@ -0,0 +1,16 @@
+set -o xtrace
+
+curl -s -X POST -d 'user[email]=someone@example.com&user[psasword]=abc123!@ASD' http://localhost:4567/users | jq -c .
+# => [{"error":"password is required"}]
+
+curl -s -X POST -d 'user[email]=someone@example.com&user[password]=abc123' http://localhost:4567/users | jq -c .
+# => [{"error":"password must be between 8 and 50 characters"}]
+
+curl -s -X POST -d 'user[username]=anonymous&user[password]=test123456' http://localhost:4567/users | jq -c .
+# => [{"error":"password must contain at least one of each: upper case, lower case, numeric and special characters"}]
+
+curl -s -X POST -d 'user[username]=anonymous&user[password]=abc123!_ASD' http://localhost:4567/users
+# => success!
+
+curl -s http://localhost:4567/users | jq -c .
+# => [{"id":1,"username":"anonymous","email":null,"hashed_password":"$2a$10$TMLSJNNj4K4YtpMmx.4hTOxh0lg0WsIQbFkY6v8ssuMBtMoJ2oCG6"}]

data/lib/speculation.rb

@@ -7,7 +7,7 @@ require "speculation/version"
 require "speculation/namespaced_symbols"
 require "speculation/identifier"
 require "speculation/utils"
-require "speculation/spec_impl"
+require "speculation/spec"
 require "speculation/error"
 
 module Speculation
@@ -42,6 +42,8 @@ module Speculation
 
   @registry_ref = Concurrent::Atom.new({})
 
+  INVALID = ns(:invalid)
+
   # Can be enabled or disabled at runtime:
   # - enabled/disabled by setting `check_asserts`.
   # - enabled by setting environment variable SPECULATION_CHECK_ASSERTS to the
@@ -108,7 +110,7 @@ module Speculation
   # @param x [Spec, Object]
   # @return [Spec, false] x if x is a spec, else false
   def self.spec?(x)
-    x if x.is_a?(SpecImpl)
+    x if x.is_a?(Spec)
   end
 
   # @param x [Hash, Object]
@@ -120,7 +122,7 @@ module Speculation
   # @param value return value of a `conform` call
   # @return [Boolean] true if value is the result of an unsuccessful conform
   def self.invalid?(value)
-    value.equal?(ns(:invalid))
+    value.equal?(INVALID)
   end
 
   # @param spec [Spec]
@@ -661,11 +663,11 @@ module Speculation
     if spec
       conform(spec, x)
     elsif pred.is_a?(Module) || pred.is_a?(::Regexp)
-      pred === x ? x : ns(:invalid)
+      pred === x ? x : INVALID
     elsif pred.is_a?(Set)
-      pred.include?(x) ? x : ns(:invalid)
+      pred.include?(x) ? x : INVALID
     elsif pred.respond_to?(:call)
-      pred.call(x) ? x : ns(:invalid)
+      pred.call(x) ? x : INVALID
     else
       raise "#{pred} is not a class, proc, set or regexp"
     end
@@ -700,7 +702,7 @@ module Speculation
     elsif Utils.ident?(pred)
       the_spec(pred)
     else
-      Spec.new(pred, should_conform)
+      PredicateSpec.new(pred, should_conform)
     end
   end
 
@@ -810,7 +812,7 @@ module Speculation
     x, *xs = data
 
     if data.empty?
-      return ns(:invalid) unless accept_nil?(regex)
+      return INVALID unless accept_nil?(regex)
 
       return_value = preturn(regex)
 
@@ -825,7 +827,7 @@ module Speculation
       if dp
         re_conform(dp, xs)
       else
-        ns(:invalid)
+        INVALID
       end
     end
   end
@@ -953,7 +955,7 @@ module Speculation
       x = dt(pred, x)
 
       if invalid?(x)
-        ns(:invalid)
+        INVALID
       elsif preds.empty?
         x
       else
@@ -1286,22 +1288,15 @@ module Speculation
         raise "Unexpected #{ns(:op)} #{p[ns(:op)]}"
       end
     end
-
-    # Resets the spec registry to only builtin specs
-    def reset_registry!
-      builtins = {
-        ns(:any)              => with_gen(Utils.constantly(true), ->(r) { r.branch(*Gen::GEN_BUILTINS.values) }),
-        ns(:boolean)          => Set[true, false],
-        ns(:positive_integer) => with_gen(self.and(Integer, ->(x) { x > 0 }), ->(r) { r.range(1) }),
-        # Rantly#positive_integer is actually a natural integer
-        ns(:natural_integer)  => with_gen(self.and(Integer, ->(x) { x >= 0 }), :positive_integer.to_proc),
-        ns(:negative_integer) => with_gen(self.and(Integer, ->(x) { x < 0 }), ->(r) { r.range(nil, -1) }),
-        ns(:empty)            => with_gen(Utils.method(:empty?), Utils.constantly([]))
-      }.freeze
-
-      @registry_ref.reset(builtins)
-    end
   end
 
-  reset_registry!
+  @registry_ref.reset(
+    ns(:any)              => with_gen(Utils.constantly(true), ->(r) { r.branch(*Gen::GEN_BUILTINS.values) }),
+    ns(:boolean)          => Set[true, false],
+    ns(:positive_integer) => with_gen(self.and(Integer, ->(x) { x > 0 }), ->(r) { r.range(1) }),
+    # Rantly#positive_integer is actually a natural integer
+    ns(:natural_integer)  => with_gen(self.and(Integer, ->(x) { x >= 0 }), :positive_integer.to_proc),
+    ns(:negative_integer) => with_gen(self.and(Integer, ->(x) { x < 0 }), ->(r) { r.range(nil, -1) }),
+    ns(:empty)            => with_gen(Utils.method(:empty?), Utils.constantly([]))
+  )
 end

data/lib/speculation/{spec_impl.rb → spec.rb}

@@ -2,7 +2,7 @@
 
 module Speculation
   # @private
-  class SpecImpl
+  class Spec
     attr_accessor :name, :gen
     attr_reader :id
 
@@ -24,13 +24,13 @@ module Speculation
   end
 end
 
-require_relative "spec_impl/hash_spec"
-require_relative "spec_impl/spec"
-require_relative "spec_impl/tuple_spec"
-require_relative "spec_impl/or_spec"
-require_relative "spec_impl/and_spec"
-require_relative "spec_impl/merge_spec"
-require_relative "spec_impl/every_spec"
-require_relative "spec_impl/regex_spec"
-require_relative "spec_impl/f_spec"
-require_relative "spec_impl/nilable_spec"
+require_relative "spec/hash_spec"
+require_relative "spec/predicate_spec"
+require_relative "spec/tuple_spec"
+require_relative "spec/or_spec"
+require_relative "spec/and_spec"
+require_relative "spec/merge_spec"
+require_relative "spec/every_spec"
+require_relative "spec/regex_spec"
+require_relative "spec/f_spec"
+require_relative "spec/nilable_spec"

data/lib/speculation/{spec_impl → spec}/and_spec.rb

@@ -2,7 +2,7 @@
 
 module Speculation
   # @private
-  class AndSpec < SpecImpl
+  class AndSpec < Spec
     include NamespacedSymbols
     S = Speculation
 
@@ -17,7 +17,7 @@ module Speculation
       @specs.value!.each do |spec|
         value = spec.conform(value)
 
-        return ns(S, :invalid) if S.invalid?(value)
+        return S::INVALID if S.invalid?(value)
       end
 
       value

data/lib/speculation/{spec_impl → spec}/every_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Speculation
   # @private
-  class EverySpec < SpecImpl
+  class EverySpec < Spec
     include NamespacedSymbols
     S = Speculation
 
@@ -55,7 +55,7 @@ module Speculation
     end
 
     def conform(value)
-      return ns(S, :invalid) unless @collection_predicate.call(value)
+      return S::INVALID unless @collection_predicate.call(value)
 
       spec = @delayed_spec.value!
 
@@ -68,7 +68,7 @@ module Speculation
           conformed_value = spec.conform(val)
 
           if S.invalid?(conformed_value)
-            return ns(S, :invalid)
+            return S::INVALID
           else
             return_value = add.call(return_value, index, val, conformed_value)
           end
@@ -81,7 +81,7 @@ module Speculation
 
         value.each_with_index do |item, index|
           return value if index == limit
-          return ns(S, :invalid) unless S.valid?(spec, item)
+          return S::INVALID unless S.valid?(spec, item)
         end
 
         value

data/lib/speculation/{spec_impl → spec}/f_spec.rb

@@ -2,7 +2,7 @@
 
 module Speculation
   # @private
-  class FSpec < SpecImpl
+  class FSpec < Spec
     include NamespacedSymbols
     S = Speculation
 
@@ -18,14 +18,14 @@ module Speculation
     def conform(f)
       raise "Can't conform fspec without args spec: #{inspect}" unless @args
 
-      return ns(S, :invalid) unless f.is_a?(Proc) || f.is_a?(Method)
+      return S::INVALID unless f.is_a?(Proc) || f.is_a?(Method)
 
       specs = { :args => @args, :ret => @ret, :fn => @fn, :block => @block }
 
       if f.equal?(FSpec.validate_fn(f, specs, S.fspec_iterations))
         f
       else
-        ns(S, :invalid)
+        S::INVALID
       end
     end
 

data/lib/speculation/{spec_impl → spec}/hash_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Speculation
   # @private
-  class HashSpec < SpecImpl
+  class HashSpec < Spec
     include NamespacedSymbols
     S = Speculation
 
@@ -34,11 +34,11 @@ module Speculation
       @opt_keys        = opt + opt_un.map(&method(:unqualify_key))
       @opt_specs       = opt + opt_un
       @keys_pred       = ->(v) { pred_exprs.all? { |p| p.call(v) } }
-      @key_to_spec_map = Hash[req_keys.concat(@opt_keys).zip(req_specs.concat(@opt_specs))]
+      @key_to_spec_map = Hash[Utils.conj(req_keys, @opt_keys).zip(Utils.conj(req_specs, @opt_specs))]
     end
 
     def conform(value)
-      return ns(S, :invalid) unless @keys_pred.call(value)
+      return S::INVALID unless @keys_pred.call(value)
 
       reg = S.registry
       ret = value
@@ -52,7 +52,7 @@ module Speculation
         conformed_value = S.conform(spec, v)
 
         if S.invalid?(conformed_value)
-          return ns(S, :invalid)
+          return S::INVALID
         else
           unless conformed_value.equal?(v)
             ret = ret.merge(key => conformed_value)
@@ -74,8 +74,7 @@ module Speculation
         failures = parse_req(@req, value, Utils.method(:itself))
 
         failures.each do |failure_sexp|
-          # eww
-          pred = [Utils.method(:key?), [sexp_to_rb(failure_sexp)]]
+          pred = [Utils.method(:key?), [failure_sexp]]
           problems << { :path => path, :pred => pred, :val => value, :via => via, :in => inn }
         end
       end
@@ -84,7 +83,7 @@ module Speculation
         failures = parse_req(@req_un, value, method(:unqualify_key))
 
         failures.each do |failure_sexp|
-          pred = [Utils.method(:key?), [sexp_to_rb(failure_sexp)]]
+          pred = [Utils.method(:key?), [failure_sexp]]
           problems << { :path => path, :pred => pred, :val => value, :via => via, :in => inn }
         end
       end
@@ -135,29 +134,6 @@ module Speculation
 
     private
 
-    def sexp_to_rb(sexp, level = 0)
-      if sexp.is_a?(Array)
-        op, *keys = sexp
-        rb_string = String.new
-
-        rb_string << "(" unless level.zero?
-
-        keys.each_with_index do |key, i|
-          unless i.zero?
-            rb_string << " #{NamespacedSymbols.name(op)} "
-          end
-
-          rb_string << sexp_to_rb(key, level + 1).to_s
-        end
-
-        rb_string << ")" unless level.zero?
-
-        rb_string
-      else
-        sexp
-      end
-    end
-
     def extract_keys(symbol_or_arr)
       if symbol_or_arr.is_a?(Array)
         symbol_or_arr[1..-1].flat_map(&method(:extract_keys))
@@ -177,16 +153,16 @@ module Speculation
               op, *kks = key
               case op
               when ns(S, :or)
-                if kks.one? { |k| parse_req([k], v, f).empty? }
+                if kks.any? { |k| parse_req([k], v, f).empty? }
                   []
                 else
-                  [key]
+                  transform_keys([key], f)
                 end
               when ns(S, :and)
                 if kks.all? { |k| parse_req([k], v, f).empty? }
                   []
                 else
-                  [key]
+                  transform_keys([key], f)
                 end
               else
                 raise "Expected or, and, got #{op}"
@@ -194,7 +170,7 @@ module Speculation
             elsif v.key?(f.call(key))
               []
             else
-              [key]
+              [f.call(key)]
             end
 
       if ks.any?
@@ -203,5 +179,15 @@ module Speculation
         ret
       end
     end
+
+    def transform_keys(keys, f)
+      keys.map { |key|
+        case key
+        when Array then transform_keys(key, f)
+        when ns(S, :and), ns(S, :or) then key
+        else f.call(key)
+        end
+      }
+    end
   end
 end

data/lib/speculation/{spec_impl → spec}/merge_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Speculation
   # @private
-  class MergeSpec < SpecImpl
+  class MergeSpec < Spec
     include NamespacedSymbols
     S = Speculation
 
@@ -13,7 +13,7 @@ module Speculation
       ms = @preds.map { |pred| S.dt(pred, x) }
 
       if ms.any?(&S.method(:invalid?))
-        ns(S, :invalid)
+        S::INVALID
       else
         ms.reduce(&:merge)
       end

data/lib/speculation/{spec_impl → spec}/nilable_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Speculation
   # @private
-  class NilableSpec < SpecImpl
+  class NilableSpec < Spec
     include NamespacedSymbols
     S = Speculation
 

data/lib/speculation/{spec_impl → spec}/or_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Speculation
   # @private
-  class OrSpec < SpecImpl
+  class OrSpec < Spec
     include NamespacedSymbols
     S = Speculation
 
@@ -27,7 +27,7 @@ module Speculation
         end
       end
 
-      ns(S, :invalid)
+      S::INVALID
     end
 
     def explain(path, via, inn, value)

data/lib/speculation/{spec_impl/spec.rb → spec/predicate_spec.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Speculation
   # @private
-  class Spec < SpecImpl
+  class PredicateSpec < Spec
     include NamespacedSymbols
     S = Speculation
 
@@ -20,7 +20,7 @@ module Speculation
       if @should_conform
         ret
       else
-        ret ? value : ns(S, :invalid)
+        ret ? value : S::INVALID
       end
     end
 

data/lib/speculation/{spec_impl → spec}/regex_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Speculation
   # @private
-  class RegexSpec < SpecImpl
+  class RegexSpec < Spec
     include NamespacedSymbols
     S = Speculation
 
@@ -13,7 +13,7 @@ module Speculation
       if value.nil? || Utils.collection?(value)
         S.re_conform(@regex, value)
       else
-        ns(S, :invalid)
+        S::INVALID
       end
     end
 

data/lib/speculation/{spec_impl → spec}/tuple_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Speculation
   # @private
-  class TupleSpec < SpecImpl
+  class TupleSpec < Spec
     include NamespacedSymbols
     S = Speculation
 
@@ -17,7 +17,7 @@ module Speculation
       specs = @delayed_specs.value!
 
       unless Utils.array?(collection) && collection.count == specs.count
-        return ns(S, :invalid)
+        return S::INVALID
       end
 
       return_value = collection.class.new
@@ -26,7 +26,7 @@ module Speculation
         conformed_value = spec.conform(value)
 
         if S.invalid?(conformed_value)
-          return ns(S, :invalid)
+          return S::INVALID
         else
           return_value += [conformed_value]
         end

data/lib/speculation/test.rb

@@ -218,7 +218,7 @@ module Speculation
           conformed_args = S.conform(fspec.args, args)
           conformed_block = S.conform(fspec.block, block) if fspec.block
 
-          if conformed_args == ns(S, :invalid)
+          if conformed_args == S::INVALID
             backtrace = backtrace_relevant_to_instrument(caller)
 
             ed = S.
@@ -230,7 +230,7 @@ module Speculation
             msg = io.string
 
             raise Speculation::Error.new("Call to '#{ident}' did not conform to spec:\n #{msg}", ed)
-          elsif conformed_block == ns(S, :invalid)
+          elsif conformed_block == S::INVALID
             backtrace = backtrace_relevant_to_instrument(caller)
 
             ed = S.
@@ -354,13 +354,13 @@ module Speculation
       def check_call(method, spec, args, block)
         conformed_args = S.conform(spec.args, args) if spec.args
 
-        if conformed_args == ns(S, :invalid)
+        if conformed_args == S::INVALID
           return explain_check(args, spec.args, args, :args)
         end
 
         conformed_block = S.conform(spec.block, block) if spec.block
 
-        if conformed_block == ns(S, :invalid)
+        if conformed_block == S::INVALID
           return explain_check(block, spec.block, block, :block)
         end
 
@@ -368,7 +368,7 @@ module Speculation
 
         conformed_ret = S.conform(spec.ret, ret) if spec.ret
 
-        if conformed_ret == ns(S, :invalid)
+        if conformed_ret == S::INVALID
           return explain_check(args, spec.ret, ret, :ret)
         end
 

data/lib/speculation/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Speculation
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speculation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jamie English
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -165,24 +165,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/bundler
-- bin/byebug
-- bin/coderay
 - bin/console
-- bin/cucumber-queue
-- bin/minitest-queue
-- bin/pry
-- bin/rake
-- bin/rspec-queue
-- bin/rubocop
-- bin/ruby-parse
-- bin/ruby-rewrite
 - bin/setup
-- bin/testunit-queue
-- bin/yard
-- bin/yardoc
-- bin/yri
 - examples/codebreaker.rb
+- examples/sinatra-web-app/Gemfile
+- examples/sinatra-web-app/Gemfile.lock
+- examples/sinatra-web-app/app.rb
+- examples/sinatra-web-app/test
 - examples/spec_guide.rb
 - lib/speculation.rb
 - lib/speculation/error.rb
@@ -190,17 +179,17 @@ files:
 - lib/speculation/identifier.rb
 - lib/speculation/namespaced_symbols.rb
 - lib/speculation/pmap.rb
-- lib/speculation/spec_impl.rb
-- lib/speculation/spec_impl/and_spec.rb
-- lib/speculation/spec_impl/every_spec.rb
-- lib/speculation/spec_impl/f_spec.rb
-- lib/speculation/spec_impl/hash_spec.rb
-- lib/speculation/spec_impl/merge_spec.rb
-- lib/speculation/spec_impl/nilable_spec.rb
-- lib/speculation/spec_impl/or_spec.rb
-- lib/speculation/spec_impl/regex_spec.rb
-- lib/speculation/spec_impl/spec.rb
-- lib/speculation/spec_impl/tuple_spec.rb
+- lib/speculation/spec.rb
+- lib/speculation/spec/and_spec.rb
+- lib/speculation/spec/every_spec.rb
+- lib/speculation/spec/f_spec.rb
+- lib/speculation/spec/hash_spec.rb
+- lib/speculation/spec/merge_spec.rb
+- lib/speculation/spec/nilable_spec.rb
+- lib/speculation/spec/or_spec.rb
+- lib/speculation/spec/predicate_spec.rb
+- lib/speculation/spec/regex_spec.rb
+- lib/speculation/spec/tuple_spec.rb
 - lib/speculation/test.rb
 - lib/speculation/utils.rb
 - lib/speculation/version.rb

data/bin/bundler

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'bundler' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("bundler", "bundler")

data/bin/byebug

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'byebug' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("byebug", "byebug")

data/bin/coderay

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'coderay' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("coderay", "coderay")

data/bin/cucumber-queue

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'cucumber-queue' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("test-queue", "cucumber-queue")

data/bin/minitest-queue

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'minitest-queue' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("test-queue", "minitest-queue")

data/bin/pry

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'pry' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("pry", "pry")

data/bin/rake

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rake", "rake")

data/bin/rspec-queue

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec-queue' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("test-queue", "rspec-queue")

data/bin/rubocop

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'rubocop' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rubocop", "rubocop")

data/bin/ruby-parse

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'ruby-parse' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("parser", "ruby-parse")

data/bin/ruby-rewrite

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'ruby-rewrite' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("parser", "ruby-rewrite")

data/bin/testunit-queue

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'testunit-queue' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("test-queue", "testunit-queue")

data/bin/yard

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'yard' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("yard", "yard")

data/bin/yardoc

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'yardoc' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("yard", "yardoc")

data/bin/yri

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'yri' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("yard", "yri")