orm_adapter 0.0.7 → 0.1.0

data/.rspec

@@ -0,0 +1 @@
+--colour

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3

data/Gemfile.lock.development

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orm_adapter (0.0.6)
+    orm_adapter (0.1.0)
 
 GEM
   remote: http://rubygems.org/
@@ -104,8 +104,6 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
     sqlite3 (1.3.5)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
     stringex (1.3.0)
     tzinfo (0.3.31)
     uuidtools (2.1.2)
@@ -127,5 +125,5 @@ DEPENDENCIES
   orm_adapter!
   rake (>= 0.8.7)
   rspec (>= 2.4.0)
-  sqlite3-ruby (>= 1.3.2)
+  sqlite3 (>= 1.3.2)
   yard (>= 0.6.0)

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.0
+
+  * Add #destroy(object) to the API [Fred Wu]
+
+
 == 0.0.7
 
   * Lazy load Active Record [José Valim]

data/README.rdoc

@@ -54,6 +54,8 @@ orm_adapter is an extraction from {pickle}[http://github.com/ianwhite/pickle] by
 
 {Luke Cunningham}[http://github.com/icaruswings] contributes the Mongo Mapper adapter.
 
+{Fred Wu}[http://github.com/fredwu] contributes the #destroy methods.
+
 
 == Development
 

data/Rakefile

@@ -1,8 +1,12 @@
-require 'rubygems'
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
 require 'rake'
 require 'rspec/core/rake_task'
-require 'yard'
-require 'git'
 $:.push File.expand_path("../lib", __FILE__)
 require "orm_adapter/version"
 
@@ -10,47 +14,24 @@ task :default => :spec
 
 RSpec::Core::RakeTask.new(:spec)
 
-YARD::Rake::YardocTask.new(:doc) do |t|
-  t.files   = ['lib/**/*.rb', 'README.rdoc']
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new(:doc) do |t|
+    t.files   = ['lib/**/*.rb', 'README.rdoc']
+  end
+rescue LoadError
+  task :doc do
+    puts "install yard to generate the docs"
+  end
 end
 
-task :build do
-  system "gem build orm_adapter.gemspec"
-end
+Bundler::GemHelper.install_tasks
 
-namespace :release do
-  task :rubygems => :pre do
-    system "gem push orm_adapter-#{OrmAdapter::VERSION}.gem"
-  end
-  
-  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
-  
-  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.any? || git.status.added.any? || 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
+task :release => :check_gemfile
+
+task :check_gemfile do
+  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
-  
-  task :all => ['release:github', 'release:rubygems']
 end

data/lib/orm_adapter/adapters/active_record.rb

@@ -1,26 +1,17 @@
-begin
-  require 'activerecord'
-rescue LoadError
-  require 'active_record'
-end
+require 'active_record'
 
 module OrmAdapter
   class ActiveRecord < Base
     # Do not consider these to be part of the class list
     def self.except_classes
       @@except_classes ||= [
-        "CGI::Session::ActiveRecordStore::Session",
         "ActiveRecord::SessionStore::Session"
       ]
     end
 
     # Gets a list of the available models for this adapter
     def self.model_classes
-      begin
-        klasses = ::ActiveRecord::Base.__send__(:descendants) # Rails 3
-      rescue
-        klasses = ::ActiveRecord::Base.__send__(:subclasses) # Rails 2
-      end
+      klasses = ::ActiveRecord::Base.__send__(:descendants)
 
       klasses.select do |klass|
         !klass.abstract_class? && !except_classes.include?(klass.name)
@@ -39,19 +30,19 @@ module OrmAdapter
 
     # @see OrmAdapter::Base#get
     def get(id)
-      klass.first :conditions => { klass.primary_key => wrap_key(id) }
+      klass.where(klass.primary_key => wrap_key(id)).first
     end
 
     # @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)
+      klass.where(conditions_to_fields(conditions)).order(*order_clause(order)).first
     end
 
     # @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)
+      klass.where(conditions_to_fields(conditions)).order(*order_clause(order)).all
     end
 
     # @see OrmAdapter::Base#create!
@@ -59,6 +50,11 @@ module OrmAdapter
       klass.create!(attributes)
     end
 
+    # @see OrmAdapter::Base#destroy
+    def destroy(object)
+      object.destroy && true if valid_object?(object)
+    end
+
   protected
 
     # Introspects the klass to convert and objects in conditions into foreign key and type fields

data/lib/orm_adapter/adapters/data_mapper.rb

@@ -50,6 +50,11 @@ module DataMapper
         klass.create(attributes)
       end
       
+      # @see OrmAdapter::Base#destroy
+      def destroy(object)
+        object.destroy if valid_object?(object)
+      end
+
     protected
       
       def order_clause(order)

data/lib/orm_adapter/adapters/mongo_mapper.rb

@@ -51,6 +51,11 @@ module MongoMapper
         klass.create!(attributes)
       end
 
+      # @see OrmAdapter::Base#destroy
+      def destroy(object)
+        object.destroy if valid_object?(object)
+      end
+
     protected
 
       # converts and documents to ids

data/lib/orm_adapter/adapters/mongoid.rb

@@ -49,6 +49,11 @@ module Mongoid
         klass.create!(attributes)
       end
   
+      # @see OrmAdapter::Base#destroy
+      def destroy(object)
+        object.destroy if valid_object?(object)
+      end
+
     protected
 
       # converts and documents to ids

data/lib/orm_adapter/base.rb

@@ -42,7 +42,7 @@ module OrmAdapter
     #
     #   User.to_adapter.get(@user.to_key) == @user
     #
-    def get
+    def get(id)
       raise NotSupportedError
     end
 
@@ -78,8 +78,17 @@ module OrmAdapter
       raise NotSupportedError
     end
 
+    # Destroy an instance by passing in the instance itself.
+    def destroy(object)
+      raise NotSupportedError
+    end
+
     protected
 
+    def valid_object?(object)
+      object.class == klass
+    end
+
     def wrap_key(key)
       key.is_a?(Array) ? key.first : key
     end

data/lib/orm_adapter/version.rb

@@ -1,3 +1,3 @@
 module OrmAdapter
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/orm_adapter.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   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"
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mongo_mapper", ">= 0.9.0"
   s.add_development_dependency "bson_ext", ">= 1.3.0"
   s.add_development_dependency "rspec", ">= 2.4.0"
-  s.add_development_dependency "sqlite3-ruby", ">= 1.3.2"
+  s.add_development_dependency "sqlite3", ">= 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"

data/spec/orm_adapter/adapters/active_record_spec.rb

@@ -37,7 +37,7 @@ else
         subject { ActiveRecord::Base::OrmAdapter }
 
         specify "#except_classes should return the names of active record session store classes" do
-          subject.except_classes.should == ["CGI::Session::ActiveRecordStore::Session", "ActiveRecord::SessionStore::Session"]
+          subject.except_classes.should == ["ActiveRecord::SessionStore::Session"]
         end
 
         specify "#model_classes should return all of the non abstract model classes (that are not in except_classes)" do

data/spec/orm_adapter/base_spec.rb

@@ -23,6 +23,13 @@ describe OrmAdapter::Base do
       subject.send(:extract_conditions_and_order!, :conditions => conditions, :order => order).should == [conditions, order]
     end
     
+    describe "#valid_object?" do
+      it "determines whether an object is valid for the current model class" do
+        subject.send(:valid_object?, Object.new).should be_true
+        subject.send(:valid_object?, String.new).should be_false
+      end
+    end
+
     describe "#normalize_order" do
       specify "(nil) returns []" do
         subject.send(:normalize_order, nil).should == []

data/spec/orm_adapter/example_app_shared.rb

@@ -60,7 +60,7 @@ shared_examples_for "example app with orm_adapter" do
       end
 
       it "should raise an error if there is no instance with that id" do
-        lambda { user_adapter.get!("non-exitent id") }.should raise_error
+        lambda { user_adapter.get!("nonexistent id") }.should raise_error
       end
     end
 
@@ -76,10 +76,10 @@ shared_examples_for "example app with orm_adapter" do
       end
 
       it "should return nil if there is no instance with that id" do
-        user_adapter.get("non-exitent id").should be_nil
+        user_adapter.get("nonexistent id").should be_nil
       end
     end
-  
+
     describe "#find_first" do
       describe "(conditions)" do
         it "should return first model matching conditions, if it exists" do
@@ -177,5 +177,23 @@ shared_examples_for "example app with orm_adapter" do
         reload_model(user).notes.should == notes
       end
     end
+
+    describe "#destroy(instance)" do
+      it "should destroy the instance if it exists" do
+        user = create_model(user_class)
+        user_adapter.destroy(user).should == true
+        user_adapter.get(user.id).should be_nil
+      end
+
+      it "should return nil if passed with an invalid instance" do
+        user_adapter.destroy("nonexistent instance").should be_nil
+      end
+
+      it "should not destroy the instance if it doesn't match the model class" do
+        user = create_model(user_class)
+        note_adapter.destroy(user).should be_nil
+        user_adapter.get(user.id).should == user
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orm_adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-25 00:00:00.000000000 Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157226320 !ruby/object:Gem::Requirement
+  requirement: &70097699980460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157226320
+  version_requirements: *70097699980460
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &2157225580 !ruby/object:Gem::Requirement
+  requirement: &70097699979600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *2157225580
+  version_requirements: *70097699979600
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2157224780 !ruby/object:Gem::Requirement
+  requirement: &70097699979000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2157224780
+  version_requirements: *70097699979000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157224140 !ruby/object:Gem::Requirement
+  requirement: &70097699978040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2157224140
+  version_requirements: *70097699978040
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2157223380 !ruby/object:Gem::Requirement
+  requirement: &70097699977120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2157223380
+  version_requirements: *70097699977120
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2157222660 !ruby/object:Gem::Requirement
+  requirement: &70097699976120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.0.0.beta.20
   type: :development
   prerelease: false
-  version_requirements: *2157222660
+  version_requirements: *70097699976120
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &2157208000 !ruby/object:Gem::Requirement
+  requirement: &70097699975540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2157208000
+  version_requirements: *70097699975540
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2157204220 !ruby/object:Gem::Requirement
+  requirement: &70097699960720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2157204220
+  version_requirements: *70097699960720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157203000 !ruby/object:Gem::Requirement
+  requirement: &70097699957980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2157203000
+  version_requirements: *70097699957980
 - !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &2157201880 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &70097699956440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *2157201880
+  version_requirements: *70097699956440
 - !ruby/object:Gem::Dependency
   name: datamapper
-  requirement: &2157201200 !ruby/object:Gem::Requirement
+  requirement: &70097699955740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2157201200
+  version_requirements: *70097699955740
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
-  requirement: &2157199880 !ruby/object:Gem::Requirement
+  requirement: &70097699954920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2157199880
+  version_requirements: *70097699954920
 - !ruby/object:Gem::Dependency
   name: dm-active_model
-  requirement: &2157197540 !ruby/object:Gem::Requirement
+  requirement: &70097699953980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +154,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2157197540
+  version_requirements: *70097699953980
 description: Provides a single point of entry for using basic features of ruby ORMs
 email: ian.w.white@gmail.com
 executables: []
@@ -162,6 +162,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock.development
 - History.txt
@@ -197,6 +199,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1483369582695834263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: