pincushion 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eab64e433918cb3f0881c57abb7d09a4dd1bfac
-  data.tar.gz: 4ca030d28f2cf4ef8b270d9a47e116cdf4a1e314
+  metadata.gz: 217f846dde4bd0ec90ee69747c5e766fd841077f
+  data.tar.gz: 5629f332f932df0ad0554860424f40c5fc3e0a70
 SHA512:
-  metadata.gz: cb77a2fd89d401c263b68ab334ee3a5eeeefa816d9578be94bb537b800c7d7abaad7169c30dbb7ce44a8dfd1637699c9d9d895e46324f0a851396382c29f6a61
-  data.tar.gz: 1b6df11775ecd620373e87767ae3e1c927541a0d9d0d145c0b56262ff4e2d357e09b151102563bf61866fdaaa4da8580a2e7d689526ec3ec40fc622f47e44c71
+  metadata.gz: 1e89c6a58f94dc875efe71cfd32fbf682dcb02cda2a79220e53bf6b67adf8fccaaa5468df074394f52e80c2a31c4c40c4c199fa09f4023dbf82c1aa832c53a55
+  data.tar.gz: f388bcaa354ca75e17d2d961e3767852b70c3c21d4b4c4b9eceb4cf587e43bee6a5ab3ab6845be8604ca309ef6f7ffe122c970e0aa5600abc5c0e83c7cdb2a1c

data/lib/pincushion.rb

@@ -69,7 +69,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
@@ -103,16 +103,16 @@ module Pincushion
 
     def that_are(*preds)
       Pincushion.validate(self, preds)
-      mod = Module.new
-      mod.include self
+      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
+      base = self
+      klass = Class.new { include base }
       klass.is(*preds)
       klass
     end
@@ -141,7 +141,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/lib/pincushion/plugins/csv_serializer.rb

@@ -4,7 +4,7 @@ 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))
+    from_rows(CSV.parse(csv, *args).map(&:to_hash))
   end
 
   module Plugins
@@ -22,10 +22,11 @@ module Pincushion
       }.freeze
 
       module RootModuleMethods
-        def to_csv(*args, **kwargs)
-          kwargs[:headers] ||= [:identifier, *predicates]
+        def to_csv(*args)
+          args << {} unless args.last.is_a?(Hash)
+          args.last[:headers] ||= [:identifier, *predicates]
 
-          CSV.generate(*args, **kwargs) do |csv|
+          CSV.generate(*args) 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.1.2"
 end # module Pincushion

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,8 +42,7 @@ 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
 
     assert_raises Pincushion::MissingPredicateError do
@@ -67,8 +65,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pincushion
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Ben Miller