wagn 1.13.0.pre2 → 1.13.0

data/db/migrate_cards/20140307231621_user_data_to_cards.rb

@@ -35,13 +35,7 @@ class UserDataToCards < ActiveRecord::Migration
         rulename = [ :signin, :self, setting ].map { |code| Card[code].name } * '+'
         Card.create! :name=>rulename, :content=>"[[#{Card[:anyone].name}]]"
       end
-      
-      puts "turn captcha off by default on signup"
-      rulename = [:signup, :type, :captcha].map { |code| Card[code].name } * '+'
-      captcha_rule = Card.fetch rulename, :new=>{}
-      captcha_rule.content = '0'
-      captcha_rule.save!
-      
+            
       puts "supporting legacy handling of +*email on User cards"
       oldname = [       :email,           :right, :structure].map { |code| Card[code].name } * '+'
       newname = [:user, :email, :type_plus_right, :structure].map { |code| Card[code].name } * '+'

data/db/migrate_cards/20140317035504_account_requests_to_signups.rb

@@ -23,6 +23,8 @@ class AccountRequestsToSignups < ActiveRecord::Migration
       new_signup.update_referencers = true
       new_signup.codename = :signup
       new_signup.save!
+
+      Card::Codename.reset_cache
       
       # move old "*signup+*thanks" to "Sign up+*type+*thanks"
       thanks = Card[:thanks]
@@ -37,6 +39,13 @@ class AccountRequestsToSignups < ActiveRecord::Migration
         old_signup.delete!
       end
       
+      # turn captcha off by default on signup
+      rulename = [:signup, :type, :captcha].map { |code| Card[code].name } * '+'
+      captcha_rule = Card.fetch rulename, :new=>{}
+      captcha_rule.content = '0'
+      captcha_rule.save!
+      
+      
     end
   end
 

data/db/migrate_cards/20140725180118_config_card_updates.rb

@@ -0,0 +1,12 @@
+# -*- encoding : utf-8 -*-
+
+class ConfigCardUpdates < ActiveRecord::Migration
+  include Wagn::MigrationHelper
+  def up
+    contentedly do
+      raw_json = File.read( File.join Wagn.gem_root, 'db/migrate_cards/data/1.13_config_text.json' )
+      json = JSON.parse raw_json
+      Card.merge_list json["card"]["value"], :output_file=>"tmp/unmerged_config_text.json", :pristine=>true
+    end
+  end
+end

data/db/migrate_cards/data/1.13_config_text.json

@@ -0,0 +1,32 @@
+{
+  "url": "http://en.dwagn.org/export.json",
+  "timestamp": "2014-07-25 17:38:28 +0000",
+  "card": {
+    "name": "export",
+    "type": "Pointer",
+    "content": "[[Signup Success]]\n[[Sign up+description]]\n[[Config]]\n[[*request]]",
+    "value": [
+      {
+        "name": "Signup Success",
+        "type": "Basic",
+        "content": "<div>Thank you for signing up with {{*title}}. You should receive a response in your email.</div>"
+      },
+      {
+        "name": "Sign up+description",
+        "type": "Basic",
+        "content": "<p>[[Sign up]] cards represent not-yet-approved accounts.  When approved, they become [[User]] cards.  [[http://wagn.org/account|more]]</p>"
+      },
+      {
+        "name": "Config",
+        "type": "Basic",
+        "content": "<h1>Basics</h1>\r\n<div>Set your site name, home card, and logo image:</div>\r\n<blockquote>\r\n<div>{{*title|closed;type:Phrase}}</div>\r\n<div>{{*home|closed;type:Phrase}}</div>\r\n<div>{{*logo|closed;type:Image}}</div>\r\n</blockquote>\r\n<div> </div>\r\n<h1>Rules</h1>\r\n<div>Cards are configured by creating <em>rules</em>.  All the rules impacting a given card can be accessed from its card menu via the \"advanced\" item. Here are the site-wide defaults:</div>\r\n<div>\r\n<blockquote>{{*all|open}}</blockquote>\r\n</div>\r\n<div><em>[[http://wagn.org/rules | More about rules.]]</em></div>\r\n<div> </div>\r\n<h1>Accounts</h1>\r\n<div>Accounts are represented in cards, too. You first create a [[Sign up]] card, and that then turns into a [[User]] card.</div>\r\n<blockquote>\r\n<div>{{Sign up|closed}}</div>\r\n<div>{{User|closed}}</div>\r\n</blockquote>\r\n<div>\r\n<ul>\r\n<li>When [[Anyone]] can [[*create|create]] a [[Sign up]] card, links to sign up will appear.</li>\r\n<li>When [[Anyone]] can [[*create|create]] a [[User]] card, sign-ups can be authenticated with a token.</li>\r\n<li>When only other [[Roles]] can [[*create|create]] a [[User]] card, sign-ups must be approved by hand. </li>\r\n</ul>\r\n</div>\r\n<div><em>[[http://wagn.org/account | More about accounts.]]</em></div>\r\n<div> </div>\r\n<blockquote>\r\n<div> </div>\r\n<div> </div>\r\n</blockquote>"
+      },
+      {
+        "name": "*request",
+        "type": "Basic",
+        "content": "",
+        "codename": "request"
+      }
+    ]
+  }
+}

data/features/setup.feature

@@ -15,7 +15,7 @@ Feature: Setting up
     When I fill in "card_name" with "The Newber"
     And I enter "newb@wagn.org" into "*email"
     And I enter "newb_pass" into "*password"
-    And I press "Submit"
+    And I press "Set up"
     Then I should see "The Newber"
     
     When I go to card "The Newber\+\*roles"

data/lib/card/auth.rb

@@ -25,31 +25,7 @@ class Card
         account.password == encrypt( password, account.salt )
       end
 
-      def authenticate_by_token token
-        token_card = find_token_card(token) or return :token_not_found
-        
-        token_card.updated_at >
-          Wagn.config.token_expiry.ago      or return :token_expired  # > means "after"
-
-        account = token_card.left and
-        account.right_id==Card::AccountID   or return :bad_account
-
-        accounted = account.left and
-        accounted.accountable?              or return :illegal_account  #(overkill?)
-        
-        as_bot { token_card.delete! }
-        accounted.id
-      end
 
-      def find_token_card token
-        Auth.as_bot do
-          Card.search(
-            :right_id=>Card::TokenID, 
-            :content=>token
-          ).first
-        end          
-      end
-    
       # Encrypts some data with the salt.
       def encrypt password, salt
         Digest::SHA1.hexdigest "#{salt}--#{password}--"

data/lib/card/content.rb

@@ -5,15 +5,16 @@ require_dependency 'card/chunk'
 
 class Card
   class Content < SimpleDelegator
-    attr_reader :revision, :format, :chunks
+    attr_reader :revision, :format, :chunks, :opts
 
-    def initialize content, format_or_card
+    def initialize content, format_or_card, opts={}
       @format = if Card===format_or_card
         Format.new format_or_card, :format=>nil
       else
         format_or_card
       end
-
+      @opts = opts || {}
+      
       unless Array === content
         content = parse_content content
       end
@@ -23,6 +24,10 @@ class Card
     def card
       format.card
     end
+    
+    def chunk_list
+      @opts[:chunk_list] || card.chunk_list
+    end
 
     def to_s
       case __getobj__
@@ -62,7 +67,7 @@ class Card
 
       if String===content
         position = last_position = 0
-        prefix_regexp = Chunk.get_prefix_regexp card.chunk_list
+        prefix_regexp = Chunk.get_prefix_regexp chunk_list
         interval_string = ''
 
         while prefix_match = content[position..-1].match( prefix_regexp )

data/lib/card/env.rb

@@ -25,14 +25,6 @@ class Card
         @@env[key.to_sym] = value
       end
       
-      #hacky - should be in module
-      def recaptcha_on?
-        if self[:recaptcha_on].nil?
-          self[:recaptcha_count] = 0
-          self[:recaptcha_on] = self[:controller] && have_recaptcha_keys? && !Auth.signed_in? && !Auth.needs_setup? && !Auth.always_ok?
-        end
-        self[:recaptcha_on]
-      end
 
       def params
         self[:params] ||= {}
@@ -54,11 +46,7 @@ class Card
         end
       end
     
-      private
-    
-      def have_recaptcha_keys?
-        !!( Wagn.config.recaptcha_public_key && Wagn.config.recaptcha_private_key )
-      end
+
     end
   end  
   Env.reset

data/lib/card/format.rb

@@ -284,7 +284,7 @@ class Card
       return content unless card
       content = card.raw_content || '' if content.nil?
 
-      obj_content = Card::Content===content ? content : Card::Content.new( content, format=self )
+      obj_content = Card::Content===content ? content : Card::Content.new( content, format=self, opts.delete(:content_opts) )
 
       card.update_references( obj_content, refresh=true ) if card.references_expired  # I thik we need this generalized
 
@@ -410,8 +410,13 @@ class Card
       opts.delete_if { |k,v| v.nil? }
       opts.reverse_merge! inclusion_defaults
     
-      sub = subformat nested_card
-      sub.inclusion_opts = opts[:items] ? opts[:items].clone : {}
+      sub = nil
+      if opts[:inc_name] =~ /^_(self)?$/
+        sub = self
+      else
+        sub = subformat nested_card
+        sub.inclusion_opts = opts[:items] ? opts[:items].clone : {}
+      end
 
 
       view = canonicalize_view opts.delete :view

data/lib/card/generators/format/format_generator.rb

@@ -2,7 +2,7 @@ class FormatGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('../templates', __FILE__)
   
   def create_files
-    template 'format_template.erb',           "mods/standard/formats/#{file_name}_format.rb"
-    template 'format_spec_template.erb', "spec/mods/standard/formats/#{file_name}_format_spec.rb"
+    template 'format_template.erb',           "mod/standard/format/#{file_name}_format.rb"
+    template 'format_spec_template.erb', "spec/mod/standard/format/#{file_name}_format_spec.rb"
   end
 end

data/lib/card/generators/set/set_generator.rb

@@ -7,8 +7,8 @@ class SetGenerator < Rails::Generators::Base
   argument :anchor
     
   def create_files
-    template 'set_template.erb',           "mods/#{mod}/sets/#{set_pattern}/#{anchor}.rb"
-    template 'set_spec_template.erb', "spec/mods/#{mod}/sets/#{set_pattern}/#{anchor}_spec.rb"
+    template 'set_template.erb',           "mod/#{mod}/set/#{set_pattern}/#{anchor}.rb"
+    template 'set_spec_template.erb', "spec/mod/#{mod}/set/#{set_pattern}/#{anchor}_spec.rb"
   end
   
 end

data/lib/card/loader.rb

@@ -14,13 +14,13 @@ class Card
       
       def load_chunks
         mod_dirs.each do |mod|
-          load_dir "#{mod}/chunks/*.rb"
+          load_dir "#{mod}/chunk/*.rb"
         end
       end
             
       def load_layouts
         mod_dirs.inject({}) do |hash, mod|
-          dirname = "#{mod}/layouts"
+          dirname = "#{mod}/layout"
           if File.exists? dirname
             Dir.foreach( dirname ) do |filename|
               next if filename =~ /^\./
@@ -35,7 +35,7 @@ class Card
     
       def mod_dirs
         @@mod_dirs ||= begin
-          (Wagn.paths['gem-mods'].existent + Wagn.paths['local-mods'].existent).map do |dirname|
+          (Wagn.paths['gem-mod'].existent + Wagn.paths['local-mod'].existent).map do |dirname|
             Dir.entries( dirname ).sort.map do |filename|
               "#{dirname}/#{filename}" if filename !~ /^\./
             end
@@ -47,14 +47,14 @@ class Card
         if rewrite_tmp_files?
           load_set_patterns_from_source
         end
-        load_dir "#{Wagn.paths['tmp/set_patterns'].first}/*.rb"
+        load_dir "#{Wagn.paths['tmp/set_pattern'].first}/*.rb"
       end
 
       def load_set_patterns_from_source
-        prepare_tmp_dir 'tmp/set_patterns'
+        prepare_tmp_dir 'tmp/set_pattern'
         seq = 100
         mod_dirs.each do |mod|
-          dirname = "#{mod}/set_patterns"
+          dirname = "#{mod}/set_pattern"
           if Dir.exists? dirname
             Dir.entries( dirname ).sort.each do |filename|
               if m = filename.match( /^(\d+_)?([^\.]*).rb/) and key = m[2]
@@ -70,12 +70,12 @@ class Card
       def load_formats
         #cheating on load issues now by putting all inherited-from formats in core mod.
         mod_dirs.each do |mod|
-          load_dir "#{mod}/formats/*.rb"
+          load_dir "#{mod}/format/*.rb"
         end
       end
 
       def load_sets
-        prepare_tmp_dir 'tmp/sets'
+        prepare_tmp_dir 'tmp/set'
         load_sets_by_pattern
         Set.process_base_modules 
         Set.clean_empty_modules
@@ -84,7 +84,7 @@ class Card
 
       def load_sets_by_pattern
         Card.set_patterns.reverse.map(&:pattern_code).each do |set_pattern|
-          pattern_tmp_dir = "#{Wagn.paths['tmp/sets'].first}/#{set_pattern}"
+          pattern_tmp_dir = "#{Wagn.paths['tmp/set'].first}/#{set_pattern}"
           if rewrite_tmp_files?
             Dir.mkdir pattern_tmp_dir
             load_implicit_sets_from_source set_pattern
@@ -98,7 +98,7 @@ class Card
       def load_implicit_sets_from_source set_pattern
         seq = 1000
         mod_dirs.each do |mod_dir|
-          dirname = [mod_dir, 'sets', set_pattern] * '/'
+          dirname = [mod_dir, 'set', set_pattern] * '/'
           next unless File.exists?( dirname )
 
           #FIXME support multiple anchors!
@@ -129,7 +129,7 @@ class Card
         if defined?( @@rewrite )
           @@rewrite
         else
-          @@rewrite = !( Rails.env.production? and Wagn.paths['tmp/sets'].existent.first )
+          @@rewrite = !( Rails.env.production? and Wagn.paths['tmp/set'].existent.first )
         end
       end
 

data/lib/card/set.rb

@@ -42,7 +42,7 @@ class Card
     
     ...then mycard will include the set modules associated with each of those sets in the above
     order.  (The order is determined by the set pattern; see lib/card/set_pattern.rb for more
-    information about set_ptterns and mods/core/sets/all/fetch.rb for more about fetching.)
+    information about set_ptterns and mod/core/set/all/fetch.rb for more about fetching.)
 
     Similarly, whenever a Format object is instantiated for a card, it includes all views
     associated with BOTH (a) sets of which the card is a member and (b) the current format or 
@@ -50,7 +50,7 @@ class Card
 
  
     In order to have a set file associated with "all cards ending in +address", you could create
-    a file in mywagn/mods/mymod/sets/right/address.rb.  The recommended mechanism for doing so
+    a file in mywagn/mod/mymod/set/right/address.rb.  The recommended mechanism for doing so
     is running `wagn generate set modname set_pattern set_anchor`. In the current example, this
     would translate to `wagn generate set mymod right address`. Note that both the set_pattern 
     and the set_anchor must correspond to the codename of a card in the database to function
@@ -196,7 +196,7 @@ class Card
         # There are special hacks for *all, but others (like *rstar) will not be found by
         # include_set_modules, which will look for Card::Set::Rstar, not Card::Set::Rstar::Blah
         
-        to_file = "#{Wagn.paths['tmp/sets'].first}/#{set_pattern}/#{seq}-#{anchor}.rb"
+        to_file = "#{Wagn.paths['tmp/set'].first}/#{set_pattern}/#{seq}-#{anchor}.rb"
         file_content = <<EOF
 # -*- encoding : utf-8 -*-
 class Card; module Set; module #{set_pattern.camelize}; module #{anchor.camelize}

data/lib/card/set_pattern.rb

@@ -40,7 +40,7 @@ class Card
       end
     
       def write_tmp_file pattern_code, from_file, seq
-        to_file = "#{Wagn.paths['tmp/set_patterns'].first}/#{seq}-#{pattern_code}.rb"
+        to_file = "#{Wagn.paths['tmp/set_pattern'].first}/#{seq}-#{pattern_code}.rb"
         klass = "Card::#{pattern_code.camelize}Set"
         file_content = <<EOF
 # -*- encoding : utf-8 -*-

data/lib/wagn/application.rb

@@ -43,7 +43,7 @@ module Wagn
         
         config.autoload_paths += Dir["#{Wagn.gem_root}/app/**/"]
         config.autoload_paths += Dir["#{Wagn.gem_root}/lib/**/"]
-        config.autoload_paths += Dir["#{Wagn.gem_root}/mods/standard/lib/**/"]
+        config.autoload_paths += Dir["#{Wagn.gem_root}/mod/standard/lib/**/"]
         
         config.assets.enabled = false
         config.assets.version = '1.0'
@@ -84,17 +84,17 @@ module Wagn
         add_gem_path paths, "db/migrate"
         add_gem_path paths, "db/migrate_cards"
         add_gem_path paths, "db/seeds",            :with => "db/seeds.rb"        
-        add_gem_path paths, 'gem-mods',            :with => 'mods'
+        add_gem_path paths, 'gem-mod',             :with => 'mod'
         add_gem_path paths, 'gem-assets',          :with => 'public/assets'
 
         paths['app/models'] = []
         paths['app/mailers'] = []
         paths['app/views'] = File.join( Wagn.gem_root, 'lib/card' )
-        paths['local-mods'] = approot_is_gemroot? ? [] : 'mods'        
-
+        paths['local-mod'] = approot_is_gemroot? ? [] : 'mod'
+        
         paths.add 'files'
-        paths.add 'tmp/sets'
-        paths.add 'tmp/set_patterns'
+        paths.add 'tmp/set'
+        paths.add 'tmp/set_pattern'
         
         paths
       end

data/lib/wagn/commands.rb

@@ -48,12 +48,12 @@ else
   when 'rspec'
     if index = ( ARGV.index("-s") || ARGV.index("--spec" ))
       ARGV.delete_at(index)
-      files = Dir.glob("mods/**/#{ARGV[index]}_spec.rb").flatten.join(' ')
+      files = Dir.glob("mod/**/#{ARGV[index]}_spec.rb").flatten.join(' ')
       ARGV.delete_at(index)
     end
     if index = ( ARGV.index("-m") || ARGV.index("--mod" ))
       ARGV.delete_at(index)
-      files = "mods/#{ARGV[index]}"
+      files = "mod/#{ARGV[index]}"
       ARGV.delete_at(index)
     end
     system "RAILS_ROOT=. bundle exec rspec #{ARGV.join(' ')} #{files}"

data/lib/wagn/config/environments/development.rb

@@ -55,12 +55,8 @@ Wagn.application.class.configure do
 #    File.delete(File.join(Rails.root,'tmp', 'debug.txt'))
 #  end
 
-  config.perform_deliveries = false
+  config.action_mailer.perform_deliveries = false
   
-  
-  # config.dev_tweaks.autoload_rules do
-  #   skip '/files'
-  # end
 end
 
 

data/lib/wagn/config/initializers/uuid_state_file.rb

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

data/lib/wagn/generators/wagn/templates/Gemfile

@@ -4,16 +4,29 @@ gem 'wagn'<%= ", :path=>'#{@wagn_path}'"  if @wagn_path.present? %>
 
 <%= database_gemfile_entry -%>
 
-<% if options['mod-dev'] %>
-
+# A javascript runtime is required for JavaScript cards.
+<% if RUBY_PLATFORM =~ /darwin/ -%>
+# Macs have one included, but on other platforms you'll need this or another runtime
+# gem 'therubyracer'
+<% else -%>
+gem 'therubyracer'
+<% end -%>
+
+<% if options['mod-dev'] -%>
 group :test do
   gem 'rspec-rails', "~> 2.6"   # behavior-driven-development suite
   gem 'spork', '>=0.9'
 end
 
-<% end %>
-<% if options['core-dev'] %>
+group :test, :development do
+  gem 'rails-dev-tweaks'
+  gem 'sprockets' # just so above works
+  gem 'byebug'
+end
 
+<% end -%>
+<% if options['core-dev'] -%>
+  
 group :assets do
   gem 'jquery-rails',  '~> 3.1'                # main js framework, along with rails-specific unobtrusive lib
   gem 'jquery-ui-rails',  '~> 4.2'             # main js framework, along with rails-specific unobtrusive lib
@@ -27,11 +40,12 @@ end
 
 
 group :test do
+  gem 'rspec-rails', "~> 2.6"                  # behavior-driven-development suite
+  gem 'spork', '>=0.9'                                           
+  gem 'rr'#, '=1.0.0'
+  
 	gem 'simplecov', '~> 0.7.1', :require => false  #test coverage
     
-  # SPECS see spec dir
-  gem 'rspec-rails', "~> 2.6"                  # behavior-driven-development suite
-
   gem 'guard-rspec', '~> 4.2'                  # trigger test runs based on file edits
   if RUBY_PLATFORM =~ /darwin/
     gem 'terminal-notifier-guard', '~> 1.5'    # use growler notifications on macs
@@ -47,21 +61,12 @@ group :test do
   gem 'timecop', '=0.3.5'                      # not clear on use/need.  referred to in shared_data.rb 
   # NOTE: had weird errors with timecop 0.4.4.  would like to update when possible
 
-  gem 'spork', '>=0.9'
-                                             
-  gem 'rr'#, '=1.0.0'
 
   gem 'email_spec'                             # 
   gem 'database_cleaner', '~> 0.7'             # used by cucumber for db transactions
 
   gem 'turn', "~>0.8.3", :require => false      # Pretty printed test output.  (version constraint is to avoid minitest requirement)
   gem 'minitest', "~>4.0"
-
-
-
-  #windows stuff
-  gem 'win32console', '~> 1.3', :platforms => ['mingw', 'mswin']
-  gem 'win32-process', '~> 0.6', :platforms => ['mingw', 'mswin']
 end
 
 gem 'ruby-prof', '~>0.12.1', :group=>:profile  # profiling