departr 0.4 → 0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 40696450d3edaf3459d98c4b571d36420337fc50
+  data.tar.gz: ea3887c825338d06d7213b2ff8aefdcbaec8d5d7
+SHA512:
+  metadata.gz: 63a264efb01f7aa9e446433f47a04385a4f434dc6d94e04228bc655970d3cd68adfdd2d1fa8ead0fbc454924a9c3e4bb0c45af852d18d355e0483854803bb30d
+  data.tar.gz: e8b0bb98b8aceaaff2e52747391d37d6560249f8cb32c46bf4fec59d03478748649e3cfb1a37a2ba78edb899d93479bad258a2fe3e3bc825476eb09c4f2fb147

data/.gitignore

@@ -0,0 +1,7 @@
+config.ru
+Gemfile.lock
+.bundle
+public/images
+lib/images.msh
+log
+.DS_Store

data/README.md

@@ -7,12 +7,18 @@ Departr is a smart and fast startpage to help you reach other web sites.
 It's up and running here http://departr.solt.biz/
 
 Anyway, it's look like that :
-![Screenshot](https://github.com/florentsolt/departr/raw/master/screenshot.png)
+![Screenshot](https://github.com/florentsolt/departr/raw/master/screenshot.jpg)
 
 # How to install
 
     gem install departr
 
+Then, run the departr-images to fetch backgrounds (you can run this task every day):
+
+    departr-images 500PX_CONSUMER_KEY 500PX_CONSUMER_SECRET 500PX_USERNAME 500PX_PASSWORD
+
+You need to go there to regirster an application http://500px.com/settings/applications.
+
 All you need now it to open your favorite code editor and create a file `config.ru` that looks like https://github.com/florentsolt/departr/blob/master/config.ru.example
 Do not forget to create a RPX account on http://www.janrain.com/ and fill the config under the `rpx` section with your account infos.
 
@@ -22,4 +28,4 @@ Then run it :
   
 Or :
 
-    rackup
+    rackup

data/bin/departr-images

@@ -0,0 +1,78 @@
+#!/usr/bin/env ruby
+require 'oauth'
+require 'json'
+
+if ARGV.size != 4
+    puts "Usage: #{$0} CONSUMER_KEY CONSUMER_SECRET USERNAME PASSWORD"
+    exit
+end
+
+CONSUMER_KEY = ARGV.shift
+CONSUMER_SECRET = ARGV.shift
+BASE_URL = 'https://api.500px.com'
+USERNAME = ARGV.shift
+PASSWORD = ARGV.shift
+
+
+consumer = OAuth::Consumer.new(CONSUMER_KEY, CONSUMER_SECRET, {
+    :site               => BASE_URL,
+    :request_token_path => "/v1/oauth/request_token",
+    :access_token_path  => "/v1/oauth/access_token",
+    :authorize_path     => "/v1/oauth/authorize"})
+
+request_token = consumer.get_request_token()
+access_token = consumer.get_access_token(request_token, {}, {
+    :x_auth_mode => 'client_auth',
+    :x_auth_username => USERNAME,
+    :x_auth_password => PASSWORD})
+
+photos = []
+1.upto(4) do |page|
+    data = JSON.parse(access_token.get("/v1/photos?rpp=100&feature=editors&image_size=2048&only=Landscapes&page=#{page}").body)
+    photos += data['photos']
+end
+
+dir = File.join(__dir__, '..', 'public', 'images')
+Dir.mkdir(dir) if not File.exists? dir
+
+photos.delete_if do |photo|
+    photo['width'].to_i < 1200
+end
+
+photos.each do |photo|
+    file = File.join(dir, "#{photo['id']}.jpg")
+    if not File.exists? file
+      puts "Download #{file}"
+      system("curl -s '#{photo['image_url']}' -o #{file}")
+      system("jpegtran -optimize -copy none -progressive -outfile #{file} #{file}")
+    end
+end
+
+photos.delete_if do |photo|
+  file = File.join(dir, "#{photo['id']}.jpg")
+  md5 = `md5sum #{file}`.strip.split(' ').first
+  if md5 == '92ec602c88283582b9e322ba7dffccde'
+    # If the file is "Your image is loading..."
+    puts "Skipping #{file}"
+    File.unlink file
+    true
+  else
+    false
+  end
+end
+
+File.open(File.join(__dir__, '..', 'lib', 'images.msh'), 'w') do |fd|
+    fd.puts Marshal.dump(photos)
+end
+
+ids = photos.map do |photo|
+  photo['id'].to_i
+end
+
+Dir[File.join(dir, "*.jpg")].each do |file|
+  id = File.basename(file, '.jpg').to_i
+  if not ids.include? id
+    puts "Remove #{file}"
+    File.unlink(file)
+  end
+end

data/chrome/manifest.json

@@ -0,0 +1,17 @@
+{
+    "manifest_version": 2,
+
+    "name": "Departr",
+    "description": "Departr is a smart and fast startpage to help you reach other web sites..",
+    "version": "1.3",
+
+    "permissions": [ "cookies", "tabs", "http://departr.solt.biz/*" ],
+
+    "chrome_url_overrides": {
+        "newtab": "newtab.html"
+    },
+
+    "icons": {
+        "128": "logo.png"
+    }
+}

data/chrome/newtab.html

@@ -0,0 +1,85 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html>
+<head>
+<title>Departr</title>
+<link href='/favicon.ico' rel='icon' type='image/png' />
+<meta content='text/html; charset=utf-8' http-equiv='content-type' />
+<script src='/newtab.js' type='text/javascript'></script>
+<style>
+* {
+  font-family: "trebuchet MS", verdana, sans-serif;
+}
+
+body {
+  padding: 0px;
+  margin: 0px;
+  height: 100%;
+  overflow: hidden;
+  background-color: rgba(238, 238, 238, 0.8);
+}
+
+html {
+  height: 100%;
+  overflow: hidden;
+}
+
+a, a:hover, a:link, a:visited {
+  color: inherit;
+}
+
+#background {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  color: transparent;
+  background-size: cover;
+  background-position: 50% 50%;
+  background-repeat: none;
+  background-image: url(http://departr.solt.biz/background.jpg);
+  z-index: -1;
+}
+
+#background:after {
+  width: 100%;
+  position: absolute;
+  font-size: 14px;
+  top: 0px;
+  bottom: 2em;
+  left: 0px;
+  content: "";
+  background-image: url("data:image/jpeg;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAABhJREFUeNpiYGBgePz//38GRhABAgABBgBFTAbfCBNE2AAAAABJRU5ErkJggg==");
+}
+
+#credits {
+  background-color: rgba(255, 255, 255, 0.4);
+  color: black;
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+  font-size: 14px;
+  height: 2em;
+  line-height: 2em;
+  position: absolute;
+  left: 0px;
+  bottom: 0px;
+  z-index: 0;
+  width: 100%;
+  text-align: right;
+}
+
+#credits a {
+  text-decoration: none;
+  padding-right: 1em;
+}
+
+</style>
+</head>
+<body>
+<div id='background'></div>
+<div id='credits'>
+    <a id='credits_link' href=""></a>
+</div>
+</body>
+</html>
+

data/chrome/newtab.js

@@ -0,0 +1,19 @@
+window.onload = function() {
+
+  chrome.cookies.get({ url: 'http://departr.solt.biz', name: 'bg_id'},
+    function (cookie) {
+      if (cookie) {
+        var a = document.getElementById('credits_link')
+        a.href = "http://500px.com/photo/" + cookie.value;
+      }
+  });
+
+  chrome.cookies.get({ url: 'http://departr.solt.biz', name: 'bg_user'},
+    function (cookie) {
+      if (cookie) {
+        var a = document.getElementById('credits_link')
+        a.innerText = decodeURIComponent(cookie.value).replace(/\+/g," ");
+      }
+  });
+
+}

data/departr.gemspec

@@ -2,22 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name        = "departr"
-  s.version     = 0.4
-  s.date        = '2012-02-15'
+  s.version     = "0.6"
+  s.date        = '2014-02-20'
   s.platform    = Gem::Platform::RUBY
   s.author      = "Florent Solt"
   s.email       = "florent@solt.biz"
   s.homepage    = "https://github.com/florentsolt/departr"
-  s.summary     = "Departr is a smart and fast startpage to help you reach other web sites."
+  s.summary     = "Departr!"
+  s.description = "Departr is a smart and fast startpage to help you reach other web sites."
+  s.license     = "MIT"
 
   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"]
 
-  s.add_runtime_dependency("json",              ["~> 1.6"])
-  s.add_runtime_dependency("tzinfo",            ["~> 0.3"])
-  s.add_runtime_dependency("haml",              ["~> 3.1"])
-  s.add_runtime_dependency("sass",              ["~> 3.1"])
-  s.add_runtime_dependency("sinatra",           ["~> 1.3"])
+  s.add_runtime_dependency("haml",              ["~> 4.0"])
+  s.add_runtime_dependency("sass",              ["~> 3.2"])
+  s.add_runtime_dependency("sinatra",           ["~> 1.4"])
+  s.add_runtime_dependency("oauth",             ["~> 0.4"])
 end

data/lib/departr/commands.rb

@@ -14,15 +14,7 @@ module Departr
       if File.exists? filename(provider, user)
         File.mtime(filename(provider, user))
       else
-        nil
-      end
-    end
-
-    def etag(provider, user)
-      begin
-        Digest::MD5.hexdigest(time(provider, user).to_s)
-      rescue
-        '-no-command-file-'
+        Time.at(0)
       end
     end
 

data/lib/departr/config.rb

@@ -10,19 +10,13 @@ module Departr
       :open_in_new_page => false,
       :default_search => "http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=",
 
-      :github => true,
-      :calendar => true,
-      :clock1 => "Europe/Paris",
-      :clock2 => "America/New_York",
-      :clock3 => "America/Los_Angeles",
-
       # Default commands
 
       :commands => [
         {'name' => "google search for {words}", 'url' => "http://www.google.com/search?rls=en&q={words}&ie=UTF-8&oe=UTF-8"},
         {'name' => "google search for {words} in {lang}", 'url' => "http://www.google.com/search?rls={lang}&q={words}&ie=UTF-8&oe=UTF-8"},
         {'name' => "wikipedia search for {words}", 'url' => "http://en.wikipedia.org/wiki/{words}"},
-        {'name' => "twitter search for {words}", 'url' => "http://search.twitter.com/search?q={words}"},
+        {'name' => "twitter search for {words}", 'url' => "https://twitter.com/search?q={words}&src=typd"},
         {'name' => "youtube search for {words}", 'url' => "http://www.youtube.com/results?search_query={words}"},
         {'name' => "dailymotion search for {words}", 'url' => "http://www.dailymotion.com/relevance/search/{words}"},
         {'name' => "facebook search for {words}", 'url' => "http://www.facebook.com/search/?q={words}"},

data/lib/departr/server.rb

@@ -11,23 +11,7 @@ module Departr
       super
       Departr::Config.instance_eval(&blk) if block_given?
       @config = Config
-
-      # when called in the constructor, it remains persistant
-      # if not, it's rebuild every time
-      javascripts! if production?
-    end
-
-    def javascripts!
-      return @javascripts if not @javascripts.nil?
-      @javascripts = ''
-      Dir[File.join(settings.root, 'public', 'javascripts', '*.js')].sort.delete_if do |file|
-        not File.basename(file).match(/^\d+_/)
-      end.each do |file|
-        @javascripts << "\n/* #{File.basename(file)} */\n"
-        @javascripts << File.read(file)
-      end
-      @javascripts_checksum = Digest::SHA1.hexdigest(@javascripts)
-      @javascripts = JSMin.minify(@javascripts) if production?
+      @images = Marshal.load(File.read(File.join(__dir__, '..', 'images.msh')))
     end
 
     #-----------------------------------------------------------------------------
@@ -38,12 +22,12 @@ module Departr
 
     set :sass, {
       :cache_store => Sass::CacheStores::Memory.new,
-      :style => production? ? :compressed : :expanded
+      :style => Server.production? && :compressed || :expanded
     }
 
     set :haml, {
       :format => :xhtml,
-      :ugly => production?
+      :ugly => Server.production?
     }
 
     set :reload_templates, true if development?
@@ -74,16 +58,6 @@ module Departr
         end
         check
       end
-
-      def clock_label(tz)
-        return ''.to_json if not tz
-        tz.split('/').last.gsub('_', ' ').to_json
-      end
-
-      def clock_offset(tz)
-        return 0 if not tz
-        TZInfo::Timezone.get(tz).current_period.utc_total_offset / 3600
-      end
     end
 
     #-----------------------------------------------------------------------------
@@ -92,16 +66,29 @@ module Departr
 
     get '/javascripts/all.js' do
       content_type :js
-      javascripts!
-      etag "js-#{@javascripts_checksum}" if production?
-      @javascripts
+
+      if not defined? @@javascripts or not Server.production?
+        @@javascripts = ''
+        @@javascripts_time = Time.at(0)
+        Dir[File.join(settings.root, 'public', 'javascripts', '*.js')].sort.delete_if do |file|
+          not File.basename(file).match(/^\d+_/)
+        end.each do |file|
+          @@javascripts << "\n/* #{File.basename(file)} */\n"
+          @@javascripts << File.read(file)
+          @@javascripts_time = File.mtime(file) if File.mtime(file) > @@javascripts_time
+        end
+        @@javascripts = JSMin.minify(@@javascripts) if Server.production?
+      end
+
+      last_modified @@javascripts_time
+      @@javascripts
     end
 
     get '/stylesheets/all.css' do
       content_type :css
-      if production?
+      if Server.production?
         time = File.mtime(File.join(settings.root, 'views', 'style.sass'))
-        etag "css-#{time.to_i}"
+        last_modified time
       end
       sass :style
     end
@@ -169,7 +156,7 @@ module Departr
     get '/command/all' do
       auth!
       content_type :json
-      etag "command-" + Command.etag(@provider, @user) if production?
+      etag "command-" + Command.etag(@provider, @user) if Server.production?
       Command.get(@provider, @user).to_json
     end
 
@@ -181,18 +168,37 @@ module Departr
       haml :help
     end
 
-    get '/' do
+    get '/background.jpg' do
+      background = @images.sample
+      response.set_cookie("bg_user", :value => background['user']['fullname'], :path => '/', :expires => Time.now + 60*60*24*365)
+      response.set_cookie("bg_id", :value => background['id'], :path => '/', :expires => Time.now + 60*60*24*365)
+      headers 'Cache-Control' => "no-cache, no-store, must-revalidate",
+        'Pragma' => 'no-cache',
+        'Expires' => '0'
+      redirect "/images/#{background['id']}.jpg"
+    end
+
+    get '/javascripts/context.js' do
+      content_type :js
       if auth?
-        etag "index-#{Command.etag(@provider, @user)}-#{Settings.etag(@provider, @user)}" if production?
-        @commands = Command.get(@provider, @user)
-        @settings = Settings.get(@provider, @user)
+        last_modified [Command.time(@provider, @user), Settings.time(@provider, @user)].max if Server.production?
+        commands = Command.get(@provider, @user)
+        settings = Settings.get(@provider, @user)
       else
-        etag "default-#{Digest::SHA1.hexdigest(Command.default.inspect)}" if production?
         response.delete_cookie("user")
         response.delete_cookie("session")
-        @commands = Command.default
-        @settings = Settings.default
+        commands = Command.default
+        settings = Settings.default
       end
+      "Command.data = #{commands.to_json};\n" +
+      "Settings = #{settings.to_json};"
+    end
+
+    get '/' do
+      dir = File.join(__dir__, '..', '..', 'views')
+      index = File.mtime(File.join(dir, 'index.haml')).to_i
+      layout = File.mtime(File.join(dir, 'layout.haml')).to_i
+      etag "#{layout}-#{index}" if Server.production?
       haml :index
     end
   end