wagn 1.12.13 → 1.13.0.pre

data/test/performance/card_create_test.rb

@@ -7,7 +7,7 @@ class CardCreateTest < ActionDispatch::PerformanceTest
   def initialize *args
     @name = 'CardA'
     super *args
-    Account.as Card::WagnBotID
+    Card::Auth.as Card::WagnBotID
   end
 
   def test_card_create_simple

data/test/performance/render_test.rb

@@ -5,6 +5,6 @@ require 'rails/performance_test_help'
 class RenderTest < ActionDispatch::PerformanceTest
   Card
   def render_test
-    Card::Format.new( Card.new( :name => "hi", :content => "{{+plus1}} {{+plus2}} {{+plus3}}" )).render :core
+     Card.new( :name => "hi", :content => "{{+plus1}} {{+plus2}} {{+plus3}}" .format).render :core
   end
 end

data/test/seed.rb

@@ -4,29 +4,27 @@ require 'timecop'
 require_dependency 'card'
 
 # following looks like legacy code to me - efm
-Dir["#{Rails.root}/app/models/card/*.rb"].sort.each do |cardtype|
-  require_dependency cardtype
-end
+#Dir["#{Rails.root}/app/models/card/*.rb"].sort.each do |cardtype|
+#  require_dependency cardtype
+#end
 
 class SharedData
 
-  def self.add_test_data
-    #Account.current_id = Card::WagnBotID
-    CodenameTable.load_bootcodes unless !Card::Codename[:wagn_bot].nil?
+  def self.account_args hash
+    { "+*account" => { "+*password" =>'joe_pass' }.merge( hash ) }
+  end
 
+  def self.add_test_data
+    
     Wagn::Cache.reset_global
-    Wagn::Env.reset
-    Wagn::Env[:no_auto_approval] = true
-    Account.as(Card::WagnBotID)
-
+    Card::Env.reset
+    Card::Auth.as_bot
 
-    account_args = { :status=>'active', :password=>'joe_pass', :password_confirmation=>'joe_pass' }
+    Card.create! :name=>"Joe User",  :type_code=>'user', :content=>"I'm number two", :subcards=>account_args( '+*email'=>'joe@user.com'  )
+    Card.create! :name=>"Joe Admin", :type_code=>'user', :content=>"I'm number one", :subcards=>account_args( '+*email'=>'joe@admin.com' )
+    Card.create! :name=>"Joe Camel", :type_code=>'user', :content=>"Mr. Buttz",      :subcards=>account_args( '+*email'=>'joe@camel.com' )
 
-    Card.create! :name=>"Joe User",  :type_code=>'user', :content=>"I'm number two", :account_args=>account_args.merge( :login=>"joe_user",  :email=>'joe@user.com'  )
-    Card.create! :name=>"Joe Admin", :type_code=>'user', :content=>"I'm number one", :account_args=>account_args.merge( :login=>"joe_admin", :email=>'joe@admin.com' )
-    Card.create! :name=>"Joe Camel", :type_code=>'user', :content=>"Mr. Buttz",      :account_args=>account_args.merge( :login=>"joe_camel", :email=>'joe@camel.com' )
-
-    Card['Joe Admin'].fetch(:trait=>:roles, :new=>{}).items = [ Card::AdminID ]
+    Card['Joe Admin'].fetch(:trait=>:roles, :new=>{}).items = [ Card::AdministratorID ]
 
     # generic, shared attribute card
     color = Card.create! :name=>"color"
@@ -34,38 +32,26 @@ class SharedData
 
     # data for testing users and account requests
 
-    Card.create! :name=>"Ron Request", :type_id=>Card::AccountRequestID, :account_args=>{
-      :email=>'ron@request.com', :password=>'ron_pass', :password_confirmation=>'ron_pass', :status=>'pending'
-    }
-    
     Card.create! :type_code=>'user', :name=>"No Count", :content=>"I got no account"
 
-    # CREATE A CARD OF EACH TYPE
     
-    Card.create! :name=>"Sample User", :type_code=>'user', :account_args=>{ 
-      :login=>"sample_user", :email=>'sample@user.com', :status=>'active', :password=>'sample_pass', :password_confirmation=>'sample_pass'
-    }
+    Card.create! :name=>"Sample User", :type_code=>'user', :subcards=>account_args('+*email'=>'sample@user.com', '+*password'=>'sample_pass')
+
+    # CREATE A CARD OF EACH TYPE
 
-    request_card = Card.create! :type_code=>'account_request', :name=>"Sample AccountRequest" #, :email=>"invitation@request.com"
+    Card.create! :type_id=>Card::SignupID, :name=>"Sample Signup" #, :email=>"invitation@request.com"
+    #above still necessary?  try commenting out above and 'Sign up' below
 
-    Account.createable_types.each do |type|
-      next if ['User', 'Account Request', 'Set', 'Number'].include? type
+    Card::Auth.createable_types.each do |type|
+      next if ['User', 'Sign up', 'Set', 'Number'].include? type
       Card.create! :type=>type, :name=>"Sample #{type}"
     end
 
     # data for role_test.rb
 
-    Card.create! :name=>"u1", :type_code=>'user', :account_args=>{
-      :login=>"u1", :email=>'u1@user.com', :status=>'active', :password=>'u1_pass', :password_confirmation=>'u1_pass'
-    }
-
-    Card.create! :name=>"u2", :type_code=>'user', :account_args=>{
-      :login=>"u2", :email=>'u2@user.com', :status=>'active', :password=>'u2_pass', :password_confirmation=>'u2_pass'
-    }
-
-    Card.create! :name=>"u3", :type_code=>'user', :account_args=>{
-      :login=>"u3", :email=>'u3@user.com', :status=>'active', :password=>'u3_pass', :password_confirmation=>'u3_pass'
-    }
+    Card.create! :name=>"u1", :type_code=>'user', :subcards=>account_args('+*email'=>'u1@user.com', '+*password'=>'u1_pass')
+    Card.create! :name=>"u2", :type_code=>'user', :subcards=>account_args('+*email'=>'u2@user.com', '+*password'=>'u2_pass')
+    Card.create! :name=>"u3", :type_code=>'user', :subcards=>account_args('+*email'=>'u3@user.com', '+*password'=>'u3_pass')
 
     r1 = Card.create!( :type_code=>'role', :name=>'r1' )
     r2 = Card.create!( :type_code=>'role', :name=>'r2' )
@@ -74,7 +60,7 @@ class SharedData
 
     Card['u1'].fetch( :trait=>:roles, :new=>{} ).items = [ r1, r2, r3 ]
     Card['u2'].fetch( :trait=>:roles, :new=>{} ).items = [ r1, r2, r4 ]
-    Card['u3'].fetch( :trait=>:roles, :new=>{} ).items = [ r1, r4, Card::AdminID ]
+    Card['u3'].fetch( :trait=>:roles, :new=>{} ).items = [ r1, r4, Card::AdministratorID ]
 
     c1 = Card.create! :name=>'c1'
     c2 = Card.create! :name=>'c2'
@@ -110,7 +96,7 @@ class SharedData
     Card.create! :type_code=>'cardtype_e', :name=>"type-e-card", :content=>"type_e_content"
     Card.create! :type_code=>'cardtype_f', :name=>"type-f-card", :content=>"type_f_content"
 
-    #warn "current user #{User.session_user.inspect}.  always ok?  #{Account.always_ok?}"
+    #warn "current user #{User.session_user.inspect}.  always ok?  #{Card::Auth.always_ok?}"
     c = Card.create! :name=>'revtest', :content=>'first'
     c.update_attributes! :content=>'second'
     c.update_attributes! :content=>'third'
@@ -120,11 +106,11 @@ class SharedData
     Card.create! :type_id=>Card::CardtypeID, :name=> "UserForm"
     Card.create! :name=>"UserForm+*type+*structure", :content=>"{{+name}} {{+age}} {{+description}}"
 
-    Account.current_id = Card['joe_user'].id
+    Card::Auth.current_id = Card['joe_user'].id
     Card.create!( :name=>"JoeLater", :content=>"test")
     Card.create!( :name=>"JoeNow", :content=>"test")
 
-    Account.current_id = Card::WagnBotID
+    Card::Auth.current_id = Card::WagnBotID
     Card.create!(:name=>"AdminNow", :content=>"test")
 
     Card.create :name=>'Cardtype B+*type+*create', :type=>'Pointer', :content=>'[[r1]]'
@@ -139,13 +125,8 @@ class SharedData
       # fwiw Timecop is apparently limited by ruby Time object, which goes only to 2037 and back to 1900 or so.
       #  whereas DateTime can represent all dates.
 
-      Card.create! :name=>"John", :type_code=>'user', :account_args=>{
-        :login=>"john", :email=>'john@user.com', :status=>'active', :password=>'john_pass', :password_confirmation=>'john_pass'
-      }
-
-      Card.create! :name=>"Sara", :type_code=>'user', :account_args=>{
-        :login=>"sara",:email=>'sara@user.com', :status => 'active', :password=>'sara_pass', :password_confirmation=>'sara_pass'
-      }
+      Card.create! :name=>"John", :type_code=>'user', :subcards=>account_args('+*email'=>'john@user.com', '+*password'=>'john_pass')
+      Card.create! :name=>"Sara", :type_code=>'user', :subcards=>account_args('+*email'=>'sara@user.com', '+*password'=>'sara_pass')
 
       Card.create! :name => "Sara Watching+*watchers",  :content => "[[Sara]]"
       Card.create! :name => "All Eyes On Me+*watchers", :content => "[[Sara]]\n[[John]]"
@@ -158,8 +139,6 @@ class SharedData
       Card.create! :name => "Optic+*watchers", :content => "[[Sara]]"
       Card.create! :name => "Sunglasses", :type=>"Optic", :content=>"{{+tint}}"
       Card.create! :name => "Sunglasses+tint"
-
-      # TODO: I would like to setup these card definitions with something like Cucumbers table feature.
     end
 
 
@@ -169,24 +148,18 @@ class SharedData
 
     ## --------- Fruit: creatable by anon but not readable ---
     f = Card.create! :type=>"Cardtype", :name=>"Fruit"
-    Card.create :name=>'Fruit+*type+*create', :type=>'Pointer', :content=>'[[Anyone]]'
-    Card.create :name=>'Fruit+*type+*read', :type=>'Pointer', :content=>'[[Administrator]]'
+    Card.create! :name=>'Fruit+*type+*create', :type=>'Pointer', :content=>'[[Anyone]]'
+    Card.create! :name=>'Fruit+*type+*read', :type=>'Pointer', :content=>'[[Administrator]]'
 
-    # codenames for card_attribute tests
-Rails.logger.warn "add codenames status and write"
-    Card.create! :name=>'*status', :codename=>:status
+    # codenames for card_accessor tests
     Card.create! :name=>'*write', :codename=>:write
-Rails.logger.warn "added codenames status and write"
 
     # -------- For toc testing: ------------
 
-    Card.create :name=>"OnneHeading", :content => "<h1>This is one heading</h1>\r\n<p>and some text</p>"
-    Card.create :name=>'TwwoHeading', :content => "<h1>One Heading</h1>\r\n<p>and some text</p>\r\n<h2>And a Subheading</h2>\r\n<p>and more text</p>"
-    Card.create :name=>'ThreeHeading', :content =>"<h1>A Heading</h1>\r\n<p>and text</p>\r\n<h2>And Subhead</h2>\r\n<p>text</p>\r\n<h1>And another top Heading</h1>"
+    Card.create! :name=>"OnneHeading", :content => "<h1>This is one heading</h1>\r\n<p>and some text</p>"
+    Card.create! :name=>'TwwoHeading', :content => "<h1>One Heading</h1>\r\n<p>and some text</p>\r\n<h2>And a Subheading</h2>\r\n<p>and more text</p>"
+    Card.create! :name=>'ThreeHeading', :content =>"<h1>A Heading</h1>\r\n<p>and text</p>\r\n<h2>And Subhead</h2>\r\n<p>text</p>\r\n<h1>And another top Heading</h1>"
 
-    c=Card.fetch 'Basic+*type+*table_of_contents', :new=>{}
-    c.content='2'
-    c.save
 
   end
 end

data/test/test_helper.rb

@@ -101,7 +101,7 @@ unless defined? TEST_ROOT
             next if cardtype=~ /Cardtype|UserForm|Set|Fruit|Optic|Book/
 
             title = url.gsub(/:id/,'').gsub(/\//,'_') + "_#{cardtype}"
-            login = (current_id==Card::AnonID ? '' : "integration_login_as '#{user}'")
+            login = (current_id==Card::AnonymousID ? '' : "integration_login_as '#{user}'")
             test_def = %{
               def test_render_#{title}_#{user}_#{status}
                 #{login}

data/wagn.gemspec

@@ -28,19 +28,19 @@ Gem::Specification.new do |s|
     [ 'rails',        '3.2.16'    ],
     [ 'smartname',    '0.2.3'     ],
     
-    [ 'htmlentities', '~> 4.3'    ],
     [ 'uuid',         '~> 2.3'    ],
-    [ 'macaddr',      '1.6.1'     ],  #required by uuid, but 1.6.2 is busted
-    
     [ 'paperclip',    '~> 2.8'    ],
+    [ 'htmlentities', '~> 4.3'    ],
     [ 'rmagick',      '~> 2.13'   ],
-    [ 'recaptcha',    '~> 0.3'    ],
-                                  
-    [ 'xmlscan',      '~> 0.3'    ],
-    [ 'rubyzip',      '~> 1.0'    ], # only required in module.  should be separated out.
-    [ 'airbrake',     '~> 3.1'    ],
+    [ 'recaptcha',    '~> 0.3'    ],                                  
     [ 'coderay',      '~> 1.0'    ],
-    [ 'sass',         '~> 3.2'    ]
+    [ 'sass',         '~> 3.2'    ],
+    [ 'coffee-script','~> 2.2'    ],
+    [ 'uglifier',     '~> 2.5'    ],
+    
+    # should not depend!
+    [ 'airbrake',     '~> 3.1'    ] 
+
     
   ].each do |dep|
     s.add_runtime_dependency *dep

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.12.13
+  version: 1.13.0.pre
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,20 +40,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.3
-- !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -69,33 +55,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: macaddr
+  name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -125,75 +111,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: xmlscan
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: airbrake
+  name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: coderay
+  name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: airbrake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
 description: a wiki approach to stuctured data, dynamic interaction, and web design
 email:
 - info@wagn.org
@@ -204,9 +190,12 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .simplecov
+- .tm_properties
 - CONTRIBUTING.rdoc
 - GPL
 - Gemfile
+- Guardfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -214,42 +203,26 @@ files:
 - app/assets/images/body-bg.bmp
 - app/assets/images/body-bg.png
 - app/assets/images/external_link.png
-- app/assets/images/images/ui-bg_flat_0_aaaaaa_40x100.png
-- app/assets/images/images/ui-bg_flat_75_ffffff_40x100.png
-- app/assets/images/images/ui-bg_glass_55_fbf9ee_1x400.png
-- app/assets/images/images/ui-bg_glass_65_ffffff_1x400.png
-- app/assets/images/images/ui-bg_glass_75_dadada_1x400.png
-- app/assets/images/images/ui-bg_glass_75_e6e6e6_1x400.png
-- app/assets/images/images/ui-bg_glass_95_fef1ec_1x400.png
-- app/assets/images/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- app/assets/images/images/ui-icons_222222_256x240.png
-- app/assets/images/images/ui-icons_2e83ff_256x240.png
-- app/assets/images/images/ui-icons_454545_256x240.png
-- app/assets/images/images/ui-icons_888888_256x240.png
-- app/assets/images/images/ui-icons_cd0a0a_256x240.png
+- app/assets/images/smoothness/animated-overlay.gif
+- app/assets/images/smoothness/ui-bg_flat_0_aaaaaa_40x100.png
+- app/assets/images/smoothness/ui-bg_flat_75_ffffff_40x100.png
+- app/assets/images/smoothness/ui-bg_glass_55_fbf9ee_1x400.png
+- app/assets/images/smoothness/ui-bg_glass_65_ffffff_1x400.png
+- app/assets/images/smoothness/ui-bg_glass_75_dadada_1x400.png
+- app/assets/images/smoothness/ui-bg_glass_75_e6e6e6_1x400.png
+- app/assets/images/smoothness/ui-bg_glass_95_fef1ec_1x400.png
+- app/assets/images/smoothness/ui-bg_highlight-soft_75_cccccc_1x100.png
+- app/assets/images/smoothness/ui-icons_222222_256x240.png
+- app/assets/images/smoothness/ui-icons_2e83ff_256x240.png
+- app/assets/images/smoothness/ui-icons_454545_256x240.png
+- app/assets/images/smoothness/ui-icons_888888_256x240.png
+- app/assets/images/smoothness/ui-icons_cd0a0a_256x240.png
 - app/assets/javascripts/application.js
-- app/assets/javascripts/html5shiv-printshiv.js
 - app/assets/javascripts/jquery.autosize.js
 - app/assets/javascripts/jquery.fileupload.js
 - app/assets/javascripts/jquery.iframe-transport.js
 - app/assets/javascripts/jquery.ui.autocomplete.html.js
-- app/assets/javascripts/wagn.js.coffee
-- app/assets/javascripts/wagn_menu.js
-- app/assets/javascripts/wagn_mod.js.coffee
-- app/controllers/account_controller.rb
-- app/controllers/admin_controller.rb
 - app/controllers/card_controller.rb
-- app/controllers/stub_card_controller.rb
-- app/controllers/wagn_controller.rb
-- app/mailers/.gitkeep
-- app/mailers/mailer.rb
-- app/models/.gitkeep
-- app/models/account.rb
-- app/models/user.rb
-- app/views/mailer/account_info.text.erb
-- app/views/mailer/change_notice.html.erb
-- app/views/mailer/flexmail.html.erb
-- app/views/mailer/signup_alert.html.erb
 - bin/wagn
 - config.ru
 - config/application.rb
@@ -262,28 +235,22 @@ files:
 - config/environments/test.rb
 - config/initializers/01_init_ruby_extensions.rb
 - config/initializers/airbrake.rb
-- config/initializers/backtrace_silencers.rb
 - config/initializers/inflections.rb
 - config/initializers/mime_types.rb
 - config/initializers/notification.rb
 - config/initializers/recaptcha.rb
-- config/initializers/schema_views.rb
 - config/initializers/secret_token.rb
 - config/initializers/session_store.rb
 - config/initializers/uuid_state_file.rb
-- config/initializers/wrap_parameters.rb
-- config/locales/en.yml
 - config/routes.rb
 - config/samples/asset_htaccess
 - config/samples/cucumber.yml
-- config/samples/database.yml.erb
 - config/samples/robots.txt
 - config/version.txt
 - config/version_cards.txt
 - db/bootstrap/card_references.yml
 - db/bootstrap/card_revisions.yml
 - db/bootstrap/cards.yml
-- db/bootstrap/users.yml
 - db/migrate/20110511221913_require_earlier_migrations.rb
 - db/migrate/20120105203350_require_1_8_migrations.rb
 - db/migrate/20121111025347_require_1_10_migrations.rb
@@ -302,6 +269,9 @@ files:
 - db/migrate_cards/20130927191728_account_events.rb
 - db/migrate_cards/20131016172445_common_css_patch.rb
 - db/migrate_cards/20140110193325_reset_account_request_type.rb
+- db/migrate_cards/20140307231621_user_data_to_cards.rb
+- db/migrate_cards/20140317035504_account_requests_to_signups.rb
+- db/migrate_cards/20140512155840_add_script_cards.rb
 - db/migrate_cards/data/1.11_help_text.json
 - db/migrate_cards/data/1.12_stylesheets/classic_cards.scss
 - db/migrate_cards/data/1.12_stylesheets/common.scss
@@ -309,41 +279,58 @@ files:
 - db/migrate_cards/data/1.12_stylesheets/traditional.scss
 - db/schema.rb
 - db/seeds.rb
-- features/account_requests.feature
 - features/autonaming.feature
-- features/content_settings.feature
 - features/flexmail.feature
-- features/google_maps.feature
-- features/hello_wagn.feature
 - features/layouts.feature
+- features/navbox.feature
 - features/notifications.feature
-- features/pattern_settings.feature
 - features/pointer_inputs.feature
 - features/presetting_content.feature
+- features/reset_password.feature
+- features/rules.feature
+- features/setup.feature
+- features/signup.feature
 - features/step_definitions/email_steps.rb
-- features/step_definitions/notification_steps.rb
 - features/step_definitions/wagn_steps.rb
 - features/step_definitions/web_steps.rb
+- features/structure.feature
 - features/support/env.rb
 - features/support/paths.rb
 - features/support/scopes.rb
-- features/support/wag_env.rb
+- features/support/wagn_env.rb
 - features/table_of_contents.feature
-- features/templates.feature
 - features/update_includers.feature
-- features/virtual_cards.feature
 - features/watch.feature
-- lib/active_record/foreign_keys.rb
-- lib/active_record/quoting_and_matching.rb
 - lib/card.rb
+- lib/card/active_record_ext.rb
+- lib/card/auth.rb
 - lib/card/chunk.rb
 - lib/card/codename.rb
-- lib/card/constant.rb
 - lib/card/content.rb
+- lib/card/core_ext.rb
 - lib/card/diff.rb
+- lib/card/env.rb
 - lib/card/exceptions.rb
 - lib/card/flexmail.rb
 - lib/card/format.rb
+- lib/card/generators/card_migration/USAGE
+- lib/card/generators/card_migration/card_migration_generator.rb
+- lib/card/generators/card_migration/templates/card_migration.erb
+- lib/card/generators/format/USAGE
+- lib/card/generators/format/format_generator.rb
+- lib/card/generators/format/templates/format_spec_template.erb
+- lib/card/generators/format/templates/format_template.erb
+- lib/card/generators/set/USAGE
+- lib/card/generators/set/set_generator.rb
+- lib/card/generators/set/templates/set_spec_template.erb
+- lib/card/generators/set/templates/set_template.erb
+- lib/card/loader.rb
+- lib/card/mailer.rb
+- lib/card/mailer/change_notice.html.erb
+- lib/card/mailer/confirmation_email.html.erb
+- lib/card/mailer/flexmail.html.erb
+- lib/card/mailer/password_reset.html.erb
+- lib/card/mailer/signup_alert.html.erb
 - lib/card/name.rb
 - lib/card/query.rb
 - lib/card/query/card_spec.rb
@@ -354,59 +341,48 @@ files:
 - lib/card/revision.rb
 - lib/card/set.rb
 - lib/card/set_pattern.rb
-- lib/generators/card_migration/USAGE
-- lib/generators/card_migration/card_migration_generator.rb
-- lib/generators/card_migration/templates/card_migration.erb
-- lib/generators/format/USAGE
-- lib/generators/format/format_generator.rb
-- lib/generators/format/templates/format_spec_template.erb
-- lib/generators/format/templates/format_template.erb
-- lib/generators/set/USAGE
-- lib/generators/set/set_generator.rb
-- lib/generators/set/templates/set_spec_template.erb
-- lib/generators/set/templates/set_template.erb
-- lib/generators/wagn/USAGE
-- lib/generators/wagn/templates/Gemfile
-- lib/generators/wagn/templates/Rakefile
-- lib/generators/wagn/templates/config.ru
-- lib/generators/wagn/templates/config/application.rb
-- lib/generators/wagn/templates/config/boot.rb
-- lib/generators/wagn/templates/config/database.yml
-- lib/generators/wagn/templates/config/databases/frontbase.yml
-- lib/generators/wagn/templates/config/databases/ibm_db.yml
-- lib/generators/wagn/templates/config/databases/jdbc.yml
-- lib/generators/wagn/templates/config/databases/jdbcmysql.yml
-- lib/generators/wagn/templates/config/databases/jdbcpostgresql.yml
-- lib/generators/wagn/templates/config/databases/jdbcsqlite3.yml
-- lib/generators/wagn/templates/config/databases/mysql.yml
-- lib/generators/wagn/templates/config/databases/oracle.yml
-- lib/generators/wagn/templates/config/databases/postgresql.yml
-- lib/generators/wagn/templates/config/databases/sqlite3.yml
-- lib/generators/wagn/templates/config/environment.rb
-- lib/generators/wagn/templates/gitignore
-- lib/generators/wagn/templates/script/wagn
-- lib/generators/wagn/wagn_generator.rb
-- lib/tasks/.gitkeep
-- lib/tasks/cucumber.rake
-- lib/tasks/db.rake
-- lib/tasks/test.rake
-- lib/tasks/wagn.rake
 - lib/wagn.rb
 - lib/wagn/all.rb
 - lib/wagn/application.rb
-- lib/wagn/authenticated_system.rb
 - lib/wagn/cache.rb
 - lib/wagn/cli.rb
 - lib/wagn/commands.rb
 - lib/wagn/commands/application.rb
-- lib/wagn/env.rb
 - lib/wagn/exceptions.rb
-- lib/wagn/loader.rb
+- lib/wagn/generators/wagn/USAGE
+- lib/wagn/generators/wagn/templates/Gemfile
+- lib/wagn/generators/wagn/templates/Rakefile
+- lib/wagn/generators/wagn/templates/config.ru
+- lib/wagn/generators/wagn/templates/config/application.rb
+- lib/wagn/generators/wagn/templates/config/boot.rb
+- lib/wagn/generators/wagn/templates/config/database.yml
+- lib/wagn/generators/wagn/templates/config/databases/frontbase.yml
+- lib/wagn/generators/wagn/templates/config/databases/ibm_db.yml
+- lib/wagn/generators/wagn/templates/config/databases/jdbc.yml
+- lib/wagn/generators/wagn/templates/config/databases/jdbcmysql.yml
+- lib/wagn/generators/wagn/templates/config/databases/jdbcpostgresql.yml
+- lib/wagn/generators/wagn/templates/config/databases/jdbcsqlite3.yml
+- lib/wagn/generators/wagn/templates/config/databases/mysql.yml
+- lib/wagn/generators/wagn/templates/config/databases/oracle.yml
+- lib/wagn/generators/wagn/templates/config/databases/postgresql.yml
+- lib/wagn/generators/wagn/templates/config/databases/sqlite3.yml
+- lib/wagn/generators/wagn/templates/config/environment.rb
+- lib/wagn/generators/wagn/templates/gitignore
+- lib/wagn/generators/wagn/templates/public/files/htaccess
+- lib/wagn/generators/wagn/templates/public/robots.txt
+- lib/wagn/generators/wagn/templates/script/wagn
+- lib/wagn/generators/wagn/wagn_generator.rb
 - lib/wagn/location.rb
 - lib/wagn/migration_helper.rb
 - lib/wagn/script_wagn_loader.rb
-- lib/wagn/spec_helper.rb
+- lib/wagn/tasks/.gitkeep
+- lib/wagn/tasks/cucumber.rake
+- lib/wagn/tasks/db.rake
+- lib/wagn/tasks/test.rake
+- lib/wagn/tasks/wagn.rake
 - lib/wagn/version.rb
+- mods/core/chunks/include.rb
+- mods/core/chunks/link.rb
 - mods/core/chunks/literal.rb
 - mods/core/chunks/reference.rb
 - mods/core/chunks/uri.rb
@@ -444,8 +420,6 @@ files:
 - mods/core/sets/all/trash.rb
 - mods/core/sets/all/type.rb
 - mods/core/sets/all/utils.rb
-- mods/standard/chunks/include.rb
-- mods/standard/chunks/link.rb
 - mods/standard/files/103/icon-6566.ico
 - mods/standard/files/103/large-6566.ico
 - mods/standard/files/103/medium-6566.ico
@@ -467,28 +441,39 @@ files:
 - mods/standard/formats/file_format.rb
 - mods/standard/formats/js_format.rb
 - mods/standard/formats/json_format.rb
-- mods/standard/formats/kml_format.rb
 - mods/standard/formats/rss_format.rb
 - mods/standard/formats/xml_format.rb
-- mods/standard/lib/google_maps_addon.rb
+- mods/standard/lib/card/machine.rb
+- mods/standard/lib/card/machine_input.rb
+- mods/standard/lib/javascript/html5shiv-printshiv.js
+- mods/standard/lib/javascript/jquery-ui.js
+- mods/standard/lib/javascript/jquery.autosize.js
+- mods/standard/lib/javascript/jquery.fileupload.js
+- mods/standard/lib/javascript/jquery.iframe-transport.js
+- mods/standard/lib/javascript/jquery.js
+- mods/standard/lib/javascript/jquery.ui.autocomplete.html.js
+- mods/standard/lib/javascript/jquery_ujs.js
+- mods/standard/lib/javascript/jquerymobile.js
+- mods/standard/lib/javascript/tinymce.js
+- mods/standard/lib/javascript/wagn.js.coffee
+- mods/standard/lib/javascript/wagn_menu.js
+- mods/standard/lib/javascript/wagn_mod.js.coffee
 - mods/standard/lib/stylesheets/functional.scss
 - mods/standard/lib/stylesheets/jquery-ui-smoothness.css
 - mods/standard/lib/stylesheets/standard.scss
 - mods/standard/sets/all/account.rb
-- mods/standard/sets/all/admin.rb
 - mods/standard/sets/all/all_css.rb
 - mods/standard/sets/all/all_csv.rb
 - mods/standard/sets/all/attach.rb
 - mods/standard/sets/all/base.rb
 - mods/standard/sets/all/comment.rb
 - mods/standard/sets/all/email_html.rb
+- mods/standard/sets/all/event_viz.rb
 - mods/standard/sets/all/file.rb
 - mods/standard/sets/all/flexmail.rb
 - mods/standard/sets/all/follow.rb
-- mods/standard/sets/all/geocode.rb
 - mods/standard/sets/all/history.rb
 - mods/standard/sets/all/json.rb
-- mods/standard/sets/all/kml.rb
 - mods/standard/sets/all/rich_html.rb
 - mods/standard/sets/all/rss.rb
 - mods/standard/sets/all/text.rb
@@ -496,94 +481,76 @@ files:
 - mods/standard/sets/right/add_help.rb
 - mods/standard/sets/right/comment.rb
 - mods/standard/sets/right/create.rb
-- mods/standard/sets/right/crypted_password.rb
 - mods/standard/sets/right/default.rb
 - mods/standard/sets/right/delete.rb
 - mods/standard/sets/right/email.rb
 - mods/standard/sets/right/help.rb
+- mods/standard/sets/right/machine_output.rb
+- mods/standard/sets/right/password.rb
 - mods/standard/sets/right/read.rb
 - mods/standard/sets/right/salt.rb
+- mods/standard/sets/right/script.rb
+- mods/standard/sets/right/stats.rb
+- mods/standard/sets/right/status.rb
 - mods/standard/sets/right/structure.rb
 - mods/standard/sets/right/style.rb
+- mods/standard/sets/right/token.rb
 - mods/standard/sets/right/update.rb
 - mods/standard/sets/right/when_created.rb
 - mods/standard/sets/right/when_last_edited.rb
 - mods/standard/sets/rstar/rules.rb
 - mods/standard/sets/self/account_links.rb
 - mods/standard/sets/self/alerts.rb
+- mods/standard/sets/self/all.rb
 - mods/standard/sets/self/foot.rb
 - mods/standard/sets/self/head.rb
 - mods/standard/sets/self/navbox.rb
 - mods/standard/sets/self/now.rb
 - mods/standard/sets/self/recent.rb
+- mods/standard/sets/self/script_card_menu.rb
+- mods/standard/sets/self/script_html5shiv_printshiv.rb
+- mods/standard/sets/self/script_jquery.rb
+- mods/standard/sets/self/script_jquery_helper.rb
+- mods/standard/sets/self/script_slot.rb
+- mods/standard/sets/self/script_tinymce.rb
 - mods/standard/sets/self/search.rb
+- mods/standard/sets/self/signin.rb
+- mods/standard/sets/self/stats.rb
 - mods/standard/sets/self/style_functional.rb
 - mods/standard/sets/self/style_jquery_ui_smoothness.rb
 - mods/standard/sets/self/style_standard.rb
 - mods/standard/sets/self/version.rb
-- mods/standard/sets/type/account_request.rb
 - mods/standard/sets/type/basic.rb
 - mods/standard/sets/type/cardtype.rb
+- mods/standard/sets/type/coffee_script.rb
 - mods/standard/sets/type/css.rb
 - mods/standard/sets/type/date.rb
 - mods/standard/sets/type/file.rb
 - mods/standard/sets/type/html.rb
 - mods/standard/sets/type/image.rb
+- mods/standard/sets/type/java_script.rb
 - mods/standard/sets/type/layout_type.rb
 - mods/standard/sets/type/number.rb
 - mods/standard/sets/type/phrase.rb
 - mods/standard/sets/type/plain_text.rb
 - mods/standard/sets/type/pointer.rb
-- mods/standard/sets/type/ruby_and_script.rb
 - mods/standard/sets/type/scss.rb
 - mods/standard/sets/type/search_type.rb
 - mods/standard/sets/type/set.rb
 - mods/standard/sets/type/setting.rb
+- mods/standard/sets/type/signup.rb
 - mods/standard/sets/type/skin.rb
 - mods/standard/sets/type/toggle.rb
 - mods/standard/sets/type/user.rb
-- public/404.html
-- public/500.html
-- public/assets/application-058913c45d4f3262667bad443a03eb45.js
-- public/assets/application-058913c45d4f3262667bad443a03eb45.js.gz
-- public/assets/application.js
-- public/assets/application.js.gz
 - public/assets/body-bg-660b752b44b87594071f3d0851ac5360.png
 - public/assets/body-bg-d031f29b6ba7399a6862382c3552f44c.bmp
 - public/assets/body-bg.bmp
 - public/assets/body-bg.png
 - public/assets/external_link-b15ab5051b4ec6f32892ed80019405b5.png
 - public/assets/external_link.png
-- public/assets/html5shiv-printshiv-ad36fc7219f4aeaa275f9a7fe2383413.js
-- public/assets/html5shiv-printshiv-ad36fc7219f4aeaa275f9a7fe2383413.js.gz
-- public/assets/html5shiv-printshiv.js
-- public/assets/html5shiv-printshiv.js.gz
-- public/assets/images/ui-bg_flat_0_aaaaaa_40x100-7d1197a52442bc56fcad60d0390f4b32.png
-- public/assets/images/ui-bg_flat_0_aaaaaa_40x100.png
-- public/assets/images/ui-bg_flat_75_ffffff_40x100-3c4b974defa5e8bdaf8a603034c4435e.png
-- public/assets/images/ui-bg_flat_75_ffffff_40x100.png
-- public/assets/images/ui-bg_glass_55_fbf9ee_1x400-38c2dea4d046fd3f56cc3996e2e6018b.png
-- public/assets/images/ui-bg_glass_55_fbf9ee_1x400.png
-- public/assets/images/ui-bg_glass_65_ffffff_1x400-ddb7ee7527bff283054406c50e597e1e.png
-- public/assets/images/ui-bg_glass_65_ffffff_1x400.png
-- public/assets/images/ui-bg_glass_75_dadada_1x400-d618461418b1ebc6b7996979f4c3dc92.png
-- public/assets/images/ui-bg_glass_75_dadada_1x400.png
-- public/assets/images/ui-bg_glass_75_e6e6e6_1x400-48d8d545f708e5870a965ce9df8b0e38.png
-- public/assets/images/ui-bg_glass_75_e6e6e6_1x400.png
-- public/assets/images/ui-bg_glass_95_fef1ec_1x400-f3526b8f82249928f0a6baf044204b15.png
-- public/assets/images/ui-bg_glass_95_fef1ec_1x400.png
-- public/assets/images/ui-bg_highlight-soft_75_cccccc_1x100-cec5c56503b8480f834c3fce35dae8df.png
-- public/assets/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- public/assets/images/ui-icons_222222_256x240-66e635a2f90b9f90675d402617630b24.png
-- public/assets/images/ui-icons_222222_256x240.png
-- public/assets/images/ui-icons_2e83ff_256x240-2ea4c160a75c1992daa2eeac86255b99.png
-- public/assets/images/ui-icons_2e83ff_256x240.png
-- public/assets/images/ui-icons_454545_256x240-5c7f12676bcead9cb2d4cb8f23f16e95.png
-- public/assets/images/ui-icons_454545_256x240.png
-- public/assets/images/ui-icons_888888_256x240-95fd3047e1f7325d995a21c729b04125.png
-- public/assets/images/ui-icons_888888_256x240.png
-- public/assets/images/ui-icons_cd0a0a_256x240-c0c1ec6a8bcf48fec40303e975a4dfa6.png
-- public/assets/images/ui-icons_cd0a0a_256x240.png
+- public/assets/jasmine/404.html
+- public/assets/jasmine/500.html
+- public/assets/jasmine/card_form.html
 - public/assets/jquery-mobile/ajax-loader-d2b731d3e844ea99b7e7cbf7867f11e9.gif
 - public/assets/jquery-mobile/ajax-loader.gif
 - public/assets/jquery-mobile/icons-png/action-black-cbdf206f5fcd70925baa44543a4daa00.png
@@ -786,13 +753,65 @@ files:
 - public/assets/jquery-mobile/icons-png/video-black.png
 - public/assets/jquery-mobile/icons-png/video-white-80a2ae6a9b790e6ee05680fcdee8905a.png
 - public/assets/jquery-mobile/icons-png/video-white.png
-- public/assets/jquery.min-8b58c0fbf303b938d8e749262f7e50dd.map
+- public/assets/jquery-ui/animated-overlay-602eee4c79a4796b02bb6442948c9e28.gif
+- public/assets/jquery-ui/animated-overlay.gif
+- public/assets/jquery-ui/ui-bg_flat_0_aaaaaa_40x100-7d1197a52442bc56fcad60d0390f4b32.png
+- public/assets/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
+- public/assets/jquery-ui/ui-bg_flat_75_ffffff_40x100-3c4b974defa5e8bdaf8a603034c4435e.png
+- public/assets/jquery-ui/ui-bg_flat_75_ffffff_40x100.png
+- public/assets/jquery-ui/ui-bg_glass_55_fbf9ee_1x400-38c2dea4d046fd3f56cc3996e2e6018b.png
+- public/assets/jquery-ui/ui-bg_glass_55_fbf9ee_1x400.png
+- public/assets/jquery-ui/ui-bg_glass_65_ffffff_1x400-ddb7ee7527bff283054406c50e597e1e.png
+- public/assets/jquery-ui/ui-bg_glass_65_ffffff_1x400.png
+- public/assets/jquery-ui/ui-bg_glass_75_dadada_1x400-d618461418b1ebc6b7996979f4c3dc92.png
+- public/assets/jquery-ui/ui-bg_glass_75_dadada_1x400.png
+- public/assets/jquery-ui/ui-bg_glass_75_e6e6e6_1x400-48d8d545f708e5870a965ce9df8b0e38.png
+- public/assets/jquery-ui/ui-bg_glass_75_e6e6e6_1x400.png
+- public/assets/jquery-ui/ui-bg_glass_95_fef1ec_1x400-f3526b8f82249928f0a6baf044204b15.png
+- public/assets/jquery-ui/ui-bg_glass_95_fef1ec_1x400.png
+- public/assets/jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100-cec5c56503b8480f834c3fce35dae8df.png
+- public/assets/jquery-ui/ui-bg_highlight-soft_75_cccccc_1x100.png
+- public/assets/jquery-ui/ui-icons_222222_256x240-b1eb177a51ea7925448318a26d988842.png
+- public/assets/jquery-ui/ui-icons_222222_256x240.png
+- public/assets/jquery-ui/ui-icons_2e83ff_256x240-49c2da9cac2dc565265586f716491298.png
+- public/assets/jquery-ui/ui-icons_2e83ff_256x240.png
+- public/assets/jquery-ui/ui-icons_454545_256x240-68b2fe3268f7604fb0767a0372e2db85.png
+- public/assets/jquery-ui/ui-icons_454545_256x240.png
+- public/assets/jquery-ui/ui-icons_888888_256x240-8040cfcc88792375b7788feb59189eef.png
+- public/assets/jquery-ui/ui-icons_888888_256x240.png
+- public/assets/jquery-ui/ui-icons_cd0a0a_256x240-d4a62216bf6f0cd0071149890763a5ff.png
+- public/assets/jquery-ui/ui-icons_cd0a0a_256x240.png
+- public/assets/jquery.min-388372ef65cc311f6a3df4a6ceac8d22.map
 - public/assets/jquery.min.map
 - public/assets/manifest.yml
-- public/assets/tinymce-22b5a139d9ff7df7643afae9ce205508.js
-- public/assets/tinymce-22b5a139d9ff7df7643afae9ce205508.js.gz
-- public/assets/tinymce.js
-- public/assets/tinymce.js.gz
+- public/assets/smoothness/animated-overlay-602eee4c79a4796b02bb6442948c9e28.gif
+- public/assets/smoothness/animated-overlay.gif
+- public/assets/smoothness/ui-bg_flat_0_aaaaaa_40x100-31613497e63975a54520b7065b125dea.png
+- public/assets/smoothness/ui-bg_flat_0_aaaaaa_40x100.png
+- public/assets/smoothness/ui-bg_flat_75_ffffff_40x100-f4b0e20e6f4c83b9f52cf062ed0f5284.png
+- public/assets/smoothness/ui-bg_flat_75_ffffff_40x100.png
+- public/assets/smoothness/ui-bg_glass_55_fbf9ee_1x400-e3606d6e7ad67486ffdc83edca64d4c5.png
+- public/assets/smoothness/ui-bg_glass_55_fbf9ee_1x400.png
+- public/assets/smoothness/ui-bg_glass_65_ffffff_1x400-dcec96932b90ff4cd4fea91284a6e9a3.png
+- public/assets/smoothness/ui-bg_glass_65_ffffff_1x400.png
+- public/assets/smoothness/ui-bg_glass_75_dadada_1x400-a2310f533684ede4f1216d7299b5cd58.png
+- public/assets/smoothness/ui-bg_glass_75_dadada_1x400.png
+- public/assets/smoothness/ui-bg_glass_75_e6e6e6_1x400-d872f3a0a02dea609e4b0321520236d9.png
+- public/assets/smoothness/ui-bg_glass_75_e6e6e6_1x400.png
+- public/assets/smoothness/ui-bg_glass_95_fef1ec_1x400-9ccaed8a65a3c285c16a73bdf03a69b3.png
+- public/assets/smoothness/ui-bg_glass_95_fef1ec_1x400.png
+- public/assets/smoothness/ui-bg_highlight-soft_75_cccccc_1x100-2ef1d227b5c0f33ce3c5e45afa953991.png
+- public/assets/smoothness/ui-bg_highlight-soft_75_cccccc_1x100.png
+- public/assets/smoothness/ui-icons_222222_256x240-0675a996f0bdc78890f7b312c543b06a.png
+- public/assets/smoothness/ui-icons_222222_256x240.png
+- public/assets/smoothness/ui-icons_2e83ff_256x240-6aea736f81a417977efd77f183519a54.png
+- public/assets/smoothness/ui-icons_2e83ff_256x240.png
+- public/assets/smoothness/ui-icons_454545_256x240-6f4361f45745fb0cd7b0cc2851dc1cc3.png
+- public/assets/smoothness/ui-icons_454545_256x240.png
+- public/assets/smoothness/ui-icons_888888_256x240-8f6818bd8631ba3489de718e26c7e6cf.png
+- public/assets/smoothness/ui-icons_888888_256x240.png
+- public/assets/smoothness/ui-icons_cd0a0a_256x240-2969ddba6d0a9c62603a4aa85a363cda.png
+- public/assets/smoothness/ui-icons_cd0a0a_256x240.png
 - public/assets/tinymce/jquery.tinymce.js
 - public/assets/tinymce/langs/en.js
 - public/assets/tinymce/license.txt
@@ -1052,20 +1071,12 @@ files:
 - public/assets/tinymce/utils/form_utils.js
 - public/assets/tinymce/utils/mctabs.js
 - public/assets/tinymce/utils/validate.js
-- public/favicon.ico
-- public/jasmine/card_form.html
-- public/robots.txt
 - script/autospec
 - script/rails
 - script/test_filter
 - script/wagn
-- spec/controllers/account_controller_spec.rb
-- spec/controllers/admin_controller_spec.rb
-- spec/controllers/captcha_spec.rb
 - spec/controllers/card_controller_spec.rb
 - spec/controllers/location_spec.rb
-- spec/controllers/sets_spec.rb
-- spec/controllers/wagn_controller_spec.rb
 - spec/javascripts/helpers/.gitkeep
 - spec/javascripts/helpers/jasmine-config.js
 - spec/javascripts/helpers/jasmine-jquery-1.3.1.js
@@ -1073,31 +1084,28 @@ files:
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
 - spec/javascripts/wagn_spec.coffee
+- spec/lib/card/auth_spec.rb
 - spec/lib/card/chunk_spec.rb
 - spec/lib/card/codename_spec.rb
 - spec/lib/card/content_spec.rb
 - spec/lib/card/diff_spec.rb
 - spec/lib/card/flexmail_spec.rb
 - spec/lib/card/format_spec.rb
+- spec/lib/card/loader_spec.rb
 - spec/lib/card/name_spec.rb
 - spec/lib/card/query_spec.rb
+- spec/lib/card/reference_spec.rb
+- spec/lib/card/revision_spec.rb
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
 - spec/lib/wagn/cache_spec.rb
-- spec/lib/wagn/loader_spec.rb
-- spec/mailers/account_spec.rb
 - spec/mailers/mailer_spec.rb
-- spec/models/account_spec.rb
 - spec/models/card/cardtype_spec.rb
-- spec/models/card/comment_spec.rb
 - spec/models/card/create_spec.rb
-- spec/models/card/reference_spec.rb
-- spec/models/card/revision_spec.rb
 - spec/models/card/trash_spec.rb
 - spec/models/card/type_transition_spec.rb
 - spec/models/card/validation_spec.rb
 - spec/models/card_spec.rb
-- spec/models/user_spec.rb
 - spec/mods/core/chunks/literal_spec.rb
 - spec/mods/core/chunks/uri_spec.rb
 - spec/mods/core/formats/data_format_spec.rb
@@ -1128,23 +1136,25 @@ files:
 - spec/mods/standard/formats/csv_format_spec.rb
 - spec/mods/standard/formats/email_html_format_spec.rb
 - spec/mods/standard/formats/file_format_spec.rb
+- spec/mods/standard/formats/js_format_spec.rb
 - spec/mods/standard/formats/json_format_spec.rb
-- spec/mods/standard/formats/kml_format_spec.rb
 - spec/mods/standard/formats/rss_format_spec.rb
 - spec/mods/standard/formats/xml_format_spec.rb
+- spec/mods/standard/lib/machine_input_spec.rb
+- spec/mods/standard/lib/machine_spec.rb
 - spec/mods/standard/sets/all/account_spec.rb
-- spec/mods/standard/sets/all/admin_spec.rb
 - spec/mods/standard/sets/all/all_css_spec.rb
 - spec/mods/standard/sets/all/all_csv_spec.rb
 - spec/mods/standard/sets/all/attach_spec.rb
 - spec/mods/standard/sets/all/base_spec.rb
+- spec/mods/standard/sets/all/comment_spec.rb
 - spec/mods/standard/sets/all/email_html_spec.rb
+- spec/mods/standard/sets/all/event_viz_spec.rb
 - spec/mods/standard/sets/all/file_spec.rb
 - spec/mods/standard/sets/all/flexmail_spec.rb
 - spec/mods/standard/sets/all/follow_spec.rb
-- spec/mods/standard/sets/all/geocode_spec.rb
+- spec/mods/standard/sets/all/history_spec.rb
 - spec/mods/standard/sets/all/json_spec.rb
-- spec/mods/standard/sets/all/kml_spec.rb
 - spec/mods/standard/sets/all/rich_html_spec.rb
 - spec/mods/standard/sets/all/rss_spec.rb
 - spec/mods/standard/sets/all/text_spec.rb
@@ -1152,60 +1162,69 @@ files:
 - spec/mods/standard/sets/right/add_help_spec.rb
 - spec/mods/standard/sets/right/comment_spec.rb
 - spec/mods/standard/sets/right/create_spec.rb
-- spec/mods/standard/sets/right/crypted_password_spec.rb
 - spec/mods/standard/sets/right/default_spec.rb
 - spec/mods/standard/sets/right/delete_spec.rb
 - spec/mods/standard/sets/right/email_spec.rb
 - spec/mods/standard/sets/right/help_spec.rb
+- spec/mods/standard/sets/right/machine_output_spec.rb
+- spec/mods/standard/sets/right/password_spec.rb
 - spec/mods/standard/sets/right/read_spec.rb
 - spec/mods/standard/sets/right/salt_spec.rb
+- spec/mods/standard/sets/right/script_spec.rb
+- spec/mods/standard/sets/right/stats_spec.rb
+- spec/mods/standard/sets/right/status_spec.rb
 - spec/mods/standard/sets/right/structure_spec.rb
 - spec/mods/standard/sets/right/style_spec.rb
+- spec/mods/standard/sets/right/token_spec.rb
 - spec/mods/standard/sets/right/update_spec.rb
 - spec/mods/standard/sets/right/when_created_spec.rb
 - spec/mods/standard/sets/right/when_last_edited_spec.rb
 - spec/mods/standard/sets/rstar/rules_spec.rb
 - spec/mods/standard/sets/self/account_links_spec.rb
 - spec/mods/standard/sets/self/alerts_spec.rb
+- spec/mods/standard/sets/self/all_spec.rb
 - spec/mods/standard/sets/self/foot_spec.rb
 - spec/mods/standard/sets/self/head_spec.rb
 - spec/mods/standard/sets/self/navbox_spec.rb
 - spec/mods/standard/sets/self/now_spec.rb
 - spec/mods/standard/sets/self/recent_spec.rb
 - spec/mods/standard/sets/self/search_spec.rb
+- spec/mods/standard/sets/self/signin_spec.rb
+- spec/mods/standard/sets/self/stats_spec.rb
 - spec/mods/standard/sets/self/style_functional_spec.rb
 - spec/mods/standard/sets/self/style_jquery_ui_smoothness_spec.rb
 - spec/mods/standard/sets/self/style_standard_spec.rb
 - spec/mods/standard/sets/self/version_spec.rb
-- spec/mods/standard/sets/type/account_request_spec.rb
 - spec/mods/standard/sets/type/basic_spec.rb
 - spec/mods/standard/sets/type/cardtype_spec.rb
+- spec/mods/standard/sets/type/coffeescript_spec.rb
 - spec/mods/standard/sets/type/css_spec.rb
 - spec/mods/standard/sets/type/date_spec.rb
 - spec/mods/standard/sets/type/file_spec.rb
 - spec/mods/standard/sets/type/html_spec.rb
 - spec/mods/standard/sets/type/image_spec.rb
+- spec/mods/standard/sets/type/javascript_spec.rb
 - spec/mods/standard/sets/type/layout_type_spec.rb
 - spec/mods/standard/sets/type/number_spec.rb
 - spec/mods/standard/sets/type/phrase_spec.rb
 - spec/mods/standard/sets/type/plain_text_spec.rb
 - spec/mods/standard/sets/type/pointer_spec.rb
-- spec/mods/standard/sets/type/ruby_and_script_spec.rb
 - spec/mods/standard/sets/type/scss_spec.rb
 - spec/mods/standard/sets/type/search_type_spec.rb
 - spec/mods/standard/sets/type/set_spec.rb
 - spec/mods/standard/sets/type/setting_spec.rb
+- spec/mods/standard/sets/type/signup_spec.rb
 - spec/mods/standard/sets/type/skin_spec.rb
 - spec/mods/standard/sets/type/toggle_spec.rb
 - spec/mods/standard/sets/type/user_spec.rb
-- spec/spec.opts
+- spec/spec_helper.rb
+- test/1.10.0-data-dump.sql
 - test/fixtures/.gitkeep
 - test/fixtures/card_references.yml
 - test/fixtures/card_revisions.yml
 - test/fixtures/cards.yml
 - test/fixtures/mao2.jpg
 - test/fixtures/rails.gif
-- test/fixtures/users.yml
 - test/performance/card_create_test.rb
 - test/performance/fetch_test.rb
 - test/performance/homepage_test.rb
@@ -1223,52 +1242,45 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: structured wiki web platform
 test_files:
-- features/account_requests.feature
 - features/autonaming.feature
-- features/content_settings.feature
 - features/flexmail.feature
-- features/google_maps.feature
-- features/hello_wagn.feature
 - features/layouts.feature
+- features/navbox.feature
 - features/notifications.feature
-- features/pattern_settings.feature
 - features/pointer_inputs.feature
 - features/presetting_content.feature
+- features/reset_password.feature
+- features/rules.feature
+- features/setup.feature
+- features/signup.feature
 - features/step_definitions/email_steps.rb
-- features/step_definitions/notification_steps.rb
 - features/step_definitions/wagn_steps.rb
 - features/step_definitions/web_steps.rb
+- features/structure.feature
 - features/support/env.rb
 - features/support/paths.rb
 - features/support/scopes.rb
-- features/support/wag_env.rb
+- features/support/wagn_env.rb
 - features/table_of_contents.feature
-- features/templates.feature
 - features/update_includers.feature
-- features/virtual_cards.feature
 - features/watch.feature
-- spec/controllers/account_controller_spec.rb
-- spec/controllers/admin_controller_spec.rb
-- spec/controllers/captcha_spec.rb
 - spec/controllers/card_controller_spec.rb
 - spec/controllers/location_spec.rb
-- spec/controllers/sets_spec.rb
-- spec/controllers/wagn_controller_spec.rb
 - spec/javascripts/helpers/.gitkeep
 - spec/javascripts/helpers/jasmine-config.js
 - spec/javascripts/helpers/jasmine-jquery-1.3.1.js
@@ -1276,31 +1288,28 @@ test_files:
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
 - spec/javascripts/wagn_spec.coffee
+- spec/lib/card/auth_spec.rb
 - spec/lib/card/chunk_spec.rb
 - spec/lib/card/codename_spec.rb
 - spec/lib/card/content_spec.rb
 - spec/lib/card/diff_spec.rb
 - spec/lib/card/flexmail_spec.rb
 - spec/lib/card/format_spec.rb
+- spec/lib/card/loader_spec.rb
 - spec/lib/card/name_spec.rb
 - spec/lib/card/query_spec.rb
+- spec/lib/card/reference_spec.rb
+- spec/lib/card/revision_spec.rb
 - spec/lib/card/set_pattern_spec.rb
 - spec/lib/card/set_spec.rb
 - spec/lib/wagn/cache_spec.rb
-- spec/lib/wagn/loader_spec.rb
-- spec/mailers/account_spec.rb
 - spec/mailers/mailer_spec.rb
-- spec/models/account_spec.rb
 - spec/models/card/cardtype_spec.rb
-- spec/models/card/comment_spec.rb
 - spec/models/card/create_spec.rb
-- spec/models/card/reference_spec.rb
-- spec/models/card/revision_spec.rb
 - spec/models/card/trash_spec.rb
 - spec/models/card/type_transition_spec.rb
 - spec/models/card/validation_spec.rb
 - spec/models/card_spec.rb
-- spec/models/user_spec.rb
 - spec/mods/core/chunks/literal_spec.rb
 - spec/mods/core/chunks/uri_spec.rb
 - spec/mods/core/formats/data_format_spec.rb
@@ -1331,23 +1340,25 @@ test_files:
 - spec/mods/standard/formats/csv_format_spec.rb
 - spec/mods/standard/formats/email_html_format_spec.rb
 - spec/mods/standard/formats/file_format_spec.rb
+- spec/mods/standard/formats/js_format_spec.rb
 - spec/mods/standard/formats/json_format_spec.rb
-- spec/mods/standard/formats/kml_format_spec.rb
 - spec/mods/standard/formats/rss_format_spec.rb
 - spec/mods/standard/formats/xml_format_spec.rb
+- spec/mods/standard/lib/machine_input_spec.rb
+- spec/mods/standard/lib/machine_spec.rb
 - spec/mods/standard/sets/all/account_spec.rb
-- spec/mods/standard/sets/all/admin_spec.rb
 - spec/mods/standard/sets/all/all_css_spec.rb
 - spec/mods/standard/sets/all/all_csv_spec.rb
 - spec/mods/standard/sets/all/attach_spec.rb
 - spec/mods/standard/sets/all/base_spec.rb
+- spec/mods/standard/sets/all/comment_spec.rb
 - spec/mods/standard/sets/all/email_html_spec.rb
+- spec/mods/standard/sets/all/event_viz_spec.rb
 - spec/mods/standard/sets/all/file_spec.rb
 - spec/mods/standard/sets/all/flexmail_spec.rb
 - spec/mods/standard/sets/all/follow_spec.rb
-- spec/mods/standard/sets/all/geocode_spec.rb
+- spec/mods/standard/sets/all/history_spec.rb
 - spec/mods/standard/sets/all/json_spec.rb
-- spec/mods/standard/sets/all/kml_spec.rb
 - spec/mods/standard/sets/all/rich_html_spec.rb
 - spec/mods/standard/sets/all/rss_spec.rb
 - spec/mods/standard/sets/all/text_spec.rb
@@ -1355,60 +1366,69 @@ test_files:
 - spec/mods/standard/sets/right/add_help_spec.rb
 - spec/mods/standard/sets/right/comment_spec.rb
 - spec/mods/standard/sets/right/create_spec.rb
-- spec/mods/standard/sets/right/crypted_password_spec.rb
 - spec/mods/standard/sets/right/default_spec.rb
 - spec/mods/standard/sets/right/delete_spec.rb
 - spec/mods/standard/sets/right/email_spec.rb
 - spec/mods/standard/sets/right/help_spec.rb
+- spec/mods/standard/sets/right/machine_output_spec.rb
+- spec/mods/standard/sets/right/password_spec.rb
 - spec/mods/standard/sets/right/read_spec.rb
 - spec/mods/standard/sets/right/salt_spec.rb
+- spec/mods/standard/sets/right/script_spec.rb
+- spec/mods/standard/sets/right/stats_spec.rb
+- spec/mods/standard/sets/right/status_spec.rb
 - spec/mods/standard/sets/right/structure_spec.rb
 - spec/mods/standard/sets/right/style_spec.rb
+- spec/mods/standard/sets/right/token_spec.rb
 - spec/mods/standard/sets/right/update_spec.rb
 - spec/mods/standard/sets/right/when_created_spec.rb
 - spec/mods/standard/sets/right/when_last_edited_spec.rb
 - spec/mods/standard/sets/rstar/rules_spec.rb
 - spec/mods/standard/sets/self/account_links_spec.rb
 - spec/mods/standard/sets/self/alerts_spec.rb
+- spec/mods/standard/sets/self/all_spec.rb
 - spec/mods/standard/sets/self/foot_spec.rb
 - spec/mods/standard/sets/self/head_spec.rb
 - spec/mods/standard/sets/self/navbox_spec.rb
 - spec/mods/standard/sets/self/now_spec.rb
 - spec/mods/standard/sets/self/recent_spec.rb
 - spec/mods/standard/sets/self/search_spec.rb
+- spec/mods/standard/sets/self/signin_spec.rb
+- spec/mods/standard/sets/self/stats_spec.rb
 - spec/mods/standard/sets/self/style_functional_spec.rb
 - spec/mods/standard/sets/self/style_jquery_ui_smoothness_spec.rb
 - spec/mods/standard/sets/self/style_standard_spec.rb
 - spec/mods/standard/sets/self/version_spec.rb
-- spec/mods/standard/sets/type/account_request_spec.rb
 - spec/mods/standard/sets/type/basic_spec.rb
 - spec/mods/standard/sets/type/cardtype_spec.rb
+- spec/mods/standard/sets/type/coffeescript_spec.rb
 - spec/mods/standard/sets/type/css_spec.rb
 - spec/mods/standard/sets/type/date_spec.rb
 - spec/mods/standard/sets/type/file_spec.rb
 - spec/mods/standard/sets/type/html_spec.rb
 - spec/mods/standard/sets/type/image_spec.rb
+- spec/mods/standard/sets/type/javascript_spec.rb
 - spec/mods/standard/sets/type/layout_type_spec.rb
 - spec/mods/standard/sets/type/number_spec.rb
 - spec/mods/standard/sets/type/phrase_spec.rb
 - spec/mods/standard/sets/type/plain_text_spec.rb
 - spec/mods/standard/sets/type/pointer_spec.rb
-- spec/mods/standard/sets/type/ruby_and_script_spec.rb
 - spec/mods/standard/sets/type/scss_spec.rb
 - spec/mods/standard/sets/type/search_type_spec.rb
 - spec/mods/standard/sets/type/set_spec.rb
 - spec/mods/standard/sets/type/setting_spec.rb
+- spec/mods/standard/sets/type/signup_spec.rb
 - spec/mods/standard/sets/type/skin_spec.rb
 - spec/mods/standard/sets/type/toggle_spec.rb
 - spec/mods/standard/sets/type/user_spec.rb
-- spec/spec.opts
+- spec/spec_helper.rb
+- test/1.10.0-data-dump.sql
 - test/fixtures/.gitkeep
 - test/fixtures/card_references.yml
 - test/fixtures/card_revisions.yml
 - test/fixtures/cards.yml
 - test/fixtures/mao2.jpg
 - test/fixtures/rails.gif
-- test/fixtures/users.yml
 - test/performance/card_create_test.rb
 - test/performance/fetch_test.rb
 - test/performance/homepage_test.rb