bterkuile/cmtool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debourbonify cmtool

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-04-29 13:17:04 +02:00
parent 9c7645cc58
commit b67280eb31
5 changed files with 84 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+65 -92
View File
@@ -15,7 +15,7 @@ GIT
GIT
remote: git://github.com/bterkuile/simply_stored.git
revision: b62ce6c7a0e453230fe807075926c637ceefedc8
revision: 7e29edef26f6e598c0804ba28929e2fad7045931
specs:
simply_stored (1.0.0)
activesupport
@@ -27,55 +27,41 @@ PATH
specs:
cmtool (0.5.0)
bourbon
coffee-script
devise
devise_simply_stored
email_validator
haml-rails
jquery-rails
paperclip
rails (>= 3.2.2)
sass-rails
slim-rails
tinymce-rails
GEM
remote: http://rubygems.org/
specs:
actionmailer (4.0.2)
actionpack (= 4.0.2)
mail (~> 2.5.4)
actionpack (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
erubis (~> 2.7.0)
actionpack (4.1.0)
actionview (= 4.1.0)
activesupport (= 4.1.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
activerecord (4.0.2)
activemodel (= 4.0.2)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.2)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.2)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
actionview (4.1.0)
activesupport (= 4.1.0)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.0)
activesupport (= 4.1.0)
builder (~> 3.1)
activesupport (4.1.0)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.1)
atomic (1.1.14)
bcrypt-ruby (3.1.2)
bootstrap-sass (3.0.3.0)
tzinfo (~> 1.1)
bcrypt (3.1.7)
bootstrap-sass (3.1.1.1)
sass (~> 3.2)
bourbon (3.2.0)
sass (~> 3.2)
bourbon (3.1.8)
sass (>= 3.2.0)
thor
builder (3.1.4)
capybara (2.2.0)
builder (3.2.2)
capybara (2.2.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@ -83,19 +69,19 @@ GEM
xpath (~> 2.0)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.3)
cocaine (0.5.4)
climate_control (>= 0.0.3, < 1.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.3)
coffee-script-source (1.7.0)
couchrest (1.2.0)
mime-types (~> 1.15)
multi_json (~> 1.0)
rest-client (~> 1.6.1)
daemons (1.1.9)
devise (3.2.2)
bcrypt-ruby (~> 3.0)
devise (3.2.4)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
thread_safe (~> 0.1)
@@ -108,88 +94,78 @@ GEM
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.2)
factory_girl (4.3.0)
factory_girl (4.4.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.3.0)
factory_girl (~> 4.3.0)
factory_girl_rails (4.4.1)
factory_girl (~> 4.4.0)
railties (>= 3.0.0)
haml (4.0.4)
haml (4.0.5)
tilt
haml-rails (0.5.2)
actionpack (~> 4.0.1)
activesupport (~> 4.0.1)
haml-rails (0.5.3)
actionpack (>= 4.0.1)
activesupport (>= 4.0.1)
haml (>= 3.1, < 5.0)
railties (~> 4.0.1)
railties (>= 4.0.1)
hike (1.2.3)
i18n (0.6.9)
jquery-rails (3.0.4)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
mini_portile (0.5.2)
minitest (4.7.5)
multi_json (1.8.2)
mini_portile (0.5.3)
minitest (5.3.3)
multi_json (1.9.2)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
paperclip (3.5.2)
paperclip (4.1.1)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.5.3)
mime-types
polyglot (0.3.3)
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.2)
actionmailer (= 4.0.2)
actionpack (= 4.0.2)
activerecord (= 4.0.2)
activesupport (= 4.0.2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.2)
sprockets-rails (~> 2.0.0)
railties (4.0.2)
actionpack (= 4.0.2)
activesupport (= 4.0.2)
railties (4.1.0)
actionpack (= 4.1.0)
activesupport (= 4.1.0)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
rake (10.3.1)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec-core (2.14.7)
rspec-expectations (2.14.4)
rspec-core (2.14.8)
rspec-expectations (2.14.5)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.4)
rspec-rails (2.14.0)
rspec-mocks (2.14.6)
rspec-rails (2.14.2)
actionpack (>= 3.0)
activemodel (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
sass (3.2.12)
sass-rails (4.0.1)
sass (3.2.19)
sass-rails (4.0.3)
railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sprockets-rails (~> 2.0)
slim (2.0.2)
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slim-rails (2.0.4)
actionpack (>= 3.0, < 4.1)
activesupport (>= 3.0, < 4.1)
railties (>= 3.0, < 4.1)
slim-rails (2.1.4)
actionpack (>= 3.0, < 4.2)
activesupport (>= 3.0, < 4.2)
railties (>= 3.0, < 4.2)
slim (~> 2.0)
sprockets (2.10.1)
sprockets (2.11.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.1)
sprockets-rails (2.1.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
@@ -197,20 +173,17 @@ GEM
capybara (>= 1.0.0)
rspec-rails (>= 2.5.0)
temple (0.6.7)
thin (1.6.1)
thin (1.6.2)
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
rack (>= 1.0.0)
thor (0.18.1)
thread_safe (0.1.3)
atomic
thor (0.19.1)
thread_safe (0.3.3)
tilt (1.4.1)
tinymce-rails (4.0.11)
tinymce-rails (4.0.19)
railties (>= 3.1.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.38)
tzinfo (1.1.0)
thread_safe (~> 0.1)
warden (1.2.3)
rack (>= 1.0)
xpath (2.0.0)
app/assets/stylesheets/cmtool/structure.css.sass
+8 -6
View File
@@ -4,7 +4,7 @@ html, body
background-color: #eee
font-family: $lucida-grande
.button
@include button(shiny, #777)
+button(#777)
a
color: #333
font-weight: bold
@@ -39,17 +39,19 @@ a
float: left
margin-right: 10px
#title-container
+linear-gradient(#aaa, #fff)
margin-top: 12px
@include linear-gradient(#aaa, #fff)
padding: 10px
+border-top-radius(15px)
+box-shadow(5px 5px 5px #555)
border-top-left-radius: 15px
border-top-right-radius: 15px
box-shadow: 5px 5px 5px #555
h1
margin: 0
padding: 0
#content-container
background-color: white
+border-bottom-radius(15px)
+box-shadow(5px 5px 5px #555)
border-bottom-left-radius: 15px
border-bottom-right-radius: 15px
box-shadow: 5px 5px 5px #555
#content
padding: 10px
cmtool.gemspec
+6 -6
View File
@@ -16,18 +16,18 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
s.test_files = Dir["spec/**/*"]
s.add_dependency "rails", ">= 3.2.2"
#s.add_dependency "rails", ">= 4.1.0"
s.add_dependency 'email_validator'
s.add_dependency 'bourbon'
s.add_dependency 'haml-rails'
s.add_dependency 'slim-rails'
s.add_dependency 'sass-rails'
#s.add_dependency 'sass-rails'
s.add_dependency 'tinymce-rails'
s.add_dependency 'paperclip'
s.add_dependency 'coffee-script'
#s.add_dependency 'paperclip'
#s.add_dependency 'coffee-script'
s.add_dependency "jquery-rails"
s.add_dependency 'devise'
s.add_dependency 'devise_simply_stored'
#s.add_dependency 'devise'
#s.add_dependency 'devise_simply_stored'
#s.add_development_dependency "sqlite3"
end
lib/cmtool/includes/user.rb
+2 -2
View File
@@ -3,7 +3,7 @@ module Cmtool
module User
def self.included(klass)
klass.send :include, SimplyStored::Couch
klass.send :include, Devise::Orm::SimplyStored
#klass.send :include, Devise::Orm::SimplyStored
klass.send :include, InstanceMethods
klass.send :extend, ClassMethods
@@ -19,9 +19,9 @@ module Cmtool
klass.validates_presence_of :encrypted_password, if: lambda{ |u| u.email.present? }
klass.validates_confirmation_of :password, if: lambda{ |u| u.password.present? }
klass.view :by_email, key: :email
end
module InstanceMethods
def google?
false
spec/dummy/config/application.rb
+3 -1
View File
@@ -1,8 +1,10 @@
require File.expand_path('../boot', __FILE__)
require 'rails'
require "action_controller/railtie"
require "action_mailer/railtie"
require "active_resource/railtie"
#require "active_resource/railtie"
require 'rails/test_unit/railtie'
require "sprockets/railtie"
if defined?(Bundler)