Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rcarver/orel
base: e03640f1af
...
head fork: rcarver/orel
compare: 821dfcf18c
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jun 22, 2011
Chris Eberly make this gem compatible with typekit 8063f3d
Chris Eberly make the specs pass 97962fe
Chris Eberly put these alerts back 821dfcf
View
6 features/algebra.feature
@@ -30,11 +30,12 @@ Feature: Perform relational algebra
"""
Then the output should contain:
"""
- SELECT * FROM `users`
+ SELECT * FROM `users`
---
John,Smith
Mary,Smith
---
+
"""
Scenario: Perform a restriction
@@ -67,10 +68,11 @@ Feature: Perform relational algebra
"""
Then the output should contain:
"""
- SELECT * FROM `users` WHERE `users`.`first_name` = 'John'
+ SELECT * FROM `users` WHERE `users`.`first_name` = 'John'
---
John,Smith
---
+
"""
Scenario: Perform an inner join
View
10 orel.gemspec
@@ -18,11 +18,11 @@ Gem::Specification.new do |s|
s.rdoc_options = ["--charset=UTF-8"]
s.require_path = "lib"
- s.add_dependency 'activerecord', '~>3.1.beta'
- s.add_dependency 'activesupport', '~>3.1.beta'
- s.add_dependency 'activemodel', '~>3.1.beta'
- s.add_dependency 'mysql2', '~>0.3'
- s.add_dependency 'arel', '~>2.1'
+ s.add_dependency 'activerecord', '~>3.0'
+ s.add_dependency 'activesupport', '~>3.0'
+ s.add_dependency 'activemodel', '~>3.0'
+ s.add_dependency 'mysql2', '~>0.2.0'
+ s.add_dependency 'arel'
s.add_dependency 'sourcify'
s.add_development_dependency "rake", '0.8.7'
View
4 spec/attributes_spec.rb
@@ -90,7 +90,7 @@
end
its(:changed?) { should be_true }
its(:changed) { should == [:name] }
- its(:changes) { should == { :name => [nil, 'Bob'] } }
+ its(:changes) { should == { "name" => [nil, 'Bob'] } }
its(:previous_changes) { should be_empty }
its(:changed_attributes) { should == { :name => nil } }
end
@@ -101,7 +101,7 @@
end
its(:changed?) { should be_true }
its(:changed) { should == [:name] }
- its(:changes) { should == { :name => ['John', 'Bob'] } }
+ its(:changes) { should == { "name" => ['John', 'Bob'] } }
its(:previous_changes) { should be_empty }
its(:changed_attributes) { should == { :name => 'John' } }
end

No commit comments for this range

Something went wrong with that request. Please try again.