Skip to content

Commit

Permalink
Always use class_attribute.
Browse files Browse the repository at this point in the history
This is supported at least since Rails 3.0.0.
  • Loading branch information
jnicklas committed Apr 9, 2015
1 parent f0b2d23 commit 4f196cb
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 39 deletions.
23 changes: 2 additions & 21 deletions lib/resizor/railtie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ def self.insert
module Glue
def self.included base
base.extend ClassMethods
base.class_attribute(:resizor_assets)
end
end

Expand All @@ -28,11 +29,7 @@ def has_resizor_asset name, options = {}
include InstanceMethods

if resizor_assets.nil?
if active_support_three_dot_one?
self.resizor_assets = {}
else
write_inheritable_attribute(:resizor_assets, {})
end
self.resizor_assets = {}
end
resizor_assets[name] = options

Expand All @@ -50,22 +47,6 @@ def has_resizor_asset name, options = {}
define_method "#{name}?" do
!asset_for(name).file.nil? || !asset_for(name).id.nil?
end

end

def resizor_assets
if active_support_three_dot_one?
class_attribute(:resizor_assets)
self.resizor_assets
else
read_inheritable_attribute(:resizor_assets)
end
end

def active_support_three_dot_one?
defined?(ActiveSupport::VERSION) &&
ActiveSupport::VERSION::MAJOR == 3 &&
ActiveSupport::VERSION::MINOR > 1
end
end

Expand Down
13 changes: 7 additions & 6 deletions resizor.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ Gem::Specification.new do |s|

s.required_rubygems_version = '>= 1.3.6'

s.add_development_dependency 'rake', '~> 0.9.2'
s.add_development_dependency 'sqlite3', '~> 1.3.4'
s.add_development_dependency 'bundler', '~> 1.0'
s.add_development_dependency 'shoulda', '~> 2.11.3'
s.add_development_dependency 'webmock', '~> 1.6.2'
s.add_development_dependency 'activerecord', '~>3.0.0'
s.add_development_dependency 'rake'
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'bundler'
s.add_development_dependency 'shoulda'
s.add_development_dependency 'webmock'
s.add_development_dependency 'activerecord'
s.add_development_dependency 'minitest', '>= 5.5.1'

s.add_dependency(%q<rest-client>, ['>= 1.4.2'])
s.add_dependency(%q<json>, ['>= 1.2'])
Expand Down
2 changes: 1 addition & 1 deletion test/asset_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require File.expand_path(File.dirname(__FILE__) + '/test_helper')

class ResizorAssetTest < Test::Unit::TestCase
class ResizorAssetTest < Minitest::Test
context "A ResizorAsset" do
setup do
setup_resizor
Expand Down
6 changes: 2 additions & 4 deletions test/integration_test.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require File.expand_path(File.dirname(__FILE__) + '/test_helper')

class IntegrationTest < Test::Unit::TestCase
class IntegrationTest < Minitest::Test

context 'Including Resizor in a Rails project' do
setup do
Expand Down Expand Up @@ -87,9 +87,7 @@ class IntegrationTest < Test::Unit::TestCase
end

should 'should work with no attachment set' do
assert_nothing_raised do
@item.save
end
@item.save
end

should 'return false when no attachment is set' do
Expand Down
4 changes: 2 additions & 2 deletions test/resizor_test.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
require File.expand_path(File.dirname(__FILE__) + '/test_helper')

class ResizorTest < Test::Unit::TestCase
class ResizorTest < Minitest::Test
context 'When Resizor gem is not setup it' do
setup do
Resizor.instance_variable_set("@connection", nil)
end

['get', 'post', 'delete'].each do |m|
should "raise error for #{m}" do
exception = assert_raise(RuntimeError) { Resizor.send(m, nil) }
exception = assert_raises(RuntimeError) { Resizor.send(m, nil) }
assert_equal 'Not connected. Please setup Resizor configuration first.', exception.message
end
end
Expand Down
10 changes: 5 additions & 5 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
$LOAD_PATH.unshift(File.dirname(__FILE__))
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

require 'rubygems'
require 'test/unit'
require 'minitest/autorun'
require 'shoulda'
require 'resizor'
require 'logger'

gem 'activerecord', '~>3.0.0'
require 'active_support'
require 'active_record'

require 'webmock/test_unit'
require 'webmock/minitest'
include WebMock::API

config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FILE__) + "/debug.log")
ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
ActiveRecord::Base.establish_connection(config['test'])

if defined?(Rails::Railtie)
Expand Down

0 comments on commit 4f196cb

Please sign in to comment.