Revert "merge bofo"

This reverts commit d56ff46.

.gitignore

@@ -1,26 +1,26 @@
-.idea/
-.jhw-cache
-.rvmrc
-.bundle
-.tm_properties
-Gemfile.lock
-config/*.yml
-coverage
-/files
-log/*
-pkg
-/public/test
-/public/files
-/public/assets/.htaccess
-/public/javascripts/inline-console.js
-local*
-/script/local
-/script/performance/*.session
-tmp/*
-wagn*gem
-card*gem
-decko*gem
-*.project
-*.sqlite3
-*.DS_Store
-*.swp
+.idea/
+.jhw-cache
+.rvmrc
+.bundle
+.tm_properties
+Gemfile.lock
+config/*.yml
+coverage
+/files
+log/*
+pkg
+/public/test
+/public/files
+/public/assets/.htaccess
+/public/javascripts/inline-console.js
+local*
+/script/local
+/script/performance/*.session
+tmp/*
+wagn*gem
+card*gem
+decko*gem
+*.project
+*.sqlite3
+*.DS_Store
+*.swp

JASMINE_RAILS_TEST.md

@@ -1,16 +1,16 @@
-### Jasmine Rails Configuration file
-  There is only 1 main configuration file called `jasmine.yml` located in `spec/javascripts/support/jasmine.yml`. The yml can only be read with modified `jasmine-rails` [gem](https://github.com/chuenlok/jasmine-rails) as we need to parse it as ERB before loading as a normal yml. Wagn path cannot be hard coded to configuration file so we need `Jasmine-Rails` to parse `Wagn.gem_root` when reading the yml file.
-
-#### Explaination 
-  Most of the things are same with default settings. However, the `src_dir` and `css_dir` are not working as they are pointed to `app/assets` folder which is the default path of the asset pipeline. The important setting is `include_dir`. This will inlcude things outside app folder into the asset pipeline. That means, things inside Wagn gem and folder `mod` can be included in this way.
-  For core testing, the default settings now will include the js and coffee inside `mod/03_machines/lib/javascript`. For mod development, the default settings now will include the js and coffee inside `mod`.
-
-
-#### How to run
-1. just like the way to create a deck to test core or mod-dev
-2. configure the `spec/javascripts/support/jasmine.yml` if neccessary
-3. `bundle exec wagn jm`
-
-
-
-
+### Jasmine Rails Configuration file
+  There is only 1 main configuration file called `jasmine.yml` located in `spec/javascripts/support/jasmine.yml`. The yml can only be read with modified `jasmine-rails` [gem](https://github.com/chuenlok/jasmine-rails) as we need to parse it as ERB before loading as a normal yml. Wagn path cannot be hard coded to configuration file so we need `Jasmine-Rails` to parse `Wagn.gem_root` when reading the yml file.
+
+#### Explaination 
+  Most of the things are same with default settings. However, the `src_dir` and `css_dir` are not working as they are pointed to `app/assets` folder which is the default path of the asset pipeline. The important setting is `include_dir`. This will inlcude things outside app folder into the asset pipeline. That means, things inside Wagn gem and folder `mod` can be included in this way.
+  For core testing, the default settings now will include the js and coffee inside `mod/03_machines/lib/javascript`. For mod development, the default settings now will include the js and coffee inside `mod`.
+
+
+#### How to run
+1. just like the way to create a deck to test core or mod-dev
+2. configure the `spec/javascripts/support/jasmine.yml` if neccessary
+3. `bundle exec wagn jm`
+
+
+
+

bootstrap_traditional.rb

@@ -1,3 +1,3 @@
-format do 
-  include BootstrapClassicCards::Format
+format do 
+  include BootstrapClassicCards::Format
 end

card/.rspec

@@ -1,4 +1,4 @@
---color
---profile
---backtrace
---require spec_helper
+--color
+--profile
+--backtrace
+--require spec_helper

card/LICENSE

@@ -1,16 +1,16 @@
-Card
-Copyright (C) 2013 Grass Commons
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+Card
+Copyright (C) 2013 Grass Commons
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

card/VERSION

@@ -1 +1 @@
-1.15.pre
+1.15.pre

card/card.gemspec

@@ -1,51 +1,51 @@
-
-#require File.expand_path( '../lib/card/version', __FILE__ )
-#version =    Card::Version.release
-version = File.open(File.expand_path( '../VERSION', __FILE__ )).read.chomp
-
-Gem::Specification.new do |s|
-  s.name          = 'card'
-  s.version       = version
-  s.authors       = ["Ethan McCutchen", "Lewis Hoffman", "Gerry Gleason"]
-  s.email         = ['info@wagn.org']
-
-#  s.date          = '2013-12-20'
-  s.summary       = "an atomic, set-driven content engine"
-  s.description   = "Cards are data atoms that are grouped into Sets to which Rules can apply. Cards can formatted with Views and transformed with Events."
-  s.homepage      = 'http://wagn.org'
-  s.license       = 'GPL'
-
-  s.files         = `git ls-files`.split($/)
-
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-
-  s.required_ruby_version = '>= 1.8.7'
-
-  [
-
-    [ 'smartname',    '0.2.3'   ],
-
-    [ 'uuid',         '~> 2.3'  ],
-    [ 'paperclip',    '~> 2.8'  ],
-    [ 'htmlentities', '~> 4.3'  ],
-    [ 'rmagick',      '~> 2.13' ],
-    [ 'recaptcha',    '~> 0.3'  ],                                  
-    [ 'coderay',      '~> 1.0'  ],
-    [ 'sass',         '~> 3.2'  ],
-    [ 'coffee-script','~> 2.2'  ],
-    [ 'uglifier',     '~> 2.5'  ],
-
-    [ 'haml',         '~> 4.0'  ],
-    [ 'kaminari',     '~> 0.16' ],
-    [ 'diffy',        '~> 3.0'  ],
-    [ 'diff-lcs',     '~> 1.2'  ],
-    # should not depend!
-    [ 'airbrake',     '~> 4.1'  ] 
-
-
-  ].each do |dep|
-    s.add_runtime_dependency *dep
-  end
-
-end
+
+#require File.expand_path( '../lib/card/version', __FILE__ )
+#version =    Card::Version.release
+version = File.open(File.expand_path( '../VERSION', __FILE__ )).read.chomp
+
+Gem::Specification.new do |s|
+  s.name          = 'card'
+  s.version       = version
+  s.authors       = ["Ethan McCutchen", "Lewis Hoffman", "Gerry Gleason"]
+  s.email         = ['info@wagn.org']
+
+#  s.date          = '2013-12-20'
+  s.summary       = "an atomic, set-driven content engine"
+  s.description   = "Cards are data atoms that are grouped into Sets to which Rules can apply. Cards can formatted with Views and transformed with Events."
+  s.homepage      = 'http://wagn.org'
+  s.license       = 'GPL'
+
+  s.files         = `git ls-files`.split($/)
+
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
+
+  s.required_ruby_version = '>= 1.8.7'
+
+  [
+
+    [ 'smartname',    '0.2.3'   ],
+
+    [ 'uuid',         '~> 2.3'  ],
+    [ 'paperclip',    '~> 2.8'  ],
+    [ 'htmlentities', '~> 4.3'  ],
+    [ 'rmagick',      '~> 2.13' ],
+    [ 'recaptcha',    '~> 0.3'  ],                                  
+    [ 'coderay',      '~> 1.0'  ],
+    [ 'sass',         '~> 3.2'  ],
+    [ 'coffee-script','~> 2.2'  ],
+    [ 'uglifier',     '~> 2.5'  ],
+
+    [ 'haml',         '~> 4.0'  ],
+    [ 'kaminari',     '~> 0.16' ],
+    [ 'diffy',        '~> 3.0'  ],
+    [ 'diff-lcs',     '~> 1.2'  ],
+    # should not depend!
+    [ 'airbrake',     '~> 4.1'  ] 
+
+
+  ].each do |dep|
+    s.add_runtime_dependency *dep
+  end
+
+end

card/config/initializers/01_init_ruby_extensions.rb

@@ -1,7 +1,7 @@
-# -*- encoding : utf-8 -*-
-
-require 'card/core_ext'
-
-
-
-
+# -*- encoding : utf-8 -*-
+
+require 'card/core_ext'
+
+
+
+

card/config/initializers/inflections.rb

@@ -1,13 +1,13 @@
-# -*- encoding : utf-8 -*-
-# Be sure to restart your server when you modify this file.
-
-# Add new inflection rules using the following format
-ActiveSupport::Inflector.inflections do |inflect|
-  inflect.irregular 'grave', 'graveyard'
-  inflect.uncountable 'this'
-#  inflect.uncountable 'plus'
-  inflect.uncountable 'anonymous'
-  inflect.uncountable /^s$/
-  inflect.singular(/(ss)$/i, '\1')
-  inflect.plural(/(ss)$/i, '\1')
-end
+# -*- encoding : utf-8 -*-
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.irregular 'grave', 'graveyard'
+  inflect.uncountable 'this'
+#  inflect.uncountable 'plus'
+  inflect.uncountable 'anonymous'
+  inflect.uncountable /^s$/
+  inflect.singular(/(ss)$/i, '\1')
+  inflect.plural(/(ss)$/i, '\1')
+end

card/config/initializers/mime_types.rb

@@ -1,13 +1,13 @@
-# -*- encoding : utf-8 -*-
-# Be sure to restart your server when you modify this file.
-# Add new mime types for use in respond_to blocks:
-
-#Mime::Type.register 'text/css', :css
-#Mime::Type.register 'application/rss+xml', :rss
-#Mime::Type.register_alias 'text/plain', :csv      # useful for testing csv in browser
-
-Mime::Type.register_alias 'text/plain', :txt
-Mime::Type.register 'application/vnd.google-earth.kml+xml', :kml
-
-# Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
+# -*- encoding : utf-8 -*-
+# Be sure to restart your server when you modify this file.
+# Add new mime types for use in respond_to blocks:
+
+#Mime::Type.register 'text/css', :css
+#Mime::Type.register 'application/rss+xml', :rss
+#Mime::Type.register_alias 'text/plain', :csv      # useful for testing csv in browser
+
+Mime::Type.register_alias 'text/plain', :txt
+Mime::Type.register 'application/vnd.google-earth.kml+xml', :kml
+
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

card/config/initializers/notification.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
-ActiveSupport::Notifications.subscribe /^card/ do |name, start, finish, id, payload|
-  Rails.logger.debug "#{ (finish - start) * 1000 }ms: #{ name }: #{ payload[:message] }"
-end
+# -*- encoding : utf-8 -*-
+ActiveSupport::Notifications.subscribe /^card/ do |name, start, finish, id, payload|
+  Rails.logger.debug "#{ (finish - start) * 1000 }ms: #{ name }: #{ payload[:message] }"
+end

card/config/initializers/recaptcha.rb

@@ -1,6 +1,6 @@
-# -*- encoding : utf-8 -*-
-Recaptcha.configure do |config|
-  config.public_key  = Cardio.config.recaptcha_public_key  || nil
-  config.private_key = Cardio.config.recaptcha_private_key || nil
-  config.proxy       = Cardio.config.recaptcha_proxy       || nil
-end
+# -*- encoding : utf-8 -*-
+Recaptcha.configure do |config|
+  config.public_key  = Cardio.config.recaptcha_public_key  || nil
+  config.private_key = Cardio.config.recaptcha_private_key || nil
+  config.proxy       = Cardio.config.recaptcha_proxy       || nil
+end

card/config/initializers/uuid_state_file.rb

@@ -1,3 +1,3 @@
-require 'uuid'
-# -*- encoding : utf-8 -*-
-UUID.state_file = false if ENV['UUID_STATE_FILE'] == 'off'
+require 'uuid'
+# -*- encoding : utf-8 -*-
+UUID.state_file = false if ENV['UUID_STATE_FILE'] == 'off'