modelish 0.2.3 → 0.2.4

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.2.4 (2012-8-23)
+
+* Make modelish compatible with hashie v1.x, instead of pinning to hashie v1.0.0.
+
 ## 0.2.3 (2012-8-17)
 
 * Tweak implementation of validate! method to call validate method, replacing a parallel
@@ -12,7 +16,7 @@
 ## 0.2.1 (2012-3-8)
 
 * Bug fix to make behavior predictable for translated properties when both the property
-  name and the translated property name are present in an initialization hash (issue #5).
+  name and the translated property name are present in an initiali23zation hash (issue #5).
 * Modelish::Base#to_hash now processes the contents of Array-typed properties.
 
 ## 0.2.0 (2012-1-16)

data/lib/modelish/base.rb

@@ -62,7 +62,10 @@ module Modelish
       add_property_type(name, options[:type]) if options[:type]
       add_property_translation(options[:from], name) if options[:from]
 
-      add_validator(name) { |val| validate_required(name => val).first } if options[:required]
+      if options[:required] || (self.respond_to?(:required?) && required?(name))
+        add_validator(name) { |val| validate_required(name => val).first }
+      end
+
       add_validator(name) { |val| validate_length(name, val, options[:max_length]) } if options[:max_length]
       add_validator(name, &options[:validator]) if options[:validator]
       add_validator(name) { |val| validate_type(name, val, options[:type]) } if options[:validate_type]
@@ -104,5 +107,17 @@ module Modelish
         raise NoMethodError, "The property '#{property}' is not defined for this Modelish object."
       end
     end
+
+    def assert_required_properties_set!
+      nil
+    end
+
+    def assert_property_required!(property,value)
+      nil
+    end
+
+    def assert_property_exists!(property)
+      property_exists?(property)
+    end
   end
 end

data/lib/modelish/version.rb

@@ -1,3 +1,3 @@
 module Modelish
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/modelish.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('hashie', '1.0.0')
+  s.add_dependency('hashie', '~>1.0')
 
   s.add_development_dependency('rspec','~> 2.5')
   s.add_development_dependency('yard', '~> 0.6')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modelish
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Maeve Revels
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-17 00:00:00 Z
+date: 2012-08-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hashie
@@ -23,14 +23,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency