wagn 1.12.13 → 1.13.0.pre

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2MwMjdiNzgxZWM1NjdiYjYzZTU5ODM3Y2FjZGQyYzA0NmZlYWJiMw==
-  data.tar.gz: !binary |-
-    NzY4ZTIzNGRmY2I2NzRkY2I1MTBmMWU1ODQwZmFkNTIxZjhiYjA3Nw==
+SHA1:
+  metadata.gz: 2a79901a7f79f2ad216070d49400f1174b2292d3
+  data.tar.gz: 16c50452dbe4a8c2ee279b95885ea5791f98a833
 SHA512:
-  metadata.gz: !binary |-
-    OTA1YjIzMzkyYTRkNmM1ZThhNzk3NWE2MmUxOGNiZDcwODI0MDFlMWZkMTA0
-    ZDBkM2FmMjM1MWZlYTBmZjgzZmQ3ZTA1ODAwM2ZlZDNhMzYxZWU0NWE0MzY5
-    MjFmYmIxODYxNmQzMTM4YzFlMjgxZmM0ZmZmYjYzODkyMTBkOTM=
-  data.tar.gz: !binary |-
-    N2E1OGViN2IwYTA2NmUzNzI2ZWRiYjNkOGIwNjk5ZGQ3NTUxZjUwZTRiZWRm
-    OTc1ZjdhNWFjMjAyMjYxZDkzYTEzMjQxYzkxNTdjNjE1N2ViZmRhMDNkNGZh
-    MTExOGViNTRlN2JhZjBhNjVhZWEyODViOWFlMzExMjQwMTM2ZWQ=
+  metadata.gz: a8b0fd27ed1dc1a774d3fab0a1e08f4bcf347bf596fb31bf67c39f435f8442cf6aa5f57b62005bc8d499283f1c23a28f867bbe4c33c13b17739e3a710314f6e0
+  data.tar.gz: a891eb947800d1101b2a608fa734b8cca8b866cf21a5aee312872b5e3b9490c36468ac715c1501ebe708937540be2cb0f24e2bd89e32ea03962d925e02f7c1f6

data/.gitignore

@@ -4,18 +4,17 @@
 .bundle
 Gemfile.lock
 config/*.yml
-config/wagn.rb
 coverage
-files
+/files
 log/*
 pkg
-public/test
-public/files
-public/assets/.htaccess
-public/javascripts/inline-console.js
+/public/test
+/public/files
+/public/assets/.htaccess
+/public/javascripts/inline-console.js
 local*
-script/local
-script/performance/*.session
+/script/local
+/script/performance/*.session
 tmp/*
 wagn*gem
 *.project

data/.rspec

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

data/.simplecov

@@ -0,0 +1,23 @@
+
+unless ENV['COVERAGE'] == 'false'
+    
+  SimpleCov.start do
+    add_filter '/spec/'
+    add_filter '/features/'
+    add_filter '/config/'
+    add_filter '/tasks/'
+    add_filter '/generators/'
+    add_filter 'lib/wagn'
+
+    add_group 'Card', 'lib/card'  
+    add_group 'Set Patterns', 'tmp/set_patterns'
+    add_group 'Sets',         'tmp/sets'
+    add_group 'Formats' do |src_file|
+      src_file.filename =~ /mods\/[^\/]+\/formats/
+    end
+    add_group 'Chunks' do |src_file|
+      src_file.filename =~ /mods\/[^\/]+\/chunks/
+    end
+  end
+
+end

data/.tm_properties

@@ -0,0 +1 @@
+excludeInFolderSearch = "{$excludeInFolderSearch,coverage,files,log,public,tmp}"

data/Gemfile

@@ -14,7 +14,8 @@ group :assets do
   gem 'coffee-rails', "~> 3.1"                 # pretty code; compiles to JS
   gem 'uglifier'                               # makes pretty code ugly again.  compresses js/css for fast loading
 
-  gem 'jquery-rails',  '~> 2.3'                # main js framework, along with rails-specific unobtrusive lib
+  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
@@ -27,12 +28,18 @@ end
 
 group :test do
   
-  # 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 ...
   
-  gem 'rails-dev-tweaks', '~> 0.6'             # dramatic speeds up asset loading, among other tweaks
+  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'
@@ -52,6 +59,8 @@ group :test do
   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']
@@ -60,15 +69,8 @@ end
 gem 'ruby-prof', '~>0.12.1', :group=>:profile  # profiling
 
 group :debug do
-  case RUBY_VERSION
-  when /^1\.9\.3-p0/
-    gem 'linecache19', '~>0.5.13'
-    gem 'ruby-debug-base19x', '~> 0.11.30.pre4'
-  when /^1\.9/
-    gem 'ruby-debug19', :require => 'ruby-debug'
-  when /^1\.8/
-    gem 'ruby-debug'
-  end
+  gem 'byebug' if RUBY_VERSION =~ /^2/
+  gem 'debugger'
 end
 
 

data/Guardfile

@@ -0,0 +1,34 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+#guard :rspec, cmd: 'bundle exec env COVERAGE=false rspec' do
+guard :rspec, cmd: 'bundle exec rspec' do
+  
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+#  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+#  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  
+#  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+#  watch('config/routes.rb')                           { "spec/routing" }
+#  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+#  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Wagn mods
+  watch(%r{mods/(.+)\.rb})                            { |m| "spec/mods/#{m[1]}_spec.rb" }
+
+
+  # Turnip features and steps
+#  watch(%r{^spec/acceptance/(.+)\.feature$})
+#  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+  
+  #callback(:start_begin) { puts "guard-rspec is watching ..." }
+  #callback(:run_on_modifications_begin) { puts "<script>document.body.innerHTML = '';</script>" } # use js to clear textmate's html view
+end
+

data/README.rdoc

@@ -1,9 +1,5 @@
 =Wagn: how pioneers roll
 
-==READ ME FIRST!
-
-This gem is brand new and is EXPERIMENTAL. If you're curious to play around, feel free! But if you want to host a production site, try the documentation at http://wagn.org/get_started
-
 ==Basics
 
 Wagn is an open web platform for building coherent web systems.
@@ -17,8 +13,6 @@ Bundler[http://gembundler.com/]:: version 1.0 or higher
 ImageMagick[http://www.imagemagick.org/]::
 A database engine:: Either MySQL[http://www.mysql.com/] or PostgreSQL[http://www.postgresql.org/]
 
-Platform-specific details at: http://www.wagn.org/wagn/installation_1_8+Platform_Notes
-
  
 ==Installation
 
@@ -87,10 +81,10 @@ First check the Wagn version of your existing site.
 ====Version 1.10 or newer
 
 1. Create a new Wagn app using steps 1 and 2 from the installation section above.
-2. copy config/database.yml from the old site to the new one.
-3. copy the old local/files contents to the new files directory
-4. if you have edited wagn.yml in your old site, make the corresponding changes to the new config/application.rb file.
-5. Follow the standard upgrade procedure above
+2. Copy config/database.yml from the old site to the new one.
+3. Copy the old local/files contents to the new files directory.
+4. If you have edited wagn.yml in your old site, make the corresponding changes to the new config/application.rb file.
+5. Follow the standard upgrade procedure above.
 
 ====Older than Version 1.10
 

data/VERSION

@@ -1 +1 @@
-1.12.13
+1.13.0.pre

data/app/assets/javascripts/application.js

@@ -5,17 +5,18 @@
 // the compiled file.
 //
 //= require jquery
-//= require jquery-ui
+//= require tinymce
+
+//= !require jquery.mobile    
+    /* jquery.mobile must be after wagn to avoid mobileinit nastiness */
+//= require jquery.ui.all
+    /* jquery.ui.all must be after jquery.mobile to override dialog weirdness */
+//= require jquery.ui.autocomplete.html.js
+    /* this autocomplete must be after jquery.ui stuff */
+//= require jquery.autosize
 //= require jquery.fileupload.js
 //= require jquery.iframe-transport.js
-//= require jquery.ui.autocomplete.html.js
 //= require jquery_ujs
-//= require jquery.autosize
-//= require tinymce
-//= require wagn_mod
-//= require wagn
-//= require wagn_menu
-//= require jquery.mobile
 
 /*
 Note: I attempted to get tinymce up with tinymce-jquery,

data/app/assets/javascripts/jquery.ui.autocomplete.html.js

@@ -37,4 +37,4 @@ $.extend( proto, {
 	}
 });
 
-})( jQuery );
+})( jQuery );

data/app/controllers/card_controller.rb

@@ -1,9 +1,21 @@
 # -*- encoding : utf-8 -*-
-class CardController < WagnController
 
+require_dependency 'card'
+
+class CardController < ActionController::Base
+
+  include Wagn::Location
+  include Recaptcha::Verify
+
+  before_filter :per_request_setup, :except => [:asset]
   before_filter :load_id, :only => [ :read ]
-  before_filter :load_card
+  before_filter :load_card, :except => [:asset]
   before_filter :refresh_card, :only=> [ :create, :update, :delete, :rollback ]
+
+  layout nil
+
+  attr_reader :card
+  
   
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~  
   #  CORE METHODS
@@ -26,7 +38,12 @@ class CardController < WagnController
     params[:success] ||= 'REDIRECT: *previous'
     handle { card.delete }
   end
-
+  
+  def asset
+    Rails.logger.info "Routing assets through Wagn. Recommend symlink from Deck to Wagn gem using 'rake wagn:update_assets_symlink'"
+    send_file_inside Wagn.paths['gem-assets'].existent.first, [ params[:filename], params[:format] ].join('.'), :x_sendfile => true
+  end
+  
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   ## the following methods need to be merged into #update
 
@@ -48,7 +65,7 @@ class CardController < WagnController
   def watch
     watchers = card.fetch :trait=>:watchers, :new=>{}
     watchers = watchers.refresh
-    myname = Account.current.name
+    myname = Card::Auth.current.name
     watchers.send((params[:toggle]=='on' ? :add_item : :drop_item), myname)
     watchers.save!
     ajax? ? show(:watch) : read
@@ -60,19 +77,31 @@ class CardController < WagnController
 
   private
   
+  # make sure that filenname doesn't leave allowed_path using ".."
+  def send_file_inside(allowed_path, filename, options = {})
+    if filename.include? "../"
+      raise Wagn::BadAddress
+    else
+      send_file File.join(allowed_path, filename), options
+    end
+  end
   
   #-------( FILTERS )
 
-  def refresh_card
-    @card =  card.refresh
+  def per_request_setup
+    request.format = :html if !params[:format] #is this used??
+    Wagn::Cache.renew
+    Card::Env.reset :controller=>self
+    Card::Auth.set_current_from_session
   end
 
-  def load_id    
-    params[:id] = case
-      when params[:id]
-        params[:id]
-      when Account.no_logins?
-        return wagn_redirect( 'admin/setup' )
+
+  def load_id
+    params[:id] ||= case
+      when Card::Auth.needs_setup?
+        params[:card] = { :type_id => Card.default_accounted_type_id }
+        params[:view] = 'setup'
+        ''
       when params[:card] && params[:card][:name]
         params[:card][:name]
       when Card::Format.tagged( params[:view], :unknown_ok )
@@ -89,36 +118,174 @@ class CardController < WagnController
     @card = case params[:id]
       when '*previous'
         return wagn_redirect( previous_location )
-      when /^\~(\d+)$/
+      when /^\~(\d+)$/ # get by id
         Card.fetch( $1.to_i ) or raise Wagn::NotFound 
-      when /^\:(\w+)$/
+      when /^\:(\w+)$/ # get by codename
         Card.fetch $1.to_sym
-      else
-        opts = params[:card]
-        opts = opts ? opts.clone : {} #clone so that original params remain unaltered.  need deeper clone?
-        opts[:type] ||= params[:type] if params[:type]# for /new/:type shortcut.  we should fix and deprecate this.
-        name = params[:id] || opts[:name]
+      else  # get by name
+        opts = params[:card] ? params[:card].clone : {}   # clone so that original params remain unaltered.  need deeper clone?
+        opts[:type] ||= params[:type] if params[:type]    # for /new/:type shortcut.  we should fix and deprecate this.
+        opts[:name] ||= params[:id].to_s.gsub( '_', ' ')  # move handling to Card::Name?
         
         if params[:action] == 'create'
           # FIXME we currently need a "new" card to catch duplicates (otherwise #save will just act like a normal update)
           # I think we may need to create a "#create" instance method that handles this checking.
           # that would let us get rid of this...
-          opts[:name] ||= name
           Card.new opts
         else
-          Card.fetch name, :new=>opts
+          mark = params[:id] || opts[:name]
+          Card.fetch mark, :new=>opts
         end
       end
     @card.selected_revision_id = params[:rev].to_i if params[:rev]
 
-    Wagn::Env[:main_name] = params[:main] || (card && card.name) || ''
+    Card::Env[:main_name] = params[:main] || (card && card.name) || ''
     render_errors if card.errors.any?
     true
   end
 
+  def refresh_card
+    @card =  card.refresh
+  end
+
+
+  protected
+
+  def ajax?
+    Card::Env.ajax?
+  end
+
+  def html?
+    [nil, 'html'].member?(params[:format])
+  end
+
+  # ----------( rendering methods ) -------------
+
+  def wagn_redirect url
+    url = wagn_url url #make sure we have absolute url
+    if ajax?
+      # lets client reset window location (not just receive redirected response)
+      # formerly used 303 response, but that gave IE the fits
+      render :json => {:redirect=> url}
+    else
+      redirect_to url
+    end
+  end
+
+  def handle
+    yield ? success : render_errors
+  end
+
+
+  def success
+    redirect, new_params = !ajax?, {}
+
+    target = case params[:success]
+      when Hash
+        new_params = params[:success]
+        redirect ||= !!(new_params.delete :redirect)
+        new_params.delete :id
+      when /^REDIRECT:\s*(.+)/
+        redirect=true
+        $1
+      when nil  ;  '_self'
+      else      ;   params[:success]
+      end
+
+    target = case target
+      when '*previous'     ;  previous_location #could do as *previous
+      when /^(http|\/)/    ;  target
+      when /^TEXT:\s*(.+)/ ;  $1
+      when ''              ;  ''
+      else                 ;  Card.fetch target.to_name.to_absolute(card.cardname), :new=>{}
+      end
+
+    case
+    when redirect
+      target = page_path target.cardname, new_params if Card === target
+      wagn_redirect target
+    when String===target
+      render :text => target
+    else
+      @card = target
+      self.params = self.params.merge new_params #need tests.  insure we get slot, main...
+      show
+    end
+  end
+
+
+  def render_errors
+    #fixme - should prioritize certain error classes
+    code = nil
+    card.errors.each do |key, msg|
+      break if code = Card.error_codes[ key ]
+    end
+    view, status = code || [ :errors, 422]
+    show view, status
+  end
+
+
+
+  def show view = nil, status = 200
+    format = request.parameters[:format]
+    format = :file if params[:explicit_file] or !Card::Format.registered.member? format #unknown format
+
+    opts = ( params[:slot] || {} ).deep_symbolize_keys
+    view ||= params[:view]      
+
+    formatter = card.format( :format=>format )
+    
+    result = formatter.show view, opts
+    status = formatter.error_status || status
+    
+    if format==:file && status==200
+      send_file *result
+    elsif status == 302
+      wagn_redirect result
+    else
+      args = { :text=>result, :status=>status }
+      args[:content_type] = 'text/text' if format == :file
+      render args
+    end
+  end
+
+
+  rescue_from Exception do |exception|
+    Rails.logger.info "exception = #{exception.class}: #{exception.message}"
+
+    @card ||= Card.new
+
+    view = case exception
+      ## arguably the view and status should be defined in the error class;
+      ## some are redundantly defined in view
+      when Card::Oops, Card::Query
+        card.errors.add :exception, exception.message 
+        # Card::Oops error messages are visible to end users and are generally not treated as bugs.
+        # Probably want to rename accordingly.
+        :errors
+      when Card::PermissionDenied, Wagn::PermissionDenied
+        :denial
+      when Wagn::NotFound, ActiveRecord::RecordNotFound, ActionController::MissingFile
+        :not_found
+      when Wagn::BadAddress
+        :bad_address
+      else #the following indicate a code problem and therefore require full logging
+        Rails.logger.info exception.backtrace*"\n"
+        notify_airbrake exception if Airbrake.configuration.api_key
+
+        if ActiveRecord::RecordInvalid === exception
+          :errors
+        elsif Rails.logger.level == 0 # could also just check non-production mode...
+          raise exception
+        else
+          :server_error
+        end
+      end
+
+    show view
+  end
 
 
-  #------- REDIRECTION 
 
 end