wagn 1.15.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3725ae3455417578f3878bab3b872c0cee591298
-  data.tar.gz: 1d4fa7ee2b49833b47865d5ce16ab42de70fc644
+  metadata.gz: 7634e6129ba3078eda44196fe405262b0519a279
+  data.tar.gz: 85b5cc8ea6c45cd2d392c70f36d255780235f43d
 SHA512:
-  metadata.gz: 94c44d3664ce629b6fceea1a35783cd131d77fb8669640d1c755e6045aef41b29b1a5ae77d8b2dc175e3a23d9c7ad16cadbf548238b74ceef2266f4e6f53f2ec
-  data.tar.gz: 840dd6e60e94e29c7347f416ed080ab3ee72a220e007b0ce68d2967f84cb4f594d55a1abe531ab1c9cf330aed19dfe89be9cdb9da8c02ec9b50db8422733d5f2
+  metadata.gz: 49bf10bcef74a75db93ea3a973fbcd888fa1f20fa091841d22b80c1ec323183d402bd5fae40011ed492d4b037b550b8d658e6257bda36e8c28a53ab422391803
+  data.tar.gz: a7e7d4d785443c7dfb71b0233d05272917c50e8cb5d78d898ff8ad189d88e6c1d25e8a088b3039a18874a833ff22d9847fc65f81024b921fbaa8c0c28d33338a

data/features/follow.feature

@@ -10,39 +10,43 @@ Feature: Follow interface
   Scenario: Anonymous User should not see follow UI
     Given I follow "Sign out"
     When I go to the homepage
-    And I hover over the main menu
+    And I open the main card menu
     Then I should not see "follow"
 
   Scenario: Following a Card
     Given Joe User is not watching "Home+*self"
     When I go to the homepage
-    And I hover over the main menu
+    And I open the main card menu
     And In the main card menu I should not see "unfollow"
     And In the main card menu I click "follow"
-    And I hover over the main menu    
+    And I follow "Close"
+    And I wait a sec
+    And I open the main card menu
     Then In the main card menu I should see "unfollow"
     And the card Home+*self+Joe User+*follow should point to "always"
-    
+
   Scenario: Unfollowing a Card
     Given Joe User is watching "Home+*self"
     And the card Home+*self+Joe User+*follow should point to "always"
     And I am on the homepage
-    And I hover over the main menu
+    And I open the main card menu
     And In the main card menu I click "unfollow"
-    And I hover over the main menu    
+    And I follow "Close"
+    And I wait a sec
+    And I open the main card menu
     Then In the main card menu I should see "follow"
     And the card Home+*self+Joe User+*follow should point to "never"
 
-    
+
   Scenario: Following a Cardtype
     When I go to card User
-    And I hover over the main menu
-    And In the main card menu I should see "follow"
+    And I open the main card menu
+    Then In the main card menu I should see "follow"
 
   Scenario: A Card whose Cardtype is Followed
     Given Joe User is watching "User+*type"
     And I go to card Joe User
-    And I hover over the main menu
+    And I open the main card menu
     Then In the main card menu I should see "(following)|unfollow"
 
 #too long for menu

data/features/step_definitions/wagn_steps.rb

@@ -18,7 +18,7 @@ Given /^site stops simulating setup need$/ do
   Card::Auth.simulate_setup_need! false
   step 'I am signed out'
 end
-  
+
 Given /^I am signed in as (.+)$/ do |account_name|
   accounted = Card[account_name]
   visit "/update/:signin?card[subcards][%2B*email][content]=#{accounted.account.email}&card[subcards][%2B*password][content]=joe_pass"
@@ -145,7 +145,7 @@ When /I wait a sec/ do
   sleep 1
 end
 
-When /I wait (.+) seconds$/ do |period|
+When /I wait (\d+) seconds$/ do |period|
   sleep period.to_i
 end
 
@@ -213,8 +213,9 @@ Then /I submit$/ do
     click_button("Submit")
 end
 
-When /^I hover over the main menu$/ do
-  page.execute_script "$('#main > .card-slot > .card-header > .card-menu-link').trigger('mouseenter')"
+When /^I open the main card menu$/ do
+  page.execute_script "$('#main .menu-slot .vertical-card-menu.show-on-hover .card-slot').show()"
+  page.find('#main .menu-slot .card-menu a').click
 end
 
 When /^I pick (.*)$/ do |menu_item|

data/features/support/scopes.rb

@@ -4,16 +4,16 @@ module ScopeHelpers
     case section
 
     when /main card content/
-      '#main > .card-slot > .card-content'
-      
+      '#main > .card-slot > .card-frame > .card-content'
+
     when /pointer card content/
-      '#main > .card-slot > .card-content > .pointer-list'
+      '#main > .card-slot > .card-frame > .card-content > .pointer-list'
 
     when /main card header/
-      '#main > .card-slot > .card-header'
-      
+      '#main > .card-slot > .card-frame > .card-header'
+
     when /main card menu/
-      '#main > .card-slot > ul.card-menu'
+      '#main > .card-slot > .menu-slot > .card-menu'
 
     else
       raise "Can't find mapping from \"#{section}\" to a scope.\n" +

data/lib/decko/engine.rb

@@ -5,13 +5,12 @@ require 'cardio'
 # TODO: Move these to modules that use them
 require 'htmlentities'
 require 'recaptcha'
-require 'airbrake'
 require 'coderay'
 require 'haml'
 require 'kaminari'
 require 'bootstrap-kaminari-views'
 require 'diff/lcs'
-require 'diffy'
+require 'builder'
 
 require 'wagn'
 

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

@@ -9,14 +9,6 @@ gem 'wagn'
 
 <%= database_gemfile_entry -%>
 
-# 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', '~> 3.1.0'   # behavior-driven-development suite
@@ -37,8 +29,8 @@ group :test, :development do
   # gem 'pry-rescue'
   # gem 'pry-stack_explorer'
   if RUBY_VERSION =~ /^2/
-  gem 'byebug' 
-  # gem 'pry-byebug'
+    gem 'byebug'
+    # gem 'pry-byebug'
   else
     gem 'debugger'
   end
@@ -46,7 +38,7 @@ end
 
 <% end -%>
 
-<% if options['core-dev'] -%>  
+<% 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
@@ -61,13 +53,13 @@ group :development do
 end
 
 group :test do
-  gem 'rspec' 
+  gem 'rspec'
   gem 'rspec-rails', '~> 3.1.0'                 # behavior-driven-development suite
-  gem 'spork', '>=0.9'                                           
+  gem 'spork', '>=0.9'
   gem 'rr'#, '=1.0.0'
 	gem 'simplecov', '~> 0.7.1', :require => false  #test coverage
-    
-  # gem 'guard-rspec', '~> 4.2'           # trigger test runs based on file edits, 
+
+  # gem 'guard-rspec', '~> 4.2'           # trigger test runs based on file edits,
                                           # currently not compatible with spring-watcher-listen
   if RUBY_PLATFORM =~ /darwin/
     # gem 'terminal-notifier-guard', '~> 1.5'    # use growler notifications on macs
@@ -77,16 +69,16 @@ group :test do
 
   # CUKES see features dir
   gem 'cucumber-rails', '~> 1.3', :require=>false # feature-driven-development suite
-  gem 'capybara', '~> 2.4.4'                    
+  gem 'capybara', '~> 2.4.4'
   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 
+  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 'email_spec'                             # 
+  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)
@@ -99,7 +91,7 @@ group :development, :test do
   gem 'spring'
   gem 'spring-commands-rspec'
   gem 'spring-commands-cucumber'
-  gem 'spring-watcher-listen' 
+  gem 'spring-watcher-listen'
   gem 'pry-rails'
   gem 'pry-rescue'
   gem 'pry-stack_explorer'

data/lib/wagn/tasks/db.rake

@@ -31,14 +31,15 @@ unless Rake::TaskManager.methods.include?(:redefine_task)
 end
 
 
-namespace :db do  
+namespace :db do
   namespace :fixtures do
     desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
     task :load => :environment do
       require 'active_record/fixtures'
+      fixture_path = File.join(Cardio.gem_root, 'db','seed', 'test', 'fixtures')
       ActiveRecord::Base.establish_connection(::Rails.env.to_sym)
-      (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Cardio.gem_root, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-        ActiveRecord::Fixtures.create_fixtures(File.join(Cardio.gem_root, 'test', 'fixtures'), File.basename(fixture_file, '.*'))
+      (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(fixture_path, '*.{yml,csv}'))).each do |fixture_file|
+        ActiveRecord::Fixtures.create_fixtures(fixture_path, File.basename(fixture_file, '.*'))
       end
     end
   end

data/lib/wagn/tasks/test.rake

@@ -17,12 +17,12 @@ namespace :test do
     puts 'put 2'
     Rake::Task['test:functionals'].invoke
     puts 'put 3'
-    
+
     #    Rake::Task['test'].invoke
     #    Rake::Task['spec'].invoke
     #    Rake::Task['cucumber'].invoke
   end
-  
+
   ## FIXME: this generates an "Adminstrator links" card with the wrong reader_id, I have been
   ##  setting it by hand after fixture generation.
   desc "recreate test fixtures from fresh db"
@@ -57,9 +57,9 @@ namespace :test do
     # go ahead and load the fixtures into the test database
     puts ">> preparing test database"
     puts `env RELOAD_TEST_DATA=true rake db:test:prepare --trace`
-    
+
     Rake::Task['wagn:assume_card_migrations'].invoke
-    
+
   end
 
 
@@ -74,7 +74,7 @@ namespace :test do
     ActiveRecord::Base.establish_connection
     tables.each do |table_name|
       i = "000"
-      File.open("#{Cardio.gem_root}/test/fixtures/#{table_name}.yml", 'w') do |file|
+      File.open("#{Cardio.gem_root}/db/seed/test/fixtures/#{table_name}.yml", 'w') do |file|
         data = ActiveRecord::Base.connection.select_all(sql % table_name)
         file.write data.inject({}) { |hash, record|
           record['trash'] = false if record.has_key? 'trash'
@@ -89,7 +89,7 @@ namespace :test do
   desc "create sample data for testing"
   task :populate_template_database => :environment do
     puts "populate test data\n"
-    load "#{Cardio.gem_root}/test/seed.rb"
+    load "#{Cardio.gem_root}/db/seed/test/seed.rb"
     SharedData.add_test_data
   end
 

data/lib/wagn/tasks/wagn.rake

@@ -1,13 +1,14 @@
 
 require 'wagn/application'
 
-WAGN_BOOTSTRAP_TABLES = %w{ cards card_actions card_acts card_changes card_references }
+WAGN_SEED_TABLES = %w{ cards card_actions card_acts card_changes card_references }
+WAGN_SEED_PATH   = File.join( Cardio.gem_root, 'db/seed/new')
 
 def prepare_migration
   Card::Cache.reset_global
   Card.config.action_mailer.perform_deliveries = false
   Card.reset_column_information
-  Card::Reference.reset_column_information  # this is needed in production mode to insure core db 
+  Card::Reference.reset_column_information  # this is needed in production mode to insure core db
                                             # structures are loaded before schema_mode is set
 end
 
@@ -47,7 +48,7 @@ namespace :wagn do
     conn = ActiveRecord::Base.connection
 
     puts "delete all data in bootstrap tables"
-    WAGN_BOOTSTRAP_TABLES.each do |table|
+    WAGN_SEED_TABLES.each do |table|
       conn.delete "delete from #{table}"
     end
   end
@@ -159,7 +160,7 @@ namespace :wagn do
       ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
       prepare_migration
       paths = ActiveRecord::Migrator.migrations_paths = Cardio.migration_paths(:core_cards)
-    
+
       Card::CoreMigration.schema_mode :core_cards do
         ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
         ActiveRecord::Migrator.migrate paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil
@@ -174,7 +175,7 @@ namespace :wagn do
       ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
       prepare_migration
       paths = ActiveRecord::Migrator.migrations_paths = Cardio.migration_paths(:deck_cards)
-    
+
       Cardio.schema_mode(:deck_cards) do
         ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
         ActiveRecord::Migrator.migrate paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil
@@ -290,9 +291,9 @@ namespace :wagn do
       # use old engine while we're supporting ruby 1.8.7 because it can't support Psych,
       # which dumps with slashes that syck can't understand
 
-      WAGN_BOOTSTRAP_TABLES.each do |table|
+      WAGN_SEED_TABLES.each do |table|
         i = "000"
-        File.open("#{Cardio.gem_root}/db/bootstrap/#{table}.yml", 'w') do |file|
+        File.open(File.join(WAGN_SEED_PATH, "#{table}.yml"), 'w') do |file|
           data = ActiveRecord::Base.connection.select_all( "select * from #{table}" )
           file.write YAML::dump( data.inject({}) do |hash, record|
             record['trash'] = false if record.has_key? 'trash'
@@ -316,24 +317,24 @@ namespace :wagn do
       # add a fourth line to the raw content of each image (or file) to identify it as a mod file
       Card::Auth.as_bot do
         Card.search( :type=>['in', 'Image', 'File'], :ne=>'' ).each do |card|
-          
+
           if card.attach_mod
-            puts "skipping #{card.name}: already in code"
+#            puts "skipping #{card.name}: already in code"
             next
           else
-            puts "working on #{card.name}"
+#            puts "working on #{card.name}"
           end
 
           base_card = card.cardname.junction? ? card.left : card
           raise "need codename for file" unless base_card.codename.present?
-          
+
           mod_name = base_card.type_id==Card::SkinID ? '06_bootstrap' : '05_standard'
           source_dir =  "#{source_files_dir}/#{card.id}"
 
           target_dir = "#{Cardio.gem_root}/mod/#{mod_name}/file/#{base_card.codename}"
-          FileUtils.remove_dir target_dir, force=true if Dir.exists? target_dir  
+          FileUtils.remove_dir target_dir, force=true if Dir.exists? target_dir
           FileUtils.mkdir_p target_dir
-          
+
 #          if card.name =~ /icon/
 #            require 'pry'; binding.pry
 #          end
@@ -344,8 +345,8 @@ namespace :wagn do
             target_filename = filename.gsub /\d+/, card.type_code.to_s
             FileUtils.cp "#{source_dir}/#{filename}", "#{target_dir}/#{target_filename}"
           end
-          
-          
+
+
           unless card.db_content.split(/\n/).last == mod_name
             new_content = card.db_content + "\n#{mod_name}"
             card.update_column :db_content, new_content
@@ -361,11 +362,11 @@ namespace :wagn do
     task :load => :environment do
       #FIXME - shouldn't we be more standard and use seed.rb for this code?
       Rake.application.options.trace = true
-      puts "bootstrap load starting #{File.join( Cardio.gem_root, 'db/bootstrap')}"
+      puts "bootstrap load starting #{WAGN_SEED_PATH}"
       require 'active_record/fixtures'
 #      require 'time'
 
-      ActiveRecord::Fixtures.create_fixtures File.join( Cardio.gem_root, 'db/bootstrap'), WAGN_BOOTSTRAP_TABLES
+      ActiveRecord::Fixtures.create_fixtures WAGN_SEED_PATH, WAGN_SEED_TABLES
     end
 
   end

data/rails/controllers/card_controller.rb

@@ -14,22 +14,22 @@ class CardController < ActionController::Base
   before_filter :start_performance_logger  if Wagn.config.performance_logger
   after_filter  :stop_performance_logger   if Wagn.config.performance_logger
   after_filter :request_logger            if Wagn.config.request_logger
-  
+
   before_filter :per_request_setup, :except => [:asset]
   before_filter :load_id, :only => [ :read ]
   before_filter :load_card, :except => [:asset]
   before_filter :refresh_card, :only=> [ :create, :update, :delete, :rollback ]
-  
 
-  
+
+
   layout nil
 
   attr_reader :card
-  
-  
-  #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~  
+
+
+  #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   #  CORE METHODS
-  
+
   def create
     handle { card.save }
   end
@@ -48,14 +48,14 @@ class CardController < ActionController::Base
     params[:success] ||= 'REDIRECT: *previous'
     handle { card.delete }
   end
-  
+
   def asset
     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
-  
+
   # make sure that filename doesn't leave allowed_path using ".."
   def send_file_inside(allowed_path, filename, options = {})
     if filename.include? "../"
@@ -64,7 +64,7 @@ class CardController < ActionController::Base
       send_file File.join(allowed_path, filename), options
     end
   end
-  
+
   #-------( FILTERS )
 
   def per_request_setup
@@ -72,7 +72,7 @@ class CardController < ActionController::Base
     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')
@@ -90,13 +90,13 @@ class CardController < ActionController::Base
         params[:card][:name]
       when Card::Format.tagged( params[:view], :unknown_ok )
         ''
-      else  
+      else
         Card.setting(:home) || 'Home'
       end
   rescue ArgumentError # less than perfect way to handle encoding issues.
     raise Wagn::BadAddress
   end
-  
+
 
   def load_card
     @card = case params[:id]
@@ -106,7 +106,7 @@ class CardController < ActionController::Base
         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.
@@ -118,10 +118,10 @@ class CardController < ActionController::Base
         end
       end
     raise Card::NotFound unless @card
-    
+
     card.select_action_by_params params
     Card::Env[:main_name] = params[:main] || (card && card.name) || ''
-    
+
     render_errors if card.errors.any?
     true
   end
@@ -131,17 +131,17 @@ class CardController < ActionController::Base
   end
 
   def request_logger
-    Card::Log::Request.write_log_entry self    
+    Card::Log::Request.write_log_entry self
   end
-  
+
   def start_performance_logger
-    Card::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
     Card::Log::Performance.stop
   end
-  
+
   protected
 
   def ajax?
@@ -225,12 +225,15 @@ class CardController < ActionController::Base
     format = :file if params[:explicit_file] or !Card::Format.registered.member? format #unknown format
 
     opts = ( params[:slot] || {} ).deep_symbolize_keys
-    view ||= params[:view]      
+    view ||= params[:view]
 
+    if params[:edit_draft] && card.drafts.present?
+      card.content = card.drafts.last.changes.last.value
+    end
     formatter = card.format(format.to_sym)
     result = formatter.show view, opts
     status = formatter.error_status || status
-  
+
     if format==:file && status==200
       send_file *result
     elsif status == 302
@@ -249,13 +252,13 @@ class CardController < ActionController::Base
 
     @card ||= Card.new
     Card::Error.current = exception
-    
+
 
     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.errors.add :exception, exception.message
         # these error messages are visible to end users and are generally not treated as bugs.
         # Probably want to rename accordingly.
         :errors
@@ -267,7 +270,7 @@ class CardController < ActionController::Base
         :bad_address
       else #the following indicate a code problem and therefore require full logging
         @card.notable_exception_raised
-        
+
         if ActiveRecord::RecordInvalid === exception
           :errors
         elsif Rails.logger.level == 0 # could also just check non-production mode...

data/spec/controllers/card_controller_spec.rb

@@ -21,7 +21,7 @@ describe CardController do
     it "should handle RESTful posts" do
       expect({ :put => '/mycard' }).to route_to( :controller=>'card', :action=>'update', :id=>'mycard')
       expect({ :put => '/' }).to route_to( :controller=>'card', :action=>'update')
-      
+
     end
 
     it "handle asset requests" do
@@ -47,7 +47,7 @@ describe CardController do
             :controller=>"card",:action=>"read",:id=>"random"
           )
         end
-        
+
       end
     end
   end
@@ -101,7 +101,7 @@ describe CardController do
       expect(c.type_code).to eq(:phrase)
     end
 
-    
+
 
     context "multi-create" do
       it "catches missing name error" do
@@ -179,7 +179,7 @@ describe CardController do
       get :read, {:id=>'Sample_Fako'}
       assert_response 404
     end
-    
+
     it "handles nonexistent card ids" do
       get :read, {:id=>'~9999999'}
       assert_response 404
@@ -193,9 +193,9 @@ describe CardController do
       assert_response 403
       get :read, :id=>'Strawberry', :format=>'txt'
       assert_response 403
-      
+
     end
-    
+
     context "view = new" do
       before do
         login_as 'joe_user'
@@ -218,34 +218,34 @@ describe CardController do
         get :read, :card=>{:name=>"A"}, :view=>'new'
         assert_response :success, "response should succeed"  #really?? how come this is ok?
       end
-      
+
       it "new with type_code" do
         post :read, :card => {:type=>'Date'}, :view=>'new'
         assert_response :success, "response should succeed"
         assert_equal Card::DateID, assigns['card'].type_id, "@card type should == Date"
       end
-      
+
       it "new should work for creatable nonviewable cardtype" do
         login_as :anonymous
         get :read, :type=>"Fruit", :view=>'new'
         assert_response :success
       end
-      
+
       it "should use card params name over id in new cards" do
         get :read, :id=>'my_life', :card=>{:name =>'My LIFE'}, :view=>'new'
         expect(assigns['card'].name).to eq('My LIFE')
       end
-      
+
     end
-    
-    
-    
+
+
+
     context 'css' do
       before do
         @all_style = Card[ "#{ Card[:all].name }+#{ Card[:style].name }" ]
         @all_style.reset_machine_output!
       end
-      
+
       it 'should create missing machine output file' do
         args = { :id=>@all_style.machine_output_card.name, :format=>'css', :explicit_file=>true }
         get :read, args
@@ -255,23 +255,23 @@ describe CardController do
         expect(response.status).to eq(200)
       end
     end
-    
-  
+
+
     context "file" do
       before do
         Card::Auth.as_bot do
-          Card.create :name => "mao2", :type_code=>'image', :attach=>File.new("#{Cardio.gem_root}/test/fixtures/mao2.jpg")
+          Card.create :name => "mao2", :type_code=>'image', :attach=>File.new( File.join FIXTURES_PATH, 'mao2.jpg' )
           Card.create :name => 'mao2+*self+*read', :content=>'[[Administrator]]'
         end
       end
-    
+
       it "handles image with no read permission" do
         get :read, :id=>'mao2'
         assert_response 403, "should deny html card view"
         get :read, :id=>'mao2', :format=>'jpg'
         assert_response 403, "should deny simple file view"
       end
-    
+
       it "handles image with read permission" do
         login_as :joe_admin
         get :read, :id=>'mao2'
@@ -282,8 +282,8 @@ describe CardController do
     end
 
   end
-  
-  describe "#asset" do 
+
+  describe "#asset" do
     it 'serves file' do
       filename = "asset-test.txt"
       args = { :id=>filename, :format=>'txt', :explicit_file=>true }
@@ -294,10 +294,10 @@ describe CardController do
       expect(page.body).to eq ("test\n")
       FileUtils.rm path
     end
-      
+
     it 'denies access to other directories' do
       args = { :filename => "/../../Gemfile" }
-      get :asset, args 
+      get :asset, args
       expect(response.status).to eq(404)
     end
   end
@@ -316,7 +316,7 @@ describe CardController do
         assert_response :success, "edited card"
         assert_equal 'brand new content', Card['Sample Basic'].content, "content was updated"
       end
-      
+
       it "rename without update references should work" do
         f = Card.create! :type=>"Cardtype", :name=>"Apple"
         xhr :post, :update, :id => "~#{f.id}", :card => {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.15.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.1
+        version: 1.15.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.15.1
+        version: 1.15.2
 description: a wiki approach to stuctured data, dynamic interaction, and web design
 email:
 - info@wagn.org