pincushion 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8eab64e433918cb3f0881c57abb7d09a4dd1bfac
-  data.tar.gz: 4ca030d28f2cf4ef8b270d9a47e116cdf4a1e314
+SHA256:
+  metadata.gz: adbd27566528f46d79e0fd15bf71936ed29382d6de0515557e274692bb427400
+  data.tar.gz: ad694d4c37d67c482573857938886cb8e2d212c38cf053f23f2846c73cea4efb
 SHA512:
-  metadata.gz: cb77a2fd89d401c263b68ab334ee3a5eeeefa816d9578be94bb537b800c7d7abaad7169c30dbb7ce44a8dfd1637699c9d9d895e46324f0a851396382c29f6a61
-  data.tar.gz: 1b6df11775ecd620373e87767ae3e1c927541a0d9d0d145c0b56262ff4e2d357e09b151102563bf61866fdaaa4da8580a2e7d689526ec3ec40fc622f47e44c71
+  metadata.gz: e1d878b8ec0d3a5f3609b1df590cf39b7b889563c4b566d25f02b3123a561f424b5623e91d9d736f5b1f370a836b5d33a643499a3ee3127a5744bd9ab3c8bf16
+  data.tar.gz: b854ce1141ccaaefb3580ba7336810c321b05ec4e13fefe73ba5265d60f4f7d957e248450bdff62ce6f2fb88945917c026e4a04a40f70fd062d6546528113e27

data/lib/pincushion/plugins/csv_serializer.rb

@@ -1,10 +1,9 @@
 require 'csv'
 
 module Pincushion
-  def self.from_csv(csv, *args)
-    args << {} unless args.last.is_a?(Hash)
-    args.last.merge!(Plugins::CsvSerializer::OPTS)
-    from_rows(CSV.parse(csv, *args).map(&:to_h))
+  def self.from_csv(csv, opts = {})
+    opts = opts.merge(Plugins::CsvSerializer::OPTS)
+    from_rows(CSV.parse(csv, **opts).map(&:to_hash))
   end
 
   module Plugins
@@ -22,10 +21,10 @@ module Pincushion
       }.freeze
 
       module RootModuleMethods
-        def to_csv(*args, **kwargs)
-          kwargs[:headers] ||= [:identifier, *predicates]
+        def to_csv(opts)
+          opts[:headers] ||= [:identifier, *predicates]
 
-          CSV.generate(*args, **kwargs) do |csv|
+          CSV.generate(**opts) do |csv|
             rows.each { |row| csv << row }
           end
         end

data/lib/pincushion/version.rb

@@ -1,3 +1,3 @@
 module Pincushion
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end # module Pincushion

data/lib/pincushion.rb

@@ -54,9 +54,6 @@ module Pincushion
       fail "Predicates can't be changed after initialization" if @predicates
       @predicates = Set.new(preds)
       is_not(*@predicates)
-      @predicates.each do |predicate|
-        alias_method(:"is_#{predicate}?", :"#{predicate}?")
-      end
     end
   end # module RootModuleMethods
 
@@ -69,7 +66,7 @@ module Pincushion
 
     def all_predicates_hash
       obj = new ""
-      predicate_pincushion_root.predicates.map { |p| [p, obj.is?(p)] }.to_h
+      Hash[predicate_pincushion_root.predicates.map { |p| [p, obj.is?(p)] }]
     end
 
     def identifiers
@@ -102,17 +99,17 @@ module Pincushion
     end
 
     def that_are(*preds)
-      Pincushion.validate(self, preds)
-      mod = Module.new
-      mod.include self
+      Pincushion.validate(predicate_pincushion_root, preds)
+      base = self
+      mod = Module.new { include base }
       mod.is(*preds)
       mod
     end
 
     def that_is(*preds)
-      Pincushion.validate(self, preds)
-      klass = Class.new
-      klass.include self
+      Pincushion.validate(predicate_pincushion_root, preds)
+      base = self
+      klass = Class.new { include base }
       klass.is(*preds)
       klass
     end
@@ -141,7 +138,7 @@ module Pincushion
     end
 
     def all_predicates_hash
-      all_predicates.map { |p| [p, is?(p)] }.to_h
+      Hash[all_predicates.map { |p| [p, is?(p)] }]
     end
 
     def is(*preds)

data/spec/pincushion_spec.rb

@@ -32,8 +32,7 @@ describe Pincushion do
   end
 
   it "can be used to define a category with properties" do
-    animals = Module.new
-    animals.include Pincushion
+    animals = Module.new { include Pincushion }
     animals.predicates :carnivore, :herbivore
     cat = animals.that_is(:carnivore).named("Mee-mow")
     mittens = animals.find("Mee-mow")
@@ -43,10 +42,12 @@ describe Pincushion do
   end
 
   it "doesn't allow unregistered predicates" do
-    animals = Module.new
-    animals.include Pincushion
+    animals = Module.new { include Pincushion }
     animals.predicates :herbivore
 
+    elephants = animals.that_are(:herbivore)
+    elephants.that_is.named("Tree Trunks")
+
     assert_raises Pincushion::MissingPredicateError do
       animals.that_is(:carnivore)
     end
@@ -67,8 +68,7 @@ describe Pincushion do
   end
 
   it "doesn't allow unregistered predicates (empty set)" do
-    animals = Module.new
-    animals.include Pincushion
+    animals = Module.new { include Pincushion }
     assert_raises Pincushion::MissingPredicateError do
       animals.that_is(:carnivore)
     end
@@ -92,4 +92,19 @@ describe Pincushion do
     animals.plugin :json_serializer
     assert_equal animals.to_json, animal_data_json
   end
+
+  it "creates question-mark methods, not is-methods" do
+    animals = Module.new { include Pincushion }
+    animals.predicates :herbivore
+    elephants = animals.that_is(:herbivore)
+    assert elephants.new("").herbivore?
+
+    assert_raises(NoMethodError) do
+      elephants.new("").is_herbivore
+    end
+
+    assert_raises(NoMethodError) do
+      elephants.new("").is_herbivore?
+    end
+  end
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: pincushion
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ben Miller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -52,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: 
+description:
 email: bmiller@rackspace.com
 executables: []
 extensions: []
@@ -69,13 +55,13 @@ homepage: https://github.com/bjmllr/pincushion
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -84,12 +70,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Predicate-centric classification toolkit
 test_files:
 - spec/pincushion_spec.rb
 - spec/spec_helper.rb
-has_rdoc: