iqvoc 3.3.2 → 3.3.3

data/CHANGELOG.md

@@ -1,7 +1,15 @@
+## 3.3.3 (2012-01-13)
+
+ * Several asset pipeline related fixes
+ * Largely simplified heroku setup
+ * Improvements to engine mode
+ 
+Detailed commit log: https://github.com/innoq/iqvoc/compare/v3.3.0...v3.3.3
+
 ## 3.3.0 (2012-01-10)
 
  * Rails 3.1
- * Asset pipeline
+ * Asset pipeline<br>
    [Detailed instructions](https://github.com/innoq/iqvoc/wiki/iQvoc-as-a-Rails-Engine)
    on how to use iQvoc as a Rails Engine (including the asset pipeline).
    

data/Gemfile

@@ -37,6 +37,7 @@ group :development do
   gem 'capistrano'
   gem 'capistrano-ext'
   gem 'rvm' # RVM API (for capistrano deployments)
+  gem 'heroku'
 end
 
 group :development, :test do
@@ -61,7 +62,7 @@ group :test do
   gem 'turn'
 end
 
-group :production, :production_internal do
+group :production do
   platforms :ruby do
     gem 'sqlite3'
   end
@@ -70,3 +71,7 @@ group :production, :production_internal do
     gem 'activerecord-oracle_enhanced-adapter'
   end
 end
+
+group :heroku do
+  gem 'pg'
+end

data/Gemfile.lock

@@ -29,6 +29,7 @@ GEM
       activesupport (= 3.1.3)
     activesupport (3.1.3)
       multi_json (~> 1.0)
+    addressable (2.2.6)
     ansi (1.4.1)
     arel (2.2.1)
     authlogic (3.1.0)
@@ -54,7 +55,7 @@ GEM
       xpath (~> 0.1.4)
     capybara-webkit (0.7.2)
       capybara (>= 1.0.0, < 1.2)
-    childprocess (0.2.8)
+    childprocess (0.2.9)
       ffi (~> 1.0.6)
     database_cleaner (0.7.0)
     erubis (2.7.0)
@@ -66,6 +67,11 @@ GEM
       factory_girl (~> 2.3.0)
       railties (>= 3.0.0)
     ffi (1.0.11)
+    heroku (2.18.1)
+      launchy (>= 0.3.2)
+      rest-client (~> 1.6.1)
+      rubyzip
+      term-ansicolor (~> 1.0.5)
     highline (1.6.9)
     hike (1.2.1)
     i18n (0.6.0)
@@ -77,6 +83,8 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -89,10 +97,11 @@ GEM
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.2.2)
+    net-ssh (2.3.0)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     nokogiri (1.5.0)
+    pg (0.12.2)
     polyglot (0.3.3)
     rack (1.3.6)
     rack-cache (1.1)
@@ -123,6 +132,8 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
     rubyzip (0.9.5)
     rvm (1.9.2)
     selenium-webdriver (2.16.0)
@@ -135,6 +146,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
+    term-ansicolor (1.0.7)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -165,12 +177,14 @@ DEPENDENCIES
   capybara-webkit
   database_cleaner
   factory_girl_rails
+  heroku
   iq_rdf (~> 0.1.0)
   json
   kaminari
   memory_test_fix
   mysql2
   nokogiri (~> 1.5.0)
+  pg
   rails (= 3.1.3)
   rails_autolink
   rvm

data/README.md

@@ -20,16 +20,39 @@ iQvoc provides comprehensive functionality for all aspects of managing such voca
 
 iQvoc is built with state-of-the-art technology and can be easily customized according to user's needs.
 
-## Getting Started
+## Setup
+
+### Heroku
+
+You can easily setup your iQvoc instance in under 5 minutes, we wanted to make this process really easy.
+
+To run iQvoc on heroku do the following:
+
+```
+bundle install
+heroku create
+bundle exec rake heroku:config
+git push heroku master
+heroku rake db:migrate
+heroku rake db:seed
+```
+
+`heroku open` opens your app in the browser.
+
+Remember to visit the Users section and change the default passwords!
+
+**Remarks:** 
+For now iQvoc only supports the standard Bamboo stack. Cedar is not supported as we have `sqlite3` as a dependency
+in the Gemfile and Cedar does not support a custom `BUNDLE_WITHOUT` config like Bamboo at the moment.
+
+### Custom
 
 1. Configure your database via `config/database.template.yml`. Don't forget to rename it to `database.yml`
 2. Run `bundle install`
 3. Run `bundle exec rake db:create` to create the database
 4. Create the necessary tables by running `rake db:migrate`
 5. Load some base data by running `rake db:seed`
-6. Create `config/initializers/secret_token.rb` based on
-   `config/initializers/secret_token.rb.template`, filling in the secret token
-   generated by `bundle exec rake secret`
+6. Run `bundle exec rake setup:generate_secret_token`
 7. Boot up the app using `bundle exec rails s` (or `passenger start` if you use passenger)
 8. Log in with "admin@iqvoc" / "admin" or "demo@iqvoc" / "cooluri" (cf. step #5)
 9. Visit the Users section and change the default passwords

data/config/application.rb

@@ -20,7 +20,7 @@ require 'rails/all'
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
+  Bundler.require(:heroku, *Rails.groups(:assets => %w(development test)))
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end

data/config/environments/heroku.rb

@@ -0,0 +1,52 @@
+# encoding: UTF-8
+
+# Copyright 2011 innoQ Deutschland GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if Iqvoc.const_defined?(:Application)
+  Iqvoc::Application.configure do
+    # Settings specified here will take precedence over those in config/environment.rb
+
+    # The production environment is meant for finished, "live" apps.
+    # Code is not reloaded between requests
+    config.cache_classes = true
+
+    # Full error reports are disabled and caching is turned on
+    config.consider_all_requests_local       = false
+    config.action_controller.perform_caching = true
+
+    # Specifies the header that your server uses for sending files
+    # config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+    # Disable Rails's static asset server
+    # In production, Apache or nginx will already do this
+    config.serve_static_assets = true
+  
+    # Compress JavaScripts and CSS
+    config.assets.compress = false
+
+    # Don't fallback to assets pipeline if a precompiled asset is missed
+    config.assets.compile = true
+
+    # Generate digests for assets URLs
+    config.assets.digest = false
+
+    # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+    # the I18n.default_locale when a translation can not be found)
+    config.i18n.fallbacks = true
+
+    # Send deprecation notices to registered listeners
+    config.active_support.deprecation = :notify
+  end
+end

data/config/initializers/secret_token.rb

@@ -25,6 +25,6 @@ if Iqvoc.const_defined?(:Application)
 
   # Run `rake secret` and uncomment the following line
   # Replace the secret-placeholder with your generated token
-  Iqvoc::Application.config.secret_token = 'b8d90f50515345071ea3a8fced203bfac91c734afda36bbe4a51a630cc11f1d7b99d6d6da19d6bc0aa2c636d46da87159cd53661ed6d98bbc5af30d72410e1a6'
+  Iqvoc::Application.config.secret_token = '175128c5b4a40cfd8b1db1ab15606e20a2263346eca7a1f89b5e06bea6f1d822ac794262642605b53c8c632062826799726e348f383d6b88c19eb93a60c75948'
 
 end

data/{lib/tasks/jdbc.rake → config/initializers/secret_token_configurator.rb}

@@ -14,11 +14,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file was generated by the "jdbc" generator, which is provided
-# by the activerecord-jdbc-adapter gem.
-#
-# This file allows you to use Rails' various db:* tasks with JDBC.
-# if defined?(JRUBY_VERSION)
-#   require 'jdbc_adapter'
-#   require 'jdbc_adapter/rake_tasks'
-# end
+# Be sure to restart your server when you modify this file.
+
+if Iqvoc.const_defined?(:Application)
+  
+  if ENV['HEROKU']
+    puts 'heroku app detected; using session secret from config vars...'
+    Rails.application.config.secret_token = ENV['SECRET_TOKEN']
+  elsif !File.exists?(Rails.root.join('config', 'initializers', 'secret_token.rb'))
+    system "bundle exec rake setup:generate_secret_token"
+    require Rails.root.join('config', 'initializers', 'secret_token.rb')
+  end
+  
+end

data/lib/engine_tasks/db.rake

@@ -4,7 +4,7 @@ namespace :iqvoc do
     desc "Migrate the database through scripts in db/migrate and update db/schema.rb by invoking db:schema:dump. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
     task :migrate => :environment do
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      ActiveRecord::Migrator.migrate(Iqvoc::Engine.find_root_with_flag("db").join('db/migrate'), ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+      ActiveRecord::Migrator.migrate(Iqvoc::Engine.find_root_with_flag("db").join("db/migrate"), ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
       Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
     end
 
@@ -13,9 +13,9 @@ namespace :iqvoc do
     task :migrate_all => :environment do
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
       paths = Rails.application.config.paths["db/migrate"].existent +
-        Rails.application.railties.engines.
-        map { |e| e.config.paths["db/migrate"] && e.config.paths["db/migrate"].existent }.
-        flatten.compact
+          Rails.application.railties.engines.
+              map { |e| e.config.paths["db/migrate"] && e.config.paths["db/migrate"].existent }.
+              flatten.compact
 
       puts "Migrating from: " + paths.join(", ")
       ActiveRecord::Migrator.migrate(paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
@@ -35,7 +35,7 @@ namespace :iqvoc do
       }
 
       engines.select{|e| e.engine_name !~ /^iqvoc_/}.each do |engine|
-        puts "There is a non iqvoc engine (#{engine.engine_name}) having seeds. This seeds areare not necessary idemprotent."
+        puts "There is a non-iQvoc engine (#{engine.engine_name}) having seeds. These seeds are not necessarily idemprotent."
         puts "Do you with to (c)ontinue, (i)gnore it or (a)bort?"
         input = nil
         while input !~ /^[cia]$/

data/lib/iqvoc/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "3.3.2"
+  VERSION = "3.3.3"
 end

data/lib/tasks/heroku.rake

@@ -0,0 +1,14 @@
+namespace :heroku do
+  task :config do
+    require 'securerandom'
+    
+    HEROKU_CONFIG = %W(
+      HEROKU=true
+      RACK_ENV=heroku
+      RAILS_ENV=heroku
+      SECRET_TOKEN=#{SecureRandom.hex(64)}
+    )
+    
+    system "heroku config:add #{HEROKU_CONFIG.join(' ')}"
+  end
+end

data/lib/tasks/setup.rake

@@ -0,0 +1,20 @@
+namespace :setup do
+  task :generate_secret_token do
+    require 'securerandom'
+    
+    template = Rails.root.join("config", "initializers", "secret_token.rb.template")
+    raise "File not found: #{template}" unless File.exist?(template)
+
+    file_name = "config/initializers/secret_token.rb"
+
+    token = SecureRandom.hex(64)
+    txt = File.read(template)
+    txt.gsub!("S-E-C-R-E-T", token)
+
+    File.open(file_name, "w") do |f|
+      f.write txt
+    end
+    
+    puts "Secret token configuration has been created in #{file_name}."
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000 Z
+date: 2012-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70277083650720 !ruby/object:Gem::Requirement
+  requirement: &70173094141340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70277083650720
+  version_requirements: *70173094141340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70277083650320 !ruby/object:Gem::Requirement
+  requirement: &70173094140940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277083650320
+  version_requirements: *70173094140940
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70277083649860 !ruby/object:Gem::Requirement
+  requirement: &70173094140480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277083649860
+  version_requirements: *70173094140480
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70277083649440 !ruby/object:Gem::Requirement
+  requirement: &70173094140060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277083649440
+  version_requirements: *70173094140060
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70277083649020 !ruby/object:Gem::Requirement
+  requirement: &70173094139640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277083649020
+  version_requirements: *70173094139640
 - !ruby/object:Gem::Dependency
   name: iq_rdf
-  requirement: &70277094723180 !ruby/object:Gem::Requirement
+  requirement: &70173094139140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70277094723180
+  version_requirements: *70173094139140
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70277083680180 !ruby/object:Gem::Requirement
+  requirement: &70173094138720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277083680180
+  version_requirements: *70173094138720
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &70277083679720 !ruby/object:Gem::Requirement
+  requirement: &70173094138260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70277083679720
+  version_requirements: *70173094138260
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
@@ -303,6 +303,7 @@ files:
 - config/engine.rb
 - config/environment.rb
 - config/environments/development.rb
+- config/environments/heroku.rb
 - config/environments/production.rb
 - config/environments/test.rb
 - config/initializers/action_view.rb
@@ -316,6 +317,7 @@ files:
 - config/initializers/mime_types.rb
 - config/initializers/secret_token.rb
 - config/initializers/secret_token.rb.template
+- config/initializers/secret_token_configurator.rb
 - config/initializers/session_store.rb
 - config/locales/activerecord.de.yml
 - config/locales/activerecord.en.yml
@@ -542,8 +544,9 @@ files:
 - lib/maker.rb
 - lib/ojdbc14.jar
 - lib/string.rb
+- lib/tasks/heroku.rake
 - lib/tasks/importer.rake
-- lib/tasks/jdbc.rake
+- lib/tasks/setup.rake
 - test/factories.rb
 - test/integration/alphabetical_test.rb
 - test/integration/authentication_test.rb