civil 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36e9e60e77f322cb051c7bc260731a64aa7130dd
-  data.tar.gz: f77a1dd589ac256dc93b54c71819c4848f7a85f9
+  metadata.gz: 7466208c6933e1c80abafd6ca50f919a479b65a8
+  data.tar.gz: 998b31b58587c0b45c59fe069a646ce3b5d53926
 SHA512:
-  metadata.gz: 636c61112090b66682338c75d4ee33f8ed5e6c58b187f44cd501a7468b32dd041d8311c5fe09eda618c0242a9151347ba325e334afed3e8b1092a4ab0f99c5bc
-  data.tar.gz: f52797cb0bece1e82362963d9586bba35b1d565344acc0776cd4db5623949066d306358d19c130b0a0b693c42345822ab2c35cf75e49b90b8308e0d74882cc3a
+  metadata.gz: 9cdfee13f4671d49cf5c5d23336b095915ab90b0b8a29c216cd2e530953a44f5fb774308130400ca187fbea67964b25c0240d006736aed7145d7c8aee3bc04ea
+  data.tar.gz: 7796162ca2fd5625955ae0755565eedb6f308e3f1de31dee46403ab5790b2be4ebcd8fa56aa78b01104e11f0c9bdc212c03ba277932409391214ea7a55d5aa1f

data/CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [3.0.0] - 2016-12-14
+### Changed
+- `Civil::Set` now renamed to `Civil::Array` and inherit from the `::Array`
+  class. This change means that conditions and meta contain `Civil::Array`
+  instances as values, which can be operated on like normal arrays (e.g.,
+  `result.conditions[:id].first[:desc]`).
+
 ## [2.1.0] - 2016-12-14
 ### Added
 - `Civil::Set#pluck` to enable extracting a given field from a set of
@@ -56,7 +63,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Documentation and examples in README.md
 - This changelog :-)
 
-[Unreleased]: https://github.com/earksiinni/civil/compare/v2.0.0...HEAD
-[1.2.0]: https://github.com/earksiinni/civil/compare/v1.1.0...v2.0.0
+[Unreleased]: https://github.com/earksiinni/civil/compare/v3.0.0...HEAD
+[3.0.0]: https://github.com/earksiinni/civil/compare/v2.1.0...v3.0.0
+[2.1.0]: https://github.com/earksiinni/civil/compare/v2.0.0...v2.1.0
+[2.0.0]: https://github.com/earksiinni/civil/compare/v1.1.0...v2.0.0
 [1.1.0]: https://github.com/earksiinni/civil/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/earksiinni/civil/compare/v0.1.0...v1.0.0

data/README.md

@@ -84,7 +84,7 @@ Your condition will be available in your result:
 ```ruby
 result = SaveAvatarImage.call image: image
 
-result.conditions # { image_too_big: "The uploaded image must be < 1 MB in size" }
+result.conditions # { image_too_big: [ "The uploaded image must be < 1 MB in size" ] }
 result.ideal?     # false
 result.deviant?   # true
 ```
@@ -106,7 +106,7 @@ end
 
 result = MetadataExample.call doodad: doodad
 
-result.meta # { length: {12.5} }
+result.meta # { length: [ 12.5 ] }
 ```
 
 ### Overriding the service block
@@ -148,9 +148,9 @@ end
 
 result = BuildCars.call(makes: ['Wondercar', 'Lamecar', 'Hamilcar'])
 
-result.conditions[:cars].where(make: 'Wondercar') # {{ make: 'Wondercar', msg: 'no such make'}, { make: 'Wondercar', msg: 'not a thing'}}
-result.conditions[:cars].where(make: 'Wondercar', msg: 'not a thing') # {{ make: 'Wondercar', msg: 'not a thing'}}
-result.meta[:cars].where(make: 'Wondercar') # {{ make: 'Wondercar', msg: 'pretty cool name, though' }}
+result.conditions[:cars].where(make: 'Wondercar') # [ { make: 'Wondercar', msg: 'no such make'}, { make: 'Wondercar', msg: 'not a thing'} ]
+result.conditions[:cars].where(make: 'Wondercar', msg: 'not a thing') # [ { make: 'Wondercar', msg: 'not a thing'} ]
+result.meta[:cars].where(make: 'Wondercar') # [ { make: 'Wondercar', msg: 'pretty cool name, though' } ]
 ```
 
 For filtering to work properly, you must pass a hash or an instance of

data/lib/civil.rb

@@ -2,4 +2,4 @@ require "civil/version"
 require "civil/service"
 require "civil/result"
 require "civil/hash"
-require "civil/set"
+require "civil/array"

data/lib/civil/array.rb

@@ -0,0 +1,35 @@
+module Civil
+  class Array < ::Array
+    def initialize(*args, &block)
+      if args[0].is_a? ::Array
+        args[0] = args[0].map { |e| e.is_a?(::Hash) ? Civil::Hash.new.merge(e) : e }
+      end
+
+      super
+    end
+
+    def <<(o)
+      o and o.is_a?(::Hash) and o = Civil::Hash.new.merge(o)
+
+      super
+    end
+
+    def where(attrs)
+      self.inject(Civil::Array.new) { |arr, item|
+        item.is_a?(Civil::Hash) and item =~ attrs and arr << item
+
+        arr
+      }
+    end
+
+    def pluck(key)
+      raise ArgumentError, "key must be a symbol" unless key.is_a? Symbol
+
+      self.inject(Civil::Array.new) { |arr, item|
+        item.is_a?(Civil::Hash) and arr << item[key]
+
+        arr
+      }
+    end
+  end
+end

data/lib/civil/service.rb

@@ -40,13 +40,13 @@ module Civil
     end
 
     def add_condition(key, condition)
-      conditions = (_conditions[key.to_sym] ||= Civil::Set.new)
+      conditions = (_conditions[key.to_sym] ||= Civil::Array.new)
 
       conditions << condition
     end
 
     def add_meta(key, metadatum)
-      meta = (_meta[key.to_sym] ||= Civil::Set.new)
+      meta = (_meta[key.to_sym] ||= Civil::Array.new)
 
       meta << metadatum
     end

data/lib/civil/version.rb

@@ -1,3 +1,3 @@
 module Civil
-  VERSION = "2.1.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: civil
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Ersin Akinci
@@ -90,10 +90,10 @@ files:
 - bin/setup
 - civil.gemspec
 - lib/civil.rb
+- lib/civil/array.rb
 - lib/civil/hash.rb
 - lib/civil/result.rb
 - lib/civil/service.rb
-- lib/civil/set.rb
 - lib/civil/version.rb
 homepage: https://github.com/earksiinni/civil
 licenses:

data/lib/civil/set.rb

@@ -1,37 +0,0 @@
-module Civil
-  class Set < ::Set
-    def initialize(enum = nil)
-      enum = enum.map { |e| e.is_a?(::Hash) ? Civil::Hash.new.merge(e) : e } if enum
-
-      super
-    end
-
-    def add(o)
-      o and o.is_a?(::Hash) and o = Civil::Hash.new.merge(o)
-
-      super
-    end
-
-    def <<(o)
-      add(o)
-    end
-
-    def where(attrs)
-      self.inject(Civil::Set.new) { |set, item|
-        item.is_a?(Civil::Hash) and item =~ attrs and set.add(item)
-
-        set
-      }
-    end
-
-    def pluck(key)
-      raise ArgumentError, "key must be a symbol" unless key.is_a? Symbol
-
-      self.inject(Civil::Set.new) { |set, item|
-        item.is_a?(Civil::Hash) and set.add(item[key])
-
-        set
-      }
-    end
-  end
-end