From 5b6cc184e46b8d63231797bdb89163a236acc943 Mon Sep 17 00:00:00 2001 From: y8 Date: Wed, 25 Jan 2012 20:16:26 +0400 Subject: [PATCH] Get rid of bloody jeweler and use bundler and pure gemspec. Also cleanup things. --- .gitignore | 7 +++- Gemfile | 12 +----- Gemfile.lock | 5 ++- README.rdoc | 4 +- Rakefile | 34 ++--------------- init.rb | 1 + lib/paperclip-meta.rb | 8 ++++ lib/paperclip-meta/version.rb | 5 +++ paperclip-meta.gemspec | 71 +++++++++++------------------------ spec/spec_helper.rb | 24 +++++------- 10 files changed, 61 insertions(+), 110 deletions(-) create mode 100644 lib/paperclip-meta/version.rb diff --git a/.gitignore b/.gitignore index 0fb3394..ea71357 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ -spec/tmp/*/** -pkg \ No newline at end of file +*.gem +.bundle +Gemfile.lock +pkg/* +spec/tmp/*/** \ No newline at end of file diff --git a/Gemfile b/Gemfile index 966529e..4aca209 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,4 @@ source "http://rubygems.org" -gem "activerecord", ">= 3", :require => "active_record" -gem "sqlite3-ruby", :require => "sqlite3" -gem "paperclip", :require => "paperclip" -gem "paperclip-meta", :path => '.' - -if RUBY_VERSION < '1.9' - gem "ruby-debug", ">= 0.10.3" -end - -gem "rspec" +# Specify your gem's dependencies in paperclip-meta.gemspec +gemspec diff --git a/Gemfile.lock b/Gemfile.lock index 31cd416..95c0c1c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - paperclip-meta (0.3) + paperclip-meta (0.3.1) paperclip GEM @@ -47,7 +47,8 @@ PLATFORMS ruby DEPENDENCIES - activerecord (>= 3) + activerecord + bundler (>= 1.0.0) paperclip paperclip-meta! rspec diff --git a/README.rdoc b/README.rdoc index 90c40c0..f41cb24 100644 --- a/README.rdoc +++ b/README.rdoc @@ -9,7 +9,7 @@ Paperclip Meta will get image dimensions right after post_process_styles using p Add paperclip-meta to Gemfile: gem 'paperclip-meta' - + Create migration: class AddMetaToAvatar < ActiveRecord::Migration @@ -23,7 +23,7 @@ Create migration: end Rebuild all thumbnails to fill meta column if you already have some attachments. - + Now you can use meta-magic: <%= image_tag @user.avatar.url, :size => @user.avatar.image_size %> diff --git a/Rakefile b/Rakefile index 64cd6a5..2655c23 100644 --- a/Rakefile +++ b/Rakefile @@ -1,34 +1,8 @@ -require 'rake' -require 'rake/testtask' -require 'rspec/core' +require "bundler/gem_tasks" +require "rspec/core" require 'rspec/core/rake_task' RSpec::Core::RakeTask.new(:spec) -task :default => :spec -begin - include_files = ["README*", "LICENSE", "Rakefile", "init.rb", "{lib,test}/**/*"].map do |glob| - Dir[glob] - end.flatten - - require "jeweler" - Jeweler::Tasks.new do |s| - s.name = "paperclip-meta" - s.version = "0.1" - s.author = "Alexey Bondar" - s.email = "y8@ya.ru" - s.homepage = "http://github.com/y8/paperclip-meta" - s.description = "Add width, height and size methods to paperclip thumbnails" - s.summary = "Thumbnail dimensions for paperclip" - s.platform = Gem::Platform::RUBY - s.files = include_files - s.require_path = "lib" - s.rubyforge_project = "paperclip-meta" - s.has_rdoc = false - s.add_dependency 'paperclip' - end - - Jeweler::GemcutterTasks.new -rescue LoadError - puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler" -end +# spec is default task +task :default => :spec diff --git a/init.rb b/init.rb index b02a067..8b77611 100644 --- a/init.rb +++ b/init.rb @@ -1 +1,2 @@ +# FIXME: What this file for? require File.join(File.dirname(__FILE__), "lib", "paperclip-meta") \ No newline at end of file diff --git a/lib/paperclip-meta.rb b/lib/paperclip-meta.rb index 623cb47..0b3e819 100644 --- a/lib/paperclip-meta.rb +++ b/lib/paperclip-meta.rb @@ -1,4 +1,12 @@ +require "paperclip" +require "paperclip-meta/version" + module Paperclip + module Meta + # TODO: Move most of paperclip-meta crap here. + end + + # TODO: Make paperclip-meta less monkey-style. class Attachment alias :original_post_process_styles :post_process_styles alias :original_save :save diff --git a/lib/paperclip-meta/version.rb b/lib/paperclip-meta/version.rb new file mode 100644 index 0000000..31bb5d4 --- /dev/null +++ b/lib/paperclip-meta/version.rb @@ -0,0 +1,5 @@ +module Paperclip + module Meta + VERSION = "0.3" + end +end diff --git a/paperclip-meta.gemspec b/paperclip-meta.gemspec index 58180b9..15e0ba4 100644 --- a/paperclip-meta.gemspec +++ b/paperclip-meta.gemspec @@ -1,57 +1,30 @@ -# Generated by jeweler -# DO NOT EDIT THIS FILE DIRECTLY -# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec' # -*- encoding: utf-8 -*- +$:.push File.expand_path("../lib", __FILE__) +require "paperclip-meta/version" Gem::Specification.new do |s| - s.name = "paperclip-meta" - s.version = "0.1" + s.name = "paperclip-meta" + s.version = Paperclip::Meta::VERSION + s.authors = ["Alexey Bondar"] + s.email = ["y8@ya.ru"] + s.homepage = "http://github.com/y8/paperclip-meta" + s.summary = %q{Thumbnail dimensions for paperclip} + s.description = %q{Add width, height and size methods to paperclip thumbnails} - s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Alexey Bondar"] - s.date = "2012-01-25" - s.description = "Add width, height and size methods to paperclip thumbnails" - s.email = "y8@ya.ru" - s.extra_rdoc_files = [ - "README.rdoc" - ] - s.files = [ - "README.rdoc", - "Rakefile", - "init.rb", - "lib/paperclip-meta.rb" - ] - s.homepage = "http://github.com/y8/paperclip-meta" - s.require_paths = ["lib"] s.rubyforge_project = "paperclip-meta" - s.rubygems_version = "1.8.10" - s.summary = "Thumbnail dimensions for paperclip" - if s.respond_to? :specification_version then - s.specification_version = 3 + s.files = `git ls-files`.split("\n") + s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") + s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } + s.require_paths = ["lib"] + + # Development depensencies + s.add_development_dependency "bundler", ">= 1.0.0" + s.add_development_dependency "paperclip" + s.add_development_dependency "rspec" + s.add_development_dependency "activerecord" + s.add_development_dependency "sqlite3-ruby" - if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then - s.add_runtime_dependency(%q, [">= 3"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - s.add_runtime_dependency(%q, [">= 0"]) - else - s.add_dependency(%q, [">= 3"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end - else - s.add_dependency(%q, [">= 3"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, [">= 0"]) - end + # Runtime dependencies + s.add_runtime_dependency "paperclip" end - diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index edb259e..6ef266b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,26 +1,20 @@ -$LOAD_PATH << "." unless $LOAD_PATH.include?(".") +require 'rubygems' +require 'bundler/setup' +Bundler.require(:default, :development) -begin - require "bundler" - Bundler.setup -rescue Bundler::GemNotFound - raise RuntimeError, "Bundler couldn't find some gems." + - "Did you run `bundle install`?" -end - -Bundler.require -require 'logger' -Paperclip::Railtie.insert +# Prepare activerecord +require "active_record" +# Connect to sqlite ActiveRecord::Base.establish_connection( - "adapter" => "sqlite3", + "adapter" => "sqlite3", "database" => ":memory:" ) ActiveRecord::Base.logger = Logger.new(nil) +load(File.join(File.dirname(__FILE__), 'schema.rb')) -load(File.dirname(__FILE__) + '/schema.rb') -$: << File.join(File.dirname(__FILE__), '..', 'lib') +Paperclip::Railtie.insert class Image < ActiveRecord::Base has_attached_file :small_image,