wagn 1.13.0.pre → 1.13.0.pre1

data/db/migrate_cards/20140512155840_add_script_cards.rb

@@ -61,6 +61,7 @@ class AddScriptCards < ActiveRecord::Migration
       default_rule_ending = "#{ Card[:right].name }+#{ Card[ :default ].name }"
       Card.create! :name=>'*machine output', :codename=>:machine_output
       Card.create! :name=>"*machine output+#{default_rule_ending}", :type_id=>Card::FileID
+      Card.create! :name=>"*machine output+#{ Card[:right].name}+#{Card[:read].name}", :content=>'_left'
       Card.create! :name=>'*machine input', :codename=>:machine_input
       Card.create! :name=>"*machine input+#{default_rule_ending}", :type_id=>Card::PointerID
       

data/features/step_definitions/wagn_steps.rb

@@ -2,7 +2,12 @@
 require 'uri'
 require 'cgi'
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
-require 'debugger'
+
+if RUBY_VERSION =~ /^2/
+  require 'byebug'
+else
+  require 'debugger'
+end
 
 
 Given /^site simulates setup need$/ do
@@ -134,7 +139,11 @@ Then /what/ do
 end
 
 Then /debug/ do
-  debugger
+  if RUBY_VERSION =~ /^2/
+    byebug
+  else
+    debugger
+  end
   nil
 end
 
@@ -200,7 +209,11 @@ end
 
 Then /^In (.*) I should see "([^\"]*)"$/ do |section, text|
   within scope_of(section) do
-    page.should have_content(text)
+    if text.index('|')
+      text.split('|').any? {|t| have_content(t)}.should be
+    else
+      page.should have_content(text)
+    end
   end
 end
 

data/features/watch.feature

@@ -17,7 +17,7 @@ Feature: Watch interface
     When I go to the homepage
     And I hover over the main menu
     And In the main card menu I click "follow"
-    Then In the main card menu I should see "unfollow"
+    Then In the main card menu I should see "following|unfollow"
     # assumes focus still on that link.  otherwise "following"
     # selenium behavior not totally consistent here.
     And the card Home+*watchers should contain "Joe User"

data/lib/card/content.rb

@@ -28,7 +28,7 @@ class Card
       case __getobj__
       when Array;    map(&:to_s)*''
       when String;   __getobj__
-      when NilClass; raise "Nil Card::Content"
+      when NilClass; '' #raise "Nil Card::Content"
       else           __getobj__.to_s
       end
     end

data/lib/card/format.rb

@@ -352,11 +352,11 @@ class Card
 
     def process_content_object content=nil, opts={}
       return content unless card
-      content = card.content if content.blank?
+      content = card.content if content.nil?
 
       obj_content = Card::Content===content ? content : Card::Content.new( content, format=self )
 
-      card.update_references( obj_content, true ) if card.references_expired  # I thik we need this genralized
+      card.update_references( obj_content, true ) if card.references_expired  # I thik we need this generalized
 
       obj_content.process_content_object do |chunk_opts|
         prepare_nest chunk_opts.merge(opts) { yield }
@@ -483,9 +483,10 @@ class Card
     end
 
     def nest nested_card, opts={}
+      #ActiveSupport::Notifications.instrument('wagn', message: "nest: #{nested_card.name}, #{opts}") do
       opts.delete_if { |k,v| v.nil? }
       opts.reverse_merge! inclusion_defaults
-      
+    
       sub = subformat nested_card
       sub.inclusion_opts = opts[:items] ? opts[:items].clone : {}
 
@@ -506,8 +507,9 @@ class Card
       when @mode == :closed     ; !nested_card.known?  ? :closed_missing : :closed_content
       else                      ; view
       end
-      
+    
       sub.render view, opts
+      #end
     end
 
     def get_inclusion_content cardname

data/lib/card/generators/card_migration/USAGE

@@ -3,7 +3,7 @@ Description:
     Generates a migration of database content
 
 Example:
-    rails generate card_migration better_commented_search_cards
+    wagn generate card_migration better_commented_search_cards
 
     This will create:
     

data/lib/card/mailer.rb

@@ -15,7 +15,8 @@ class Card
 
     def confirmation_email account
       @site = Card.setting :title
-      @link = wagn_url "/update/#{account.left.cardname.url_key}?token=#{account.token}"
+      @token = account.token
+      @link = wagn_url "/update/#{ account.left.cardname.url_key }?token=#{ @token }"
       @expiry = Wagn.config.token_expiry
 
       confirm_from = token_emails_from(account)

data/lib/card/mailer/confirmation_email.html.erb

@@ -2,7 +2,11 @@
 <html>
   <body style="text-align:center">
     <h1>Thank you for signing up with <%= @site %></h1>
-    <div>Please <a href="<%= @link %>">follow this link</a> to verify this email address and activate your account.</div>
-    <div>(link will remain valid for <%= @expiry / 1.day %> days)</div>
+	<%- if @token %>
+	    <div>Please <a href="<%= @link %>">follow this link</a> to verify this email address and activate your account.</div>
+	    <div>(link will remain valid for <%= @expiry / 1.day %> days)</div>
+	<%- else %>
+		<div>You will receive further notification when your account is approved</div>
+	<%- end %>
   </body>
 </html>

data/lib/wagn/all.rb

@@ -1,13 +1,5 @@
 require 'rails/all'
 
-if Rails.env.development?
-  if $LOAD_PATH.find { |path| File.exists? "#{path}/wagn/dev.rb" } 
-    require 'wagn/dev'
-  else
-    puts "WARNING: the gem wagn-dev is strongly recommended when running wagn in development mode but is not found"
-  end
-end
-
 require 'htmlentities'
 require 'recaptcha'
 require 'airbrake'

data/lib/wagn/application.rb

@@ -2,7 +2,6 @@
 
 require 'wagn/all'
 require 'active_support/core_ext/numeric/time'
-
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
   Bundler.require *Rails.groups(:assets => %w(development test))
@@ -14,6 +13,20 @@ end
 module Wagn
   class Application < Rails::Application
     
+    initializer :load_wagn_environment_config, :before => :load_environment_config, :group => :all do
+      add_gem_path paths, "lib/wagn/config/environments", :glob => "#{Rails.env}.rb"   
+      paths["lib/wagn/config/environments"].existent.each do |environment|
+        require environment
+      end
+    end
+    
+    initializer :load_wagn_config_initializers,  :before => :load_config_initializers do
+      add_gem_path paths, 'lib/wagn/config/initializers', :glob => "**/*.rb" 
+      config.paths['lib/wagn/config/initializers'].existent.sort.each do |initializer|
+        load(initializer)
+      end
+    end
+    
     class << self
       def inherited(base)
         Rails.application = base.instance
@@ -62,20 +75,17 @@ module Wagn
     def paths
       @paths ||= begin
         paths = super
-        add_wagn_path paths, "app",                 :eager_load => true, :glob => "*"
-        add_wagn_path paths, "app/assets",          :glob => "*"
-        add_wagn_path paths, "app/controllers",     :eager_load => true
-        add_wagn_path paths, "lib/tasks",           :with => "lib/wagn/tasks", :glob => "**/*.rake"
-        add_wagn_path paths, "config"
-        add_wagn_path paths, "config/environments", :glob => "#{Rails.env}.rb"
-        add_wagn_path paths, "config/initializers", :glob => "**/*.rb"
-        add_wagn_path paths, "config/routes",       :with => "config/routes.rb"
-        add_wagn_path paths, "db"
-        add_wagn_path paths, "db/migrate"
-        add_wagn_path paths, "db/migrate_cards"
-        add_wagn_path paths, "db/seeds",            :with => "db/seeds.rb"        
-        add_wagn_path paths, 'gem-mods',            :with => 'mods'
-        add_wagn_path paths, 'gem-assets',          :with => 'public/assets'
+        add_gem_path paths, "app",                 :eager_load => true, :glob => "*"
+        add_gem_path paths, "app/assets",          :glob => "*"
+        add_gem_path paths, "app/controllers",     :eager_load => true
+        add_gem_path paths, "lib/tasks",           :with => "lib/wagn/tasks", :glob => "**/*.rake"
+        add_gem_path paths, "config/routes",       :with => "config/routes.rb"
+        add_gem_path paths, "db"
+        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-assets',          :with => 'public/assets'
 
         paths['app/models'] = []
         paths['app/mailers'] = []
@@ -94,11 +104,11 @@ module Wagn
       Wagn.gem_root.to_s == config.root.to_s
     end
     
-    def add_wagn_path paths, path, options={}
-      wagn_path        = File.join( Wagn.gem_root, path )
+    def add_gem_path paths, path, options={}
+      gem_path        = File.join( Wagn.gem_root, path )
       options[:with] &&= File.join( Wagn.gem_root, options[:with]) 
-      with = options[:with] || wagn_path
-      paths[path] = Rails::Paths::Path.new(paths, wagn_path, with, options)
+      with = options[:with] || gem_path
+      paths[path] = Rails::Paths::Path.new(paths, gem_path, with, options)
     end
 
     def load_tasks(app=self)

data/lib/wagn/commands.rb

@@ -1,2 +1,104 @@
-require 'wagn'
-require 'rails/commands'
+def load_rake_tasks
+  require './config/environment'
+  require 'rake'
+  Wagn::Application.load_tasks
+end
+
+require 'active_support/core_ext/object/inclusion' # adds method in? to Object class
+
+ARGV << '--help' if ARGV.empty?
+
+aliases = {
+  "rs" => "rspec",
+  "cc" => "cucumber",
+  "g"  => "generate",
+  "d"  => "destroy",
+  "c"  => "console",
+  "s"  => "server",
+  "db" => "dbconsole",
+  "r"  => "runner"
+}
+
+rails_commands = %w( generate destroy plugin benchmarker profiler console server dbconsole application runner )
+
+if ARGV.first.in? rails_commands or aliases[ARGV.first].in? rails_commands
+  require 'wagn'
+  require 'rails/commands'
+else
+  command = ARGV.shift
+  command = aliases[command] || command
+
+  case command
+  when 'seed'
+    #load_rake_tasks  we can't load config/environment if the database doesn't exist, use config/application instead
+    require './config/application'
+    require 'wagn/migration_helper'
+    require 'rake'
+    Wagn::Application.load_tasks
+    Rake::Task['wagn:create'].invoke
+    if ARGV.include? "--test-data" 
+      ENV['RELOAD_TEST_DATA'] = 'true'
+      Rake::Task['db:test:prepare'].invoke
+    end
+  when 'update'
+    load_rake_tasks
+    Rake::Taske['wagn:update'].invoke
+  when 'cucumber'
+    system "RAILS_ROOT=. bundle exec cucumber #{ ARGV.join(' ') }"
+  when 'rspec'
+    if index = ( ARGV.index("-s") || ARGV.index("--spec" ))
+      ARGV.delete_at(index)
+      files = Dir.glob("mods/**/#{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]}"
+      ARGV.delete_at(index)
+    end
+    system "RAILS_ROOT=. bundle exec rspec #{ARGV.join(' ')} #{files}"
+  when '--version', '-v'
+    puts "Wagn #{Wagn::Version.release}"
+  when 'new'
+    if ARGV.first.in?(['-h', '--help'])
+      require 'wagn/commands/application'
+    else
+      puts "Can't initialize a new deck within the directory of another, please change to a non-deck directory first.\n"
+      puts "Type 'wagn' for help."
+      exit(1)
+    end
+
+  else
+    puts "Error: Command not recognized" unless command.in?(['-h', '--help'])
+    puts <<-EOT
+  Usage: wagn COMMAND [ARGS]
+
+  The most common wagn commands are:
+   new         Create a new Wagn deck. "wagn new my_deck" creates a
+               new deck called MyDeck in "./my_deck"
+   seed        Create and seed the database specified in config/database.yml
+   
+   server      Start the Rails server (short-cut alias: "s")
+   console     Start the Rails console (short-cut alias: "c")
+   dbconsole   Start a console for the database specified in config/database.yml
+               (short-cut alias: "db")
+               
+  For core developers
+   cucumber     Run cucumber features (short-cut alias: "cc")
+   rspec        Run rspec tests (short-cut alias: "rs")
+   update       Run card migrations
+
+  In addition to those, there are the standard rails commands:
+   generate     Generate new code (short-cut alias: "g")
+   application  Generate the Rails application code
+   destroy      Undo code generated with "generate" (short-cut alias: "d")
+   benchmarker  See how fast a piece of code runs
+   profiler     Get profile information from a piece of code
+   plugin       Install a plugin
+   runner       Run a piece of code in the application environment (short-cut alias: "r")
+
+  All commands can be run with -h (or --help) for more information.
+    EOT
+    exit(1)
+  end
+end

data/{config → lib/wagn/config}/initializers/airbrake.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-
 filename = '/etc/airbrake.key'
 if File.exists? filename
   key = File.read( filename ).strip

data/lib/wagn/generators/wagn/USAGE

@@ -1,8 +1,9 @@
 Description:
-    Explain the generator
+    The 'wagn new' command creates a new Wagn deck with a default
+    directory structure and configuration at the path you specify.
 
 Example:
-    rails generate wagn Thing
+    wagn new ~/Poker/FullHouse
+
+    This generates a new deck in ~/Poker/FullHouse.
 
-    This will create:
-        what/will/it/create

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

@@ -1,7 +1,72 @@
 source 'http://rubygems.org'
 
-gem 'wagn'
+gem 'wagn'<%= ", :path=>'#{@wagn_path}'"  if @wagn_path.present? %>
 
 <%= database_gemfile_entry -%>
 
-#gem 'wagn-dev', :group=>'development'
+<% if options['mod-dev'] %>
+  gem 'rspec-rails', "~> 2.6"   # behavior-driven-development suite
+  gem 'spork', '>=0.9'
+<% 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
+	  gem "jquery_mobile_rails", "~> 1.4.1"
+  
+	  gem 'tinymce-rails', '~> 3.4'                # wysiwyg editor
+  
+	  # execjs is necessary for developing coffeescript.  mac users have execjs built-in; don't need this one
+	  gem 'therubyrhino', :platform=>:ruby         # :ruby is MRI rubies, so if you use a mac ruby ...
+	end
+
+
+	group :test do
+  	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
+	  end
+  
+	  # CUKES see features dir
+	  gem 'cucumber-rails', '~> 1.3', :require=>false # feature-driven-development suite
+	  gem 'capybara', '~> 2.2.1'                     # note, selectors were breaking when we used 2.0.1
+	  gem 'selenium-webdriver', '~> 2.39'
+	#  gem 'capybara-webkit'
+	  gem 'launchy'                                # lets cucumber launch browser windows
+
+	  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
+
+	group :debug do
+	  if RUBY_VERSION =~ /^2/
+			gem 'byebug' 
+		else
+			gem 'debugger'
+		end
+	end
+<% end %>