resin 0.0.7 → 0.0.8

data/amber/st/Kernel-Collections.st

@@ -1,4 +1,53 @@
 Smalltalk current createPackage: 'Kernel-Collections' properties: #{}!
+Object subclass: #Association
+	instanceVariableNames: 'key value'
+	category: 'Kernel-Collections'!
+
+!Association methodsFor: 'accessing'!
+
+key: aKey
+	key := aKey
+!
+
+key
+	^key
+!
+
+value: aValue
+	value := aValue
+!
+
+value
+	^value
+! !
+
+!Association methodsFor: 'comparing'!
+
+= anAssociation
+	^self class = anAssociation class and: [
+	    self key = anAssociation key and: [
+		self value = anAssociation value]]
+!
+
+storeOn: aStream
+	"Store in the format (key->value)"
+
+	"aStream nextPutAll: '('."
+	key storeOn: aStream.
+	aStream nextPutAll: '->'.
+	value storeOn: aStream.
+	"aStream nextPutAll: ')'"
+! !
+
+!Association class methodsFor: 'instance creation'!
+
+key: aKey value: aValue
+	    ^self new
+		key: aKey;
+		value: aValue;
+		yourself
+! !
+
 Object subclass: #Stream
 	instanceVariableNames: 'collection position streamSize'
 	category: 'Kernel-Collections'!
@@ -132,55 +181,6 @@ on: aCollection
 		yourself
 ! !
 
-Object subclass: #Association
-	instanceVariableNames: 'key value'
-	category: 'Kernel-Collections'!
-
-!Association methodsFor: 'accessing'!
-
-key: aKey
-	key := aKey
-!
-
-key
-	^key
-!
-
-value: aValue
-	value := aValue
-!
-
-value
-	^value
-! !
-
-!Association methodsFor: 'comparing'!
-
-= anAssociation
-	^self class = anAssociation class and: [
-	    self key = anAssociation key and: [
-		self value = anAssociation value]]
-!
-
-storeOn: aStream
-	"Store in the format (key->value)"
-
-	"aStream nextPutAll: '('."
-	key storeOn: aStream.
-	aStream nextPutAll: '->'.
-	value storeOn: aStream.
-	"aStream nextPutAll: ')'"
-! !
-
-!Association class methodsFor: 'instance creation'!
-
-key: aKey value: aValue
-	    ^self new
-		key: aKey;
-		value: aValue;
-		yourself
-! !
-
 Object subclass: #RegularExpression
 	instanceVariableNames: ''
 	category: 'Kernel-Collections'!
@@ -265,12 +265,12 @@ asSet
 	^Set withAll: self
 !
 
-asJSONString
-	^JSON stringify: (self collect: [:each | each asJSONString])
-!
-
 asOrderedCollection
 	^self asArray
+!
+
+asJSON
+	^self asArray collect: [:each | each asJSON]
 ! !
 
 !Collection methodsFor: 'copying'!
@@ -385,7 +385,11 @@ ifNotEmpty: aBlock
 !
 
 ifEmpty: aBlock
-	self isEmpty ifTrue: aBlock.
+	"Evaluate the given block with the receiver as argument, answering its value if the receiver is empty, otherwise answer the receiver. Note that the fact that this method returns its argument in case the receiver is not empty allows one to write expressions like the following ones: self classifyMethodAs: 
+		(myProtocol ifEmpty: ['As yet unclassified'])"
+	^ self isEmpty 
+		ifTrue: [ aBlock value ]
+		ifFalse: [ self ]
 ! !
 
 !Collection class methodsFor: 'accessing'!
@@ -505,6 +509,13 @@ indexOf: anObject startingAt: start
 
 atRandom
 	^ self at: self size atRandom
+!
+
+first: n
+	"Answer the first n elements of the receiver.
+	Raise an error if there are not enough elements."
+
+	^ self copyFrom: 1 to: n
 ! !
 
 !SequenceableCollection methodsFor: 'adding'!
@@ -751,12 +762,12 @@ asJavaScriptSelector
 	^(self asSelector replace: '^_' with: '') replace: '_.*' with: ''.
 !
 
-asJSONString
-	^self
-!
-
 asSymbol
 	^Symbol lookup: self
+!
+
+asJSON
+	^self
 ! !
 
 !String methodsFor: 'copying'!
@@ -1006,6 +1017,10 @@ asJavascript
 
 asSelector
 	^self asString asSelector
+!
+
+asJSON
+	^self asString asJSON
 ! !
 
 !Symbol methodsFor: 'copying'!
@@ -1158,7 +1173,7 @@ with: anObject with: anObject2 with: anObject3
 withAll: aCollection
 	| instance |
 	instance := self new: aCollection size.
-	aCollection withIndexDo: [:index :each |
+	aCollection withIndexDo: [:each :index  |
 		instance at: index put: each].
 	^instance
 ! !
@@ -1275,7 +1290,7 @@ with: anObject with: anObject2 with: anObject3
 withAll: aCollection
 	| instance |
 	instance := self new: aCollection size.
-	aCollection withIndexDo: [:index :each |
+	aCollection withIndexDo: [:each :index  |
 		instance at: index put: each].
 	^instance
 ! !
@@ -1504,6 +1519,14 @@ removeKey: aKey ifAbsent: aBlock
 
 asDictionary
 	^Dictionary fromPairs: self associations
+!
+
+asJSON
+	| c |
+	c := self class new.
+	self keysAndValuesDo: [:key :value |
+		c at: key put: value asJSON].
+	^c
 ! !
 
 !HashedCollection methodsFor: 'copying'!
@@ -1674,8 +1697,8 @@ asHashedCollection
 	^HashedCollection fromPairs: self associations
 !
 
-asJSONString
-	^self asHashedCollection asJSONString
+asJSON
+	^self asHashedCollection asJSON
 ! !
 
 !Dictionary methodsFor: 'initialization'!

data/amber/st/Kernel-Objects.st

@@ -114,11 +114,15 @@ asJavascript
 !
 
 asJSON
-	^JSON parse: self asJSONString
+	| variables |
+	variables := HashedCollection new.
+	self class allInstanceVariableNames do: [:each |
+		variables at: each put: (self instVarAt: each) asJSON].
+	^variables
 !
 
 asJSONString
-	^JSON stringify: self
+	^JSON stringify: self asJSON
 ! !
 
 !Object methodsFor: 'copying'!
@@ -823,6 +827,10 @@ to: stop by: step
 	  			pos := pos + 1.
 	    			value := value + step]].
 	^array
+!
+
+asJSON
+	^self
 ! !
 
 !Number methodsFor: 'copying'!
@@ -1005,6 +1013,12 @@ not
 	>
 ! !
 
+!Boolean methodsFor: 'converting'!
+
+asJSON
+	^self
+! !
+
 !Boolean methodsFor: 'copying'!
 
 shallowCopy
@@ -1231,6 +1245,12 @@ subclass: aString instanceVariableNames: aString2 package: aString3
 	    superclass: self subclass: aString instanceVariableNames: aString2 package: aString3
 ! !
 
+!UndefinedObject methodsFor: 'converting'!
+
+asJSON
+	^null
+! !
+
 !UndefinedObject methodsFor: 'copying'!
 
 shallowCopy
@@ -1635,6 +1655,13 @@ printString
 		stream nextPutAll: y printString]
 ! !
 
+!Point methodsFor: 'transforming'!
+
+translateBy: delta 
+	"Answer a Point translated by delta (an instance of Point)."
+	^(delta x + x) @ (delta y + y)
+! !
+
 !Point class methodsFor: 'instance creation'!
 
 x: aNumber y: anotherNumber

data/amber/st/Kernel-Tests.st

@@ -1,4 +1,18 @@
 Smalltalk current createPackage: 'Kernel-Tests' properties: #{}!
+TestCase subclass: #ArrayTest
+	instanceVariableNames: ''
+	category: 'Kernel-Tests'!
+
+!ArrayTest methodsFor: 'testing'!
+
+testFirstN
+	self assert: {1. 2. 3} equals: ({1. 2. 3. 4. 5} first: 3).
+!
+
+testIfEmpty
+	self assert: 'zork' equals: ( '' ifEmpty: ['zork'] )
+! !
+
 TestCase subclass: #StringTest
 	instanceVariableNames: ''
 	category: 'Kernel-Tests'!
@@ -58,6 +72,10 @@ testSize
 testAddRemove
 	self should: ['hello' add: 'a'] raise: Error.
 	self should: ['hello' remove: 'h'] raise: Error
+!
+
+testAsArray
+	self assert: 'hello' asArray = #('h' 'e' 'l' 'l' 'o').
 ! !
 
 TestCase subclass: #DictionaryTest
@@ -467,44 +485,6 @@ testGrulCommitPathJsShouldBeServerGrulJs
 	self assert: 'server/grul/js' equals: grulPackage commitPathJs
 ! !
 
-PackageTest subclass: #PackageWithDefaultCommitPathChangedTest
-	instanceVariableNames: ''
-	category: 'Kernel-Tests'!
-
-!PackageWithDefaultCommitPathChangedTest methodsFor: 'running'!
-
-setUp
-	super setUp.
-
-	Package
-		defaultCommitPathJs: 'javascripts/';
-		defaultCommitPathSt: 'smalltalk/'.
-! !
-
-!PackageWithDefaultCommitPathChangedTest methodsFor: 'tests'!
-
-testGrulCommitPathJsShouldBeServerGrulJs
-	self assert: 'server/grul/js' equals: grulPackage commitPathJs
-!
-
-testGrulCommitPathStShouldBeGrulSt
-	self assert: 'grul/st' equals: grulPackage commitPathSt
-!
-
-testZorkCommitPathJsShouldBeJavascript
-	self assert: 'javascripts/' equals: zorkPackage commitPathJs
-!
-
-testZorkCommitPathStShouldBeSmalltalk
-	self assert: 'smalltalk/' equals: zorkPackage commitPathSt
-! !
-
-!PackageWithDefaultCommitPathChangedTest class methodsFor: 'accessing'!
-
-shouldInheritSelectors
-	^ false
-! !
-
 TestCase subclass: #BlockClosureTest
 	instanceVariableNames: ''
 	category: 'Kernel-Tests'!
@@ -797,6 +777,13 @@ testArithmetic
 	self assert: 3@4 + (3@4 ) equals: (Point x: 6 y: 8).
 	self assert: 3@4 - (3@4 ) equals: (Point x: 0 y: 0).
 	self assert: 6@8 / (3@4 ) equals: (Point x: 2 y: 2)
+!
+
+testTranslateBy
+	self assert: 3@4 equals: (3@3 translateBy: 0@1).
+	self assert: 3@2 equals: (3@3 translateBy: 0@1 negated).
+	self assert: 5@6 equals: (3@3 translateBy: 2@3).
+	self assert: 0@3 equals: (3@3 translateBy: 3 negated @0).
 ! !
 
 TestCase subclass: #RandomTest
@@ -890,3 +877,41 @@ testSize
 	self assert: (Set withAll: #(1 1 1 1)) size equals: 1
 ! !
 
+PackageTest subclass: #PackageWithDefaultCommitPathChangedTest
+	instanceVariableNames: ''
+	category: 'Kernel-Tests'!
+
+!PackageWithDefaultCommitPathChangedTest methodsFor: 'running'!
+
+setUp
+	super setUp.
+
+	Package
+		defaultCommitPathJs: 'javascripts/';
+		defaultCommitPathSt: 'smalltalk/'.
+! !
+
+!PackageWithDefaultCommitPathChangedTest methodsFor: 'tests'!
+
+testGrulCommitPathJsShouldBeServerGrulJs
+	self assert: 'server/grul/js' equals: grulPackage commitPathJs
+!
+
+testGrulCommitPathStShouldBeGrulSt
+	self assert: 'grul/st' equals: grulPackage commitPathSt
+!
+
+testZorkCommitPathJsShouldBeJavascript
+	self assert: 'javascripts/' equals: zorkPackage commitPathJs
+!
+
+testZorkCommitPathStShouldBeSmalltalk
+	self assert: 'smalltalk/' equals: zorkPackage commitPathSt
+! !
+
+!PackageWithDefaultCommitPathChangedTest class methodsFor: 'accessing'!
+
+shouldInheritSelectors
+	^ false
+! !
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resin
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,7 +24,7 @@ dependencies:
   version_requirements: *3239880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &3239220 !ruby/object:Gem::Requirement
+  requirement: &3238860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3239220
+  version_requirements: *3238860
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &3237880 !ruby/object:Gem::Requirement
+  requirement: &3237980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3237880
+  version_requirements: *3237980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &3237060 !ruby/object:Gem::Requirement
+  requirement: &3237260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3237060
+  version_requirements: *3237260
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &3236360 !ruby/object:Gem::Requirement
+  requirement: &3236440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *3236360
+  version_requirements: *3236440
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &3235460 !ruby/object:Gem::Requirement
+  requirement: &3235500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3235460
+  version_requirements: *3235500
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &3234480 !ruby/object:Gem::Requirement
+  requirement: &3234540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3234480
+  version_requirements: *3234540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &3233520 !ruby/object:Gem::Requirement
+  requirement: &3233760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *3233520
+  version_requirements: *3233760
 description: 
 email: tyler@linux.com
 executables:
@@ -112,8 +112,10 @@ files:
 - lib/resin/app/app.rb
 - lib/resin.rb
 - lib/resin/app/views/index.haml
+- amber/css/amber-normalize.css
 - amber/css/amber.css
 - amber/css/style.css
+- amber/css/amber-normalize.less
 - amber/css/documentation.css
 - amber/css/profstef.css
 - amber/js/Kernel-Tests.js
@@ -205,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3599338579994700400
+      hash: -393056432692429665
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3599338579994700400
+      hash: -393056432692429665
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10