wagn 1.14.4 → 1.14.5

data/lib/card/query/{spec.rb → clause.rb}

@@ -1,6 +1,6 @@
 
-class Card::Query::Spec
-  attr_accessor :spec
+class Card::Query::Clause
+  attr_accessor :clause
 
   def safe_sql(txt)
     txt = txt.to_s
@@ -9,7 +9,7 @@ class Card::Query::Spec
 
   def quote(v)  ActiveRecord::Base.connection.quote(v)  end
 
-  def match_prep(v,cardspec=self)
+  def match_prep(v)
     cxn ||= ActiveRecord::Base.connection
     [cxn, v]
   end

data/lib/card/query/ref_clause.rb

@@ -0,0 +1,47 @@
+class Card::Query
+  class RefClause < Clause
+    REFERENCE_DEFINITIONS = {
+      # syntax:
+      # wql query key => [ direction, {reference_type} ]
+          # direction      = :out | :in
+          # reference_type =  'L' | 'I' | 'P' 
+
+      :refer_to => [ :out, 'L','I' ], :referred_to_by => [ :in, 'L','I' ],
+      :link_to  => [ :out, 'L' ],     :linked_to_by   => [ :in, 'L' ],
+      :include  => [ :out, 'I' ],     :included_by    => [ :in, 'I' ]
+    }
+    
+    REFERENCE_FIELDS = {
+      :out => [ :referer_id, :referee_id ],
+      :in  => [ :referee_id, :referer_id ]
+    }
+        
+    def initialize key, val, parent
+      @key, @val, @parent = key, val, parent
+    end
+
+    def to_sql *args
+      dir, *type = REFERENCE_DEFINITIONS[ @key.to_sym ]
+      field1, field2 = REFERENCE_FIELDS[ dir ]
+      cond = []
+      if type.present?
+        operator = (type.size==1 ? '=' : 'IN')
+        quoted_letters = type.map { |letter| "'#{letter}'" } * ', '
+        cond << "ref_type #{operator} (#{quoted_letters})"
+      end
+
+      sql =  %[select distinct #{field1} as ref_id from card_references]
+      if @val == '_none'
+        cond << "present = 0"
+      else
+        cardclause = CardClause.build(:return=>'id', :_parent=>@parent).merge(@val)
+        sql << %[ join #{ cardclause.to_sql } as c on #{field2} = c.id]
+      end
+      sql << %[ where #{ cond * ' and ' }] if cond.any?
+      
+      "(#{sql})"
+    end
+  end
+end
+
+

data/lib/card/query/value_clause.rb

@@ -0,0 +1,65 @@
+class Card::Query
+  class ValueClause < Clause
+    def initialize clause, cardclause
+      @cardclause = cardclause
+
+      # bare value shortcut
+      @clause = case clause
+        when ValueClause; clause.instance_variable_get('@clause')  # FIXME what a hack (what's this for?)
+        when Array;     clause
+        when String;    ['=', clause]
+        when Integer;   ['=', clause]
+        else raise("Invalid Condition Clause #{clause.inspect}")
+      end
+
+      # operator aliases
+      @clause[0] = @clause[0].to_s
+      if target = OPERATORS[@clause[0]]
+        @clause[0] = target
+      end
+
+      # check valid operator
+      raise("Invalid Operator #{@clause[0]}") unless OPERATORS.has_key?(@clause[0])
+
+      # handle IN  #FIXME -- shouldn't this handle "not in", too?
+      if @clause[0]=='in' and !@clause[1].is_a?(CardClause) and !@clause[1].is_a?(RefClause)
+        @clause = [@clause[0], @clause[1..-1]]
+      end
+    end
+
+    def op
+      @clause[0]
+    end
+
+    def sqlize(v)
+      case v
+        when CardClause, RefClause, SqlCond; v.to_sql
+        when Array;    "(" + v.flatten.collect {|x| sqlize(x)}.join(',') + ")"
+        else quote(v.to_s)
+      end
+    end
+
+    def to_sql field
+      op,v = @clause
+      #warn "to_sql(#{field}), #{op}, #{v}, #{@cardclause.inspect}"
+      v=@cardclause.selfname if v=='_self'
+      table = @cardclause.table_alias
+
+      #warn "to_sql #{field}, #{v} (#{op})"
+      field, v = case field
+        when "cond";     return "(#{sqlize(v)})"
+        when "name";     ["#{table}.key",      [v].flatten.map(&:to_name).map(&:key)]
+        when "content";  ["#{table}.db_content", v]
+        else;            ["#{table}.#{safe_sql(field)}", v]
+        end
+
+      v = v[0] if Array===v && v.length==1 && op != 'in'
+      if op=='~'
+        cxn, v = match_prep(v)
+        %{#{field} #{cxn.match(sqlize(v))}}
+      else
+        "#{field} #{op} #{sqlize(v)}"
+      end
+    end
+  end
+end

data/lib/card/reference.rb

@@ -40,30 +40,21 @@ class Card::Reference < ActiveRecord::Base
     end
     
     def repair_missing_referees
-      where( Card.where( :id=>arel_table[:referee_id]).exists.not ).update_all :referee_id=>nil
+      #FIXME - should treat trashed cards as not existing
+      where( Card.where( :id=>arel_table[:referee_id], :trash=>false).exists.not ).update_all :referee_id=>nil
+    end
+    
+    def delete_missing_referers
+      where( Card.where( :id=>arel_table[:referer_id], :trash=>false).exists.not ).delete_all
     end
     
     def repair_all
-      connection.execute 'truncate card_references'
-      Card.update_all :references_expired => 1
-
-      expired_cards_remain = true
-      batchsize, count_updated = 100, 0
-
-      while expired_cards_remain
-        batch = Card.find_all_by_references_expired(1, :order=>"name ASC", :limit=>batchsize)
-        if batch.empty?
-          expired_cards_remain = false
-        else
-          Rails.logger.debug "Updating references for '#{batch.first.name}' to '#{batch.last.name}' ... "; $stdout.flush        
-          batch.each do |card|
-            count_updated += 1
-            card.update_references
-          end
-          Rails.logger.info "batch done.  \t\t#{count_updated} total updated"
-        end
-      end
+      delete_missing_referers
       
+      Card.where(:trash=>false).find_each do |card|
+        Rails.logger.info "\n\n\nRepairing references for '#{card.name}' (id: #{card.id}) ... \n\n\n"
+        card.update_references 
+      end
     end
     
   end

data/lib/card/set.rb

@@ -195,22 +195,23 @@ class Card
         end      
       end
       
-      def write_tmp_file set_pattern, anchor, from_file, seq
+      def write_tmp_file set_pattern, anchors, from_file, seq
         # FIXME - this does not properly handle anchorless sets
         # There are special hacks for *all, but others (like *rstar) will not be found by
         # include_set_modules, which will look for Card::Set::Rstar, not Card::Set::Rstar::Blah
         
-        to_file = "#{Wagn.paths['tmp/set'].first}/#{set_pattern}/#{seq}-#{anchor}.rb"
+        to_file = "#{Wagn.paths['tmp/set'].first}/#{set_pattern}/#{seq}-#{anchors.join '-'}.rb"
+        anchor_modules = anchors.map { |a| "module #{a.camelize};" }.join
         file_content = <<EOF
 # -*- encoding : utf-8 -*-
-class Card; module Set; module #{set_pattern.camelize}; module #{anchor.camelize}
+class Card; module Set; module #{set_pattern.camelize}; #{anchor_modules}
 extend Card::Set
 # ~~~~~~~~~~~ above autogenerated; below pulled from #{from_file} ~~~~~~~~~~~
 
 #{ File.read from_file }
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from #{from_file} ~~~~~~~~~~~
-end;end;end;end
+end;end;end;#{'end;'*anchors.size}
 EOF
         File.write to_file, file_content
         to_file
@@ -275,8 +276,7 @@ EOF
       first = 2 # shortname eliminates Card::Set
       set_class = Card::SetPattern.find parts[first].underscore
       
-      last = first + ( set_class.anchorless? ? 0 : 1 )
-      #FIXME - handle multi-anchor sets like type_plus_right 
+      last = first + set_class.anchor_parts_count
       parts[first..last].join '::'
     end
 

data/lib/card/set_pattern.rb

@@ -2,7 +2,7 @@ class Card
   class SetPattern
     
     class << self
-      attr_accessor :pattern_code, :pattern_id, :junction_only, :assigns_type, :anchorless
+      attr_accessor :pattern_code, :pattern_id, :junction_only, :assigns_type, :anchorless, :anchor_parts_count
       
       def find pattern_code
         Card.set_patterns.find { |sub| sub.pattern_code == pattern_code }        
@@ -39,6 +39,10 @@ class Card
         junction_only? ? card.cardname.junction? : true
       end
     
+      def anchor_parts_count 
+        @anchor_parts_count ||= ( anchorless? ? 0 : 1 )
+      end
+      
       def write_tmp_file pattern_code, from_file, seq
         to_file = "#{Wagn.paths['tmp/set_pattern'].first}/#{seq}-#{pattern_code}.rb"
         klass = "Card::#{pattern_code.camelize}Set"

data/lib/wagn/commands.rb

@@ -1,5 +1,5 @@
 require 'optparse'
-require 'active_support/core_ext/object/inclusion' # adds method in? to Object class
+require 'active_support/core_ext/object/inclusion' # adds method in? to Object class 
 
 def load_rake_tasks
   require './config/environment'
@@ -11,6 +11,7 @@ RAILS_COMMANDS = %w( generate destroy plugin benchmarker profiler console server
 ALIAS = {
   "rs" => "rspec",
   "cc" => "cucumber",
+  "jm" => "jasmine",
   "g"  => "generate",
   "d"  => "destroy",
   "c"  => "console",
@@ -48,7 +49,7 @@ else
 
   case command
   when 'seed'
-    envs = ['production']
+    envs = []
     parser = OptionParser.new do |parser|
       parser.banner = "Usage: wagn seed [options]\n\nCreate and seed the production database specified in config/database.yml\n\n"
       parser.on('--production','-p', 'seed production database (default)') do
@@ -61,13 +62,19 @@ else
         envs = ['development']
       end
       parser.on('--all', '-a', 'seed production, test, and development database') do
-        envs = %w( production development test)          
+        envs = %w( production development test)
       end
     end
     parser.parse!(ARGV)
-    envs.each do |env|
-      puts "env RAILS_ENV=#{env} bundle exec rake wagn:create"
-      puts `env RAILS_ENV=#{env} bundle exec rake wagn:create`
+    task_cmd="bundle exec rake wagn:create"
+    if envs.empty?
+      puts task_cmd
+      puts `#{task_cmd}`
+    else
+      envs.each do |env|
+        puts "env RAILS_ENV=#{env} #{task_cmd}"
+        puts `env RAILS_ENV=#{env} #{task_cmd}`
+      end
     end
   when 'update'
     load_rake_tasks
@@ -77,14 +84,20 @@ else
     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(' ')
-    system "RAILS_ROOT=. bundle exec cucumber #{require_args} #{feature_args}"
+    unless system "RAILS_ROOT=. bundle exec cucumber #{require_args} #{feature_args} 2>&1"
+      exit $?.exitstatus
+    end
+  when 'jasmine'
+    unless system "RAILS_ENV=test bundle exec rake spec:javascript 2>&1"
+      exit $?.exitstatus
+    end
   when 'rspec'
     opts = {}
     require 'rspec/core'
     parser = RSpec::Core::Parser.new.parser(opts)
     parser.banner = "Usage: wagn rspec [WAGN ARGS] -- [RSPEC ARGS]\n\nRSPEC ARGS"
-    parser.separator <<-WAGN 
-      
+    parser.separator <<-WAGN
+
 WAGN ARGS
 
   You don't have to give a full path for FILENAME, the basename is enough
@@ -128,8 +141,10 @@ WAGN
     wagn_args, rspec_args = (' '<<ARGV.join(' ')).split(' -- ')
     parser.parse!(wagn_args.split(' '))
 
-    rspec_command = "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} #{opts[:rescue]} rspec #{rspec_args} #{opts[:files]}" 
-    system rspec_command
+    rspec_command = "RAILS_ROOT=. #{opts[:simplecov]} #{opts[:executer]} #{opts[:rescue]} rspec #{rspec_args} #{opts[:files]} 2>&1" 
+    unless system rspec_command
+      exit $?.exitstatus
+    end
   when '--version', '-v'
     puts "Wagn #{Wagn::Version.release}"
   when 'new'
@@ -150,12 +165,12 @@ WAGN
    new         Create a new Wagn deck. "wagn new my_deck" creates a
                new deck called MyDeck in "./my_deck"
    seed        Create and seed the database specified in config/database.yml
-   
+
    server      Start the Rails server (short-cut alias: "s")
    console     Start the Rails console (short-cut alias: "c")
    dbconsole   Start a console for the database specified in config/database.yml
                (short-cut alias: "db")
-               
+
   For core developers
    cucumber     Run cucumber features (short-cut alias: "cc")
    rspec        Run rspec tests (short-cut alias: "rs")
@@ -177,4 +192,3 @@ WAGN
 end
 
 
-

data/lib/wagn/config/environments/test.rb

@@ -8,6 +8,9 @@ Wagn.application.class.configure do
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
+
+  config.assets.enabled = true if Object.const_defined?( :JasmineRails )
+
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"

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

@@ -21,6 +21,9 @@ end
 
 group :test, :development do
   gem 'rails-dev-tweaks'
+  gem 'jasmine'
+  gem 'jasmine-rails', :git=>"https://github.com/chuenlok/jasmine-rails.git"
+  gem 'jasmine-jquery-rails'
   gem 'sprockets' # just so above works
   # gem 'spring'
   # gem 'spring-commands-rspec'
@@ -97,6 +100,9 @@ group :development, :test do
   gem 'pry-rails'
   gem 'pry-rescue'
   gem 'pry-stack_explorer'
+  gem 'jasmine'
+  gem 'jasmine-rails', :git=>"https://github.com/chuenlok/jasmine-rails.git"
+  gem 'jasmine-jquery-rails'
 end
 
 group :debug do

data/lib/wagn/generators/wagn/templates/Rakefile

@@ -3,5 +3,6 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
+require 'jasmine'
 
 <%= app_const %>.load_tasks

data/lib/wagn/generators/wagn/templates/config/application.rb

@@ -16,6 +16,7 @@ module <%= app_const_base %>
   
     
     # Email configuration
+
     config.action_mailer.perform_deliveries = false
     # config.action_mailer.delivery_method  = ...
     # config.action_mailer.smtp_settings    = ...

data/lib/wagn/generators/wagn/templates/spec/javascripts/support/deck_jasmine.yml

@@ -0,0 +1,56 @@
+# path to parent directory of src_files
+# relative path from Rails.root
+# defaults to app/assets/javascripts
+# useless in wagn file structure
+src_dir: "mod"
+#"app/assets/javascripts"
+
+# path to additional directory of source file that are not part of assets pipeline and need to be included
+# relative path from Rails.root
+# defaults to []
+# include_dir:
+#   - ../mobile_app/public/js
+
+# path to parent directory of css_files
+# relative path from Rails.root
+# defaults to app/assets/stylesheets
+# useless in wagn file structure
+css_dir: "mod"
+
+# list of file expressions to include as source files
+# relative path from src_dir
+src_files:
+ - "**/*.{js.coffee,js,coffee}"
+
+# list of file expressions to include as css files
+# relative path from css_dir
+css_files: 
+    # - "**/*.{css,scss}"
+# THIS IS IMPORTANT!!
+include_dir: "mod"
+  #- <%= Wagn.gem_root+"/mod/03_machines/lib/javascript" %>
+# path to parent directory of spec_files
+# relative path from Rails.root
+#
+# Alternatively accept an array of directory to include external spec files
+# spec_dir:
+#   - spec/javascripts
+#   - ../engine/spec/javascripts
+#
+# defaults to spec/javascripts
+spec_dir:  "spec/javascripts"
+
+# list of file expressions to include as helpers into spec runner
+# relative path from spec_dir
+helpers:
+  - "helpers/**/*.{js.coffee,js,coffee}"
+
+# list of file expressions to include as specs into spec runner
+# relative path from spec_dir
+spec_files:
+  - "**/*[Ss]pec.{js.coffee,js,coffee}"
+
+# path to directory of temporary files
+# (spec runner and asset cache)
+# defaults to tmp/jasmine
+tmp_dir: "tmp/jasmine"

data/lib/wagn/generators/wagn/templates/spec/javascripts/support/wagn_jasmine.yml

@@ -0,0 +1,69 @@
+# path to parent directory of src_files
+# relative path from Rails.root
+# defaults to app/assets/javascripts
+# useless for wagn file structure
+src_dir: <%= Wagn.gem_root+"/mod/03_machines/lib/javascript" %>
+#"app/assets/javascripts"
+
+# path to additional directory of source file that are not part of assets pipeline and need to be included
+# relative path from Rails.root
+# defaults to []
+# include_dir:
+#   - ../mobile_app/public/js
+
+# path to parent directory of css_files
+# relative path from Rails.root
+# defaults to app/assets/stylesheets
+# useless for wagn file structure
+css_dir: <%= Wagn.gem_root+"/mod/03_machines/lib/stylesheets" %>
+
+# list of file expressions to include as source files
+# relative path from src_dir
+src_files:
+ - jquery.js
+ - tinymce.js
+ - wagn_mod.js.coffee
+ - wagn.js.coffee
+ - wagn_menu.js
+ # - jquerymobile.js 
+ - jquery-ui.js 
+ - jquery.ui.autocomplete.html.js 
+ - jquery.autosize.js 
+ - jquery.fileupload.js 
+ - jquery.iframe-transport.js 
+ - jquery_ujs.js
+ - ace.js
+ #- "**/*.{js.coffee,js,coffee}"
+
+# list of file expressions to include as css files
+# relative path from css_dir
+css_files: 
+    # - "**/*.{css,scss}"
+# THIS IS IMPORTANT!!!
+include_dir:
+  - <%= Wagn.gem_root+"/mod/03_machines/lib/javascript" %>
+# path to parent directory of spec_files
+# relative path from Rails.root
+#
+# Alternatively accept an array of directory to include external spec files
+# spec_dir:
+#   - spec/javascripts
+#   - ../engine/spec/javascripts
+#
+# defaults to spec/javascripts
+spec_dir:  <%= Wagn.gem_root+"/spec/javascripts" %>
+
+# list of file expressions to include as helpers into spec runner
+# relative path from spec_dir
+helpers:
+  - "helpers/**/*.{js.coffee,js,coffee}"
+
+# list of file expressions to include as specs into spec runner
+# relative path from spec_dir
+spec_files:
+  - "**/*[Ss]pec.{js.coffee,js,coffee}"
+
+# path to directory of temporary files
+# (spec runner and asset cache)
+# defaults to tmp/jasmine
+tmp_dir: "tmp/jasmine"