Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: pirkka/lolnas
...
head fork: pirkka/lolnas
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 13 files changed
  • 0 commit comments
  • 1 contributor
View
2  Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.2'
+gem 'rails', '3.2.3'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
View
62 Gemfile.lock
@@ -1,17 +1,17 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.2)
- actionpack (= 3.2.2)
- mail (~> 2.4.0)
- actionpack (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ actionmailer (3.2.3)
+ actionpack (= 3.2.3)
+ mail (~> 2.4.4)
+ actionpack (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
activeadmin (0.4.0)
@@ -25,18 +25,18 @@ GEM
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)
- activemodel (3.2.2)
- activesupport (= 3.2.2)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
- activerecord (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ activerecord (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- activesupport (3.2.2)
+ activeresource (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
acts_as_api (0.3.11)
@@ -101,14 +101,14 @@ GEM
jquery-rails (2.0.0)
railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
- json (1.6.5)
+ json (1.6.6)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
launchy (2.0.5)
addressable (~> 2.2.6)
- mail (2.4.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -118,7 +118,7 @@ GEM
activesupport (~> 3.1)
meta_search
polyamorous (~> 0.5.0)
- mime-types (1.17.2)
+ mime-types (1.18)
multi_json (1.0.4)
nokogiri (1.5.0)
orm_adapter (0.0.6)
@@ -133,17 +133,17 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.2)
- actionmailer (= 3.2.2)
- actionpack (= 3.2.2)
- activerecord (= 3.2.2)
- activeresource (= 3.2.2)
- activesupport (= 3.2.2)
+ rails (3.2.3)
+ actionmailer (= 3.2.3)
+ actionpack (= 3.2.3)
+ activerecord (= 3.2.3)
+ activeresource (= 3.2.3)
+ activesupport (= 3.2.3)
bundler (~> 1.0)
- railties (= 3.2.2)
- railties (3.2.2)
- actionpack (= 3.2.2)
- activesupport (= 3.2.2)
+ railties (= 3.2.3)
+ railties (3.2.3)
+ actionpack (= 3.2.3)
+ activesupport (= 3.2.3)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -192,7 +192,7 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.32)
+ tzinfo (0.3.33)
uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -218,7 +218,7 @@ DEPENDENCIES
jquery-rails
json
pg
- rails (= 3.2.2)
+ rails (= 3.2.3)
rspec
rspec-rails
ruby_parser
View
2  app/admin/api_users.rb
@@ -1,5 +1,5 @@
ActiveAdmin.register Api::User do
- controller.authorize_resource(:class => "Api::User")
+ controller.authorize_resource :class => "Api::User"
menu :label => "Api users"
end
View
4 app/assets/javascripts/welcome.js.coffee
@@ -1,4 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
-
View
3  app/assets/stylesheets/welcome.css.scss
@@ -1,3 +0,0 @@
-// Place all the styles related to the welcome controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
View
6 app/controllers/welcome_controller.rb
@@ -1,6 +0,0 @@
-class WelcomeController < ApplicationController
-
- def index
- end
-
-end
View
2  app/helpers/welcome_helper.rb
@@ -1,2 +0,0 @@
-module WelcomeHelper
-end
View
4 app/models/api/user.rb
@@ -16,6 +16,10 @@ class Api::User < ActiveRecord::Base
has_many :restaurants, :foreign_key => "api_user_id"
+ def to_s
+ email
+ end
+
protected
def password_required?
View
2  app/models/restaurant.rb
@@ -32,7 +32,7 @@ class Restaurant < ActiveRecord::Base
belongs_to :api_user, :class_name => "Api::User"
- attr_accessible :name, :url, :latitude, :longitude, :distance, :data_provider_title, :data_provider_url
+ attr_accessible :name, :url, :latitude, :longitude, :distance, :data_provider_title, :data_provider_url, :api_user_id
def valid_lunches
lunches.valid_only
View
13 app/views/layouts/application.html.haml
@@ -8,9 +8,9 @@
= javascript_include_tag 'http://maps.googleapis.com/maps/api/js?sensor=false'
= csrf_meta_tags
= stylesheet_link_tag 'http://fonts.googleapis.com/css?family=Mate:400,400italic'
- %meta{'name' => 'viewport', 'content' => 'width = 640'}
- %meta{'name' => 'apple-mobile-web-app-capable', 'content' => 'yes'}
- %meta{'name' => 'apple-mobile-web-app-status-bar-style', 'content' => 'black'}
+ %meta{'name' => 'viewport', 'content' => 'width = 640'}
+ %meta{'name' => 'apple-mobile-web-app-capable', 'content' => 'yes'}
+ %meta{'name' => 'apple-mobile-web-app-status-bar-style', 'content' => 'black'}
%link{'rel' => 'apple-touch-startup-image', 'href' => '/startup.png'}
%body
@@ -25,6 +25,13 @@
= yield
+ %footer
+ #navigation
+ #{link_to "API-rajapinta", "/api"}
+ |
+ =link_to "palaute@lolnas.fi", "mailto:palaute@lolnas.fi"
+
+
-if Rails.env.production?
:javascript
View
24 app/views/welcome/index.html.haml
@@ -1,24 +0,0 @@
-Tervetuloa lounastiedon rajapintaan.
-
-%h2
- Nälkäisille
-
-%p
- #{link_to "Lounaslista", "/lista"} päivittyy joka päivä näyttämään kuluvan
- päivän lounaat. Lähimmät lounaat näkyvät listassa ensimmäisinä.
-
-%h2
- Sovelluskehittäjille
-
-%p
- #{link_to "API", "/api"} mahdollistaa lounastiedon tallentamisen ja lukemisen.
- Voit vaikkapa kirjoittaa parserin suosikkiravintolallesi tai käyttää
- lounastietoa omassa sovelluksessasi.
-
-%h2
- Yhteydenottajille
-
-%p
- Kehitysideoita? Toiveita? Suosikkiravintolasi puuttuu listalta?
- Lolnas-palauteposti on käytössäsi vuorokauden jokaisena tuntina.
- =link_to "palaute@lolnas.fi", "mailto:palaute@lolnas.fi"
View
2  config/routes.rb
@@ -16,5 +16,5 @@
match '/lista' => 'restaurants#index'
- root :to => 'welcome#index'
+ root :to => 'restaurants#index'
end
View
14 spec/controllers/welcome_controller_spec.rb
@@ -1,14 +0,0 @@
-require 'spec_helper'
-
-describe WelcomeController do
- render_views
-
- describe "GET index" do
- it "shows logo" do
- get "index"
-
- response.body.should include("lolnas.svg")
- end
- end
-
-end

No commit comments for this range

Something went wrong with that request. Please try again.