wagn 1.13.0.pre1 → 1.13.0.pre2

data/lib/wagn/cache.rb

@@ -59,6 +59,14 @@ module Wagn
         Card.delete_tmp_files
       end
 
+      def reset_local
+        cache_by_class.each do |cc, cache|
+          if Wagn::Cache===cache
+            cache.reset_local
+          else warn "reset class #{cc}, #{cache.class} #{caller[0..8]*"\n"} ???" end
+        end
+      end
+
       private
 
       def prepopulate
@@ -71,13 +79,6 @@ module Wagn
       end
 
 
-      def reset_local
-        cache_by_class.each do |cc, cache|
-          if Wagn::Cache===cache
-            cache.reset_local
-          else warn "reset class #{cc}, #{cache.class} #{caller[0..8]*"\n"} ???" end
-        end
-      end
 
     end
 

data/lib/wagn/commands.rb

@@ -42,7 +42,7 @@ else
     end
   when 'update'
     load_rake_tasks
-    Rake::Taske['wagn:update'].invoke
+    Rake::Task['wagn:update'].invoke
   when 'cucumber'
     system "RAILS_ROOT=. bundle exec cucumber #{ ARGV.join(' ') }"
   when 'rspec'

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

@@ -7,7 +7,7 @@ Wagn.application.class.configure do
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
-
+  
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
 

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

@@ -0,0 +1 @@
+Paperclip::Attachment.default_options[:use_timestamp] = false

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

@@ -5,68 +5,72 @@ gem 'wagn'<%= ", :path=>'#{@wagn_path}'"  if @wagn_path.present? %>
 <%= database_gemfile_entry -%>
 
 <% 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 :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 :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"
 
-	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 '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
+gem 'ruby-prof', '~>0.12.1', :group=>:profile  # profiling
 
-	group :debug do
-	  if RUBY_VERSION =~ /^2/
-			gem 'byebug' 
-		else
-			gem 'debugger'
-		end
+group :debug do
+  if RUBY_VERSION =~ /^2/
+		gem 'byebug' 
+	else
+		gem 'debugger'
 	end
+end
 <% end %>

data/lib/wagn/location.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 # helper for urls, links, redirects, and other location related things.
 #  note: i'm sure this isn't the optimal name..
+
 module Wagn::Location
 
   # we keep a history stack so that in the case of card removal
@@ -17,8 +18,7 @@ module Wagn::Location
   end
 
   def save_location
-    return if ajax? || !html? || !@card.known?
-
+    return if ajax? || !html? || !@card.known? || (@card.codename == 'signin')
     discard_locations_for @card
     @previous_location = wagn_path @card
     location_history.push @previous_location

data/mods/core/formats/html_format.rb

@@ -34,8 +34,8 @@ class Card
     end
 
     def commentable? view, args
-      self.class.tagged view, :comment      and 
-      show_view? :comment_box, args, :hide and #developer or wagneer has overridden default
+      self.class.tagged view, :comment                                   and 
+      show_view? :comment_box, args.merge( :default_visibility=>:hide )  and #developer or wagneer has overridden default
       ok? :comment
     end
 
@@ -211,10 +211,6 @@ class Card
       }
     end
   
-    def unknown_view view
-      "<strong>unknown view: <em>#{view}</em></strong>"
-    end
-  
     def unsupported_view view
       "<strong>view <em>#{view}</em> not supported for <em>#{error_cardname}</em></strong>"
     end

data/mods/core/formats/text_format.rb

@@ -5,6 +5,6 @@ class Card
   Format.register :txt
   
   class TextFormat < Format
-    @@aliases[:txt] = :text
+    @@aliases['txt'] = 'text'
   end
 end

data/mods/core/set_patterns/01_all.rb

@@ -1,8 +1,3 @@
-@@options = {
-  :opt_keys => [],
-  :method_key => ''
-}
-
 def label name
   'All cards'
 end

data/mods/core/set_patterns/02_all_plus.rb

@@ -1,6 +1,4 @@
-@@options = {
-  :junction_only => true
-}
+@@options = { :junction_only => true }
 
 def label name
   'All "+" cards'

data/mods/core/set_patterns/07_type_plus_right.rb

@@ -1,5 +1,4 @@
 @@options = {
-  :opt_keys => [:ltype, :right],
   :junction_only=>true,
   :assigns_type=>true
 }

data/mods/core/sets/all/active_card.rb

@@ -29,5 +29,5 @@ end
 
 #fixme -this needs a better home!
 def format opts={}
-  Format.new self, opts
+  Card::Format.new self, opts
 end

data/mods/core/sets/all/name.rb

@@ -136,9 +136,10 @@ event :validate_unique_codename, :after=>:permit_codename do
 end
 
 event :validate_name, :before=>:approve, :on=>:save do 
-
   cdname = name.to_name
-  if cdname.blank?
+  if name.length > 255
+    errors.add :name, "is too long (255 character maximum)"
+  elsif cdname.blank?
     errors.add :name, "can't be blank"
   elsif name_changed?
     #Rails.logger.debug "valid name #{card.name.inspect} New #{name.inspect}"

data/mods/core/sets/all/pattern.rb

@@ -1,21 +1,3 @@
-MODULES={}
-
-module ClassMethods
-
-  def find_set_pattern mark
-    if mark
-      class_key = if Card::Name === mark
-        key_card = Card.fetch mark.to_name.tag_name, :skip_modules=>true
-        key_card && key_card.codename
-      else
-        mark.to_s
-      end
-      set_patterns.find { |sub| sub.key == class_key }
-    end
-  end
-
-end
-
 
 def patterns
   @patterns ||= set_patterns.map { |sub| sub.new(self) }.compact
@@ -27,7 +9,7 @@ end
 alias_method_chain :patterns, :new
 
 def reset_patterns
-  @set_mods_loaded = @patterns = @set_modules = @junction_only = @method_keys = @set_names = @template = @rule_set_keys = @virtual = nil
+  @set_mods_loaded = @patterns = @set_modules = @junction_only = @set_names = @template = @rule_set_keys = @virtual = nil
   true
 end
 
@@ -49,7 +31,14 @@ def safe_set_keys
 end
 
 def set_modules
-  @set_modules ||= patterns_without_new[0..-2].reverse.map(&:set_const).compact
+  @set_modules ||= patterns_without_new[0..-2].reverse.map(&:module_list).flatten.compact
+end
+
+def set_format_modules klass
+  @set_format_modules ||= {}
+  @set_format_modules[klass] = patterns_without_new[0..-2].reverse.map do |pattern|
+    pattern.format_module_list klass
+  end.flatten.compact
 end
 
 def set_names
@@ -65,6 +54,3 @@ def rule_set_keys
   @rule_set_keys ||= patterns.map( &:rule_set_key ).compact
 end
 
-def method_keys
-  @method_keys ||= patterns.map(&:get_method_key).compact
-end

data/mods/core/sets/all/phases.rb

@@ -1,15 +1,33 @@
 
-def valid_subcard?
-  abortable { valid? }
+# The Card#abort method is for cleanly exiting an action without continuing to process any further events.
+#
+# Three statuses are supported:
+#
+#   failure: adds an error, returns false on save
+#   success: no error, returns true on save
+#   triumph: similar to success, but if called on a subcard it causes the entire action to abort (not just the subcard)
+
+def abort status, msg='action canceled'
+  if status == :failure && errors.empty?
+    errors.add :abort, msg
+  end
+  raise Card::Abort.new( status, msg)
 end
 
+
 def abortable
   yield
 rescue Card::Abort => e
-  # need mechanism for subcards to abort entire process?
-  e.status == :success
+  if e.status == :triumph
+    @supercard ? raise( e ) : true
+  else
+    e.status == :success
+  end
 end
 
+def valid_subcard?
+  abortable { valid? }
+end
 
 # this is an override of standard rails behavior that rescues abortmakes it so that :success abortions do not rollback
 def with_transaction_returning_status
@@ -22,12 +40,8 @@ def with_transaction_returning_status
   status
 end
 
-def abort status=:failure, msg='action canceled'
-  if status == :failure && errors.empty?
-    errors.add :abort, msg
-  end
-  raise Card::Abort.new( status, msg)
-end
+# perhaps above should be in separate module?
+#~~~~~~
 
 def approve
   @action = identify_action
@@ -39,7 +53,7 @@ def approve
   run_callbacks :approve
   expire_pieces if errors.any?
   errors.empty?
-rescue Exception=>e
+rescue =>e
   rescue_event e
 end
 
@@ -56,7 +70,7 @@ def store
     yield
     @virtual = false
   end
-rescue Exception=>e
+rescue =>e
   rescue_event e
 ensure
   @from_trash = nil
@@ -66,7 +80,7 @@ end
 def extend
 #    puts "extend called"
   run_callbacks :extend
-rescue Exception=>e
+rescue =>e
   rescue_event e
 ensure
   @action = nil

data/mods/core/sets/all/rules.rb

@@ -44,9 +44,9 @@ def related_sets
   # refers to sets that users may configure from the current card - NOT to sets to which the current card belongs
 
   sets = []
-  sets << ["#{name}+*type",  Card::SetPattern::TypePattern.label( name) ] if known? && type_id==Card::CardtypeID
-  sets << ["#{name}+*self",  Card::SetPattern::SelfPattern.label( name) ] 
-  sets << ["#{name}+*right", Card::SetPattern::RightPattern.label(name) ] if known? && cardname.simple?
+  sets << ["#{name}+*type",  Card::TypeSet.label( name) ] if known? && type_id==Card::CardtypeID
+  sets << ["#{name}+*self",  Card::SelfSet.label( name) ] 
+  sets << ["#{name}+*right", Card::RightSet.label(name) ] if known? && cardname.simple?
     
 #      Card.search(:type=>'Set',:left=>{:right=>name},:right=>'*type plus right',:return=>'name').each do |set_name|
 #        sets<< set_name

data/mods/core/sets/all/templating.rb

@@ -91,8 +91,11 @@ def assigns_type?
   # for example, X+*type+*structure governs all cards of type X,
   # but the content rule does not (in fact cannot) have the type X.
   if is_structure?
-    set_class = Card.find_set_pattern cardname.trunk_name
-    set_class && set_class.assigns_type
+    if set_pattern = Card.fetch( cardname.trunk_name.tag_name, :skip_modules=>true )
+      pattern_code = set_pattern.codename and
+      set_class    = Card::SetPattern.find( pattern_code ) and
+      set_class.assigns_type
+    end
   end
 end
 

data/mods/core/sets/all/tracked_attributes.rb

@@ -50,6 +50,7 @@ def set_content new_content
     clear_drafts if current_revision_id
     new_rev = Card::Revision.create :card_id=>self.id, :content=>new_content, :creator_id =>Auth.current_id
     self.current_revision_id = new_rev.id
+    self.selected_revision_id = nil
     reset_patterns_if_rule saving=true
     @name_or_content_changed = true
   else
@@ -102,7 +103,7 @@ event :update_ruled_cards, :after=>:store do
       in_set = {}
       if !(self.trash)
         if class_id = (set=left and set_class=set.tag and set_class.id)
-          rule_class_ids = set_patterns.map &:key_id
+          rule_class_ids = set_patterns.map &:pattern_id
           #warn "rule_class_id #{class_id}, #{rule_class_ids.inspect}"
 
           #first update all cards in set that aren't governed by narrower rule