minimodel 0.4.0 → 1.0.0

data/README.md

@@ -1,5 +1,11 @@
-Minimodel: A little library for defining little models
-======================================================
+A little library for defining little models
+===========================================
+
+
+Installation
+------------
+
+    $ gem install minimodel
 
 
 Motivation

data/Rakefile

@@ -1,7 +1,8 @@
 require 'rake/testtask'
 
-task :default => :test
+task :default => :spec
 
-Rake::TestTask.new do |t|
+Rake::TestTask.new(:spec) do |t|
   t.test_files = FileList['spec/*_spec.rb']
+  t.warning = true
 end

data/lib/minimodel.rb

@@ -1,6 +1,10 @@
 require 'yaml'
 
 class MiniModel
+  if defined?(id)
+    undef_method :id
+  end
+
   def initialize(attributes)
     @attributes = attributes.to_hash
   end

data/minimodel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'minimodel'
-  s.version = '0.4.0'
+  s.version = '1.0.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
   s.email = ['mail@timcraft.com']
@@ -8,7 +8,14 @@ Gem::Specification.new do |s|
   s.description = 'A little library for defining little models'
   s.summary = 'See description'
   s.files = Dir.glob('{lib,spec}/**/*') + %w(README.md Rakefile minimodel.gemspec)
+  s.add_development_dependency('rake', '~> 10.0.3')
   s.add_development_dependency('activesupport', ['>= 3.0.3'])
   s.add_development_dependency('activerecord', ['>= 3.0.3'])
+  s.add_development_dependency('sqlite3', ['~> 1.3.6'])
   s.require_path = 'lib'
+
+  if RUBY_VERSION == '1.8.7'
+    s.add_development_dependency('minitest', '>= 4.2.0')
+    s.add_development_dependency('json', '>= 1.7.7')
+  end
 end

data/spec/colour_spec.rb

@@ -2,15 +2,15 @@ require 'minitest/autorun'
 require 'minimodel'
 
 class Colour < MiniModel
-  indexed_by :id, auto_increment: true
+  indexed_by :id, :auto_increment => true
 
-  insert name: 'Blue', hexdigits: '0000FF'
-  insert name: 'Red', hexdigits: 'FF0000'
-  insert name: 'Green', hexdigits: '00FF00'
+  insert :name => 'Blue', :hexdigits => '0000FF'
+  insert :name => 'Red', :hexdigits => 'FF0000'
+  insert :name => 'Green', :hexdigits => '00FF00'
 end
 
 describe 'Colour' do
-  it 'should assign auto incrementing id values' do
+  it 'assigns auto incrementing id values' do
     Colour.all.map(&:id).must_equal([1, 2, 3])
   end
 end

data/spec/currency_spec.rb

@@ -7,50 +7,55 @@ class Currency < MiniModel
 
   load_from 'spec/currency_data.yml'
 
-  insert code: 'INR', name: 'Indian rupee'
-  insert code: 'JPY', name: 'Japanese yen'
+  insert :code => 'INR', :name => 'Indian rupee'
+  insert :code => 'JPY', :name => 'Japanese yen'
 end
 
 describe 'A currency object' do
   before do
-    @euro = Currency.new(code: 'EUR', name: 'Euro')
+    @euro = Currency.new(:code => 'EUR', :name => 'Euro')
   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)
+  if Object.new.respond_to?(:respond_to_missing?)
+    it 'responds to code and name methods' do
+      @euro.respond_to?(:code).must_equal(true)
+      @euro.respond_to?(:name).must_equal(true)
+    end
   end
 
-  it 'should have attribute reader methods' do
+  it 'provides attribute reader methods' do
     @euro.code.must_equal('EUR')
     @euro.name.must_equal('Euro')
   end
 
   describe 'eql query method' do
-    it 'should return true when passed a currency object with the same attributes' do
+    it 'returns 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)
+      @euro.eql?(Currency.new(:code => 'EUR', :name => 'Euro')).must_equal(true)
     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)
+    it 'returns 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 method' do
-    it 'should return a hash containing the object attributes' do
-      @euro.to_hash.must_equal({code: 'EUR', name: 'Euro'})
+    it 'returns a hash containing the object attributes' do
+      @euro.to_hash.must_equal({:code => 'EUR', :name => 'Euro'})
     end
   end
 
   describe 'to_json method' do
-    it 'should return a string containing a JSON object' do
-      @euro.to_json.must_equal('{"code":"EUR","name":"Euro"}')
+    it 'returns a string containing the object attributes encoded as json' do
+      output = @euro.to_json
+      output.must_match(/\{.+?\}/)
+      output.must_match(/"code":"EUR"/)
+      output.must_match(/"name":"Euro"/)
     end
   end
 
   describe 'read_attribute method' do
-    it 'should return the value corresponding to the given attribute name' do
+    it 'returns the value corresponding to the given attribute name' do
       @euro.read_attribute(:code).must_equal('EUR')
       @euro.read_attribute(:name).must_equal('Euro')
     end
@@ -59,32 +64,35 @@ end
 
 describe 'Currency' do
   describe 'all class method' do
-    it 'should return an array containing currency objects' do
+    it 'returns an array containing currency objects' do
       Currency.all.must_be_kind_of(Array)
       Currency.all.each { |object| object.must_be_kind_of(Currency) }
     end
   end
 
   describe 'keys class method' do
-    it 'should return an array containing all the primary keys' do
-      Currency.keys.must_equal(%w(EUR GBP USD INR JPY))
+    it 'returns an array containing all the primary keys' do
+      keys = Currency.keys
+      keys.length.must_equal(5)
+
+      %w(EUR GBP USD INR JPY).each { |key| keys.must_include(key) }
     end
   end
 
   describe 'primary_key class method' do
-    it 'should return the primary key specified using #indexed_by' do
+    it 'returns the name of the primary key attribute' do
       Currency.primary_key.must_equal(:code)
     end
   end
 
   describe 'count class method' do
-    it 'should return the total number of currencies defined' do
+    it 'returns the total number of currencies' do
       Currency.count.must_equal(5)
     end
   end
 
   describe 'find class method' do
-    it 'should return the correct currency object' do
+    it 'returns the correct currency object' do
       currency = Currency.find('EUR')
 
       currency.must_be_kind_of(Currency)
@@ -92,18 +100,22 @@ describe 'Currency' do
       currency.name.must_equal('Euro')
     end
 
-    it 'should raise an error if the currency cannot be found' do
-      proc { Currency.find('FOO') }.must_raise(KeyError)
+    it 'raises an error if the currency cannot be found' do
+      if defined?(KeyError)
+        proc { Currency.find('FOO') }.must_raise(KeyError) # 1.9
+      else
+        proc { Currency.find('FOO') }.must_raise(IndexError) # 1.8
+      end
     end
 
-    it 'should yield if the currency cannot be found and the caller supplies a block' do
+    it 'yields if the currency cannot be found and the caller supplies a block' do
       Currency.find('FOO') { nil }.must_be_nil
     end
   end
 
   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)
+    it 'raises an error when passed a key that already exists' do
+      proc { Currency.insert(:code => 'EUR', :name => 'Euro') }.must_raise(MiniModel::DuplicateKeyError)
     end
   end
 end

data/spec/dutch_education_spec.rb

@@ -3,7 +3,7 @@ require 'minimodel'
 require 'minimodel/associations'
 require 'active_record'
 
-ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 
 ActiveRecord::Schema.define(:version => 1) do
   create_table :courses, :force => true do |t|
@@ -18,30 +18,30 @@ class Level < MiniModel
   has_many :courses
   has_many :profiles
 
-  insert name: 'VMBO-T'
-  insert name: 'HAVO'
-  insert name: 'VWO'
+  insert :name => 'VMBO-T'
+  insert :name => 'HAVO'
+  insert :name => 'VWO'
 end
 
 class Profile < MiniModel
-  indexed_by :id, auto_increment: true
+  indexed_by :id, :auto_increment => true
 
   belongs_to :level
 
-  insert level_name: 'VMBO-T', name: 'Techniek'
-  insert level_name: 'VMBO-T', name: 'Zorg en Welzijn'
-  insert level_name: 'VMBO-T', name: 'Economie'
-  insert level_name: 'VMBO-T', name: 'Landbouw'
+  insert :level_name => 'VMBO-T', :name => 'Techniek'
+  insert :level_name => 'VMBO-T', :name => 'Zorg en Welzijn'
+  insert :level_name => 'VMBO-T', :name => 'Economie'
+  insert :level_name => 'VMBO-T', :name => 'Landbouw'
 
-  insert level_name: 'HAVO', name: 'Economie en Maatschappij'
-  insert level_name: 'HAVO', name: 'Cultuur en Maatschappij'
-  insert level_name: 'HAVO', name: 'Natuur en Gezondheid'
-  insert level_name: 'HAVO', name: 'Natuur en Techniek'
+  insert :level_name => 'HAVO', :name => 'Economie en Maatschappij'
+  insert :level_name => 'HAVO', :name => 'Cultuur en Maatschappij'
+  insert :level_name => 'HAVO', :name => 'Natuur en Gezondheid'
+  insert :level_name => 'HAVO', :name => 'Natuur en Techniek'
 
-  insert level_name: 'VWO', name: 'Economie en Maatschappij'
-  insert level_name: 'VWO', name: 'Cultuur en Maatschappij'
-  insert level_name: 'VWO', name: 'Natuur en Gezondheid'
-  insert level_name: 'VWO', name: 'Natuur en Techniek'
+  insert :level_name => 'VWO', :name => 'Economie en Maatschappij'
+  insert :level_name => 'VWO', :name => 'Cultuur en Maatschappij'
+  insert :level_name => 'VWO', :name => 'Natuur en Gezondheid'
+  insert :level_name => 'VWO', :name => 'Natuur en Techniek'
 end
 
 class Course < ActiveRecord::Base
@@ -52,7 +52,7 @@ end
 
 Level.all.each do |level|
   for course_name in %w( Nederlands Engels Duits )
-    Course.create!(level_name: level.name, name: "#{level.name}/#{course_name}")
+    Course.create!(:level_name => level.name, :name => "#{level.name}/#{course_name}")
   end
 end
 
@@ -66,7 +66,7 @@ describe 'A level object' do
   end
 
   describe 'profiles method' do
-    it 'should return an enumerable object with the correct size' do
+    it 'returns an enumerable object with the correct size' do
       profiles = @level.profiles
       profiles.must_respond_to(:each)
       profiles.class.ancestors.must_include(Enumerable)
@@ -75,7 +75,7 @@ describe 'A level object' do
   end
 
   describe 'courses method' do
-    it 'should return an enumerable object with the correct size' do
+    it 'returns an enumerable object with the correct size' do
       courses = @level.courses
       courses.must_respond_to(:each)
       courses.class.ancestors.must_include(Enumerable)
@@ -90,7 +90,7 @@ describe 'A profile object' do
   end
 
   describe 'level method' do
-    it 'should return the correct level object' do
+    it 'returns the correct level object' do
       @profile.level.must_be_kind_of(Level)
       @profile.level.name.must_equal('HAVO')
     end
@@ -103,7 +103,7 @@ describe 'A course object' do
   end
 
   describe 'level method' do
-    it 'should return the correct level object' do
+    it 'returns the correct level object' do
       @course.level.must_be_kind_of(Level)
       @course.level.name.must_equal('VWO')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimodel
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &508110 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +37,15 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *508110
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &487740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +53,28 @@ dependencies:
         version: 3.0.3
   type: :development
   prerelease: false
-  version_requirements: *487740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 description: A little library for defining little models
 email:
 - mail@timcraft.com
@@ -69,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: See description