Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

update for rails 3.[1|2]

  • Loading branch information...
commit 45c5561295c968410ad3f04e2931ec5789ad6230 1 parent 5609af4
@plukevdh plukevdh authored
Showing with 75 additions and 58 deletions.
  1. +71 −55 Gemfile.lock
  2. +2 −2 app/models/arturo/feature.rb
  3. +2 −1  arturo.gemspec
View
126 Gemfile.lock
@@ -1,80 +1,95 @@
PATH
remote: .
specs:
- arturo (1.2.0)
- rails (~> 3.0)
+ arturo (1.3.0)
+ rails (~> 3.2)
GEM
remote: http://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.5)
- actionpack (= 3.0.5)
- mail (~> 2.2.15)
- actionpack (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.4)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.13)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.5)
- activesupport (= 3.0.5)
- builder (~> 2.1.2)
- i18n (~> 0.4)
- activerecord (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- arel (~> 2.0.2)
- tzinfo (~> 0.3.23)
- activeresource (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- activesupport (3.0.5)
- arel (2.0.9)
- builder (2.1.2)
- erubis (2.6.6)
- abstract (>= 1.0.0)
+ actionmailer (3.2.3)
+ actionpack (= 3.2.3)
+ mail (~> 2.4.4)
+ actionpack (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ journey (~> 1.0.1)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.1.2)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
+ builder (~> 3.0.0)
+ activerecord (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ arel (~> 3.0.2)
+ tzinfo (~> 0.3.29)
+ activeresource (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ activesupport (3.2.3)
+ i18n (~> 0.6)
+ multi_json (~> 1.0)
+ arel (3.0.2)
+ builder (3.0.0)
+ erubis (2.7.0)
factory_girl (1.3.2)
- i18n (0.5.0)
- mail (2.2.15)
- activesupport (>= 2.3.6)
+ hike (1.2.1)
+ i18n (0.6.0)
+ journey (1.0.3)
+ json (1.6.6)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
+ mime-types (1.18)
mocha (0.9.8)
rake
- polyglot (0.3.1)
- rack (1.2.2)
- rack-mount (0.6.14)
- rack (>= 1.0.0)
- rack-test (0.5.7)
+ multi_json (1.3.2)
+ polyglot (0.3.3)
+ rack (1.4.1)
+ rack-cache (1.2)
+ rack (>= 0.4)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.0.5)
- actionmailer (= 3.0.5)
- actionpack (= 3.0.5)
- activerecord (= 3.0.5)
- activeresource (= 3.0.5)
- activesupport (= 3.0.5)
+ rails (3.2.3)
+ actionmailer (= 3.2.3)
+ actionpack (= 3.2.3)
+ activerecord (= 3.2.3)
+ activeresource (= 3.2.3)
+ activesupport (= 3.2.3)
bundler (~> 1.0)
- railties (= 3.0.5)
- railties (3.0.5)
- actionpack (= 3.0.5)
- activesupport (= 3.0.5)
+ railties (= 3.2.3)
+ railties (3.2.3)
+ actionpack (= 3.2.3)
+ activesupport (= 3.2.3)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
- thor (~> 0.14.4)
+ rdoc (~> 3.4)
+ thor (~> 0.14.6)
rake (0.8.7)
+ rdoc (3.12)
+ json (~> 1.4)
redgreen (1.2.2)
+ sprockets (2.1.2)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.6)
sqlite3-ruby (1.3.1)
thor (0.14.6)
+ tilt (1.3.3)
timecop (0.3.5)
- treetop (1.4.9)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.26)
+ tzinfo (0.3.33)
PLATFORMS
ruby
@@ -85,5 +100,6 @@ DEPENDENCIES
mocha
rake
redgreen (~> 1.2)
+ sqlite3 (~> 1.3)
sqlite3-ruby (~> 1.3)
timecop (~> 0.3)
View
4 app/models/arturo/feature.rb
@@ -29,8 +29,8 @@ def self.to_feature(feature_or_symbol)
end
# Create a new Feature
- def initialize(attributes = {})
- super(DEFAULT_ATTRIBUTES.merge(attributes || {}))
+ def initialize(attributes = {}, options = {})
+ super(DEFAULT_ATTRIBUTES.merge(attributes), options)
end
# @param [Object] feature_recipient a User, Account,
View
3  arturo.gemspec
@@ -13,10 +13,11 @@ Gem::Specification.new do |gem|
gem.has_rdoc = 'false'
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
gem.specification_version = 2
- gem.add_runtime_dependency 'rails', '~> 3.0'
+ gem.add_runtime_dependency 'rails', '~> 3.2'
gem.add_development_dependency 'mocha'
gem.add_development_dependency 'rake'
gem.add_development_dependency 'redgreen', '~> 1.2'
+ gem.add_development_dependency 'sqlite3', '~> 1.3'
gem.add_development_dependency 'sqlite3-ruby', '~> 1.3'
gem.add_development_dependency 'factory_girl', '~> 1.3'
gem.add_development_dependency 'timecop', '~> 0.3'
Please sign in to comment.
Something went wrong with that request. Please try again.