wagn 1.16.14 → 1.16.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe7e45ee8b6975ca10ad14a24bb77184ac7924ce
-  data.tar.gz: 0ac7e94a5403d0c5d8fd8c756516382221c91360
+  metadata.gz: 91193f2217c2ee149afd3789dd7d13ef3b87831d
+  data.tar.gz: 997c9cb094906484298a44ece969f143282859e8
 SHA512:
-  metadata.gz: a862786a7d50d72944490aec4155ca1b55f434c3cf1e60bd971c008e24b291a570d3f9161df20cc7ce5a6df9babc03a4e13396f12748129d92fd118a9a2c7da1
-  data.tar.gz: b44093733c9a77ce3e9a0664b13ac5a2f003b5b5082d982a36211b6a79f64eda525e78a2d384dffb954a640f09f3501efc75eebd7eac0fb49e578ca46b6d022c
+  metadata.gz: b036a8603a038b8cfcdad0594c4aecac81fda0e609e55c9c8f731eef827b21e5dda4487f3cac2d981b71b09442d81838baf5b3bbfb392abe3381ea53e4bae77a
+  data.tar.gz: 451b6152b9ef511a1ec0a019b843c3016da86bb2a9d4aa75acdc660482fc2f7fda1efcc4bfd7af89dd5c387b5a2d19f313554af81151d7f2c653003adcf0b745

data/README.rdoc

@@ -1,5 +1,9 @@
 =Wagn: how pioneers roll
 
+{<img src="https://semaphoreci.com/api/v1/projects/0d61c1f9-5ef0-4c5c-89c6-7664e247e4be/294670/shields_badge.svg" />}[https://semaphoreci.com/ethan/wagn]
+{<img src="https://badge.fury.io/rb/wagn.svg" alt="Gem Version" />}[https://badge.fury.io/rb/wagn]
+{<img src="https://codeclimate.com/repos/56548cb6fafb98574e013c39/badges/be88db3f72d0fd06ace3/gpa.svg" />}[https://codeclimate.com/repos/56548cb6fafb98574e013c39/feed]
+
 ==Basics
 
 Wagn is serious web development made fun.

data/features/attach.feature

@@ -4,6 +4,14 @@ Feature: File Upload
 
   Background:
     Given I am signed in as Joe Admin
+    And I wait until ajax response done
+
+  Scenario: Block creating a new empty file
+    When I go to new File
+    And I fill in "card_name" with "a test file"
+    And I press "Submit"
+    Then I should see "Problems with"
+    And I should see "is missing"
 
   Scenario: Uploading a file
     When I go to new File
@@ -77,4 +85,21 @@ Feature: File Upload
     Then I should see an image of size "medium" and type "jpg"
     And I wait until ajax response done
 
+  Scenario: submit a form without updating a file
+    When I go to  "/new Cardtype"
+    And I fill in "card_name" with "complicated_card"
+    And I press "Submit"
+    And I create HTML card "complicated card+*type+*structure" with content "{{+image}}{{+description}}"
+    And I go to "/new complicated_card"
+    And I fill in "card_name" with "Vignesh has a complicated relationship"
+    And I wait until ajax response done
+    And I upload the image "image.png"
+    And I wait until ajax response done
+    And I press "Submit"
+    And I edit "Vignesh has a complicated relationship"
+    And I press "Submit"
+    And I wait until ajax response done
+    Then within ".card-body" I should see an image of size "medium" and type "png"
+    And I wait until ajax response done
+
 

data/features/step_definitions/wagn_steps.rb

@@ -358,6 +358,13 @@ Then /^I should see an image of size "(.+)" and type "(.+)"$/ do |size, type|
   find("img[src*='#{size}.#{type}']")
 end
 
+img_sld = /^within "(.+)" I should see an image of size "(.+)" and type "(.+)"$/
+Then img_sld do |selector, size, type|
+  within selector do
+    find("img[src*='#{size}.#{type}']")
+  end
+end
+
 img_should = /^I should see a non-mod image of size "(.+)" and type "(.+)"$/
 Then img_should do |size, type|
   element = find("img[src*='#{size}.#{type}']")

data/features/support/env.rb

@@ -20,7 +20,7 @@ require 'cucumber/rails'
 # prefer to use XPath just remove this line and adjust any selectors in your
 # steps to use the XPath syntax.
 Capybara.default_selector = :css
-
+Capybara.default_wait_time = 60
 # By default, any exception happening in your Rails application will bubble up
 # to Cucumber so that your scenario will fail. This is a different from how
 # your application behaves in the production environment, where an error page will

data/lib/wagn/application.rb

@@ -9,19 +9,18 @@ if defined?(Bundler)
   # Bundler.require(:default, :assets, Rails.env)
 end
 
-
 module Wagn
   class Application < Rails::Application
-
-    initializer :load_wagn_environment_config, before: :load_environment_config, group: :all do
-      add_path paths, "lib/wagn/config/environments", glob: "#{Rails.env}.rb"
-      paths["lib/wagn/config/environments"].existent.each do |environment|
+    initializer :load_wagn_environment_config,
+                before: :load_environment_config, group: :all do
+      add_path paths, 'lib/wagn/config/environments', glob: "#{Rails.env}.rb"
+      paths['lib/wagn/config/environments'].existent.each do |environment|
         require environment
       end
     end
 
     class << self
-      def inherited(base)
+      def inherited base
         super
         Rails.app_class = base
         add_lib_to_load_path!(find_root(base.called_from))
@@ -31,37 +30,37 @@ module Wagn
 
     def add_path paths, path, options={}
       root = options.delete(:root) || Wagn.gem_root
-      #gem_path = File.join( root, path )
-      options[:with] = File.join(root, (options[:with] || path) )
+      options[:with] = File.join(root, (options[:with] || path))
       paths.add path, options
     end
 
-
     def config
       @config ||= begin
         config = super
 
         Cardio.set_config config
 
+        # any config settings below:
+        # (a) do not apply to Card used outside of a Wagn context
+        # (b) cannot be overridden in a deck's application.rb, but
+        # (c) CAN be overridden in an environment file
+
+        # therefore, in general, they should be restricted to settings that
+        # (1) are specific to the web environment, and
+        # (2) should not be overridden
+        # ...and we should address (c) above!
+
+        # general card settings (overridable and not) should be in cardio.rb
+        # overridable wagn-specific settings don't have a place yet
+        # but should probably follow the cardio pattern.
+
         config.i18n.enforce_available_locales = true
-        #config.active_record.raise_in_transactional_callbacks = true
+        # config.active_record.raise_in_transactional_callbacks = true
 
         config.assets.enabled = false
         config.assets.version = '1.0'
 
         config.filter_parameters += [:password]
-
-        config.encoding              = 'utf-8'
-        config.no_authentication     = false
-        config.files_web_path        = 'files'
-
-        config.email_defaults        = nil
-
-        config.token_expiry          = 2.days
-        config.revisions_per_page    = 10
-        config.request_logger        = false
-        config.performance_logger    = false
-        config.sql_comments          = true
         config
       end
     end
@@ -79,11 +78,10 @@ module Wagn
 
         add_path paths, 'config/routes.rb', with: 'rails/application-routes.rb'
 
-        Cardio.set_mod_paths  #really this should happen later
+        Cardio.set_mod_paths # really this should happen later
 
         paths
       end
     end
   end
 end
-

data/spec/controllers/card_controller_spec.rb

@@ -273,7 +273,7 @@ describe CardController do
       end
 
       it "handles image with read permission" do
-        login_as :joe_admin
+        login_as 'joe_admin'
         get :read, id: 'mao2'
         assert_response 200
         get :read, id: 'mao2', format: 'jpg'

metadata

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