wml_action 0.0.2 → 0.0.3

data/spec/tag_spec.rb

@@ -5,25 +5,35 @@ module WMLAction
 
   describe Tag do
 
+    before(:all) do
+        Attr = Tag::Attribute
+        Macro = Tag::Macro
+        Action = Tag::Action
+        Filter = Tag::Filter
+        Var = Tag::Expr::Var unless WMLAction.const_defined? 'Var'
+        Op = Tag::Expr::Op unless WMLAction.const_defined? 'Op'
+        Expr = Tag::Expr unless WMLAction.const_defined? 'Expr'
+    end
+
     describe '#merge' do
 
       context 'when no action' do
 
         let(:actions) do
           a = Tag.new
-          a << Tag::Attribute[:hp,25]
-          a << Tag::Macro['{REGENERATE}']
+          a << Attr[:hp,25]
+          a << Macro['{REGENERATE}']
           sub = Tag.new(name: 'attack')
-          sub << Tag::Attribute[:type,'blunt']
+          sub << Attr[:type,'blunt']
           a << sub
           sub = Tag.new(name: 'resists')
-          sub << Tag::Attribute[:cold,100]
+          sub << Attr[:cold,100]
           a << sub
         end
 
         let(:target) do
           t = Tag.new
-          t << Tag::Attribute[:hp,10]
+          t << Attr[:hp,10]
           t << Tag.new(name: 'attack')
           t << Tag.new(name: 'attack')
           t.merge(actions)
@@ -34,7 +44,7 @@ module WMLAction
         end
 
         it 'merges existing sections' do
-          # TODO Should it works through check receiving messages?
+          # TODO Should this test works through check target receiving messages?
           expect(target.subs[0].attrs).to include :type
           expect(target.subs[1].attrs).to include :type
         end
@@ -58,11 +68,11 @@ module WMLAction
         let(:actions) do
           a = Tag.new
           sub = Tag.new(name: 'attack')
-          sub << Tag::Attribute[:type,'blunt']
-          a << Tag::Action[sub, '+']
+          sub << Attr[:type,'blunt']
+          a << Action[sub, '+']
           sub = Tag.new(name: 'resists')
-          a << Tag::Action[sub, '+']
-          a << Tag::Action[Tag::Macro['{REGENERATE}'], '+']
+          a << Action[sub, '+']
+          a << Action[Macro['{REGENERATE}'], '+']
           a
         end
 
@@ -92,14 +102,14 @@ module WMLAction
         let(:actions) do
           a = Tag.new
           sub = Tag.new(name: 'attack')
-          a << Tag::Action[sub,'-']
-          a << Tag::Action[Tag::Macro['{REGENERATE}'], '-']
+          a << Action[sub,'-']
+          a << Action[Macro['{REGENERATE}'], '-']
         end
 
         let(:target) do
           t = Tag.new
           t << Tag.new(name: 'attack')
-          t << Tag::Macro['{REGENERATE}']
+          t << Macro['{REGENERATE}']
           t.merge(actions)
         end
 
@@ -117,20 +127,20 @@ module WMLAction
         let(:actions) do
           a = Tag.new
           sub = Tag.new(name: 'attack')
-          sub << Tag::Filter[Tag::Attribute[:type,'blunt']]
-          sub << Tag::Attribute[:damage, 30]
+          sub << Filter[Attr[:type,'blunt']]
+          sub << Attr[:damage, 30]
           a << sub
         end
 
         let(:target) do
           t = Tag.new
           sub = Tag.new(name: 'attack')
-          sub << Tag::Attribute[:type,'blunt']
-          sub << Tag::Attribute[:damage, 25]
+          sub << Attr[:type,'blunt']
+          sub << Attr[:damage, 25]
           t << sub
           sub = Tag.new(name: 'attack')
-          sub << Tag::Attribute[:type,'pierce']
-          sub << Tag::Attribute[:damage, 25]
+          sub << Attr[:type,'pierce']
+          sub << Attr[:damage, 25]
           t << sub
           t.merge(actions)
         end
@@ -146,13 +156,31 @@ module WMLAction
 
       end
 
+      context 'when expression' do
+        let(:actions) do
+          a = Tag.new
+          a << Attr[:damage, Expr[Var[:damage],1.0,Op['+']]]
+        end
+
+        let(:target) do
+          t = Tag.new
+          t << Attr[:damage, 30]
+          t.merge(actions)
+        end
+
+        it 'evaluates expression' do
+          expect(target.attrs[:damage]).to eq 31
+        end
+
+      end
+
 
     end
 
     describe '#add and #<<' do
 
       it 'returns self' do
-        s = Tag.new << Tag::Attribute[:hp,25]
+        s = Tag.new << Attr[:hp,25]
         expect(s).to be_kind_of(Tag)
       end
 
@@ -170,8 +198,8 @@ module WMLAction
       end
 
       it 'prints attributes' do
-        s << Tag::Attribute[:hp,25]
-        s << Tag::Attribute[:race,'human']
+        s << Attr[:hp,25]
+        s << Attr[:race,'human']
         expect(s.to_s).to eq <<-EOS.gsub(/^\s+\|/, '')
         |[unit]
         |\thp=25
@@ -181,8 +209,8 @@ module WMLAction
       end
 
       it 'prints macros' do
-        s << Tag::Macro['{REGENERATES}']
-        s << Tag::Macro['{INVISIBLE}']
+        s << Macro['{REGENERATES}']
+        s << Macro['{INVISIBLE}']
         expect(s.to_s).to eq <<-EOS.gsub(/^\s+\|/, '')
         |[unit]
         |\t{REGENERATES}
@@ -205,8 +233,8 @@ module WMLAction
       end
 
       it 'prints filters' do
-        s << Tag::Filter[Tag::Attribute[:hp,25]]
-        s << Tag::Filter[Tag::Macro['{REGENERATES}']]
+        s << Filter[Attr[:hp,25]]
+        s << Filter[Macro['{REGENERATES}']]
         expect(s.to_s).to eq <<-EOS.gsub(/^\s+\|/, '')
         |[unit]
         |\t/ hp=25
@@ -216,8 +244,8 @@ module WMLAction
       end
 
       it 'prints actions' do
-        s << Tag::Action[Tag.new(name: 'attack'),'+']
-        s << Tag::Action[Tag::Macro['{REGENERATES}'],'-']
+        s << Action[Tag.new(name: 'attack'),'+']
+        s << Action[Macro['{REGENERATES}'],'-']
         expect(s.to_s).to eq <<-EOS.gsub(/^\s+\|/, '')
         |[unit]
         |\t+ [attack]

data/wml_action.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["paul.schko@gmail.com"]
   spec.description   = %q{Parses WML files and performs actions on them}
   spec.summary       = %q{Parse WML and simple WML extension to make modifications to WML files }
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/PaiPan/wml_action"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -21,12 +21,13 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "debugger"
+  spec.add_development_dependency "debugger", "~> 1.6.8"
   spec.add_development_dependency "ruby-prof"
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "rubocop-rspec"
   spec.add_development_dependency "reek"
   spec.add_development_dependency "cucumber"
+  spec.add_development_dependency "autotest"
 
 
   spec.add_development_dependency "racc"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wml_action
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Pancho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,154 +28,168 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oedipus_lex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Parses WML files and performs actions on them
@@ -187,15 +201,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .rubocop.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/wml_action
+- features/wml_action.feature
 - lib/wml_action.rb
 - lib/wml_action/cli.rb
 - lib/wml_action/document.rb
+- lib/wml_action/expr.rb
 - lib/wml_action/lexer.rex
 - lib/wml_action/lexer.rex.rb
 - lib/wml_action/log.rb
@@ -204,9 +221,11 @@ files:
 - lib/wml_action/tag.rb
 - lib/wml_action/version.rb
 - spec/document_spec.rb
+- spec/expr_spec.rb
 - spec/fixtures/actions.cfg
 - spec/fixtures/as_from_file.cfg
 - spec/fixtures/attributes.cfg
+- spec/fixtures/expr.cfg
 - spec/fixtures/filter.cfg
 - spec/fixtures/inners.cfg
 - spec/fixtures/macros.cfg
@@ -215,7 +234,7 @@ files:
 - spec/fixtures/tag.cfg
 - spec/tag_spec.rb
 - wml_action.gemspec
-homepage: ''
+homepage: https://github.com/PaiPan/wml_action
 licenses:
 - MIT
 metadata: {}
@@ -225,25 +244,28 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Parse WML and simple WML extension to make modifications to WML files
 test_files:
+- features/wml_action.feature
 - spec/document_spec.rb
+- spec/expr_spec.rb
 - spec/fixtures/actions.cfg
 - spec/fixtures/as_from_file.cfg
 - spec/fixtures/attributes.cfg
+- spec/fixtures/expr.cfg
 - spec/fixtures/filter.cfg
 - spec/fixtures/inners.cfg
 - spec/fixtures/macros.cfg