diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | MIT-LICENSE | 2 | ||||
| -rw-r--r-- | Rakefile | 3 | ||||
| -rwxr-xr-x | bin/dashing | 3 | ||||
| -rw-r--r-- | dashing.gemspec | 10 | ||||
| -rw-r--r-- | lib/dashing.rb | 2 | ||||
| -rw-r--r-- | lib/dashing/app.rb | 11 | ||||
| -rw-r--r-- | shipit.rubygems.yml | 1 | ||||
| -rw-r--r-- | templates/project/Gemfile | 2 | ||||
| -rw-r--r-- | templates/project/assets/stylesheets/application.scss | 1 | ||||
| -rw-r--r-- | templates/project/jobs/twitter.rb | 4 |
11 files changed, 28 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 0a28e78..66b5ca9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: ruby rvm: - - 2.1.0 + - 2.1.2 - 2.0.0 - 1.9.3 diff --git a/MIT-LICENSE b/MIT-LICENSE index d2bf435..1cb4835 100644 --- a/MIT-LICENSE +++ b/MIT-LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013 Shopify +Copyright (c) 2014 Shopify Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -1,5 +1,6 @@ require 'rubygems' require 'rake' +require 'bundler/gem_tasks' require 'rake/testtask' Rake::TestTask.new(:test) do |test| @@ -7,4 +8,4 @@ Rake::TestTask.new(:test) do |test| test.pattern = 'test/**/*_test.rb' end -task :default => [:test]
\ No newline at end of file +task :default => [:test] diff --git a/bin/dashing b/bin/dashing index 97a7af5..cce9340 100755 --- a/bin/dashing +++ b/bin/dashing @@ -3,6 +3,7 @@ require "pathname" bin_file = Pathname.new(__FILE__).realpath $:.unshift File.expand_path("../../lib", bin_file) -require 'dashing' +require 'dashing/cli' +require 'dashing/downloader' Dashing::CLI.source_root(File.expand_path('../../templates', bin_file)) Dashing::CLI.start(ARGV) diff --git a/dashing.gemspec b/dashing.gemspec index 8ef27f8..2f9df4a 100644 --- a/dashing.gemspec +++ b/dashing.gemspec @@ -2,9 +2,9 @@ Gem::Specification.new do |s| s.name = 'dashing' - s.version = '1.3.2' - s.date = '2013-11-21' - s.executables << 'dashing' + s.version = '1.3.4' + s.date = '2014-05-30' + s.executables = %w(dashing) s.summary = "The exceptionally handsome dashboard framework." @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency('sinatra', '~> 1.4.4') s.add_dependency('sinatra-contrib', '~> 1.4.2') s.add_dependency('thin', '~> 1.6.1') - s.add_dependency('rufus-scheduler', '~> 3.0.3') + s.add_dependency('rufus-scheduler', '~> 2.0.24') s.add_dependency('thor', '~> 0.18.1') s.add_dependency('sprockets', '~> 2.10.1') s.add_dependency('rack', '~> 1.5.2') @@ -32,4 +32,4 @@ Gem::Specification.new do |s| s.add_development_dependency('mocha', '~> 0.14.0') s.add_development_dependency('fakeweb', '~> 1.3.0') s.add_development_dependency('simplecov', '~> 0.8.2') -end +end
\ No newline at end of file diff --git a/lib/dashing.rb b/lib/dashing.rb index 855aa36..3527034 100644 --- a/lib/dashing.rb +++ b/lib/dashing.rb @@ -3,4 +3,4 @@ require 'dashing/downloader' require 'dashing/app' module Dashing -end +end
\ No newline at end of file diff --git a/lib/dashing/app.rb b/lib/dashing/app.rb index 033849c..921bf9c 100644 --- a/lib/dashing/app.rb +++ b/lib/dashing/app.rb @@ -6,6 +6,7 @@ require 'coffee-script' require 'sass' require 'json' require 'yaml' +require 'thin' SCHEDULER = Rufus::Scheduler.new @@ -119,6 +120,16 @@ get '/views/:widget?.html' do end end +Thin::Server.class_eval do + def stop_with_connection_closing + Sinatra::Application.settings.connections.dup.each(&:close) + stop_without_connection_closing + end + + alias_method :stop_without_connection_closing, :stop + alias_method :stop, :stop_with_connection_closing +end + def send_event(id, body, target=nil) body[:id] = id body[:updatedAt] ||= Time.now.to_i diff --git a/shipit.rubygems.yml b/shipit.rubygems.yml new file mode 100644 index 0000000..c3f42d3 --- /dev/null +++ b/shipit.rubygems.yml @@ -0,0 +1 @@ +# using the default shipit config diff --git a/templates/project/Gemfile b/templates/project/Gemfile index 3c7e7a9..1235b37 100644 --- a/templates/project/Gemfile +++ b/templates/project/Gemfile @@ -3,4 +3,4 @@ source 'https://rubygems.org' gem 'dashing' ## Remove this if you don't need a twitter widget. -gem 'twitter', '>= 5.0.0'
\ No newline at end of file +gem 'twitter', '>= 5.9.0'
\ No newline at end of file diff --git a/templates/project/assets/stylesheets/application.scss b/templates/project/assets/stylesheets/application.scss index 20e009f..091ac69 100644 --- a/templates/project/assets/stylesheets/application.scss +++ b/templates/project/assets/stylesheets/application.scss @@ -117,6 +117,7 @@ h3 { } .icon-background { + pointer-events: none; width: 100%!important; height: 100%; position: absolute; diff --git a/templates/project/jobs/twitter.rb b/templates/project/jobs/twitter.rb index 26228bc..7b2bd6f 100644 --- a/templates/project/jobs/twitter.rb +++ b/templates/project/jobs/twitter.rb @@ -6,8 +6,8 @@ require 'twitter' twitter = Twitter::REST::Client.new do |config| config.consumer_key = 'YOUR_CONSUMER_KEY' config.consumer_secret = 'YOUR_CONSUMER_SECRET' - config.oauth_token = 'YOUR_OAUTH_TOKEN' - config.oauth_token_secret = 'YOUR_OAUTH_SECRET' + config.access_token = 'YOUR_OAUTH_TOKEN' + config.access_token_secret = 'YOUR_OAUTH_SECRET' end search_term = URI::encode('#todayilearned') |