wagn 1.14.0.pre2 → 1.14.0.pre3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzYyZjJmM2EwMmFkZGUzNDI1MmMzOWVlMGUyYzE4MGY0M2U5NTYyZA==
+    ZDI4YWExYTkwZjk4M2MyNjhlM2ZkMTc3ZTJhMGMzMWY0ODQyYzU4Mw==
   data.tar.gz: !binary |-
-    Yzk5ZTI0ZTk4ZGQ2MjkxNzRiMTI2ZTI0NTc0ZDJmMDAxMzgwZjliMQ==
+    YTg1Njg2NWFmNjI3ZDlhYTM5ZTJmOTNhNjZlMTg0YjYyYjdjZDJkZg==
 SHA512:
   metadata.gz: !binary |-
-    ZDFkNzBiODAzOWVjNzhjNDJhZjY3MjYxNDMxNjYzMWY2OWMyMDQwMzViZDIw
-    YzEyMTg2YWM2Mjg5NDI0ODhhNTI3ZWIyMThlMmQ2MjI4ZjljNzg0NTU0OTMz
-    NTRhZTgxMzUxMDViM2VhNmRjZTk0Njg3ODEyNTY5OTRkNTg5Mzc=
+    ODgwMmU3MzU5ZTZiNWEyNjE5Y2JiMWE0NWVlMmM1ZmI2NzE1ZDY0M2VlMDBh
+    OWM5ZjYzYjk2MWIxN2FmMjFjYTdkYjY0MTVhOGI2MzJmOWEyNWNhODhhYmE0
+    MTYyZjk1NmNjYjc4NDM2NDk2ZDdkMTA1YjA5NWNjZWI3MTc1NjM=
   data.tar.gz: !binary |-
-    MGY0NDcxNDY5ZGFjNDFjNWMzOTVjZjE5OGZhMDJhNjY5ZmIzZDBlYjhhMTFm
-    MTdhMDZjODgxOTE3MDZjZmY1MDgxZjVmNDE0YWRmNTRlYmM5MjNlMTE1MTRj
-    NTg5YjAzZjhhODA4N2E5ODk4Mzg1NTRkZDNjZjJiNzdmNTkyNzE=
+    NWZjNmZiYzVjNjYwNzA2NGNiM2U5NTNiMGRmMDhmYzYxM2MwYjU4MDRmZTRj
+    NWRkZjg4YjkwODE4MjYyMjNkMzIwZmEzYmM4NDA2MDg5NjZiMmFjOTk4N2Yz
+    MjllNjNhZDI1N2QzYmU0MzJiZGExOTcyNzZiN2E0ZjQ2Y2ZhYzc=

data/VERSION

@@ -1 +1 @@
-1.14.0.pre2
+1.14.0.pre3

data/db/migrate_cards/20140629222005_add_email_cards.rb

@@ -111,7 +111,7 @@ class AddEmailCards < Wagn::Migration
       ).each do |card|
         set_name = card.cardname.left
         card.name = "#{ set_name.gsub('*','' ).gsub('+', '_') }_email_template"
-        card.type_code = 'email_template'
+        card.type = 'Email Template'
         card.save!
         Card.create! :name=>"#{set_name}+*on create", :content=>card.name
       end
@@ -124,7 +124,7 @@ class AddEmailCards < Wagn::Migration
     # move old send rule to on_create
     #fields = %w( to from cc bcc subject message attach )
     Card.search(:right=>"*send").each do |send_rule|
-      Card.create! :name=>"send_rule.left+*on create", :content=>send_rule.content, :type_code=>:pointer
+      Card.create! :name=>"#{send_rule.left}+*on create", :content=>send_rule.content, :type_code=>:pointer
       send_rule.delete  #@ethn: keep old rule for safety reasons?
     end
   

data/lib/wagn/tasks/db.rake

@@ -7,6 +7,7 @@ require 'rake'
 unless Rake::TaskManager.methods.include?(:redefine_task)
   module Rake
     module TaskManager
+
       def redefine_task(task_class, args, &block)
         task_name, arg_names, deps = resolve_args(args)
         task_name = task_class.scope_name(@scope, task_name)
@@ -41,7 +42,7 @@ namespace :db do
       end
     end
   end
-    
+
   namespace :test do
     desc 'Prepare the test database and load the schema'
     Rake::Task.redefine_task( :prepare => :environment ) do
@@ -53,3 +54,6 @@ namespace :db do
     end
   end
 end
+
+
+

data/lib/wagn/tasks/wagn.rake

@@ -12,7 +12,7 @@ namespace :wagn do
       puts "not dropped"
     end
 
-    ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
+    ENV['SCHEMA'] ||= "#{Wagn.gem_root}/db/schema.rb"
      
     puts "creating"
     Rake::Task['db:create'].invoke
@@ -62,7 +62,7 @@ namespace :wagn do
 
   desc "migrate structure and cards"
   task :migrate =>:environment do
-    ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
+    ENV['SCHEMA'] ||= "#{Wagn.gem_root}/db/schema.rb"
     
     stamp = ENV['STAMP_MIGRATIONS']
 
@@ -102,7 +102,7 @@ namespace :wagn do
     desc "migrate cards"
     task :cards => :environment do
       Wagn::Cache.reset_global
-      ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
+      ENV['SCHEMA'] ||= "#{Wagn.gem_root}/db/schema.rb"
       Wagn.config.action_mailer.perform_deliveries = false
       Card.reset_column_information
        # this is needed in production mode to insure core db structures are loaded before schema_mode is set
@@ -119,7 +119,7 @@ namespace :wagn do
     desc "migrate deck cards"
     task :deck_cards => :environment do
       Wagn::Cache.reset_global
-      ENV['SCHEMA'] = "#{Rails.root}/db/schema.rb"
+      ENV['SCHEMA'] ||= "#{Rails.root}/db/schema.rb"
       Wagn.config.action_mailer.perform_deliveries = false
       Card # this is needed in production mode to insure core db structures are loaded before schema_mode is set
     
@@ -133,7 +133,7 @@ namespace :wagn do
   
     desc 'write the version to a file (not usually called directly)' #maybe we should move this to a method? 
     task :stamp, :suffix do |t, args|
-      ENV['SCHEMA'] = "#{Wagn.gem_root}/db/schema.rb"
+      ENV['SCHEMA'] ||= "#{Wagn.gem_root}/db/schema.rb"
       Wagn.config.action_mailer.perform_deliveries = false
       
       stamp_file = Wagn::Version.schema_stamp_path( args[:suffix] )

data/lib/wagn/version.rb

@@ -14,13 +14,10 @@ module Wagn
       end
 
       def schema_stamp_path type
-        stamp_dir = ENV['SCHEMA_STAMP_PATH'] || if type.to_s =~ /deck/
-          File.join( Wagn.root, 'config' )
-        else
-          File.join( Wagn.gem_root, 'config' )
-        end 
+        root_dir = type.to_s =~ /deck/ ? Wagn.root : Wagn.gem_root
+        stamp_dir = ENV['SCHEMA_STAMP_PATH'] || File.join( root, 'config' )
         
-        File.join stamp_dir, "version#{ '_cards' if type.to_s =~ /card|deck/ }.txt"  
+        File.join stamp_dir, "version#{ "_#{type}s" if type.present? }.txt"  
       end
             
     end

data/wagn.gemspec

@@ -25,25 +25,25 @@ Gem::Specification.new do |s|
 
   [
     
-    [ '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'    ],
+    [ '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.5'  ],
-    [ 'kaminari',     '~> 0.16.1' ],
-    [ 'diffy',        '~> 3.0.6'  ],
-    [ 'diff-lcs',     '~> 1.2.5'  ],
+    [ 'haml',         '~> 4.0'  ],
+    [ 'kaminari',     '~> 0.16' ],
+    [ 'diffy',        '~> 3.0'  ],
+    [ 'diff-lcs',     '~> 1.2'  ],
     # should not depend!
-    [ 'airbrake',     '~> 3.1'    ] 
+    [ 'airbrake',     '~> 3.1'  ] 
 
     
   ].each do |dep|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wagn
 version: !ruby/object:Gem::Version
-  version: 1.14.0.pre2
+  version: 1.14.0.pre3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -172,56 +172,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: airbrake
   requirement: !ruby/object:Gem::Requirement