wagn 1.14.9 → 1.15.pre

data/{app → rails}/controllers/card_controller.rb

@@ -1,7 +1,8 @@
 # -*- encoding : utf-8 -*-
 
 require_dependency 'card'
-require_dependency 'card/action'
+
+require_dependency 'wagn/exceptions'
 require_dependency 'card/mailer'  #otherwise Net::SMTPError rescues can cause problems when error raised comes before Card::Mailer is mentioned
 
 class CardController < ActionController::Base
@@ -19,7 +20,6 @@ class CardController < ActionController::Base
   before_filter :load_card, :except => [:asset]
   before_filter :refresh_card, :only=> [ :create, :update, :delete, :rollback ]
   
-  
 
   
   layout nil
@@ -50,8 +50,8 @@ class CardController < ActionController::Base
   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
+    Rails.logger.info "Routing assets through Card. Recommend symlink from Deck to Card gem using 'rake wagn:update_assets_symlink'"
+    send_file_inside Decko::Engine.paths['gem-assets'].existent.first, [ params[:filename], params[:format] ].join('.'), :x_sendfile => true
   end
   
   private
@@ -69,9 +69,14 @@ class CardController < ActionController::Base
 
   def per_request_setup
     request.format = :html if !params[:format] #is this used??
-    Wagn::Cache.renew
+    Card::Cache.renew
     Card::Env.reset :controller=>self
     Card::Auth.set_current_from_session
+    
+    if params[:id] && !params[:id].valid_encoding?  # slightly better way to handle encoding issues (than the rescue in load_id)
+                                                    # we should find the place where we produce these bad urls
+      params[:id] = params[:id].force_encoding('ISO-8859-1').encode('UTF-8')
+    end
   end
 
 
@@ -96,7 +101,7 @@ class CardController < ActionController::Base
   def load_card
     @card = case params[:id]
       when '*previous'
-        return wagn_redirect( previous_location )
+        return card_redirect( previous_location )
       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.
@@ -112,11 +117,9 @@ class CardController < ActionController::Base
           Card.fetch mark, :new=>opts
         end
       end
-    raise Wagn::NotFound unless @card
+    raise Card::NotFound unless @card
     
-    if action = @card.find_action_by_params( params )
-      @card.selected_action_id = action.id
-    end
+    card.select_action_by_params params
     Card::Env[:main_name] = params[:main] || (card && card.name) || ''
     
     render_errors if card.errors.any?
@@ -128,15 +131,15 @@ class CardController < ActionController::Base
   end
 
   def request_logger
-    Wagn::Log::Request.write_log_entry self    
+    Card::Log::Request.write_log_entry self    
   end
   
   def start_performance_logger
-    Wagn::Log::Performance.start :method=>env["REQUEST_METHOD"], :message=>env["PATH_INFO"] 
+    Card::Log::Performance.start :method=>env["REQUEST_METHOD"], :message=>env["PATH_INFO"] 
   end
   
   def stop_performance_logger
-    Wagn::Log::Performance.stop
+    Card::Log::Performance.stop
   end
   
   protected
@@ -151,8 +154,8 @@ class CardController < ActionController::Base
 
   # ----------( rendering methods ) -------------
 
-  def wagn_redirect url
-    url = wagn_url url #make sure we have absolute url
+  def card_redirect url
+    url = card_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
@@ -193,7 +196,7 @@ class CardController < ActionController::Base
     case
     when redirect
       target = page_path target.cardname, new_params if Card === target
-      wagn_redirect target
+      card_redirect target
     when String===target
       render :text => target
     else
@@ -217,8 +220,7 @@ class CardController < ActionController::Base
 
 
   def show view = nil, status = 200
-#    ActiveSupport::Notifications.instrument('wagn', message: 'CardController#show') do
-        
+#    ActiveSupport::Notifications.instrument('card', message: 'CardController#show') do
     format = request.parameters[:format]
     format = :file if params[:explicit_file] or !Card::Format.registered.member? format #unknown format
 
@@ -232,7 +234,7 @@ class CardController < ActionController::Base
     if format==:file && status==200
       send_file *result
     elsif status == 302
-      wagn_redirect result
+      card_redirect result
     else
       args = { :text=>result, :status=>status }
       args[:content_type] = 'text/text' if format == :file
@@ -257,9 +259,9 @@ class CardController < ActionController::Base
         # these 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
+      when Card::PermissionDenied
         :denial
-      when Wagn::NotFound, ActiveRecord::RecordNotFound, ActionController::MissingFile
+      when Card::NotFound, ActiveRecord::RecordNotFound, ActionController::MissingFile
         :not_found
       when Wagn::BadAddress
         :bad_address

data/{lib/wagn/config/routes.rb → rails/engine-routes.rb}

@@ -1,14 +1,10 @@
 # -*- encoding : utf-8 -*-
 
-Rails.application.routes.draw do
+Decko::Engine.routes.draw do
 
-  if !Rails.env.production? && Object.const_defined?( :JasmineRails )
-    mount Object.const_get(:JasmineRails).const_get(:Engine) => "/specs"
-  end
-  
   #most common
   root                      :to => 'card#read', :via=>:get
-  match "#{ Wagn.config.files_web_path }/:id(-:size)-:rev_id.:format" => 
+  match "#{ Decko::Engine.config.files_web_path }/:id(-:size)-:rev_id.:format" => 
                                    'card#read', :via=>:get, :id => /[^-]+/, :explicit_file=>true
   match "assets/*filename"      => 'card#asset', :via=>:get
   match "javascripts/*filename" => 'card#asset', :via=>:get

data/spec/controllers/card_controller_spec.rb

@@ -1,11 +1,16 @@
 # -*- encoding : utf-8 -*-
 
 describe CardController do
+  routes { Decko::Engine.routes }
 
   include Capybara::DSL
   describe "- route generation" do
 
     it "should recognize type" do
+      #all_routes = Rails.application.routes.routes
+      #require 'rails/application/route_inspector'
+      #warn "rountes#{ENV['CONTROLLER']}:\n" + Rails::Application::RouteInspector.new.format(all_routes, ENV['CONTROLLER'])* "\n"
+
       expect({ :get => "/new/Phrase" }).to route_to( :controller => 'card', :action=>'read', :type=>'Phrase', :view=>'new' )
     end
 
@@ -255,7 +260,7 @@ describe CardController do
     context "file" do
       before do
         Card::Auth.as_bot do
-          Card.create :name => "mao2", :type_code=>'image', :attach=>File.new("#{Wagn.gem_root}/test/fixtures/mao2.jpg")
+          Card.create :name => "mao2", :type_code=>'image', :attach=>File.new("#{Cardio.gem_root}/test/fixtures/mao2.jpg")
           Card.create :name => 'mao2+*self+*read', :content=>'[[Administrator]]'
         end
       end
@@ -282,7 +287,7 @@ describe CardController do
     it 'serves file' do
       filename = "asset-test.txt"
       args = { :id=>filename, :format=>'txt', :explicit_file=>true }
-      path = File.join( Wagn.paths['gem-assets'].existent.first, filename)
+      path = File.join( Decko::Engine.paths['gem-assets'].existent.first, filename)
       File.open(path, "w") { |f| f.puts "test" }
       args = { :filename => "#{filename}" }
       visit "/assets/#{filename}"
@@ -296,8 +301,8 @@ describe CardController do
       expect(response.status).to eq(404)
     end
   end
-  describe "unit tests" do
 
+  describe "unit tests" do
     before do
       @simple_card = Card['Sample Basic']
       login_as 'joe_user'

data/spec/controllers/location_spec.rb

@@ -1,7 +1,10 @@
+# -*- encoding : utf-8 -*-
+
 
 #FIXME - this shouldn't really be with the controller specs
 
 describe CardController, "location test from old integration" do
+  routes { Decko::Engine.routes }
 
   before do
     login_as 'joe_user'

data/test/script/run_engine_deck.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+VER=1.15.pre
+DATABASE=mysql
+RVER=3.2.16
+DBCFG=../database.yml.local2
+#SEEDSQL=../rdummy_test.sql
+GEMFILE=../Gemfile.eng_deck
+RAKEFILE=../Rakefile.eng_deck
+APPLICATION=../application_rb.eng_deck
+REPO_DIR=`pwd`
+TEST_WORK=${REPO_DIR}/test_work
+cd wagn/
+gem build wagn.gemspec
+mv *.gem ${REPO_DIR}/card/
+cd ${REPO_DIR}/decko-rails
+gem build decko.gemspec
+mv *.gem ${REPO_DIR}/card/
+cd ${REPO_DIR}/card
+gem build card.gemspec
+gem install *-${VER}.gem
+cd $TEST_WORK
+bundle exec rails -v
+echo Generate a rails app
+bundle exec rails new test_wagn_rails --skip-bundle --database=$DATABASE
+cd test_wagn_rails
+echo "Diff config (should only show necessary edits after rails new above)"
+diff ${GEMFILE} Gemfile
+#diff ${RAKEFILE} Rakefile
+#diff ${APPLICATION} config/application.rb
+echo "Add config"
+cp ${GEMFILE} Gemfile
+echo "bundle install"
+bundle install
+# load seed db (customize to your database.yml)
+#echo "Load seed db (enter the pw)"
+#mysql -u decko_user -p mdummy_test < ${SEEDSQL}
+# copy db config (populate .local with you user/pw)
+cp ${DBCFG} config/database.yml
+RAILS_ENV=test bundle exec rake db:create --trace
+echo "seed database"
+RAILS_ENV=test bundle exec rake wagn:seed --trace
+#echo "migrating"
+#RAILS_ENV=test bundle exec rake db:migrate --trace
+#RAILS_ENV=test bundle exec rake wagn:migrate --trace
+#RAILS_ENV=development bundle exec rake db:migrate --trace
+#RAILS_ENV=development bundle exec rake wagn:migrate --trace

data/test/script/run_mig.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+VER=1.15.pre
+DBCFG=../database.yml.local
+SEEDSQL=../mdummy_test.sql
+cd wagn/
+gem build wagn.gemspec
+mv *.gem ../card/
+cd ../decko-rails
+gem build decko.gemspec
+mv *.gem ../card/
+cd ../card
+gem build card.gemspec
+gem install *-${VER}.gem
+cd ../test_work
+rbenv which wagn
+echo Generate a wagn app
+wagn new test_wagn_app -c --gem-path='../../'
+cd test_wagn_app
+# load seed db (customize to your database.yml)
+echo "Load seed db (enter the pw)"
+mysql -u decko_user -p mdummy_test < ${SEEDSQL}
+# copy db config (populate .local with you user/pw)
+cp ${DBCFG} config/database.yml
+echo "migrating"
+#RAILS_ENV=test bundle exec rake db:migrate --trace
+RAILS_ENV=test bundle exec rake wagn:migrate --trace
+#RAILS_ENV=development bundle exec rake db:migrate --trace
+#RAILS_ENV=development bundle exec rake wagn:migrate --trace

data/test/test_helper.rb

@@ -86,7 +86,7 @@ unless defined? TEST_ROOT
         if args[:cardtypes]==:all
           # FIXME: need a better data source for this?
           #args[:cardtypes] = YAML.load_file('db/bootstrap/card_codenames.yml').
-          bootstrap_file = File.join( Wagn.gem_root, 'db/bootstrap/cards.yml')
+          bootstrap_file = File.join( Cardio.gem_root, 'db/bootstrap/cards.yml')
           args[:cardtypes] = YAML.load_file(bootstrap_file).find_all do |p|
             !%w{set setting}.member?( p[1]['codename'] ) and
               card=Card[ p[1]['name'] ] and card.type_id == Card::CardtypeID

data/wagn.gemspec

@@ -1,10 +1,8 @@
-#lib = File.expand_path('../lib', __FILE__)
-#$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require File.expand_path( '../lib/wagn/version', __FILE__ )
+version = File.open(File.expand_path( '../../card/VERSION', __FILE__ )).read.chomp
 
 Gem::Specification.new do |s|
   s.name          = 'wagn'
-  s.version       = Wagn::Version.release
+  s.version       = version
   s.authors       = ["Ethan McCutchen", "Lewis Hoffman", "Gerry Gleason"]
   s.email         = ['info@wagn.org']
                   
@@ -24,28 +22,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 1.8.7'
 
   [
-    
-    [ 'rails',        '3.2.16'  ],
-    [ 'smartname',    '0.2.3'   ],
-
-    [ 'uuid',         '~> 2.3'  ],
-    [ 'paperclip',    '~> 2.8'  ],
-    [ 'htmlentities', '~> 4.3'  ],
-    [ 'rmagick',      '~> 2.13' ],
-    [ 'recaptcha',    '~> 0.3'  ],                                  
-    [ 'coderay',      '~> 1.0'  ],
-    [ 'sass',         '~> 3.2'  ],
-    [ 'coffee-script','~> 2.2'  ],
-    [ 'uglifier',     '~> 2.5'  ],
-    
-    [ 'haml',         '~> 4.0'  ],
-    [ 'kaminari',     '~> 0.16' ],
-    [ 'diffy',        '~> 3.0'  ],
-    [ 'diff-lcs',     '~> 1.2'  ],
-    # should not depend!
-    [ 'airbrake',     '~> 4.1'  ] 
-
-    
+    [ 'rails', '3.2.16'  ],
+    [ 'card',   version  ]
   ].each do |dep|
     s.add_runtime_dependency *dep
   end