wagn 1.18.3 → 1.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cbe6bd1aa55678a8d2ca843b1c373544dece5ed
-  data.tar.gz: c5b8babf7cfb7acfa9da9f08f542c1f15d15bcc4
+  metadata.gz: e933d025e07645dd7f92d25942d0ecc4665355a3
+  data.tar.gz: 0658db4a559f088eb629e608568c44da66e5c9e4
 SHA512:
-  metadata.gz: b5221880b583ffd25857caef00d67e775e9b40c6632d834b6a0c8d9d3ef7571d338cacab5862493fd308327968a47a83747fbe682cf9a74058759dc82d432024
-  data.tar.gz: 0bc50056845418d95106848b11fb9975b7205d9a1667a43b9a0221ed6edb0b8153fe7ec8e7037dbcdb4788f38e15efaa6bec6ded1b315760cfd14410f758e7bc
+  metadata.gz: 68b1be15a9980ba07e2c8e750b8d1df15ee8f158c67c937dcc27b499d6c097abff25acfa2c8112b51a507b1414368477c8450eea07412fa78f5c353676c2342d
+  data.tar.gz: 2cfe84024ef8f98c1bf5f82e9b0694ee38c439335f3a3cb3b90aeec7801f2d25532629a84a8427b69319c814a49266ebb51254026a03559f1333702f815954f8

data/features/paging.feature

@@ -7,14 +7,28 @@ Feature: paging
   Background:
     Given I am signed in as Joe Admin
     And I create Search card "basic card search" with content "{\"type\":\"basic\", \"limit\":2}"
-    And I create HTML card "basic item structure" with content "{{_|name}}"
-    And I create HTML card "list all basic cards" with content "{{basic card search||content;structure:basic item structure}}"
 
   Scenario: jump to pages should keep the item structure
-    When I go to card "list all basic cards"
-    And I click "2" within ".paging"    
+    When I create HTML card "basic item structure" with content "{{_|name}}"
+    And I create HTML card "list all basic cards" with content "{{basic card search||content;structure:basic item structure}}"
+    And I go to card "list all basic cards"
+    And I click "2" within ".paging"
     And I wait until ajax response done
     Then I should see css class ".STRUCTURE-basic_item_structure" within ".search-result-item"
-    And I click "3" within ".paging"    
+    And I click "3" within ".paging"
     And I wait until ajax response done
     Then I should see css class ".STRUCTURE-basic_item_structure" within ".search-result-item"
+
+  Scenario: jump to pages should keep the item view
+    When I create HTML card "list basic types" with content "{{basic card search|open|closed}}"
+    And I go to card "list basic types"
+    And I click "2" within ".paging"
+    And I wait until ajax response done
+    Then I should see css class ".closed-view" within ".search-result-item"
+    And I click "3" within ".paging"
+    And I wait until ajax response done
+    Then I should see css class ".TYPE-search.open-view"
+    Then I should see css class ".closed-view" within ".search-result-item"
+
+
+

data/lib/wagn/commands.rb

@@ -65,7 +65,7 @@ else
     end.flatten
     require_args = "-r #{Wagn.gem_root}/features "
     require_args += feature_paths.map { |path| "-r #{path}" }.join(' ')
-    feature_args = ARGV.empty? ? feature_paths.join(' ') : ARGV.join(' ')
+    feature_args = ARGV.empty? ? feature_paths.join(' ') : ARGV.shelljoin
     unless system 'RAILS_ROOT=. bundle exec cucumber ' \
                   "#{require_args} #{feature_args} 2>&1"
       exit $CHILD_STATUS.exitstatus
@@ -86,9 +86,11 @@ else
     rspec_args.shift
     opts = {}
     Wagn::Parser.rspec(opts).parse!(wagn_args)
+
     rspec_command =
       "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} " \
-      " #{opts[:rescue]} rspec #{rspec_args.join(' ')} #{opts[:files]} 2>&1"
+      " #{opts[:rescue]} rspec #{rspec_args.shelljoin} #{opts[:files]}
+2>&1"
     exit $CHILD_STATUS.exitstatus unless system rspec_command
   when '--version', '-v'
     puts "Wagn #{Card::Version.release}"

data/lib/wagn/mods_spec_helper.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+# require 'codeclimate-test-reporter'
+# CodeClimate::TestReporter.start
 require 'spork'
 
 ENV['RAILS_ENV'] = 'test'

data/lib/wagn/tasks/wagn.rake

@@ -6,7 +6,19 @@ WAGN_SEED_PATH = File.join(
   ENV['DECKO_SEED_REPO_PATH'] || [Cardio.gem_root, 'db', 'seed'], 'new'
 )
 
+def run_card_migration core_or_deck
+  prepare_migration
+  verbose = ENV['VERBOSE'] ? ENV['VERBOSE'] == 'true' : true
+  Cardio.schema_mode(core_or_deck) do |paths|
+    ActiveRecord::Migrator.migrations_paths = paths
+    ActiveRecord::Migration.verbose = verbose
+    ActiveRecord::Migrator.migrate paths, version
+  end
+end
+
 def prepare_migration
+  Card::Cache.reset_all
+  ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
   Card::Cache.reset_all
   Card.config.action_mailer.perform_deliveries = false
   Card.reset_column_information
@@ -153,9 +165,9 @@ namespace :wagn do
     desc 'migrate structure'
     task structure: :environment do
       ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
-      Cardio.schema_mode(:structure) do
-        paths = ActiveRecord::Migrator.migrations_paths = Cardio.migration_paths(:structure)
-        ActiveRecord::Migrator.migrate paths
+      Cardio.schema_mode(:structure) do |paths|
+        ActiveRecord::Migrator.migrations_paths = paths
+        ActiveRecord::Migrator.migrate paths, version
         Rake::Task['db:_dump'].invoke   # write schema.rb
       end
     end
@@ -163,34 +175,23 @@ namespace :wagn do
     desc 'migrate core cards'
     task core_cards: :environment do
       require 'card/core_migration'
-
-      Card::Cache.reset_all
-      ENV['SCHEMA'] ||= "#{Cardio.gem_root}/db/schema.rb"
-      prepare_migration
-      paths = Cardio.migration_paths(:core_cards)
-      verbose = ENV['VERBOSE'] ? ENV['VERBOSE'] == 'true' : true
-      version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
-
-      ActiveRecord::Migrator.migrations_paths = paths
-      Cardio.schema_mode :core_cards do
-        ActiveRecord::Migration.verbose = verbose
-        ActiveRecord::Migrator.migrate paths, version
-      end
+      run_card_migration :core_cards
     end
 
     desc 'migrate deck cards'
     task deck_cards: :environment do
       require 'card/migration'
+      run_card_migration :deck_cards
+    end
 
-      Card::Cache.reset_all
-      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
-      end
+    desc 'Runs the "up" for a given deck cards migration VERSION.'
+    task up: :environment do
+      version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
+      verbose = ENV['VERBOSE'] ? ENV['VERBOSE'] == 'true' : true
+      raise 'VERSION is required' unless version
+      ActiveRecord::Migration.verbose = verbose
+      ActiveRecord::Migrator.run :up, Cardio.migration_paths(:deck_cards),
+                                 version
     end
 
     # maybe we should move this to a method?
@@ -268,7 +269,7 @@ namespace :wagn do
           data = ActiveRecord::Base.connection.select_all(
             "select * from #{table}"
           )
-          file.write YAML.dump(data.inject({}) do |hash, record|
+          file.write YAML.dump(data.each_with_object({}) do |record, hash|
             record['trash'] = false if record.key? 'trash'
             record['draft'] = false if record.key? 'draft'
             if record.key? 'content'
@@ -277,7 +278,6 @@ namespace :wagn do
               # would not be needed with psych.
             end
             hash["#{table}_#{i.succ!}"] = record
-            hash
           end)
         end
       end
@@ -348,7 +348,7 @@ end
 
 def delete_unwanted_cards
   Card::Auth.as_bot do
-    if ignoramus = Card['*ignore']
+    if (ignoramus = Card['*ignore'])
       ignoramus.item_cards.each(&:delete!)
     end
     Card::Cache.reset_all
@@ -375,3 +375,7 @@ def clear_history
     action.update_attributes!(card_act_id: act.id)
   end
 end
+
+def version
+  ENV['VERSION'] ? ENV['VERSION'].to_i : nil
+end

data/wagn.gemspec

@@ -5,14 +5,16 @@ version = File.open(File.expand_path('../../card/VERSION', __FILE__)).read.chomp
 Gem::Specification.new do |s|
   s.name          = 'wagn'
   s.version       = version
-  s.authors       = ['Ethan McCutchen', 'Lewis Hoffman', 'Gerry Gleason', "Philipp Kühl"]
+  s.authors       = ['Ethan McCutchen', 'Lewis Hoffman',
+                     'Gerry Gleason', 'Philipp Kühl']
   s.email         = ['info@wagn.org']
 
   #  s.date          = '2013-12-20'
   s.summary       = 'structured wiki web platform'
-  s.description   = 'a wiki approach to stuctured data, dynamic interaction, and web design'
+  s.description   = 'a wiki approach to stuctured data, dynamic interaction, '\
+                    ' and web design'
   s.homepage      = 'http://wagn.org'
-  s.license       = 'GPL'
+  s.licenses      = ['GPL-2.0', 'GPL-3.0']
 
   s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
 
@@ -27,6 +29,6 @@ Gem::Specification.new do |s|
     ['rails', '~> 4.2'],
     ['card',   version]
   ].each do |dep|
-    s.add_runtime_dependency *dep
+    s.add_runtime_dependency(*dep)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.18.3
+  version: 1.18.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-04 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,15 +33,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.18.3
+        version: 1.18.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.18.3
-description: a wiki approach to stuctured data, dynamic interaction, and web design
+        version: 1.18.4
+description: a wiki approach to stuctured data, dynamic interaction,  and web design
 email:
 - info@wagn.org
 executables:
@@ -738,7 +738,8 @@ files:
 - wagn.gemspec
 homepage: http://wagn.org
 licenses:
-- GPL
+- GPL-2.0
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []