orm_adapter 0.0.3 → 0.0.4

data/.gitignore

@@ -1,6 +1,15 @@
+# system crap
 .DS_Store
+
+# local ruby/gems dev stuff
 .rvmrc
 .bundle
+Gemfile.lock
+
+# built docs
 .yardoc
-pkg
 doc
+
+# built gems
+pkg
+*.gem

data/Gemfile

@@ -1,15 +1,3 @@
 source "http://rubygems.org"
 
-gem "yard"
-
-group :test do
-  gem "activerecord", "~> 3.0.0"
-  gem "mongoid", "~> 2.0.0.beta.17"
-  gem "rspec", "~> 2.0.0.rc"
-  gem "jeweler"
-  gem "rake"
-  gem "sqlite3-ruby"
-  gem "datamapper"
-  gem "dm-sqlite-adapter"
-  gem "dm-active_model"
-end
+gemspec

data/{Gemfile.lock → Gemfile.lock.development}

@@ -1,20 +1,25 @@
+PATH
+  remote: .
+  specs:
+    orm_adapter (0.0.4)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.0)
-    addressable (2.2.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    bson (1.1)
+    activesupport (3.0.3)
+    addressable (2.2.2)
+    arel (2.0.6)
+    bson (1.1.5)
+    bson_ext (1.1.5)
     builder (2.1.2)
     data_objects (0.10.2)
       addressable (~> 2.1)
@@ -29,7 +34,7 @@ GEM
       dm-types (= 1.0.2)
       dm-validations (= 1.0.2)
     diff-lcs (1.1.2)
-    dm-active_model (1.0.2)
+    dm-active_model (1.0.3)
       activemodel (~> 3.0.0)
       dm-core (~> 1.0.2)
     dm-aggregates (1.0.2)
@@ -68,52 +73,46 @@ GEM
       data_objects (= 0.10.2)
     extlib (0.9.15)
     fastercsv (1.5.3)
-    gemcutter (0.6.1)
     git (1.2.5)
-    i18n (0.4.1)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
+    i18n (0.5.0)
     json_pure (1.4.6)
-    mongo (1.0.9)
-      bson (>= 1.0.5)
-    mongoid (2.0.0.beta.19)
+    mongo (1.1.5)
+      bson (>= 1.1.5)
+    mongoid (2.0.0.beta.20)
       activemodel (~> 3.0)
-      mongo (= 1.0.9)
+      mongo (~> 1.1)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
     rake (0.8.7)
-    rspec (2.0.0.rc)
-      rspec-core (= 2.0.0.rc)
-      rspec-expectations (= 2.0.0.rc)
-      rspec-mocks (= 2.0.0.rc)
-    rspec-core (2.0.0.rc)
-    rspec-expectations (2.0.0.rc)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.rc)
-      rspec-core (= 2.0.0.rc)
-      rspec-expectations (= 2.0.0.rc)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
-    sqlite3-ruby (1.3.1)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    sqlite3-ruby (1.3.2)
     stringex (1.1.0)
     tzinfo (0.3.23)
     uuidtools (2.1.1)
     will_paginate (3.0.pre2)
-    yard (0.6.1)
+    yard (0.6.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.0)
-  datamapper
-  dm-active_model
-  dm-sqlite-adapter
-  jeweler
-  mongoid (~> 2.0.0.beta.17)
-  rake
-  rspec (~> 2.0.0.rc)
-  sqlite3-ruby
-  yard
+  activerecord (>= 3.0.0)
+  bson_ext (>= 1.1.5)
+  bundler (>= 1.0.0)
+  datamapper (>= 1.0)
+  dm-active_model (>= 1.0)
+  dm-sqlite-adapter (>= 1.0)
+  git (>= 1.2.5)
+  mongoid (>= 2.0.0.beta.20)
+  orm_adapter!
+  rake (>= 0.8.7)
+  rspec (>= 2.4.0)
+  sqlite3-ruby (>= 1.3.2)
+  yard (>= 0.6.0)

data/History.txt

@@ -1,3 +1,9 @@
+== 0.0.4
+  
+  * Adds ability to order results from #find_first and #find_all [Ian White]
+  * Rationalise development dependencies and release process [Ian White]
+  
+
 == 0.0.3
   
   * ActiveRecord's OrmAdapter handles non standard foreign key names [Ian White]

data/README.rdoc

@@ -15,9 +15,11 @@ Provides a single point of entry for popular ruby ORMs.  Its target audience is
   user_model.get!(1)                      # find a record by id
   user_model.find_first(:name => 'fred')  # find first fred
   user_model.find_all(:name => 'fred')    # find all freds
+  user_model.find_all(:order => :name)    # find all freds, ordered by name
   user_model.create!(:name => 'fred')     # create a fred 
-  
 
+@see OrmAdapter::Base for more details of the supported API
+  
 == Supported ORMs
 
 Currently supported ORMs are *ActiveRecord*, *DataMapper* and *MongoId*.
@@ -36,6 +38,14 @@ ORM Adapter will support only basic methods, as +get+, +find_first+, <tt>create!
 If you need complex queries, we recommend you to subclass ORM Adapters in your plugin and extend it expressing these query conditions as part of your domain logic.
 
 
+== Projects using orm_adapter
+
+* {devise}[http://github.com/plataformatec/devise]
+* {pickle}[http://github.com/ianwhite/pickle]
+
+Get in touch if you want your project added to this list
+
+
 == History
 
 orm_adapter is an extraction from {pickle}[http://github.com/ianwhite/pickle] by {Ian White}[http://github.com/ianwhite].  Pickle's orm adapter included work by {Daniel Neighman}[http://github.com/hassox], {Josh Bassett}[http://github.com/nullobject], {Marc Lee}[http://github.com/maleko], and {Sebastian Zuchmanski}[http://github.com/sebcioz].
@@ -43,6 +53,17 @@ orm_adapter is an extraction from {pickle}[http://github.com/ianwhite/pickle] by
 {José Valim}[http://github.com/josevalim] suggested the extraction, and worked on the first release with Ian.
 
 
+== Development
+
+To run the specs, you can start from the last known good set of gem dependencies in Gemfile.lock.development:
+
+  git clone http://github.com/ianwhite/orm_adapter
+  cd orm_adapter
+  cp Gemfile.lock.development Gemfile.lock
+  bundle
+  bundle exec rake spec
+
+
 == Copyright
 
-Copyright (c) 2010 Ian White and José Valim. See LICENSE for details.
+Copyright (c) 2010-2011 Ian White and José Valim. See LICENSE for details.

data/Rakefile

@@ -2,38 +2,55 @@ require 'rubygems'
 require 'rake'
 require 'rspec/core/rake_task'
 require 'yard'
+require 'git'
+$:.push File.expand_path("../lib", __FILE__)
+require "orm_adapter/version"
 
-$:.unshift File.expand_path('lib')
-require 'orm_adapter/version'
-
-task :spec => :check_dependencies
 task :default => :spec
 
-desc "Run the specs"
 RSpec::Core::RakeTask.new(:spec)
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "orm_adapter"
-    gem.version = OrmAdapter::VERSION
-    gem.summary = %Q{Provides a single point of entry for using basic features of ruby ORMs}
-    gem.description = %Q{Provides a single point of entry for using basic features of ruby ORMs}
-    gem.email = "ian.w.white@gmail.com"
-    gem.homepage = "http://github.com/ianwhite/orm_adapter"
-    gem.authors = ["Ian White", "Jose Valim"]
+YARD::Rake::YardocTask.new(:doc) do |t|
+  t.files   = ['lib/**/*.rb', 'README.rdoc']
+end
+
+task :build do
+  system "gem build orm_adapter.gemspec"
+end
+
+namespace :release do
+  task :rubygems => :pre do
+    system "gem push orm_adapter-#{OrmAdapter::VERSION}.gem"
   end
-  Jeweler::GemcutterTasks.new
   
-  namespace :release do
-    desc "release to github and gemcutter"
-    task :all => ['release', 'gemcutter:release']
+  task :github => :pre do
+    tag = "v#{OrmAdapter::VERSION}"
+    git = Git.open('.')
+    
+    if (git.tag(tag) rescue nil)
+      raise "** repo is already tagged with: #{tag}"
+    end
+    
+    git.add_tag(tag)
+    git.push('origin', tag)
   end
   
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-YARD::Rake::YardocTask.new(:doc) do |t|
-  t.files   = ['lib/**/*.rb', 'README.rdoc']
-end
+  task :pre => [:spec, :build] do
+    git = Git.open('.')
+    
+    if File.exists?("Gemfile.lock") && File.read("Gemfile.lock") != File.read("Gemfile.lock.development")
+      cp "Gemfile.lock", "Gemfile.lock.development"
+      raise "** Gemfile.lock.development has been updated, please commit these changes."
+    end
+    
+    if (git.status.changed + git.status.added + git.status.deleted).any?
+      raise "** repo is not clean, try committing some files"
+    end
+    
+    if git.object('HEAD').sha != git.object('origin/master').sha
+      raise "** origin does not match HEAD, have you pushed?"
+    end
+  end
+  
+  task :all => ['release:github', 'release:rubygems']
+end

data/lib/orm_adapter/adapters/active_record.rb

@@ -35,27 +35,29 @@ class ActiveRecord::Base
       klass.column_names
     end
 
-    # Get an instance by id of the model
+    # @see OrmAdapter::Base#get!
     def get!(id)
       klass.find(wrap_key(id))
     end
 
-    # Get an instance by id of the model
+    # @see OrmAdapter::Base#get
     def get(id)
       klass.first :conditions => { klass.primary_key => wrap_key(id) }
     end
 
-    # Find the first instance matching conditions
-    def find_first(conditions)
-      klass.first :conditions => conditions_to_fields(conditions)
+    # @see OrmAdapter::Base#find_first
+    def find_first(options)
+      conditions, order = extract_conditions_and_order!(options)
+      klass.first :conditions => conditions_to_fields(conditions), :order => order_clause(order)
     end
 
-    # Find all models matching conditions
-    def find_all(conditions)
-      klass.all :conditions => conditions_to_fields(conditions)
+    # @see OrmAdapter::Base#find_all
+    def find_all(options)
+      conditions, order = extract_conditions_and_order!(options)
+      klass.all :conditions => conditions_to_fields(conditions), :order => order_clause(order)
     end
     
-    # Create a model using attributes
+    # @see OrmAdapter::Base#create!
     def create!(attributes)
       klass.create!(attributes)
     end
@@ -75,5 +77,9 @@ class ActiveRecord::Base
       end
       fields
     end
+    
+    def order_clause(order)
+      order.map {|pair| "#{pair[0]} #{pair[1]}"}.join(",")
+    end
   end
 end

data/lib/orm_adapter/adapters/data_mapper.rb

@@ -23,30 +23,38 @@ module DataMapper
         klass.properties.map(&:name)
       end
 
-      # Get an instance by id of the model
+      # @see OrmAdapter::Base#get!
       def get!(id)
         klass.get!(id)
       end
 
-      # Get an instance by id of the model
+      # @see OrmAdapter::Base#get
       def get(id)
         klass.get(id)
       end
 
-      # Find the first instance matching conditions
-      def find_first(conditions)
-        klass.first(conditions)
+      # @see OrmAdapter::Base#find_first
+      def find_first(options)
+        conditions, order = extract_conditions_and_order!(options)
+        klass.first :conditions => conditions, :order => order_clause(order)
       end
 
-      # Find all models matching conditions
-      def find_all(conditions)
-        klass.all(conditions)
+      # @see OrmAdapter::Base#find_all
+      def find_all(options)
+        conditions, order = extract_conditions_and_order!(options)
+        klass.all :conditions => conditions, :order => order_clause(order)
       end
     
-      # Create a model using attributes
+      # @see OrmAdapter::Base#create!
       def create!(attributes)
         klass.create(attributes)
       end
+      
+    protected
+      
+      def order_clause(order)
+        order.map {|pair| pair.first.send(pair.last)}
+      end
     end
   end
 end

data/lib/orm_adapter/adapters/mongoid.rb

@@ -22,27 +22,29 @@ module Mongoid
         klass.fields.keys
       end
 
-      # Get an instance by id of the model
+      # @see OrmAdapter::Base#get!
       def get!(id)
         klass.find(wrap_key(id))
       end
 
-      # Get an instance by id of the model
+      # @see OrmAdapter::Base#get
       def get(id)
         klass.first(:conditions => { :id => wrap_key(id) })
       end
 
-      # Find the first instance matching conditions
-      def find_first(conditions)
-        klass.first(:conditions => conditions_to_fields(conditions))
+      # @see OrmAdapter::Base#find_first
+      def find_first(options)
+        conditions, order = extract_conditions_and_order!(options)
+        klass.limit(1).where(conditions_to_fields(conditions)).order_by(order).first
       end
 
-      # Find all models matching conditions
-      def find_all(conditions)
-        klass.all(:conditions => conditions_to_fields(conditions))
+      # @see OrmAdapter::Base#find_all
+      def find_all(options)
+        conditions, order = extract_conditions_and_order!(options)
+        klass.where(conditions_to_fields(conditions)).order_by(order)
       end
 
-      # Create a model with given attributes
+      # @see OrmAdapter::Base#create!
       def create!(attributes)
         klass.create!(attributes)
       end

data/lib/orm_adapter/base.rb

@@ -46,13 +46,30 @@ module OrmAdapter
       raise NotSupportedError
     end
 
-    # Find the first instance matching conditions
-    def find_first(conditions)
+    # Find the first instance, optionally matching conditions, and specifying order
+    #
+    # You can call with just conditions, providing a hash
+    #   
+    #   User.to_adapter.find_first :name => "Fred", :age => 23
+    #
+    # Or you can specify :order, and :conditions as keys
+    #
+    #   User.to_adapter.find_first :conditions => {:name => "Fred", :age => 23}
+    #   User.to_adapter.find_first :order => [:age, :desc]
+    #   User.to_adapter.find_first :order => :name, :conditions => {:age => 18}
+    #
+    # When specifying :order, it may be
+    # * a single arg e.g. <tt>:order => :name</tt>
+    # * a single pair with :asc, or :desc as last, e.g. <tt>:order => [:name, :desc]</tt>
+    # * an array of single args or pairs (with :asc or :desc as last), e.g. <tt>:order => [[:name, :asc], [:age, :desc]]</tt>
+    #
+    def find_first(options)
       raise NotSupportedError
     end
 
-    # Find all models matching conditions
-    def find_all(conditions)
+    # Find all models, optionally matching conditions, and specifying order
+    # @see OrmAdapter::Base#find_first for how to specify order and conditions
+    def find_all(options)
       raise NotSupportedError
     end
 
@@ -66,6 +83,31 @@ module OrmAdapter
     def wrap_key(key)
       key.is_a?(Array) ? key.first : key
     end
+    
+    # given an options hash, with optional :conditions and :order keys, returns conditions and normalized order
+    def extract_conditions_and_order!(options = {})
+      order = normalize_order(options.delete(:order))
+      conditions = options.delete(:conditions) || options
+      [conditions, order]
+    end
+    
+    # given an order argument, returns an array of pairs, with each pair containing the attribute, and :asc or :desc
+    def normalize_order(order)
+      order = Array(order)
+      
+      if order.length == 2 && !order[0].is_a?(Array) && [:asc, :desc].include?(order[1])
+        order = [order]
+      else
+        order = order.map {|pair| pair.is_a?(Array) ? pair : [pair, :asc] }
+      end
+      
+      order.each do |pair|
+        pair.length == 2 or raise ArgumentError, "each order clause must be a pair (unknown clause #{pair.inspect})"
+        [:asc, :desc].include?(pair[1]) or raise ArgumentError, "order must be specified with :asc or :desc (unknown key #{pair[1].inspect})"
+      end
+      
+      order
+    end
   end
 
   class NotSupportedError < NotImplementedError

data/lib/orm_adapter/version.rb

@@ -1,3 +1,3 @@
 module OrmAdapter
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/orm_adapter.gemspec

@@ -1,66 +1,34 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "orm_adapter/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{orm_adapter}
-  s.version = "0.0.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.name = "orm_adapter"
+  s.version = OrmAdapter::VERSION.dup
+  s.platform = Gem::Platform::RUBY
   s.authors = ["Ian White", "Jose Valim"]
-  s.date = %q{2010-10-12}
-  s.description = %q{Provides a single point of entry for using basic features of ruby ORMs}
-  s.email = %q{ian.w.white@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "Gemfile",
-     "Gemfile.lock",
-     "History.txt",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "lib/orm_adapter.rb",
-     "lib/orm_adapter/adapters/active_record.rb",
-     "lib/orm_adapter/adapters/data_mapper.rb",
-     "lib/orm_adapter/adapters/mongoid.rb",
-     "lib/orm_adapter/base.rb",
-     "lib/orm_adapter/to_adapter.rb",
-     "lib/orm_adapter/version.rb",
-     "orm_adapter.gemspec",
-     "spec/orm_adapter/adapters/active_record_spec.rb",
-     "spec/orm_adapter/adapters/data_mapper_spec.rb",
-     "spec/orm_adapter/adapters/mongoid_spec.rb",
-     "spec/orm_adapter/example_app_shared.rb",
-     "spec/orm_adapter_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/ianwhite/orm_adapter}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Provides a single point of entry for using basic features of ruby ORMs}
-  s.test_files = [
-    "spec/orm_adapter/adapters/active_record_spec.rb",
-     "spec/orm_adapter/adapters/data_mapper_spec.rb",
-     "spec/orm_adapter/adapters/mongoid_spec.rb",
-     "spec/orm_adapter/example_app_shared.rb",
-     "spec/orm_adapter_spec.rb",
-     "spec/spec_helper.rb"
-  ]
+  s.description = "Provides a single point of entry for using basic features of ruby ORMs"
+  s.summary = "orm_adapter provides a single point of entry for using basic features of popular ruby ORMs.  Its target audience is gem authors who want to support many ruby ORMs."
+  s.email = "ian.w.white@gmail.com"
+  s.homepage = "http://github.com/ianwhite/orm_adapter"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "orm_adapter"
+  s.required_rubygems_version = ">= 1.3.6"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.require_paths = ["lib"]
+  
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "git", ">= 1.2.5"
+  s.add_development_dependency "yard", ">= 0.6.0"
+  s.add_development_dependency "rake", ">= 0.8.7"
+  s.add_development_dependency "activerecord", ">= 3.0.0"
+  s.add_development_dependency "mongoid", ">= 2.0.0.beta.20"
+  s.add_development_dependency "bson_ext", ">= 1.1.5"
+  s.add_development_dependency "rspec", ">= 2.4.0"
+  s.add_development_dependency "sqlite3-ruby", ">= 1.3.2"
+  s.add_development_dependency "datamapper", ">= 1.0"
+  s.add_development_dependency "dm-sqlite-adapter", ">= 1.0"
+  s.add_development_dependency "dm-active_model", ">= 1.0"
 end
 

data/spec/orm_adapter/adapters/active_record_spec.rb

@@ -8,14 +8,13 @@ else
 
   ActiveRecord::Migration.suppress_messages do
     ActiveRecord::Schema.define(:version => 0) do
-      create_table(:users, :force => true) {|t| t.string :name; t.belongs_to :site }
+      create_table(:users, :force => true) {|t| t.string :name; t.integer :rating; }
       create_table(:notes, :force => true) {|t| t.belongs_to :owner, :polymorphic => true }
     end
   end
   
   module ArOrmSpec
     class User < ActiveRecord::Base
-      belongs_to :site, :class_name => "ArOrmSpec::Site"
       has_many :notes, :as => :owner
     end
 

data/spec/orm_adapter/adapters/data_mapper_spec.rb

@@ -12,6 +12,7 @@ else
       include DataMapper::Resource
       property :id,   Serial
       property :name, String
+      property :rating, Integer
       has n, :notes, :child_key => [:owner_id]
     end
 

data/spec/orm_adapter/adapters/mongoid_spec.rb

@@ -13,6 +13,7 @@ else
     class User
       include Mongoid::Document
       field :name
+      field :rating
       has_many_related :notes, :foreign_key => :owner_id, :class_name => 'MongoidOrmSpec::Note'
     end
 

data/spec/orm_adapter/base_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe OrmAdapter::Base do
+  subject { OrmAdapter::Base.new(Object) }
+  
+  describe "#extract_conditions_and_order!" do
+    let(:conditions) { {:foo => 'bar'} }
+    let(:order) { [[:foo, :asc]] }
+    
+    it "(<conditions>) should return [<conditions>, []]" do
+      subject.send(:extract_conditions_and_order!, conditions).should == [conditions, []]
+    end
+    
+    it "(:conditions => <conditions>) should return [<conditions>, []]" do
+      subject.send(:extract_conditions_and_order!, :conditions => conditions).should == [conditions, []]
+    end
+
+    it "(:order => <order>) should return [{}, <order>]" do
+      subject.send(:extract_conditions_and_order!, :order => order).should == [{}, order]
+    end
+    
+    it "(:conditions => <conditions>, :order => <order>) should return [<conditions>, <order>]" do
+      subject.send(:extract_conditions_and_order!, :conditions => conditions, :order => order).should == [conditions, order]
+    end
+    
+    describe "#normalize_order" do
+      specify "(nil) returns []" do
+        subject.send(:normalize_order, nil).should == []
+      end
+      
+      specify ":foo returns [[:foo, :asc]]" do
+        subject.send(:normalize_order, :foo).should == [[:foo, :asc]]
+      end
+      
+      specify "[:foo] returns [[:foo, :asc]]" do
+        subject.send(:normalize_order, [:foo]).should == [[:foo, :asc]]
+      end
+      
+      specify "[:foo, :desc] returns [[:foo, :desc]]" do
+        subject.send(:normalize_order, [:foo, :desc]).should == [[:foo, :desc]]
+      end
+      
+      specify "[:foo, [:bar, :asc], [:baz, :desc], :bing] returns [[:foo, :asc], [:bar, :asc], [:baz, :desc], [:bing, :asc]]" do
+        subject.send(:normalize_order, [:foo, [:bar, :asc], [:baz, :desc], :bing]).should == [[:foo, :asc], [:bar, :asc], [:baz, :desc], [:bing, :asc]]
+      end
+      
+      specify "[[:foo, :wtf]] raises ArgumentError" do
+        lambda { subject.send(:normalize_order, [[:foo, :wtf]]) }.should raise_error(ArgumentError)
+      end
+      
+      specify "[[:foo, :asc, :desc]] raises ArgumentError" do
+        lambda { subject.send(:normalize_order, [[:foo, :asc, :desc]]) }.should raise_error(ArgumentError)
+      end
+    end
+  end
+end

data/spec/orm_adapter/example_app_shared.rb

@@ -80,43 +80,81 @@ shared_examples_for "example app with orm_adapter" do
       end
     end
   
-    describe "#find_first(conditions)" do
-      it "should return first model matching conditions, if it exists" do
-        user = create_model(user_class, :name => "Fred")
-        user_adapter.find_first(:name => "Fred").should == user
-      end
+    describe "#find_first" do
+      describe "(conditions)" do
+        it "should return first model matching conditions, if it exists" do
+          user = create_model(user_class, :name => "Fred")
+          user_adapter.find_first(:name => "Fred").should == user
+        end
 
-      it "should return nil if no conditions match" do
-        user_adapter.find_first(:name => "Betty").should == nil
-      end
+        it "should return nil if no conditions match" do
+          user_adapter.find_first(:name => "Betty").should == nil
+        end
       
-      it "when conditions contain associated object, should return first model if it exists" do
-        user = create_model(user_class)
-        note = create_model(note_class, :owner => user)
-        note_adapter.find_first(:owner => user).should == note
+        it "when conditions contain associated object, should return first model if it exists" do
+          user = create_model(user_class)
+          note = create_model(note_class, :owner => user)
+          note_adapter.find_first(:owner => user).should == note
+        end
       end
-    end
     
-    describe "#find_all(conditions)" do
-      it "should return only models matching conditions" do
-        user1 = create_model(user_class, :name => "Fred")
-        user2 = create_model(user_class, :name => "Fred")
-        user3 = create_model(user_class, :name => "Betty")
-        user_adapter.find_all(:name => "Fred").should == [user1, user2]
+      describe "(:order => <order array>)" do
+        it "should return first model in specified order" do
+          user1 = create_model(user_class, :name => "Fred", :rating => 1)
+          user2 = create_model(user_class, :name => "Fred", :rating => 2)
+          user_adapter.find_first(:order => [:name, [:rating, :desc]]).should == user2
+        end
+      end
+          
+      describe "(:conditions => <conditions hash>, :order => <order array>)" do
+        it "should return first model matching conditions, in specified order" do
+          user1 = create_model(user_class, :name => "Fred", :rating => 1)
+          user2 = create_model(user_class, :name => "Fred", :rating => 2)
+          user_adapter.find_first(:conditions => {:name => "Fred"}, :order => [:rating, :desc]).should == user2
+        end
       end
+    end
+
+    describe "#find_all" do
+      describe "(conditions)" do
+        it "should return only models matching conditions" do
+          user1 = create_model(user_class, :name => "Fred")
+          user2 = create_model(user_class, :name => "Fred")
+          user3 = create_model(user_class, :name => "Betty")
+          user_adapter.find_all(:name => "Fred").should == [user1, user2]
+        end
 
-      it "should return empty array if no conditions match" do
-        user_adapter.find_all(:name => "Fred").should == []
+        it "should return empty array if no conditions match" do
+          user_adapter.find_all(:name => "Fred").should == []
+        end
+      
+        it "when conditions contain associated object, should return first model if it exists" do
+          user1, user2 = create_model(user_class), create_model(user_class)
+          note1 = create_model(note_class, :owner => user1)
+          note2 = create_model(note_class, :owner => user2)
+          note_adapter.find_all(:owner => user2).should == [note2]
+        end
+      end
+
+      describe "(:order => <order array>)" do
+        it "should return all models in specified order" do
+          user1 = create_model(user_class, :name => "Fred", :rating => 1)
+          user2 = create_model(user_class, :name => "Fred", :rating => 2)
+          user3 = create_model(user_class, :name => "Betty", :rating => 1)
+          user_adapter.find_all(:order => [:name, [:rating, :desc]]).should == [user3, user2, user1]
+        end
       end
       
-      it "when conditions contain associated object, should return first model if it exists" do
-        user1, user2 = create_model(user_class), create_model(user_class)
-        note1 = create_model(note_class, :owner => user1)
-        note2 = create_model(note_class, :owner => user2)
-        note_adapter.find_all(:owner => user2).should == [note2]
+      describe "(:conditions => <conditions hash>, :order => <order array>)" do
+        it "should return only models matching conditions, in specified order" do
+          user1 = create_model(user_class, :name => "Fred", :rating => 1)
+          user2 = create_model(user_class, :name => "Fred", :rating => 2)
+          user3 = create_model(user_class, :name => "Betty", :rating => 1)
+          user_adapter.find_all(:conditions => {:name => "Fred"}, :order => [:rating, :desc]).should == [user2, user1]
+        end
       end
     end
-
+    
     describe "#create!(attributes)" do
       it "should create a model with the passed attributes" do
         user = user_adapter.create!(:name => "Fred")

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: orm_adapter
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ian White
@@ -15,23 +16,212 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +01:00
+date: 2011-01-04 00:00:00 +00:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: git
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 2
+        - 5
+        version: 1.2.5
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: mongoid
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 62196427
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 20
+        version: 2.0.0.beta.20
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 1
+        - 5
+        version: 1.1.5
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 2
+        - 4
+        - 0
+        version: 2.4.0
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: datamapper
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: dm-sqlite-adapter
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: dm-active_model
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
+  version_requirements: *id012
 description: Provides a single point of entry for using basic features of ruby ORMs
 email: ian.w.white@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
+- Gemfile.lock.development
 - History.txt
 - LICENSE
 - README.rdoc
@@ -47,6 +237,7 @@ files:
 - spec/orm_adapter/adapters/active_record_spec.rb
 - spec/orm_adapter/adapters/data_mapper_spec.rb
 - spec/orm_adapter/adapters/mongoid_spec.rb
+- spec/orm_adapter/base_spec.rb
 - spec/orm_adapter/example_app_shared.rb
 - spec/orm_adapter_spec.rb
 - spec/spec_helper.rb
@@ -55,8 +246,8 @@ homepage: http://github.com/ianwhite/orm_adapter
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -64,6 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -72,20 +264,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: orm_adapter
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Provides a single point of entry for using basic features of ruby ORMs
+summary: orm_adapter provides a single point of entry for using basic features of popular ruby ORMs.  Its target audience is gem authors who want to support many ruby ORMs.
 test_files: 
 - spec/orm_adapter/adapters/active_record_spec.rb
 - spec/orm_adapter/adapters/data_mapper_spec.rb
 - spec/orm_adapter/adapters/mongoid_spec.rb
+- spec/orm_adapter/base_spec.rb
 - spec/orm_adapter/example_app_shared.rb
 - spec/orm_adapter_spec.rb
 - spec/spec_helper.rb