repo
string
commit
string
message
string
diff
string
makandra/query_diet
63d0829a3e1fefe7feca4ba203a7130a7eaf5d55
Rename test application
diff --git a/spec/rails-3.2/config/application.rb b/spec/rails-3.2/config/application.rb index 547844a..2e7163a 100644 --- a/spec/rails-3.2/config/application.rb +++ b/spec/rails-3.2/config/application.rb @@ -1,32 +1,32 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' # If you have a Gemfile,...
makandra/query_diet
a02b7af265b83d16ef339e46e3a1da03edc3ff0b
Use HTTPS for rubygems.org
diff --git a/spec/rails-3.2/Gemfile b/spec/rails-3.2/Gemfile index e11e21a..aea564c 100644 --- a/spec/rails-3.2/Gemfile +++ b/spec/rails-3.2/Gemfile @@ -1,10 +1,10 @@ -source 'http://rubygems.org' +source 'https://rubygems.org' gem 'sqlite3' gem 'rails', '~>3.2' gem 'rspec', '3.5.0.beta1' gem 'rspec-rails', '3.5....
makandra/query_diet
9ad37536bfc1ea37311c5b9ea8d5fb97daea5072
Bump version to 0.7.2
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c39cf5..590dabf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,16 @@ # Changelog All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## Unreleased ### Comp...
makandra/query_diet
786a6912523272e5c96005da48060ce096db55b5
Use ActiveSupport.on_load for extending ActiveRecord
diff --git a/lib/query_diet/active_record_ext.rb b/lib/query_diet/active_record_ext.rb index 02b8283..9bbb31a 100644 --- a/lib/query_diet/active_record_ext.rb +++ b/lib/query_diet/active_record_ext.rb @@ -1,15 +1,17 @@ module QueryDiet module ActiveRecordExt if RUBY_VERSION >= '3' def log(query, *, **) ...
makandra/query_diet
db3be7a6d4b008e0c52e44c600b86ddfbaf81c6d
Add Ruby 3.1 to the CI matrix
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 586e53b..14e021c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,53 +1,55 @@ name: Tests on: push: branches: - master pull_request: branches: - master jobs: test: runs-on: ubunt...
makandra/query_diet
687f5695fd00eee478234df6924d8db919990c1c
release version 0.7.1
diff --git a/CHANGELOG.md b/CHANGELOG.md index b765f68..6c39cf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,13 @@ # Changelog All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## Unreleased + ### Compa...
makandra/query_diet
925c54e9a425fc0922655e5e4a7205f0501d4a1c
attempt to fix a Ruby 3 delegation issue [fixes #31]
diff --git a/lib/query_diet/active_record_ext.rb b/lib/query_diet/active_record_ext.rb index 87556d3..02b8283 100644 --- a/lib/query_diet/active_record_ext.rb +++ b/lib/query_diet/active_record_ext.rb @@ -1,9 +1,15 @@ module QueryDiet module ActiveRecordExt - def log(query, *) - QueryDiet::Logger.log(query)...
makandra/query_diet
e5d58608be20119f20eed11ece90a0f4cd825333
Activate rubygems MFA
diff --git a/query_diet.gemspec b/query_diet.gemspec index a99101e..11cfe77 100644 --- a/query_diet.gemspec +++ b/query_diet.gemspec @@ -1,13 +1,14 @@ require './lib/query_diet/version' Gem::Specification.new "query_diet", QueryDiet::VERSION do |gem| gem.authors = ["Henning Koch", "Tobias Kraze"] gem.em...
makandra/query_diet
715ee125d0dce2eac7bbbe23910c509ad697cfb2
Add tests for rails 7
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9c10fc6..586e53b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,49 +1,53 @@ name: Tests on: push: branches: - master pull_request: branches: - master jobs: test: runs-on: ubunt...
makandra/query_diet
a546b75488f5d4a03382e3075c621dbad2e8a9ae
[#179114417] Entfernen älterer Ruby-Versionen aus Gem QueryDiet
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 871e038..9c10fc6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,53 +1,49 @@ name: Tests on: push: branches: - master pull_request: branches: - master jobs: test: runs-on: ubunt...
makandra/query_diet
4c6a62001d2180d657ce1fa446a10bc1d642916c
Add tests for ruby 3.0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ccc84dd..871e038 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,51 +1,53 @@ name: Tests on: push: branches: - master pull_request: branches: - master jobs: test: runs-on: ubunt...
makandra/query_diet
cab84b068d9960b44e5f4917a6d9b90f202702a6
Upgrade mimemagic in test projects to 0.3.10 due to licency
diff --git a/spec/rails-5.2/Gemfile.lock b/spec/rails-5.2/Gemfile.lock index 8f6b24a..1b08569 100644 --- a/spec/rails-5.2/Gemfile.lock +++ b/spec/rails-5.2/Gemfile.lock @@ -1,168 +1,170 @@ PATH remote: ../.. specs: query_diet (0.7.0) GEM remote: http://rubygems.org/ specs: actioncable (5.2.4.4...
makandra/query_diet
870a7c18c052d03a00e1190b4c47f4408d8610fe
[#177283654] Rails-6.1.-Tests für query_diet
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ac74613..ccc84dd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,45 +1,51 @@ name: Tests on: push: branches: - master pull_request: branches: - master jobs: test: runs-on: ubunt...
makandra/query_diet
7cd7bb160c94f70c1f280e74d2be18a481ccf8e0
Removed unnecessary 'gem install bundler', taken care of by step 'Install Ruby'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1d9c5b5..95b440b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,31 +1,29 @@ name: Tests on: push: branches: - master pull_request: branches: - master jobs: test: runs-on: ub...
makandra/query_diet
bbee65a7f15553e7bca896398ac20913f24bfc18
Added rake and removed unnecessary bundle exec in tests
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 14095cc..1d9c5b5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,30 +1,31 @@ name: Tests on: push: branches: - master pull_request: branches: - master jobs: test: runs-on: ub...
makandra/query_diet
d65ec8ce87c517e2580ca475132fee0a4eb41bce
Corrected the bundler version and removed unneessary bundle install
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 751957b..14095cc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,31 +1,30 @@ name: Tests on: push: branches: - master pull_request: branches: - master jobs: test: runs-on: ub...
makandra/query_diet
38a525a6a40805f283e6912ed77211dba12a95e3
Tab-character replaced with normal spaces
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 512d6f7..751957b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,31 +1,31 @@ name: Tests on: push: branches: - master pull_request: branches: - master jobs: test: runs-on: ub...
makandra/query_diet
37fbb330ba5f78fa0444d22daa43e0d66f16d0a6
Replaced travis-ci with github actions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..512d6f7 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,31 @@ +name: Tests +on: + push: + branches: + - master + pull_request: + branches: + - master +jobs: + test: + runs-on: ubuntu-2...
makandra/query_diet
fd9fcd55e26e4a7d00ed7b99553011d5f0f4ab65
Bump version from 0.6.2 to 0.7.0
diff --git a/lib/query_diet/version.rb b/lib/query_diet/version.rb index 19f1475..b626c61 100644 --- a/lib/query_diet/version.rb +++ b/lib/query_diet/version.rb @@ -1,3 +1,3 @@ module QueryDiet - VERSION = '0.6.2' + VERSION = '0.7.0' end diff --git a/spec/rails-3.2/Gemfile.lock b/spec/rails-3.2/Gemfile.lock index 0...
makandra/query_diet
445debd96e17365fae4c55d849a462db0163c7f4
Allow to pass in a nonce to fulfill the CSP in development (closes #23)
diff --git a/CHANGELOG.md b/CHANGELOG.md index cda8844..b765f68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,9 @@ # Changelog All notable changes to this project will be documented in this file. - This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - - ## Unreleased - ###...
makandra/query_diet
e9085f3709d9f75cd353534cf5394490da724fa5
Freeze travis distribution
diff --git a/.travis.yml b/.travis.yml index 0c5c3e7..cb349a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,16 @@ language: ruby sudo: false cache: bundler +dist: trusty + branches: only: - master rvm: - 2.0.0 - 2.1.8 - 2.2.4 - 2.3.0 matrix: fast_finish: true
makandra/query_diet
b74b83710b7bba6c9f27d7451b9b98dcada5632a
Notify author instead of fail@makandra.de
diff --git a/.travis.yml b/.travis.yml index e2cba0f..0c5c3e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,14 @@ language: ruby sudo: false cache: bundler -notifications: - email: - - fail@makandra.de + branches: only: - master rvm: - 2.0.0 - 2.1.8 - 2.2.4 - 2.3.0 matrix: fast...
makandra/query_diet
38611eb5c87947c88012d30d763ee0e9295dd619
Add CHANGELOG
diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..ff19258 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,10 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project ad...
makandra/query_diet
dfdc7da152010a8500a49d0fd85f9684004a554c
Increase default z-index to 99999
diff --git a/lib/query_diet/version.rb b/lib/query_diet/version.rb index 06d3dbf..19f1475 100644 --- a/lib/query_diet/version.rb +++ b/lib/query_diet/version.rb @@ -1,3 +1,3 @@ module QueryDiet - VERSION = '0.6.1' + VERSION = '0.6.2' end diff --git a/lib/query_diet/widget.rb b/lib/query_diet/widget.rb index 37a476a...
makandra/query_diet
519b488ba857dc7d25db8672093335ec7f8fb8fa
release version 0.6.1
diff --git a/lib/query_diet/version.rb b/lib/query_diet/version.rb index ec9779f..06d3dbf 100644 --- a/lib/query_diet/version.rb +++ b/lib/query_diet/version.rb @@ -1,3 +1,3 @@ module QueryDiet - VERSION = '0.6.0' + VERSION = '0.6.1' end diff --git a/spec/rails-3.2/Gemfile.lock b/spec/rails-3.2/Gemfile.lock index 5...
makandra/query_diet
acabbedc569a84064264ba6ed55273a29ef3f701
use prepend
diff --git a/lib/query_diet/active_record_ext.rb b/lib/query_diet/active_record_ext.rb index 5dc4fb4..87556d3 100644 --- a/lib/query_diet/active_record_ext.rb +++ b/lib/query_diet/active_record_ext.rb @@ -1,12 +1,9 @@ -ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do - - def log_with_query_diet(query, *...
makandra/query_diet
e1e10e37e231fb48a2603b4bad9228124537cde8
rspec3
diff --git a/spec/rails-3.2/Gemfile b/spec/rails-3.2/Gemfile index 140d0ef..e11e21a 100644 --- a/spec/rails-3.2/Gemfile +++ b/spec/rails-3.2/Gemfile @@ -1,10 +1,10 @@ source 'http://rubygems.org' gem 'sqlite3' gem 'rails', '~>3.2' -gem 'rspec', '~> 2.0' -gem 'rspec-rails', '~> 2.0' -gem 'webrat' +gem 'rspec', '3.5...
makandra/query_diet
26a79e6664a0ec8de199c1ad5c3f802981262c19
simplify test projects to mimic a real rails project
diff --git a/spec/rails-3.2/app_root/.gitignore b/spec/rails-3.2/.gitignore similarity index 100% rename from spec/rails-3.2/app_root/.gitignore rename to spec/rails-3.2/.gitignore diff --git a/spec/rails-3.2/Rakefile b/spec/rails-3.2/Rakefile index 9654632..ec0cd09 100644 --- a/spec/rails-3.2/Rakefile +++ b/spec/rails...
makandra/query_diet
fa6ac4ea4818d7bfc58cadfba5258489ed273641
markdown
diff --git a/README.md b/README.md new file mode 100644 index 0000000..6c4840c --- /dev/null +++ b/README.md @@ -0,0 +1,67 @@ +Query Diet [![Build Status](https://travis-ci.org/makandra/query_diet.svg?branch=master)](https://travis-ci.org/makandra/query_diet) +========== + +Query Diet counts the number of database quer...
makandra/query_diet
3de1668ea78cadaac9b7425067227265f03eabc8
really fix README (why is it .rdoc?)
diff --git a/README.rdoc b/README.rdoc index f7497f3..1c8a326 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,61 +1,60 @@ -Query Diet [![Build Status](https://travis-ci.org/makandra/query_diet.svg?branch=master)](https://travis-ci.org/makandra/query_diet) -============= += Query Diet {<img src="https://travis-ci.org/m...
makandra/query_diet
714a193a1e0be1846e404c09ae43bb40757b72c6
fix README
diff --git a/README.rdoc b/README.rdoc index a66bb87..f7497f3 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,60 +1,61 @@ -= Query Diet [![Build Status](https://travis-ci.org/makandra/query_diet.svg?branch=master)](https://travis-ci.org/makandra/query_diet) +Query Diet [![Build Status](https://travis-ci.org/makandra/q...
makandra/query_diet
f03ac9e3051940842d32f1b4e9883b02032c3620
add build status badge to README
diff --git a/README.rdoc b/README.rdoc index bd6e4d4..a66bb87 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,60 +1,60 @@ -= Query Diet += Query Diet [![Build Status](https://travis-ci.org/makandra/query_diet.svg?branch=master)](https://travis-ci.org/makandra/query_diet) Query Diet counts the number of database que...
makandra/query_diet
02308f55bb52fb672d057517b2d7fa03b66ea1ad
bump version to 0.6
diff --git a/README.rdoc b/README.rdoc index 5905290..bd6e4d4 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,60 +1,60 @@ = Query Diet Query Diet counts the number of database queries for the last request and *subtly* displays it in the upper right corner of your screen. The display turns red if too many queries ...
makandra/query_diet
e43daaf468eab8168d63a32400d2ea54ee6f8d6d
add notifications to .travis.yml
diff --git a/.travis.yml b/.travis.yml index fb42639..e2cba0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,16 @@ language: ruby sudo: false cache: bundler +notifications: + email: + - fail@makandra.de +branches: + only: + - master rvm: - 2.0.0 - 2.1.8 - 2.2.4 - 2.3.0 matrix: fast_f...
makandra/query_diet
345e63a6525cab424274eaadd01f522a674e3d2c
fix rails 4.2
diff --git a/spec/rails-4.2/Rakefile b/spec/rails-4.2/Rakefile index da128f4..9654632 100644 --- a/spec/rails-4.2/Rakefile +++ b/spec/rails-4.2/Rakefile @@ -1,10 +1,10 @@ require 'rake' require 'rspec/core/rake_task' desc 'Default: Run all specs for a specific rails version.' task :default => :spec desc "Run a...
makandra/query_diet
7b8d801a21240a4e188427e90018258053e3c114
drop super old rails versions and unmaintained ruby versions
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..fb42639 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +language: ruby +sudo: false +cache: bundler +rvm: + - 2.0.0 + - 2.1.8 + - 2.2.4 + - 2.3.0 +matrix: + fast_finish: true diff --git a/Rakefile b/Rakefile index b41aba4..8be5069 100644 ...
makandra/query_diet
9efa3b1eabaf199296fd553ee681511d6e7a9542
bump version to 0.5.4
diff --git a/lib/query_diet/version.rb b/lib/query_diet/version.rb index a8fc78f..bbd72f4 100644 --- a/lib/query_diet/version.rb +++ b/lib/query_diet/version.rb @@ -1,3 +1,3 @@ module QueryDiet - VERSION = '0.5.3' + VERSION = '0.5.4' end diff --git a/spec/rails-2.3/Gemfile.lock b/spec/rails-2.3/Gemfile.lock index e...
makandra/query_diet
6bb6cd957f2664fb9dbb77a9950303ad11cf529e
add rails 4.2 as test target; make more tests work with current rubies
diff --git a/Rakefile b/Rakefile index 430032d..b41aba4 100644 --- a/Rakefile +++ b/Rakefile @@ -1,44 +1,49 @@ require 'rake' require 'bundler/gem_tasks' desc 'Default: Run all specs.' task :default => 'all:spec' namespace :all do desc "Run specs on all spec apps" task :spec do for_each_directory_...
makandra/query_diet
e1e6033745dd13ea1f35d397990535acacc594ba
simplify gemspec
diff --git a/query_diet.gemspec b/query_diet.gemspec index b92b181..d3b0162 100644 --- a/query_diet.gemspec +++ b/query_diet.gemspec @@ -1,22 +1,12 @@ -# -*- encoding: utf-8 -*- -$: << File.expand_path('../lib', __FILE__) -require 'query_diet/version' +require './lib/query_diet/version' -Gem::Specification.new do |ge...
makandra/query_diet
1efb7ed3d778bfe6a28dc72d47f6a460fd32732c
Passing strings or symbols to the middleware builder is deprecated, please change
diff --git a/lib/query_diet/rack/reset_logger.rb b/lib/query_diet/rack/reset_logger.rb index 88a9fb8..b02ab24 100644 --- a/lib/query_diet/rack/reset_logger.rb +++ b/lib/query_diet/rack/reset_logger.rb @@ -1,26 +1,26 @@ module QueryDiet module Rack class ResetLogger def initialize(app) @app = ...
makandra/query_diet
af586c5d2f52aaf81dd6c2b220a5cb0a3ef4e028
make rails 5 compatible
diff --git a/lib/query_diet/active_record_ext.rb b/lib/query_diet/active_record_ext.rb index 6a3dbf7..5dc4fb4 100644 --- a/lib/query_diet/active_record_ext.rb +++ b/lib/query_diet/active_record_ext.rb @@ -1,11 +1,12 @@ ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do def log_with_query_diet(query, ...
makandra/query_diet
1acfbaa519d23805401f9abf2e20c01198028155
Fix bizarro test failures for Rails 3.x; version bump
diff --git a/lib/query_diet/version.rb b/lib/query_diet/version.rb index c8870d5..a8fc78f 100644 --- a/lib/query_diet/version.rb +++ b/lib/query_diet/version.rb @@ -1,3 +1,3 @@ module QueryDiet - VERSION = '0.5.2' + VERSION = '0.5.3' end diff --git a/spec/rails-2.3/Gemfile.lock b/spec/rails-2.3/Gemfile.lock index 9...
makandra/query_diet
ff00d2a80108ae30b8d0a9431fb2612471399c8a
Add Rails env check in post install message
diff --git a/query_diet.gemspec b/query_diet.gemspec index a889d41..b92b181 100644 --- a/query_diet.gemspec +++ b/query_diet.gemspec @@ -1,22 +1,22 @@ # -*- encoding: utf-8 -*- $: << File.expand_path('../lib', __FILE__) require 'query_diet/version' Gem::Specification.new do |gem| gem.authors = ["Henning ...
makandra/query_diet
777471cc8194c1d53f41472ab12d1168b9928f3d
license as MIT
diff --git a/lib/query_diet/version.rb b/lib/query_diet/version.rb index 0947c42..c8870d5 100644 --- a/lib/query_diet/version.rb +++ b/lib/query_diet/version.rb @@ -1,3 +1,3 @@ module QueryDiet - VERSION = '0.5.1' + VERSION = '0.5.2' end diff --git a/query_diet.gemspec b/query_diet.gemspec index 21c8496..a889d41 10...
makandra/query_diet
a8ea48fb87ce815823f205cca6c006507238a39d
check in Gemfile.locks of test applications
diff --git a/.gitignore b/.gitignore index b040bea..8c0f972 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ doc pkg *.gem .idea -spec/**/Gemfile.lock diff --git a/spec/rails-2.3/Gemfile.lock b/spec/rails-2.3/Gemfile.lock new file mode 100644 index 0000000..9991b00 --- /dev/null +++ b/spec/rails-2.3/Gemfile...
makandra/query_diet
1372562473ebab9e910a2032abd9c0c3e0f763fb
fix bug that prevents query execution if Logger is paused
diff --git a/lib/query_diet/logger.rb b/lib/query_diet/logger.rb index 9027aee..5a2ef03 100644 --- a/lib/query_diet/logger.rb +++ b/lib/query_diet/logger.rb @@ -1,49 +1,51 @@ module QueryDiet class Logger DEFAULT_OPTIONS = { :bad_count => 8, :bad_time => 5000 } class << self attr_accessor :querie...
makandra/query_diet
91b5e39251f1145dbc25f50a37d55c542f7687d0
add QueryDiet::Logger#paused
diff --git a/lib/query_diet/logger.rb b/lib/query_diet/logger.rb index cdacee2..9027aee 100644 --- a/lib/query_diet/logger.rb +++ b/lib/query_diet/logger.rb @@ -1,43 +1,49 @@ module QueryDiet class Logger DEFAULT_OPTIONS = { :bad_count => 8, :bad_time => 5000 } class << self - attr_accessor :querie...
makandra/query_diet
79995a5673bbfc80b7dc7d6dc6b2994964abfa93
remove Gemfile.lock
diff --git a/.gitignore b/.gitignore index 038ac89..b040bea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ doc pkg *.gem .idea - +spec/**/Gemfile.lock diff --git a/spec/rails-2.3/Gemfile.lock b/spec/rails-2.3/Gemfile.lock deleted file mode 100644 index 30f0b9b..0000000 --- a/spec/rails-2.3/Gemfile.lock ++...
makandra/query_diet
a5cdc6209f040c1e26e04b2421ff9a4d64dbceb2
migrate gemspec to bundler style; bump version
diff --git a/lib/query_diet/version.rb b/lib/query_diet/version.rb new file mode 100644 index 0000000..cfb2c8d --- /dev/null +++ b/lib/query_diet/version.rb @@ -0,0 +1,3 @@ +module QueryDiet + VERSION = '0.4.0' +end diff --git a/query_diet.gemspec b/query_diet.gemspec index dcd75c2..21c8496 100644 --- a/query_diet.gem...
makandra/query_diet
9498ac1baa433c1cc2b44ba2e0662f81a6830dcf
change README to only render widget in dev environment
diff --git a/README.rdoc b/README.rdoc index dcb877c..dc362c8 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,56 +1,56 @@ = Query Diet Query Diet counts the number of database queries for the last request and *subtly* displays it in the upper right corner of your screen. The display turns red if too many queries ...
makandra/query_diet
fb6ca80b44a667a1cc8053319d7ddd30f5491241
Rails 3 compatibility
diff --git a/README.rdoc b/README.rdoc index c6a042a..dcb877c 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,55 +1,56 @@ = Query Diet Query Diet counts the number of database queries for the last request and *subtly* displays it in the upper right corner of your screen. The display turns red if too many queries ...
makandra/query_diet
80866934969730dad3574871d399ef9fe290cf55
mark widget as html-safe
diff --git a/lib/query_diet/widget.rb b/lib/query_diet/widget.rb index 1cf45f8..37a476a 100644 --- a/lib/query_diet/widget.rb +++ b/lib/query_diet/widget.rb @@ -1,54 +1,55 @@ module QueryDiet module Widget class << self def css <<-EOF <style type="text/css"><!-- div#query_...
makandra/query_diet
e95e8e2b730ba7536c3d210211b85558978f14ea
configure thresholds via method params
diff --git a/README.rdoc b/README.rdoc index 5436ef8..c6a042a 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,55 +1,55 @@ = Query Diet Query Diet counts the number of database queries for the last request and *subtly* displays it in the upper right corner of your screen. The display turns red if too many queries ...
makandra/query_diet
ec86f25ec7d732b2520b817a8cc2f27f5430f8ee
make widget integration somewhat less magic
diff --git a/README.rdoc b/README.rdoc index a96dfee..5436ef8 100644 --- a/README.rdoc +++ b/README.rdoc @@ -1,46 +1,55 @@ = Query Diet Query Diet counts the number of database queries for the last request and *subtly* displays it in the upper right corner of your screen. The display turns red if too many queries ...
makandra/query_diet
efdb1c5d7ae5db1a007084ff61b2014ba257d900
properly test query count reset; move reset logic to rack middleware
diff --git a/lib/query_diet.rb b/lib/query_diet.rb index 223c53c..e418d39 100644 --- a/lib/query_diet.rb +++ b/lib/query_diet.rb @@ -1,5 +1,5 @@ require 'query_diet/logger' require 'query_diet/widget' require 'query_diet/active_record_ext' require 'query_diet/action_controller_ext' - +require 'query_diet/rack/reset...
makandra/query_diet
0d129181e1a3888f2d210ce5614c9be4901f8a88
get rid of unused test app environments
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..038ac89 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +doc +pkg +*.gem +.idea + diff --git a/MIT-LICENSE b/MIT-LICENSE new file mode 100644 index 0000000..30adc46 --- /dev/null +++ b/MIT-LICENSE @@ -0,0 +1,20 @@ +Copyright (c) 2009 Henning Koch +...
ztatlock/spark
9a61315a21bb32fda131091c9e08ded82aff3fee
try to prevent song info from wrapping
diff --git a/spark/spark.js b/spark/spark.js index 7d5bf03..1293403 100644 --- a/spark/spark.js +++ b/spark/spark.js @@ -1,410 +1,413 @@ FIELDS = ['genre', 'artist', 'album', 'title', 'track']; SONGDB = null; MENU = null; PLAYER = null; function main() { SONGDB = new SongDB(); MENU = new Menu(); P...
ztatlock/spark
e6aabea89d38d94e73ad7e0d02fb82aea8e3be36
moved selected style from js into css
diff --git a/spark/spark.js b/spark/spark.js index 39e9353..7d5bf03 100644 --- a/spark/spark.js +++ b/spark/spark.js @@ -1,412 +1,410 @@ FIELDS = ['genre', 'artist', 'album', 'title', 'track']; SONGDB = null; MENU = null; PLAYER = null; function main() { SONGDB = new SongDB(); MENU = new Menu(); P...
ztatlock/spark
4bfacf9adfbd1ae036fc34d0331108276cbb8438
reintroduced globals - several small simplifications
diff --git a/spark/spark.js b/spark/spark.js index af724e3..39e9353 100644 --- a/spark/spark.js +++ b/spark/spark.js @@ -1,435 +1,412 @@ FIELDS = ['genre', 'artist', 'album', 'title', 'track']; +SONGDB = null; +MENU = null; +PLAYER = null; + function main() { - d = new SongDB(); - m = new Menu(); - p = new Pla...
ztatlock/spark
c33765e2e562dce994e17a62259c77f64cc3ea21
tightening up fonts
diff --git a/spark/style.css b/spark/style.css index d3d23b9..dc6ddff 100644 --- a/spark/style.css +++ b/spark/style.css @@ -1,69 +1,69 @@ html { /* always show vertical scroll bar */ overflow-y: scroll; } body { font-family: sans-serif; - font-size: 12pt; + font-size: 11pt; } #wrap { width: 800p...
ztatlock/spark
12957523b3b37f36897bb30900f200cc7de436f6
reworked and simplified style.css
diff --git a/spark/style.css b/spark/style.css index 8e10fc4..d3d23b9 100644 --- a/spark/style.css +++ b/spark/style.css @@ -1,73 +1,69 @@ html { /* always show vertical scroll bar */ overflow-y: scroll; } body { font-family: sans-serif; - font-size: 11pt; + font-size: 12pt; } #wrap { width: 800p...
ztatlock/spark
2ff8bca4355121e48267de4fa4ba08e77c87983a
no dash between track num and title
diff --git a/spark/yurit b/spark/yurit index 171bada..5615301 100755 --- a/spark/yurit +++ b/spark/yurit @@ -1,111 +1,111 @@ #!/usr/bin/env python # tag mp3s based on filename import re, glob, os, sys LIB = '~/music' LIB = os.path.expanduser(LIB) # song path regexp to extract tag info # # group meanin...
ztatlock/spark
7a14648a21bf25ea34ed4cadba6b7716dad07ca0
removed volume code; tweaked layout
diff --git a/spark/index.html b/spark/index.html index 5a15390..e616dd2 100644 --- a/spark/index.html +++ b/spark/index.html @@ -1,51 +1,44 @@ <!DOCTYPE HTML> <html> <head> <title>spark</title> <link rel='shortcut icon' href='note.ico' /> <link rel='stylesheet' type='text/css' href='style.css' /> <script...
ztatlock/spark
8439fb3b1baf63c0acc8d7c3e822e6a0c29e4909
slightly larger font, still fits
diff --git a/spark/style.css b/spark/style.css index 2021792..e73375c 100644 --- a/spark/style.css +++ b/spark/style.css @@ -1,73 +1,73 @@ html { /* always show vertical scroll bar */ overflow-y: scroll; } body { font-family: sans-serif; - font-size: 10pt; + font-size: 11pt; } #wrap { width: 800p...
ztatlock/spark
26ba2cc58751fa9ebb8fbce0a5defdc2214f410d
shrink fonts so everything fits in 800px
diff --git a/spark/style.css b/spark/style.css index 260223b..2021792 100644 --- a/spark/style.css +++ b/spark/style.css @@ -1,73 +1,73 @@ html { /* always show vertical scroll bar */ overflow-y: scroll; } body { font-family: sans-serif; - font-size: 12pt; + font-size: 10pt; } #wrap { width: 800p...
ztatlock/spark
5bdc4e5a30cdd941eb76138031824e94144ce117
yurit: tag songs based on filename
diff --git a/spark/gen-songdb b/spark/gen-songdb index 565b3b5..59048a2 100755 --- a/spark/gen-songdb +++ b/spark/gen-songdb @@ -1,54 +1,52 @@ #!/usr/bin/env python import os, sys, glob, eyeD3 def main(): ss = songs('..') js = map(song_js, ss) db = '[%s]' % (','.join(js)) write(db) def songs(dir...
ztatlock/spark
f4b5734f9851c2522ad68edc75d8d8b880621faa
explain install
diff --git a/README b/README index 84dcbf6..fa0b897 100644 --- a/README +++ b/README @@ -1 +1,12 @@ spark: javascript + HTML5 music player + +To build a webpage to play any mp3 reachable from FOO/ simply: + + $ cd FOO/ + $ cp -r /path/to/spark/spark . + $ cd spark + $ ./gen-songdb + +Now http://your.domain.net/FOO...
ztatlock/spark
639c8249761f4dfc0b0f6b63ab5d2196cada8470
assume all song paths root at ..
diff --git a/spark/gen-songdb b/spark/gen-songdb index 2258175..565b3b5 100755 --- a/spark/gen-songdb +++ b/spark/gen-songdb @@ -1,54 +1,54 @@ #!/usr/bin/env python import os, sys, glob, eyeD3 def main(): - ss = songs('.') + ss = songs('..') js = map(song_js, ss) db = '[%s]' % (','.join(js)) write(db)...
ztatlock/spark
879843834f1c135eab5b673c40e3ee592c0705ce
removed art and cleaned up layout
diff --git a/src/index.html b/src/index.html index a3dde56..5a15390 100644 --- a/src/index.html +++ b/src/index.html @@ -1,54 +1,51 @@ <!DOCTYPE HTML> <html> <head> <title>spark</title> <link rel='shortcut icon' href='note.ico' /> <link rel='stylesheet' type='text/css' href='style.css' /> <script type='t...
ztatlock/spark
8f04651ad318d79f120764690318c34f0aab26ae
simplifying: removed user and art from songdb
diff --git a/gen-songdb b/gen-songdb index 896a6ba..2258175 100755 --- a/gen-songdb +++ b/gen-songdb @@ -1,65 +1,54 @@ #!/usr/bin/env python -import os, sys, glob, getpass, eyeD3 - -owner = getpass.getuser() +import os, sys, glob, eyeD3 def main(): ss = songs('.') - js = map(song_to_js, ss) + js = map(song_j...
ztatlock/spark
9efb6037699943c6511aa6485d4e013394492188
small clean up
diff --git a/src/spark.js b/src/spark.js index cd99693..72f4c5d 100644 --- a/src/spark.js +++ b/src/spark.js @@ -1,503 +1,476 @@ FIELDS = ['genre', 'artist', 'album', 'title', 'track', 'year']; function proj(field) { return function(s) { switch(field) { case 'genre' : return s.genre; case 'ar...
ztatlock/spark
704bc7fb5473bb5ec201edb453e23ce5c9c08fb9
prevent whitespace filters
diff --git a/src/spark.js b/src/spark.js index 93f6707..cd99693 100644 --- a/src/spark.js +++ b/src/spark.js @@ -1,498 +1,503 @@ FIELDS = ['genre', 'artist', 'album', 'title', 'track', 'year']; function proj(field) { return function(s) { switch(field) { case 'genre' : return s.genre; case 'ar...
ztatlock/spark
aa96f721829bf0a88f20bc6e0e882bce5185761c
only selectively kill events, not all
diff --git a/src/spark.js b/src/spark.js index 7e885ce..93f6707 100644 --- a/src/spark.js +++ b/src/spark.js @@ -1,491 +1,498 @@ FIELDS = ['genre', 'artist', 'album', 'title', 'track', 'year']; function proj(field) { return function(s) { switch(field) { case 'genre' : return s.genre; case 'ar...
ztatlock/spark
171244a1f112a87287935b5f2eae8f693d9b65cc
player OOPified, no more globals
diff --git a/src/index.html b/src/index.html index f774c31..a3dde56 100644 --- a/src/index.html +++ b/src/index.html @@ -1,52 +1,54 @@ <!DOCTYPE HTML> <html> <head> <title>spark</title> <link rel='shortcut icon' href='note.ico' /> <link rel='stylesheet' type='text/css' href='style.css' /> <script type='t...
ztatlock/spark
e5af623974dd497d2f88f53c6391a2cf6e51cbdc
always show vertical scroll
diff --git a/src/style.css b/src/style.css index 8ddec2b..f60f527 100644 --- a/src/style.css +++ b/src/style.css @@ -1,83 +1,87 @@ +html { + overflow-y: scroll; +} + body { font-family: sans-serif; font-size: 12pt; } #wrap { width: 900px; margin: 0 auto; } #top { margin-bottom: 8px; } #cont...
ztatlock/spark
a3db328c0b4d8efd5603a77f5c9d058e28b7c2e5
big clean up before OOPifying player
diff --git a/src/index.html b/src/index.html index bb44af7..f774c31 100644 --- a/src/index.html +++ b/src/index.html @@ -1,51 +1,52 @@ <!DOCTYPE HTML> <html> <head> <title>spark</title> <link rel='shortcut icon' href='note.ico' /> <link rel='stylesheet' type='text/css' href='style.css' /> <script type='t...
ztatlock/spark
82a220ebf21ea8b5cdab846d9b594c9bb0749aca
layout futzing, likely stable
diff --git a/src/index.html b/src/index.html index ee68a1c..bb44af7 100644 --- a/src/index.html +++ b/src/index.html @@ -1,49 +1,51 @@ <!DOCTYPE HTML> <html> <head> <title>spark</title> <link rel='shortcut icon' href='note.ico' /> <link rel='stylesheet' type='text/css' href='style.css' /> <script type='t...
ztatlock/spark
ab320acc2b83e1673c3aae1c8a7460f74bdbd106
songdb OOPified
diff --git a/src/spark.js b/src/spark.js index 256f218..dd479d9 100644 --- a/src/spark.js +++ b/src/spark.js @@ -1,407 +1,387 @@ +function SongDB(url) { + var db; + db = eval(fetch(url)); + db = map(intify, db); + db.sort(song_cmp); + + this.db = db; + this._db = db; + + this.restore = function() { + this....
ztatlock/spark
b8499aba18eab4068461730bacd409412f354b70
partly OOPified song db
diff --git a/src/index.html b/src/index.html index 963044b..ee68a1c 100644 --- a/src/index.html +++ b/src/index.html @@ -1,49 +1,49 @@ <!DOCTYPE HTML> <html> <head> <title>spark</title> <link rel='shortcut icon' href='note.ico' /> <link rel='stylesheet' type='text/css' href='style.css' /> <script type='t...
ztatlock/spark
8add2d455606a7524e47695590036b5659b99abe
OOPified menu
diff --git a/src/index.html b/src/index.html index 35e5e1e..963044b 100644 --- a/src/index.html +++ b/src/index.html @@ -1,47 +1,49 @@ <!DOCTYPE HTML> <html> <head> <title>spark</title> <link rel='shortcut icon' href='note.ico' /> <link rel='stylesheet' type='text/css' href='style.css' /> <script type='t...
ztatlock/spark
bbe2c3139a323c74cfdc05409b458c8f52cbc1d7
reworked layout, clean up
diff --git a/src/index.html b/src/index.html index 985b505..35e5e1e 100644 --- a/src/index.html +++ b/src/index.html @@ -1,134 +1,47 @@ <!DOCTYPE HTML> <html> <head> <title>spark</title> - <link rel='shortcut icon' href='.note.ico'> + <link rel='shortcut icon' href='note.ico' /> + <link rel='stylesheet' type='...
ztatlock/spark
6c324aa8401aea79de6c6390b2005c840e3422e8
factored out style sheet from html
diff --git a/src/style.css b/src/style.css new file mode 100644 index 0000000..a7f2c80 --- /dev/null +++ b/src/style.css @@ -0,0 +1,88 @@ +body { + margin: 0; + padding: 0; + color: #000; + background: #fff; + font-family: sans-serif; + font-size: 12pt; +} + +#wrap { + width: 90%; + margin: 0 auto; +} + +#top {...
ztatlock/spark
9b5100194478c521c9d0e22d531fd3b911e52f1b
added owner field: anticipating filters over multi dbs
diff --git a/gen-songdb b/gen-songdb index 1eb429a..896a6ba 100755 --- a/gen-songdb +++ b/gen-songdb @@ -1,61 +1,65 @@ #!/usr/bin/env python -import os, sys, glob, eyeD3 +import os, sys, glob, getpass, eyeD3 + +owner = getpass.getuser() def main(): ss = songs('.') js = map(song_to_js, ss) db = '[%s]' % (...
ztatlock/spark
c42e3ddbebe28dc8cd3493736045a6c005c09a98
style tweak: smaller genre font
diff --git a/index.html b/index.html index e7d9577..985b505 100644 --- a/index.html +++ b/index.html @@ -1,134 +1,134 @@ <!DOCTYPE HTML> <html> <head> <title>spark</title> <link rel='shortcut icon' href='.note.ico'> <script type='text/javascript' src='spark.js'></script> <style> body { margin...
ztatlock/spark
4aede92ca6ffecb847b10d5af03072b34ab23a66
comment on future of serve
diff --git a/TODO b/TODO index 93a9070..96d4e5e 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,13 @@ - on load, play song specified by url - controls in canvas - pop up manual for keybindings +- webfs seems perfect for now + If we eventually want more control / portability, consider + using Python's builtin web...
ztatlock/spark
a1f96c52c6b2162869fcda2c0e27b7a9f8691abe
added script to start lightweight webserver
diff --git a/serve b/serve new file mode 100755 index 0000000..d675405 --- /dev/null +++ b/serve @@ -0,0 +1,12 @@ +#!/bin/bash + +if [ ! -x "$(which webfsd)" ]; then + echo "webfsd must be installed to use this simple server" \ + "(Debian/Ubuntu package 'webfs')." + exit -1 +fi + +# -b username:password to add ...
ztatlock/spark
758f44b5beccbc38a1c27b3c37fc1b756e786b70
treat year, track, and total as ints
diff --git a/spark.js b/spark.js index 1024d37..7498575 100644 --- a/spark.js +++ b/spark.js @@ -1,379 +1,389 @@ state = { genre : '' , artist : '' , album : '' , title : '' , art : '' , volume : 0.8 }; -DB = []; // song database -PCACHE = []; // player...
ztatlock/spark
ed4fb3e1684243ebefa7b6c6b3da5cf6c6da7791
(extremely) minor formatting
diff --git a/spark.js b/spark.js index a1023a1..1024d37 100644 --- a/spark.js +++ b/spark.js @@ -1,379 +1,379 @@ state = { genre : '' , artist : '' , album : '' , title : '' , art : '' , volume : 0.8 }; DB = []; // song database PCACHE = []; // player...
ztatlock/spark
d62060b633463f9f3d850f433163b589f63859fb
minor tweak: constant prop art var
diff --git a/gen-songdb b/gen-songdb index 7f0cdc3..1eb429a 100755 --- a/gen-songdb +++ b/gen-songdb @@ -1,62 +1,61 @@ #!/usr/bin/env python import os, sys, glob, eyeD3 def main(): ss = songs('.') js = map(song_to_js, ss) db = '[%s]' % (','.join(js)) write(db) def songs(dir): res = [] # un...
ztatlock/spark
0adf626b5c0c063c7eae27601d2a4a2029ba7c3c
refactor gen-songdb top-down, lower case genre
diff --git a/gen-songdb b/gen-songdb index ba23f75..7f0cdc3 100755 --- a/gen-songdb +++ b/gen-songdb @@ -1,50 +1,62 @@ #!/usr/bin/env python -from __future__ import print_function -import os -import glob -import eyeD3 +import os, sys, glob, eyeD3 + +def main(): + ss = songs('.') + js = map(song_to_js, ss) + db = ...
ztatlock/spark
c66447779d76f2a1825f806682b999451d6cf415
prevent accidental songdb mod in filter
diff --git a/spark.js b/spark.js index 19a0f74..a1023a1 100644 --- a/spark.js +++ b/spark.js @@ -1,372 +1,379 @@ state = { genre : '' , artist : '' , album : '' , title : '' , art : '' , volume : 0.8 }; DB = []; // song database PCACHE = []; // player...
ztatlock/spark
08812d790ff5cf0fecce5f88134ef1577cb8e682
simplify filter syntax: no explicit song object
diff --git a/spark.js b/spark.js index e8cd7e2..19a0f74 100644 --- a/spark.js +++ b/spark.js @@ -1,365 +1,372 @@ state = { genre : '' , artist : '' , album : '' , title : '' , art : '' , volume : 0.8 }; DB = []; // song database PCACHE = []; // player...
ztatlock/spark
c8c050c331960e6cd293d5675711280d5336008c
fix case where song.art is undefined
diff --git a/index.html b/index.html index 3adf03c..e7d9577 100644 --- a/index.html +++ b/index.html @@ -1,133 +1,134 @@ <!DOCTYPE HTML> <html> <head> <title>spark</title> <link rel='shortcut icon' href='.note.ico'> <script type='text/javascript' src='spark.js'></script> <style> body { margin...
ztatlock/spark
94c9bb7a736eb04fd508884ab0ba4b4b99f289b8
layout tweak for art
diff --git a/index.html b/index.html index 61d54f8..3adf03c 100644 --- a/index.html +++ b/index.html @@ -1,143 +1,133 @@ <!DOCTYPE HTML> <html> <head> <title>spark</title> <link rel='shortcut icon' href='.note.ico'> <script type='text/javascript' src='spark.js'></script> <style> body { + margin...
ztatlock/spark
59fb790d03cde60847d6a500b9d5b683a3c305b0
rough draft of support for cover art
diff --git a/gen-songdb b/gen-songdb index 2076f1c..ba23f75 100755 --- a/gen-songdb +++ b/gen-songdb @@ -1,42 +1,50 @@ #!/usr/bin/env python from __future__ import print_function import os +import glob import eyeD3 def song_to_js(path): tag = eyeD3.Tag() tag.link(path) + art_imgs = glob.glob('%s/*...
ztatlock/spark
5b917b9945f1fd2da7928eda1a2d3b7283f70cf0
converted to gen-songdb to python, seems to be faster
diff --git a/gen-songdb b/gen-songdb index 9e2f0d8..2076f1c 100755 --- a/gen-songdb +++ b/gen-songdb @@ -1,71 +1,42 @@ -#!/usr/bin/env bash - -# TODO check that eyeD3 is available - -# do not split on spaces in file names -IFS=$(echo -en "\n\b") - -function main { - print_dir . -} - -function print_dir { - dir="$1"...
ztatlock/spark
d91c9f42c91dce1ba7a910b23040c7f3c13d4b65
hack to help genre on nasty mp3s, allow symlinks in find
diff --git a/gen-songdb b/gen-songdb index 4791b88..9e2f0d8 100755 --- a/gen-songdb +++ b/gen-songdb @@ -1,59 +1,71 @@ #!/usr/bin/env bash # TODO check that eyeD3 is available # do not split on spaces in file names IFS=$(echo -en "\n\b") function main { + print_dir . +} + +function print_dir { + dir="$1"...
ztatlock/spark
a2c539f6150d05def8be740b96d6a01c5e02e572
allows one to add full http paths to .songdb
diff --git a/spark.js b/spark.js index b362c88..86ee197 100644 --- a/spark.js +++ b/spark.js @@ -1,351 +1,353 @@ state = { genre : '' , artist : '' , album : '' , title : '' , volume : 0.8 }; DB = []; // song database PCACHE = []; // player cache PMAX = 4; //...
ztatlock/spark
afc87936dbb35a17ccf67044e46a869022548ada
document title tracks the name of the current song
diff --git a/spark.js b/spark.js index 19b7fa9..b362c88 100644 --- a/spark.js +++ b/spark.js @@ -1,350 +1,351 @@ state = { genre : '' , artist : '' , album : '' , title : '' , volume : 0.8 }; DB = []; // song database PCACHE = []; // player cache PMAX = 4; //...
ztatlock/spark
1b387ccadc31d421967e4244fe6e9dcef141bea8
filter to restrict view of song db
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index fd61e7d..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.songdb -test diff --git a/note.ico b/.note.ico similarity index 100% rename from note.ico rename to .note.ico diff --git a/index.html b/index.html index 0876904..0c47a80 100644 --- a/ind...