minimodel 0.2.0 → 0.3.0

data/lib/minimodel.rb

@@ -77,8 +77,8 @@ class MiniModel
       index[pkey] = object
     end
 
-    def find(key)
-      index[key]
+    def find(primary_key, &block)
+      index.fetch(primary_key, &block)
     end
 
     def load_from(path)

data/minimodel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'minimodel'
-  s.version = '0.2.0'
+  s.version = '0.3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
   s.email = ['mail@timcraft.com']

data/spec/colour_spec.rb

@@ -9,8 +9,8 @@ class Colour < MiniModel
   insert name: 'Green', hexdigits: '00FF00'
 end
 
-describe Colour do
+describe 'Colour' do
   it 'should assign auto incrementing id values' do
-    Colour.all.map(&:id).must_equal [1, 2, 3]
+    Colour.all.map(&:id).must_equal([1, 2, 3])
   end
 end

data/spec/currency_spec.rb

@@ -17,92 +17,87 @@ describe 'A currency object' do
   end
 
   it 'should respond_to?(:code) and respond_to?(:name)' do
-    @euro.respond_to?(:code).must_equal true
-    @euro.respond_to?(:name).must_equal true
+    @euro.respond_to?(:code).must_equal(true)
+    @euro.respond_to?(:name).must_equal(true)
   end
 
   it 'should have attribute reader methods' do
-    @euro.code.must_equal 'EUR'
-    @euro.name.must_equal 'Euro'
+    @euro.code.must_equal('EUR')
+    @euro.name.must_equal('Euro')
   end
 
-  describe '#eql?' do
-    describe 'when passed the same currency object' do
-      it 'should return true' do
-        @euro.eql?(@euro).must_equal true
-        @euro.eql?(Currency.new(code: 'EUR', name: 'Euro')).must_equal true
-      end
+  describe 'eql query method' do
+    it 'should return true when passed a currency object with the same attributes' do
+      @euro.eql?(@euro).must_equal(true)
+      @euro.eql?(Currency.new(code: 'EUR', name: 'Euro')).must_equal(true)
     end
 
-    describe 'when passed a different currency object' do
-      it 'should return false' do
-        @euro.eql?(Currency.new(code: 'GBP', name: 'Pound sterling')).must_equal false
-      end
+    it 'should return false when given a currency object with a different code' do
+      @euro.eql?(Currency.new(code: 'GBP', name: 'Pound sterling')).must_equal(false)
     end
   end
 
-  describe '#to_hash' do
+  describe 'to_hash method' do
     it 'should return a hash containing the object attributes' do
-      @euro.to_hash.must_be_kind_of Hash
-      @euro.to_hash.must_equal code: 'EUR', name: 'Euro'
+      @euro.to_hash.must_equal({code: 'EUR', name: 'Euro'})
     end
   end
 
-  describe '#to_json' do
+  describe 'to_json method' do
     it 'should return a string containing a JSON object' do
-      @euro.to_json.must_equal '{"code":"EUR","name":"Euro"}'
+      @euro.to_json.must_equal('{"code":"EUR","name":"Euro"}')
     end
   end
 
-  describe '#read_attribute' do
+  describe 'read_attribute method' do
     it 'should return the value corresponding to the given attribute name' do
-      @euro.read_attribute(:code).must_equal 'EUR'
-      @euro.read_attribute(:name).must_equal 'Euro'
+      @euro.read_attribute(:code).must_equal('EUR')
+      @euro.read_attribute(:name).must_equal('Euro')
     end
   end
 end
 
-describe Currency do
-  describe '#all' do
+describe 'Currency' do
+  describe 'all class method' do
     it 'should return an array containing currency objects' do
-      Currency.all.must_be_kind_of Array
-      Currency.all.all? { |object| object.must_be_kind_of Currency }
+      Currency.all.must_be_kind_of(Array)
+      Currency.all.each { |object| object.must_be_kind_of(Currency) }
     end
   end
 
-  describe '#primary_key' do
+  describe 'primary_key class method' do
     it 'should return the primary key specified using #indexed_by' do
-      Currency.primary_key.must_equal :code
+      Currency.primary_key.must_equal(:code)
     end
   end
 
-  describe '#count' do
+  describe 'count class method' do
     it 'should return the total number of currencies defined' do
-      Currency.count.must_equal 5
+      Currency.count.must_equal(5)
     end
   end
 
-  describe '#find' do
-    describe 'when passed a valid currency code' do
-      it 'should return the correct currency' do
-        currency = Currency.find('EUR')
+  describe 'find class method' do
+    it 'should return the correct currency object' do
+      currency = Currency.find('EUR')
 
-        currency.must_be_kind_of Currency
-        currency.code.must_equal 'EUR'
-        currency.name.must_equal 'Euro'
-      end
+      currency.must_be_kind_of(Currency)
+      currency.code.must_equal('EUR')
+      currency.name.must_equal('Euro')
     end
 
-    describe 'when passed an invalid currency code' do
-      it 'should return nil' do
-        Currency.find('FOO').must_be_nil
-      end
+    it 'should raise an error if the currency cannot be found' do
+      proc { Currency.find('FOO') }.must_raise(KeyError)
+    end
+
+    it 'should yield if the currency cannot be found and the caller supplies a block' do
+      Currency.find('FOO') { nil }.must_be_nil
     end
   end
 
-  describe '#insert' do
+  describe 'insert class method' do
     it 'should raise an error when passed a key that already exists' do
-      proc { Currency.insert(code: 'EUR', name: 'Euro') }.must_raise MiniModel::DuplicateKeyError
+      proc { Currency.insert(code: 'EUR', name: 'Euro') }.must_raise(MiniModel::DuplicateKeyError)
     end
   end
 end

data/spec/dutch_education_spec.rb

@@ -65,47 +65,21 @@ describe 'A level object' do
     @course_names = %w( VMBO-T/Duits VMBO-T/Engels VMBO-T/Nederlands )
   end
 
-  describe '#profiles' do
-    it 'should be enumerable' do
-      @level.profiles.must_respond_to :each
-      @level.profiles.class.ancestors.must_include Enumerable
-    end
-
-    describe '#size' do
-      it 'should return the number of profiles linked to this level' do
-        @level.profiles.size.must_equal 4
-      end
-    end
-
-    describe '#to_a' do
-      it 'should return an array containing the correct profile objects' do
-        profiles = @level.profiles.to_a
-
-        profiles.must_be_kind_of Array
-        profiles.map(&:name).sort.must_equal @profile_names
-      end
+  describe 'profiles method' do
+    it 'should return an enumerable object with the correct size' do
+      profiles = @level.profiles
+      profiles.must_respond_to(:each)
+      profiles.class.ancestors.must_include(Enumerable)
+      profiles.size.must_equal(4)
     end
   end
 
-  describe '#courses' do
-    it 'should be enumerable' do
-      @level.courses.must_respond_to :each
-      @level.courses.class.ancestors.must_include Enumerable
-    end
-
-    describe '#size' do
-      it 'should return the number of courses linked to this level' do
-        @level.courses.size.must_equal 3
-      end
-    end
-
-    describe '#to_a' do
-      it 'should return an array containing the correct course objects' do
-        courses = @level.courses.to_a
-
-        courses.must_be_kind_of Array
-        courses.map(&:name).sort.must_equal @course_names
-      end
+  describe 'courses method' do
+    it 'should return an enumerable object with the correct size' do
+      courses = @level.courses
+      courses.must_respond_to(:each)
+      courses.class.ancestors.must_include(Enumerable)
+      courses.size.must_equal(3)
     end
   end
 end
@@ -115,10 +89,10 @@ describe 'A profile object' do
     @profile = Profile.find(8)
   end
 
-  describe '#level' do
+  describe 'level method' do
     it 'should return the correct level object' do
-      @profile.level.must_be_kind_of Level
-      @profile.level.name.must_equal 'HAVO'
+      @profile.level.must_be_kind_of(Level)
+      @profile.level.name.must_equal('HAVO')
     end
   end
 end
@@ -128,10 +102,10 @@ describe 'A course object' do
     @course = Course.find_by_name('VWO/Engels')
   end
 
-  describe '#level' do
+  describe 'level method' do
     it 'should return the correct level object' do
-      @course.level.must_be_kind_of Level
-      @course.level.name.must_equal 'VWO'
+      @course.level.must_be_kind_of(Level)
+      @course.level.name.must_equal('VWO')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimodel
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &9966180 !ruby/object:Gem::Requirement
+  requirement: &10440420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *9966180
+  version_requirements: *10440420
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &9965800 !ruby/object:Gem::Requirement
+  requirement: &10440150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *9965800
+  version_requirements: *10440150
 description: A little library for defining little models
 email:
 - mail@timcraft.com