strelka 0.5.0.pre.393 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d2cffaf505aa41496b0ce345534e70d6f4b45a0
-  data.tar.gz: c922b2aa4deafe3472b9be7d2d960237dc2e2b11
+  metadata.gz: e6d4fe519bbd4afaacce50262948b7a079041378
+  data.tar.gz: 8c38f999384187837c9b15b9786c60a8099aa4fe
 SHA512:
-  metadata.gz: 295a62542aae175dd4c70d425fc70f43d314412db557a01989aa63b015931cdf20cad5793fefd4e15a237f49d0f50a17c95b72b5905f321a260520ba4c13e06f
-  data.tar.gz: 590d6dfab3b2a652e916b9e78ad497440b5e5de314abbd12b5c289fd917d43a1c9e4b212ec55fdc2d030693ef312ea44d8ce0b530c140ee5c714241388a0ae0d
+  metadata.gz: 367d122a8c1ca23bb8e49a172e273a5a2b6baba2f0bdae38f576871649ae76637dcd75cf90d3f926852010058c7fab7b9d4ca081da5e056b5d3d1cf91169ff3c
+  data.tar.gz: 7da4ade4e80c6a066e20d20748167f583f2536ae18d078798db28a428742f52c76c57ff527e5dfa400f81a175a3cad9988d96b9658f00c0ff0b74fee54aa051d

data/History.rdoc

@@ -1,3 +1,11 @@
+== v0.5.0 [2013-05-17] Michael Granger <ged@FaerieMUD.org>
+
+- Add :datetime builtin validator
+- Add builtin validators for various checksums.
+- Wire up custom mediatype handlers to content negotiation. Fixes #5.
+- Bump Pluggability dependency
+
+
 == v0.4.0 [2013-03-26] Michael Granger <ged@FaerieMUD.org>
 
 - Handle Strelka::App subclass inheritance, add Strelka::App syntactic

data/lib/strelka.rb

@@ -27,7 +27,7 @@ module Strelka
 	VERSION = '0.5.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 49ae27e4588e $
+	REVISION = %q$Revision: 80db7acd42dc $
 
 	require 'strelka/constants'
 	require 'strelka/exceptions'

data/lib/strelka/app/restresources.rb

@@ -65,6 +65,17 @@ require 'strelka/app' unless defined?( Strelka::App )
 #       end
 #
 #
+# == Supported/Planned Options
+#
+# The 'resource' directive accepts options that control which methods it
+# creates for the specified resource:
+#
+# [√] :readonly     => false
+# [ ] :include      => <array of verbs>
+# [ ] :exclude      => <array of verbs>
+# [ ] :subsets      => <boolean or array>
+# [ ] :associations => <boolean or array>
+#
 module Strelka::App::RestResources
 	extend Strelka::Plugin
 
@@ -203,7 +214,6 @@ module Strelka::App::RestResources
 					attributes.map {|name,type| "  "}
 				end
 
-
 				return res
 			end
 

data/lib/strelka/paramvalidator.rb

@@ -427,7 +427,13 @@ class Strelka::ParamValidator
 			:uri		  => /^(?<uri>#{URI::URI_REF})$/,
 			:uuid		  => /^(?<uuid>[[:xdigit:]]{8}(?:-[[:xdigit:]]{4}){3}-[[:xdigit:]]{12})$/i,
 			:date         => /.*\d.*/,
+			:datetime     => /.*\d.*/,
 			:json         => JSON_VALIDATOR_RE,
+			:md5sum       => /^(?<md5sum>[[:xdigit:]]{32})$/i,
+			:sha1sum      => /^(?<sha1sum>[[:xdigit:]]{40})$/i,
+			:sha256sum    => /^(?<sha256sum>[[:xdigit:]]{64})$/i,
+			:sha384sum    => /^(?<sha384sum>[[:xdigit:]]{96})$/i,
+			:sha512sum    => /^(?<sha512sum>[[:xdigit:]]{128})$/i,
 		}
 
 		# Field values which result in a valid ‘true’ value for :boolean constraints
@@ -517,6 +523,14 @@ class Strelka::ParamValidator
 		end
 
 
+		### Constrain a value to a parseable Date
+		def post_process_datetime( val )
+			return Time.parse( val )
+		rescue ArgumentError
+			return nil
+		end
+
+
 		### Constrain a value to a Float
 		def post_process_float( val )
 			return Float( val.to_s )

data/spec/strelka/paramvalidator_spec.rb

@@ -360,6 +360,60 @@ describe Strelka::ParamValidator do
 
 	end # describe "hash parameters"
 
+	describe "merging new parameters" do
+
+		it "can be merged with another set of parameters" do
+			@validator.add( :foo, :integer, :required )
+			@validator.validate( {} )
+			newval = @validator.merge( 'foo' => '1' )
+
+			newval.should_not equal( @validator )
+
+			@validator.should_not be_okay()
+			@validator.should have_errors()
+			newval.should be_okay()
+			newval.should_not have_errors()
+
+			@validator[:foo].should == nil
+			newval[:foo].should == 1
+		end
+
+		it "can have required parameters merged into it after the initial validation" do
+			@validator.add( :foo, :integer, :required )
+			@validator.validate( {} )
+			@validator.merge!( 'foo' => '1' )
+
+			@validator.should be_okay()
+			@validator.should_not have_errors()
+
+			@validator[:foo].should == 1
+		end
+
+		it "can have optional parameters merged into it after the initial validation" do
+			@validator.add( :foom, /^\d+$/ )
+			@validator.validate( {} )
+			@validator.merge!( 'foom' => '5' )
+
+			@validator.should be_okay()
+			@validator.should_not have_errors()
+
+			@validator[:foom].should == '5'
+		end
+
+	    it "rejects invalid parameters when they're merged after initial validation" do
+	            @validator.add( :foom, /^\d+$/ )
+	            @validator.add( :bewm, /^\d+$/ )
+	            @validator.validate( 'foom' => "1" )
+
+	            @validator.merge!( 'bewm' => 'buckwheat noodles' )
+
+	            @validator.should_not be_okay()
+	            @validator.should have_errors()
+	            @validator[:bewm].should == nil
+	    end
+
+	end # describe "merging new parameters"
+
 	describe "builtin constraint type" do
 
 		it "treats ArgumentErrors as validation failures" do
@@ -715,6 +769,41 @@ describe Strelka::ParamValidator do
 
 		end
 
+		describe ":datetime constaints" do
+
+			before( :each ) do
+				@validator.add( :expires, :datetime )
+			end
+
+			it "accepts dates" do
+				@validator.validate( 'expires' => '2008-11-18' )
+
+				@validator.should be_okay()
+				@validator.should_not have_errors()
+
+				@validator[:expires].should == Time.parse( '2008-11-18' )
+			end
+
+			it "accepts a date with a time" do
+				@validator.validate( 'expires' => '2008-11-18T12:31:18.818Z' )
+
+				@validator.should be_okay()
+				@validator.should_not have_errors()
+
+				@validator[:expires].should == Time.parse( '2008-11-18T12:31:18.818Z' )
+			end
+
+			it "rejects non-dates" do
+				@validator.validate( 'expires' => 'someday' )
+
+				@validator.should_not be_okay()
+				@validator.should have_errors()
+
+				@validator[:expires].should be_nil()
+			end
+
+		end
+
 		describe ":uri constraints" do
 			VALID_URIS = %w{
 				http://127.0.0.1
@@ -1066,60 +1155,6 @@ describe Strelka::ParamValidator do
 
 		end
 
-		describe "merging new parameters" do
-
-			it "can be merged with another set of parameters" do
-				@validator.add( :foo, :integer, :required )
-				@validator.validate( {} )
-				newval = @validator.merge( 'foo' => '1' )
-
-				newval.should_not equal( @validator )
-
-				@validator.should_not be_okay()
-				@validator.should have_errors()
-				newval.should be_okay()
-				newval.should_not have_errors()
-
-				@validator[:foo].should == nil
-				newval[:foo].should == 1
-			end
-
-			it "can have required parameters merged into it after the initial validation" do
-				@validator.add( :foo, :integer, :required )
-				@validator.validate( {} )
-				@validator.merge!( 'foo' => '1' )
-
-				@validator.should be_okay()
-				@validator.should_not have_errors()
-
-				@validator[:foo].should == 1
-			end
-
-			it "can have optional parameters merged into it after the initial validation" do
-				@validator.add( :foom, /^\d+$/ )
-				@validator.validate( {} )
-				@validator.merge!( 'foom' => '5' )
-
-				@validator.should be_okay()
-				@validator.should_not have_errors()
-
-				@validator[:foom].should == '5'
-			end
-
-		    it "rejects invalid parameters when they're merged after initial validation" do
-		            @validator.add( :foom, /^\d+$/ )
-		            @validator.add( :bewm, /^\d+$/ )
-		            @validator.validate( 'foom' => "1" )
-
-		            @validator.merge!( 'bewm' => 'buckwheat noodles' )
-
-		            @validator.should_not be_okay()
-		            @validator.should have_errors()
-		            @validator[:bewm].should == nil
-		    end
-
-		end
-
 		describe ":json constraint" do
 
 			# Some tests derived from the json-smart feature test matrix by Uriel Chemouni:
@@ -1344,9 +1379,138 @@ describe Strelka::ParamValidator do
 			end
 		end
 
+		describe ":md5sum constraint" do
+
+			let( :sum ) { Digest::MD5.hexdigest('an api key') }
+
+			it "accepts a 32-character hex string" do
+				@validator.add( :apikey, :md5sum )
+				@validator.validate( 'apikey' => sum )
+
+				@validator.should_not have_errors()
+				@validator.should be_okay()
+
+				@validator[:apikey].should == sum
+			end
+
+			it "rejects anything but a 32-character hex string" do
+				@validator.add( :apikey, :md5sum )
+				@validator.validate( 'apikey' => 'my ponies have WINGS!!!11' )
+
+				@validator.should have_errors()
+				@validator.should_not be_okay()
+
+				@validator[:apikey].should be_nil()
+			end
+
+		end
+
+		describe ":sha1sum constraint" do
+
+			let( :sum ) { Digest::SHA1.hexdigest('an api key') }
+
+			it "accepts a 40-character hex string" do
+				@validator.add( :apikey, :sha1sum )
+				@validator.validate( 'apikey' => sum )
+
+				@validator.should_not have_errors()
+				@validator.should be_okay()
+
+				@validator[:apikey].should == sum
+			end
+
+			it "rejects anything but a 40-character hex string" do
+				@validator.add( :apikey, :sha1sum )
+				@validator.validate( 'apikey' => '084444a9979487f43a238e45afc1ec1277a' )
+
+				@validator.should have_errors()
+				@validator.should_not be_okay()
+
+				@validator[:apikey].should be_nil()
+			end
+
+		end
+
+		describe ":sha256sum constraint" do
+
+			let( :sum ) { Digest::SHA256.hexdigest('an api key') }
+
+			it "accepts a 64-character hex string" do
+				@validator.add( :apikey, :sha256sum )
+				@validator.validate( 'apikey' => sum )
+
+				@validator.should_not have_errors()
+				@validator.should be_okay()
+
+				@validator[:apikey].should == sum
+			end
+
+			it "rejects anything but a 64-character hex string" do
+				@validator.add( :apikey, :sha256sum )
+				@validator.validate( 'apikey' => 'a_key' )
+
+				@validator.should have_errors()
+				@validator.should_not be_okay()
+
+				@validator[:apikey].should be_nil()
+			end
+
+		end
+
+		describe ":sha384sum constraint" do
+
+			let( :sum ) { Digest::SHA384.hexdigest('an api key') }
+
+			it "accepts a 96-character hex string" do
+				@validator.add( :apikey, :sha384sum )
+				@validator.validate( 'apikey' => sum )
+
+				@validator.should_not have_errors()
+				@validator.should be_okay()
+
+				@validator[:apikey].should == sum
+			end
+
+			it "rejects anything but a 96-character hex string" do
+				@validator.add( :apikey, :sha384sum )
+				@validator.validate( 'apikey' => ' ' + sum )
+
+				@validator.should have_errors()
+				@validator.should_not be_okay()
+
+				@validator[:apikey].should be_nil()
+			end
+
+		end
+
+		describe ":sha512sum constraint" do
+
+			let( :sum ) { Digest::SHA512.hexdigest('an api key') }
+
+			it "accepts a 128-character hex string" do
+				@validator.add( :apikey, :sha512sum )
+				@validator.validate( 'apikey' => sum )
+
+				@validator.should_not have_errors()
+				@validator.should be_okay()
+
+				@validator[:apikey].should == sum
+			end
+
+			it "rejects anything but a 128-character hex string" do
+				@validator.add( :apikey, :sha512sum )
+				@validator.validate( 'apikey' => '..,,..' )
+
+				@validator.should have_errors()
+				@validator.should_not be_okay()
+
+				@validator[:apikey].should be_nil()
+			end
 
+		end
 
 	end # describe "constraints"
 
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strelka
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre.393
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -206,14 +206,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe-deveiate
   requirement: !ruby/object:Gem::Requirement