minimodel 1.0.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ead30d3e5905fd4a9cefbcc8acefafea60f88ac3
+  data.tar.gz: a91bd67fc303c5fa57b4f43865a5fd788bd5bcf8
+SHA512:
+  metadata.gz: 0cf78af9171a8a066e3e1fe244b306c9dfb33803a34b5efff3076a8f87d5441b6166141ac621a9ca623320c43d6675d71ffb270c9d991f642b64da68d3516c9b
+  data.tar.gz: 57328487523f9ab365bc11ce754e6066d8508ac64c18621573f7dc381aab4e317f9258d18da40167e82a8ff71d4f3ddfba2ef0d99a790e9d2ff241f704bc6a63

data/LICENSE.txt

@@ -0,0 +1,9 @@
+Copyright (c) TIMCRAFT <http://timcraft.com>
+
+This is an Open Source project licensed under the terms of the LGPLv3 license.
+Please see <http://www.gnu.org/licenses/lgpl-3.0.html> for license text.
+
+This code is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.

data/README.md

@@ -1,15 +1,17 @@
-A little library for defining little models
-===========================================
+# minimodel
 
+[![Gem Version](https://badge.fury.io/rb/minimodel.svg)](https://badge.fury.io/rb/minimodel) [![Build Status](https://api.travis-ci.org/timcraft/minimodel.svg?branch=master)](https://travis-ci.org/timcraft/minimodel)
 
-Installation
-------------
+
+A little Ruby library for defining little models.
+
+
+## Installation
 
     $ gem install minimodel
 
 
-Motivation
-----------
+## Motivation
 
 Many apps use small "read only" datasets that can easily be held in memory,
 for example: currency data, country data, colour data, advertising banners,
@@ -17,8 +19,7 @@ options for select boxes, payment plans etc. Sometimes it's useful to model
 this data without using a database, and that's what minimodel is for.
 
 
-Example
--------
+## Example
 
 Here's how you could implement a currency model using minimodel:
 
@@ -37,6 +38,7 @@ end
 The Currency class will respond to `#count` (returning the total number of
 currencies), `#all` (returning an array of currency objects), and `#find`
 (to lookup a specific currency by its code). Similar to ActiveRecord.
+
 There's also a `load_from` class method which will load data from a YAML
 file; useful for when you'd rather store the raw data outside of the class.
 

data/lib/minimodel.rb

@@ -1,10 +1,6 @@
 require 'yaml'
 
 class MiniModel
-  if defined?(id)
-    undef_method :id
-  end
-
   def initialize(attributes)
     @attributes = attributes.to_hash
   end
@@ -30,7 +26,7 @@ class MiniModel
   end
 
   def method_missing(symbol, *args, &block)
-    if @attributes.has_key?(symbol) && args.empty? && block.nil?
+    if @attributes.key?(symbol) && args.empty? && block.nil?
       return @attributes[symbol]
     else
       super symbol, *args, &block
@@ -38,7 +34,7 @@ class MiniModel
   end
 
   def respond_to_missing?(symbol, include_private = false)
-    @attributes.has_key?(symbol)
+    @attributes.key?(symbol)
   end
 
   class DuplicateKeyError < StandardError
@@ -67,6 +63,12 @@ class MiniModel
       all.map(&primary_key)
     end
 
+    def options(text_attribute)
+      all.each_with_object({}) do |model, hash|
+        hash[model.read_attribute(text_attribute)] = model.read_attribute(primary_key)
+      end
+    end
+
     def insert(attributes)
       unless @auto_increment.nil?
         attributes[primary_key] = @auto_increment
@@ -78,7 +80,7 @@ class MiniModel
 
       pkey = object.send(primary_key)
 
-      if index.has_key?(pkey)
+      if index.key?(pkey)
         raise DuplicateKeyError
       end
 

data/minimodel.gemspec

@@ -1,21 +1,19 @@
 Gem::Specification.new do |s|
   s.name = 'minimodel'
-  s.version = '1.0.0'
+  s.version = '2.0.0'
+  s.license = 'LGPL-3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
   s.email = ['mail@timcraft.com']
   s.homepage = 'http://github.com/timcraft/minimodel'
-  s.description = 'A little library for defining little models'
+  s.description = 'A little Ruby 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.files = Dir.glob('{lib,spec}/**/*') + %w(LICENSE.txt README.md Rakefile minimodel.gemspec)
+  s.required_ruby_version = '>= 1.9.3'
+  s.add_development_dependency('rake', '~> 10')
+  s.add_development_dependency('activerecord', '~> 5')
+  s.add_development_dependency('sqlite3', '~> 1.3')
+  s.add_development_dependency('minitest', '~> 5')
+  s.add_development_dependency('json', '~> 2')
   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 'assigns auto incrementing id values' do
-    Colour.all.map(&:id).must_equal([1, 2, 3])
+    Colour.all.map(&:id).sort.must_equal([1, 2, 3])
   end
 end

data/spec/currency_spec.rb

@@ -7,20 +7,18 @@ 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
 
-  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
+  it 'responds to code and name methods' do
+    @euro.respond_to?(:code).must_equal(true)
+    @euro.respond_to?(:name).must_equal(true)
   end
 
   it 'provides attribute reader methods' do
@@ -31,17 +29,17 @@ describe 'A currency object' do
   describe 'eql query method' 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 'returns false when given a currency object with a different code' do
-      @euro.eql?(Currency.new(:code => 'GBP', :name => 'Pound sterling')).must_equal(false)
+      @euro.eql?(Currency.new(code: 'GBP', name: 'Pound sterling')).must_equal(false)
     end
   end
 
   describe 'to_hash method' do
     it 'returns a hash containing the object attributes' do
-      @euro.to_hash.must_equal({:code => 'EUR', :name => 'Euro'})
+      @euro.to_hash.must_equal({code: 'EUR', name: 'Euro'})
     end
   end
 
@@ -72,10 +70,21 @@ describe 'Currency' do
 
   describe 'keys class method' do
     it 'returns an array containing all the primary keys' do
-      keys = Currency.keys
-      keys.length.must_equal(5)
+      Currency.keys.must_equal(%w(EUR GBP USD INR JPY))
+    end
+  end
 
-      %w(EUR GBP USD INR JPY).each { |key| keys.must_include(key) }
+  describe 'options class method' do
+    it 'returns a hash mapping the given text attribute to primary keys' do
+      options = {
+        'Euro' => 'EUR',
+        'Pound sterling' => 'GBP',
+        'United States dollar' => 'USD',
+        'Indian rupee' => 'INR',
+        'Japanese yen' => 'JPY'
+      }
+
+      Currency.options(:name).must_equal(options)
     end
   end
 
@@ -101,11 +110,7 @@ describe 'Currency' do
     end
 
     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
+      proc { Currency.find('FOO') }.must_raise(KeyError) # 1.9
     end
 
     it 'yields if the currency cannot be found and the caller supplies a block' do
@@ -115,7 +120,7 @@ describe 'Currency' do
 
   describe 'insert class method' do
     it 'raises 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

@@ -3,12 +3,12 @@ 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|
-    t.string :name, :index => true
-    t.string :level_name, :index => true
+ActiveRecord::Schema.define(version: 1) do
+  create_table :courses, force: true do |t|
+    t.string :name, index: true
+    t.string :level_name, index: true
   end
 end
 
@@ -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
 

metadata

@@ -1,118 +1,124 @@
 --- !ruby/object:Gem::Specification
 name: minimodel
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-16 00:00:00.000000000 Z
+date: 2017-06-09 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
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '2'
   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
+        version: '2'
+description: A little Ruby library for defining little models
 email:
 - mail@timcraft.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/minimodel/associations.rb
+- LICENSE.txt
+- README.md
+- Rakefile
 - lib/minimodel.rb
+- lib/minimodel/associations.rb
+- minimodel.gemspec
 - spec/colour_spec.rb
 - spec/currency_data.yml
 - spec/currency_spec.rb
 - spec/dutch_education_spec.rb
-- README.md
-- Rakefile
-- minimodel.gemspec
 homepage: http://github.com/timcraft/minimodel
-licenses: []
+licenses:
+- LGPL-3.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.6.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: See description
 test_files: []