hashme 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1baf318f249321f9486052a01db0881479f461c
-  data.tar.gz: f5b623806198098e2d5e4d6fa42c60cb6137498e
+  metadata.gz: d156ad2e578a61e6d5b0c35d1c2c3ef3abf1fa78
+  data.tar.gz: e74817abf9f6e1986d33d837c870f0eb1aa738c8
 SHA512:
-  metadata.gz: 9bdfc2fea9f19cccd974a2a8d0b8cfad142bb91af0f35d1ba40a91f0fe0049ae085633d48f1abf9e67f211f6bbdb811bb6961e2ebf491f5858bdfcbc4494933b
-  data.tar.gz: 9e1b4fb53dde4cafd41b9e5917a7a7e12ea22b036cd330ae3eebf79b749a89897afe3f18bb346ad1e524ceb91a27f0af9e1e3a5be1e65d255ce983a6f7ca26d2
+  metadata.gz: 3a7fe15c3b3b4b9b29229410088c976464ce6d97ffdf4f79dce15c5863fde6764174b323fca141b1fbfb9ba816254f7089e54a2e9b0c4532f478a8f63302bd56
+  data.tar.gz: c08a3540c7b1b37400310b2e9faac9a77f7c6b4ce439fe8029d4384e0c7429296b0502a6654647260cd7386ec53d4a8b3ac0159bf3d6c57a667fd60e4e819a06

data/README.md

@@ -8,6 +8,15 @@ generate hashes that you can serialize and store as you wish.
 Its a bit like ActiveRecord, but without all the messy database stuff,
 and of course you can nest to you're heart's content.
 
+A few situations where you might find Hashme useful:
+
+ * parsing incoming data from an API,
+ * defining documents that will be stored and reloaded from a file system, or,
+ * using a "json" field in a relational database with a bit more structure.
+
+Hashme adheres to ActiveModel and includes support validation, even of nested
+attributes with a `valid?` method.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -109,6 +118,10 @@ u.errors.first     # [:email, "can't be blank"]
 
 ## History
 
+### 0.2.1 - 2016-06-03
+
+ * Support for embedded document validation.
+
 ### 0.2.0 - 2016-06-02
 
  * Added support for advanced type casting, copy stuff from CouchRest Model.

data/lib/hashme.rb

@@ -17,17 +17,18 @@ require "hashme/casted_array"
 require "hashme/properties"
 require "hashme/property"
 require "hashme/property_casting"
+require "hashme/validations/casted_attribute_validator"
+require "hashme/validations"
 
 module Hashme
   extend ActiveSupport::Concern
 
-  include ActiveModel::Validations
+  include Validations
 
   included do
     include Castable
     include Attributes
     include Properties
-    # Eventually! include Validations
   end
 
   def initialize(attrs = {})

data/lib/hashme/properties.rb

@@ -52,7 +52,7 @@ module Hashme
         property = Property.new(*args)
         self.properties = properties.merge(property.name => property)
         define_property_methods(property)
-
+        prepare_validation(property)
         property
       end
 
@@ -69,6 +69,12 @@ module Hashme
         end
       end
 
+      def prepare_validation(property)
+        if property.type.method_defined?(:valid?)
+          validates_casted_attributes property.name
+        end
+      end
+
     end
 
 

data/lib/hashme/validations.rb

@@ -0,0 +1,21 @@
+module Hashme
+
+  # Additional functionality for validation outside the standard ActiveModel stuff.
+  module Validations
+    extend ActiveSupport::Concern
+    include ActiveModel::Validations
+
+    module ClassMethods
+
+      # Validates the associated casted model. This method should not be
+      # used within your code as it is automatically included when a CastedModel
+      # is used inside the model.
+      def validates_casted_attributes(*args)
+        validates_with(CastedAttributeValidator, _merge_attributes(args))
+      end
+
+    end
+
+  end
+
+end

data/lib/hashme/validations/casted_attribute_validator.rb

@@ -0,0 +1,13 @@
+module Hashme
+  module Validations
+    class CastedAttributeValidator < ActiveModel::EachValidator
+      
+      def validate_each(document, attribute, value)
+        values = value.is_a?(Array) ? value : [value]
+        return if values.collect {|attr| attr.nil? || attr.valid? }.all?
+        document.errors.add(attribute)
+      end
+
+    end
+  end
+end

data/lib/hashme/version.rb

@@ -1,3 +1,3 @@
 module Hashme
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/hashme/validations_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Hashme::Validations do
+
+  context "with simple validation" do
+    subject do
+      Class.new do
+        include Hashme
+        def self.name; "Example"; end
+        property :name, String
+        validates :name, presence: true
+      end
+    end
+
+    it "should not fail when valid" do
+      obj = subject.new(name: "Sam")
+      expect(obj).to be_valid
+      expect(obj.errors).to be_empty
+    end
+    it "should add error when invalid" do
+      obj = subject.new
+      expect(obj).to_not be_valid
+      expect(obj.errors).to_not be_empty
+      expect(obj.errors[:name]).to_not be_empty
+    end
+  end
+
+  context "with embedded object that supports validation" do
+    subject do
+      submod = Class.new do
+        include Hashme
+        def self.name; "SubExample"; end
+        property :email, String
+        validates :email, presence: true
+      end
+      Class.new do
+        include Hashme
+        def self.name; "Example"; end
+        property :sub, submod
+      end
+    end
+
+    it "should not error when valid" do
+      obj = subject.new(sub: {email: 'sam@cabify.com'})
+      expect(obj).to be_valid
+    end
+
+    it "should not err if embedded object empty" do
+      obj = subject.new()
+      expect(obj).to be_valid
+    end
+
+    it "should provide errors when invalid" do
+      obj = subject.new(sub: {})
+      expect(obj).to_not be_valid
+      expect(obj.errors[:sub]).to_not be_empty
+      expect(obj.sub.errors).to_not be_empty
+      expect(obj.sub.errors[:email]).to_not be_empty
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hashme
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sam Lown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -87,6 +87,8 @@ files:
 - lib/hashme/properties.rb
 - lib/hashme/property.rb
 - lib/hashme/property_casting.rb
+- lib/hashme/validations.rb
+- lib/hashme/validations/casted_attribute_validator.rb
 - lib/hashme/version.rb
 - spec/hashme/attributes_spec.rb
 - spec/hashme/base_spec.rb
@@ -94,6 +96,7 @@ files:
 - spec/hashme/properties_spec.rb
 - spec/hashme/property_casting_spec.rb
 - spec/hashme/property_spec.rb
+- spec/hashme/validations_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -126,4 +129,5 @@ test_files:
 - spec/hashme/properties_spec.rb
 - spec/hashme/property_casting_spec.rb
 - spec/hashme/property_spec.rb
+- spec/hashme/validations_spec.rb
 - spec/spec_helper.rb