wally 0.0.29 → 0.0.30

data/bin/wally

@@ -10,7 +10,13 @@ elsif ARGV[0] == "push"
   require "wally"
   features = []
   Dir.glob(File.join("#{ARGV[2]}", "**/*.feature")).each do |feature_path|
-    gherkin = Wally::ParsesFeatures.new.parse(File.read(feature_path))
+    begin
+      gherkin = Wally::ParsesFeatures.new.parse(File.read(feature_path))
+    rescue
+      puts "Couldn't parse '#{feature_path}'"
+      puts "Contents:"
+      puts File.read(feature_path)
+    end
     features << {:path => feature_path, :gherkin => gherkin}
   end
   RestClient.put "#{ARGV[1]}/features/?authentication_code=#{File.read(".wally")}", features.to_json, {:content_type => :json, :accept => :json}

data/lib/wally.rb

@@ -5,7 +5,6 @@ $:.unshift(File.expand_path(File.dirname(__FILE__)))
 
 require "wally/version"
 require "wally/application"
-require "wally/lists_features"
 require "wally/search_features"
 require "wally/counts_tags"
 require "wally/parses_features"

data/lib/wally/application.rb

@@ -18,12 +18,8 @@ else
   MongoMapper.database = "wally"
 end
 
-def lists_features
-  Wally::ListsFeatures.new
-end
-
 def tag_count
-  Wally::CountsTags.new(lists_features).count_tags
+  Wally::CountsTags.new(Wally::Feature).count_tags
 end
 
 def excessive_wip_tags
@@ -31,7 +27,12 @@ def excessive_wip_tags
 end
 
 def scenario_count
-  lists_features.features.to_s.scan(/scenario/).length
+  Feature.all.inject(0) do |count, feature|
+    if feature.gherkin["elements"]
+      count += feature.gherkin["elements"].select { |e| e["type"] == "scenario" }
+    end
+    count
+  end
 end
 
 def highlighted_search_result_blurb search_result
@@ -68,9 +69,9 @@ get '/?' do
   haml :index
 end
 
-get '/features/:feature/?' do |feature|
-  lists_features.features.each do |feature_hash|
-    @feature = feature_hash if feature_hash["id"] == feature
+get '/features/:feature/?' do |id|
+  Wally::Feature.all.each do |feature|
+    @feature = feature if feature.gherkin["id"] == id
   end
   haml :feature
 end
@@ -81,16 +82,16 @@ end
 
 get '/search/?' do
   if params[:q]
-    @search_results = Wally::SearchFeatures.new(lists_features).find(:query => params[:q])
+    @search_results = Wally::SearchFeatures.new(Wally::Feature).find(:query => params[:q])
   end
   haml :search
 end
 
 get '/features/:feature/scenario/:scenario/?'  do  |feature_id, scenario_id|
-  lists_features.features.each do |feature|
-    if feature["id"] == feature_id
+  Wally::Feature.all.each do |feature|
+    if feature.gherkin["id"] == feature_id
       @feature = feature
-      feature["elements"].each do |element|
+      feature.gherkin["elements"].each do |element|
         if element["type"] == "background"
           @background = element
         end
@@ -110,8 +111,8 @@ end
 def get_sorted_scenarios(feature)
   scenarios = []
 
-  if feature["elements"]
-    feature["elements"].each do |element|
+  if feature.gherkin["elements"]
+    feature.gherkin["elements"].each do |element|
       if element["type"] == "scenario" || element["type"] == "scenario_outline"
         scenarios << element
       end

data/lib/wally/counts_tags.rb

@@ -5,14 +5,14 @@ module Wally
     end
 
     def count_tags
-      @lists_features.features.inject(Hash.new(0)) do |tag_count, feature|
-        if feature["tags"]
-          feature["tags"].each do |tag|
+      @lists_features.all.inject(Hash.new(0)) do |tag_count, feature|
+        if feature.gherkin["tags"]
+          feature.gherkin["tags"].each do |tag|
             tag_count[tag["name"].downcase] += 1
           end
         end
-        if feature["elements"]
-          feature["elements"].each do |element|
+        if feature.gherkin["elements"]
+          feature.gherkin["elements"].each do |element|
             if element["tags"]
               element["tags"].each do |tag|
                 tag_count[tag["name"].downcase] += 1

data/lib/wally/feature.rb

@@ -4,5 +4,13 @@ module Wally
 
     key :path, String
     key :gherkin, Hash
+    key :name, String
+
+    before_save :save_feature_name
+
+    private
+    def save_feature_name
+      @name = gherkin["name"]
+    end
   end
 end

data/lib/wally/parses_features.rb

@@ -15,9 +15,16 @@ module Wally
       io = StringIO.new
       formatter = Gherkin::Formatter::JSONFormatter.new(io)
       parser = Gherkin::Parser::Parser.new(formatter, false, 'root')
-      parser.parse(text, nil, 0)
+      begin
+        parser.parse(text, nil, 0)
+      rescue Exception => e
+        raise FeatureParseException.new
+      end
       hash = formatter.to_hash
       hash
     end
   end
+
+  class FeatureParseException < StandardError
+  end
 end

data/lib/wally/search_features.rb

@@ -9,21 +9,21 @@ module Wally
     def find(query)
       searchables = []
 
-      @lists_features.features.each do |feature|
-        feature_text = feature["name"]
-        if feature["tags"]
-          feature_text += " " + feature["tags"].map { |tag| tag["name"] }.join(" ")
+      @lists_features.all.each do |feature|
+        feature_text = feature.gherkin["name"]
+        if feature.gherkin["tags"]
+          feature_text += " " + feature.gherkin["tags"].map { |tag| tag["name"] }.join(" ")
         end
-        if feature["description"]
-          feature_text += " " + feature["description"]
+        if feature.gherkin["description"]
+          feature_text += " " + feature.gherkin["description"]
         end
         feature_data = OpenStruct.new
-        feature_data.feature = feature
+        feature_data.feature = feature.gherkin
         feature_data.text = feature_text
         searchables << feature_data
 
-        if feature["elements"]
-          feature["elements"].each do |element|
+        if feature.gherkin["elements"]
+          feature.gherkin["elements"].each do |element|
             element_text = [element["name"]]
             if element["steps"]
               element_text << element["steps"].map { |s| s["name"] }
@@ -32,7 +32,7 @@ module Wally
               element_text << element["tags"].map { |t| t["name"] }
             end
             scenario_data = OpenStruct.new
-            scenario_data.feature = feature
+            scenario_data.feature = feature.gherkin
             scenario_data.scenario = element
             scenario_data.text = element_text.join(" ")
             searchables << scenario_data

data/lib/wally/version.rb

@@ -1,3 +1,3 @@
 module Wally
-  VERSION = "0.0.29"
+  VERSION = "0.0.30"
 end

data/lib/wally/views/feature.haml

@@ -1,15 +1,14 @@
 %h2
-  = @feature["name"]
-- if @feature["path"]
-  %p
-    from
-    %em
-      = @feature["path"]
-  %section{:class=>"scenarios"}
-    %section{:class => 'feature'}
-      :markdown
-        #{@feature["description"]}
-- if @feature["description"]
+  = @feature.gherkin["name"]
+%p
+  from
+  %em
+    = @feature.path
+%section{:class=>"scenarios"}
+  %section{:class => 'feature'}
+    :markdown
+      #{@feature.gherkin["description"]}
+- if @feature.gherkin["description"]
   %h2 Scenarios
   %ul
     - get_sorted_scenarios(@feature).each do |scenario|

data/lib/wally/views/feature_link.haml

@@ -1,6 +1,6 @@
 %li
-  %a{:href => "/features/#{feature["id"]}"}
-    = feature["name"]
-  - if feature["tags"]
-    - tags = feature["tags"]
+  %a{:href => "/features/#{feature.gherkin["id"]}"}
+    = feature.gherkin["name"]
+  - if feature.gherkin["tags"]
+    - tags = feature.gherkin["tags"]
     = haml :tag_links, {:locals => {:tags => tags}, :layout => false}

data/lib/wally/views/layout.haml

@@ -18,19 +18,13 @@
     %div.container-fluid
       %div.sidebar
         %ul
-          -# %li
-          -#   %a{:href => "/search?q="}
-          -#     = "Scenarios (#{scenario_count})"
-          -# %li
-          -#   %a{:href => "/"}
-          -#     = "Features (#{lists_features.features.length})"
           %li
             %a{:href => "/progress"}
               Progress
         %h2
-          = "Features (#{lists_features.features.length})"
+          = "Features (#{Wally::Feature.all.count})"
         %ul
-          - lists_features.features.each do |feature|
+          - Wally::Feature.sort(:name).each do |feature|
             = haml :feature_link, {:locals => {:feature => feature}, :layout => false}
         - if tag_count.any?
           %h2

data/lib/wally/views/scenario.haml

@@ -1,6 +1,6 @@
 %h2
   %a{"href" => '../'}
-    = @feature["name"]
+    = @feature.gherkin["name"]
 %h2
   = @scenario["name"]
   - if @scenario["tags"]

data/spec/wally/counts_tags_spec.rb

@@ -17,9 +17,7 @@ module Wally
     it "counts feature tags" do
       create_feature("feature-1.feature", "@tag1 @tag2\nFeature: Feature 1")
       create_feature("feature-2.feature", "@tag2 @tag2\nFeature: Feature 2")
-      lists_features = ListsFeatures.new
-
-      CountsTags.new(lists_features).count_tags.should == {
+      CountsTags.new(Feature).count_tags.should == {
         "@tag1" => 1,
         "@tag2" => 3
       }
@@ -28,8 +26,7 @@ module Wally
     it "counts scenario tags" do
       create_feature("feature-1.feature", "Feature: Feature 1\n@tag1@tag1\nScenario: Scenario 1")
       create_feature("feature-2.feature", "Feature: Feature 2\n@tag3@tag1\nScenario: Scenario 1")
-      lists_features = ListsFeatures.new
-      CountsTags.new(lists_features).count_tags.should == {
+      CountsTags.new(Feature).count_tags.should == {
         "@tag1" => 3,
         "@tag3" => 1
       }
@@ -39,9 +36,7 @@ module Wally
       create_feature("feature-1.feature", "@tag1\nFeature: Feature 1")
       create_feature("feature-2.feature", "@TAG1\nFeature: Feature 2")
       create_feature("feature-3.feature", "Feature: Feature 2\n@TAG1\nScenario: Scenario 1")
-      lists_features = ListsFeatures.new
-
-      CountsTags.new(lists_features).count_tags.should == {
+      CountsTags.new(Feature).count_tags.should == {
         "@tag1" => 3
       }
     end

data/spec/wally/feature_spec.rb

@@ -19,5 +19,11 @@ module Wally
       subject.save
       Feature.all.first.gherkin.should == {"meh" => "ble"}
     end
+
+    it "stores the feature name" do
+      subject.gherkin = {"name" => "ble"}
+      subject.save
+      Feature.all.first.name.should == "ble"
+    end
   end
 end

data/spec/wally/parses_features_spec.rb

@@ -13,5 +13,16 @@ module Wally
         "uri"         => nil
       }
     end
+
+    it "raises nice errors" do
+      feature = "!WEFFW"
+      error = nil
+      begin
+        ParsesFeatures.new.parse(feature)
+      rescue Exception => e
+        error = e
+      end
+      error.should_not be_nil
+    end
   end
 end

data/spec/wally/search_features_spec.rb

@@ -13,36 +13,32 @@ module Wally
       feature.save
     end
 
-    let :lists_features do
-      ListsFeatures.new
-    end
-
     it "finds features containing text" do
       create_feature("sample1.feature", "Feature: Bla")
       create_feature("sample2.feature", "Feature: Meh")
 
-      results = SearchFeatures.new(lists_features).find(:query => "Meh")
+      results = SearchFeatures.new(Feature).find(:query => "Meh")
       results.items.size.should == 1
       results.items.first.object.feature["name"].should == "Meh"
     end
 
     it "finds features by narrative" do
       create_feature("sample1.feature", "Feature: bla\nIn order to bananas")
-      results = SearchFeatures.new(lists_features).find(:query => "bananas")
+      results = SearchFeatures.new(Feature).find(:query => "bananas")
       results.items.size.should == 1
       results.items.first.object.feature["name"].should == "bla"
     end
 
     it "has a suggestion" do
       create_feature("sample1.feature", "Feature: Monkeys")
-      results = SearchFeatures.new(lists_features).find(:query => "mnkeys")
+      results = SearchFeatures.new(Feature).find(:query => "mnkeys")
       results.suggestion.should == "Monkeys"
     end
 
     it "has a suggestion only when it's different from the search query" do
       create_feature("sample1.feature", "Feature: monkeys\nScenario: feature")
       create_feature("sample2.feature", "Feature: dogs\nScenario: Sample scenario")
-      results = SearchFeatures.new(lists_features).find(:query => "feature")
+      results = SearchFeatures.new(Feature).find(:query => "feature")
       results.suggestion.should be_nil
     end
 
@@ -59,13 +55,13 @@ module Wally
       end
 
       it "finds scenarios containing text" do
-        results = SearchFeatures.new(lists_features).find(:query => "MATCHED")
+        results = SearchFeatures.new(Feature).find(:query => "MATCHED")
         results.items.size.should == 1
         results.items.first.object.scenario["name"].should == "Matched Scenario"
       end
 
       it "finds scenario steps" do
-        results = SearchFeatures.new(lists_features).find(:query => "DOUGHNUTS")
+        results = SearchFeatures.new(Feature).find(:query => "DOUGHNUTS")
         results.items.size.should == 1
         results.items.first.object.scenario["name"].should == "Matched Scenario"
       end
@@ -74,13 +70,13 @@ module Wally
     context "feature with tags" do
       it "finds features by tag" do
         create_feature("example-feature.feature", "@tag_name\nFeature: Example Feature")
-        results = SearchFeatures.new(lists_features).find(:query => "@tag_NAME")
+        results = SearchFeatures.new(Feature).find(:query => "@tag_NAME")
         results.items.first.object.feature["name"].should == "Example Feature"
       end
 
       it "finds scenarios by tag" do
         create_feature("example-feature.feature", "Feature: Example Feature\n@scenario_tag\nScenario: Example Scenario")
-        results = SearchFeatures.new(lists_features).find(:query => "@scenario_TAG")
+        results = SearchFeatures.new(Feature).find(:query => "@scenario_TAG")
         results.items.first.object.scenario["name"].should == "Example Scenario"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wally
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70100057374200 !ruby/object:Gem::Requirement
+  requirement: &70272590012520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100057374200
+  version_requirements: *70272590012520
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70100057373740 !ruby/object:Gem::Requirement
+  requirement: &70272590011980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100057373740
+  version_requirements: *70272590011980
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70100057373320 !ruby/object:Gem::Requirement
+  requirement: &70272590011500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100057373320
+  version_requirements: *70272590011500
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70100057372900 !ruby/object:Gem::Requirement
+  requirement: &70272590010780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100057372900
+  version_requirements: *70272590010780
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &70100057372480 !ruby/object:Gem::Requirement
+  requirement: &70272590010040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100057372480
+  version_requirements: *70272590010040
 - !ruby/object:Gem::Dependency
   name: komainu
-  requirement: &70100057372060 !ruby/object:Gem::Requirement
+  requirement: &70272590009360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70100057372060
+  version_requirements: *70272590009360
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70100057371600 !ruby/object:Gem::Requirement
+  requirement: &70272590008620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100057371600
+  version_requirements: *70272590008620
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70100057371180 !ruby/object:Gem::Requirement
+  requirement: &70272590007760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100057371180
+  version_requirements: *70272590007760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70100057370760 !ruby/object:Gem::Requirement
+  requirement: &70272590006900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100057370760
+  version_requirements: *70272590006900
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70100057370340 !ruby/object:Gem::Requirement
+  requirement: &70272590006080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100057370340
+  version_requirements: *70272590006080
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70100057369880 !ruby/object:Gem::Requirement
+  requirement: &70272590005180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70100057369880
+  version_requirements: *70272590005180
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -171,7 +171,6 @@ files:
 - lib/wally/application.rb
 - lib/wally/counts_tags.rb
 - lib/wally/feature.rb
-- lib/wally/lists_features.rb
 - lib/wally/parses_features.rb
 - lib/wally/public/bootstrap.min.css
 - lib/wally/public/skin.css
@@ -189,7 +188,6 @@ files:
 - spec/spec_helper.rb
 - spec/wally/counts_tags_spec.rb
 - spec/wally/feature_spec.rb
-- spec/wally/lists_features_spec.rb
 - spec/wally/parses_features_spec.rb
 - spec/wally/search_features_spec.rb
 - wally.gemspec
@@ -235,6 +233,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/wally/counts_tags_spec.rb
 - spec/wally/feature_spec.rb
-- spec/wally/lists_features_spec.rb
 - spec/wally/parses_features_spec.rb
 - spec/wally/search_features_spec.rb

data/lib/wally/lists_features.rb

@@ -1,24 +0,0 @@
-require 'gherkin/formatter/json_formatter'
-require 'gherkin/parser/parser'
-
-module Gherkin::Formatter
-  class JSONFormatter
-    def to_hash
-      @feature_hash
-    end
-  end
-end
-
-module Wally
-  class ListsFeatures
-    def features
-      features = []
-      Feature.all.each do |feature|
-        gherkin = feature.gherkin
-        gherkin["path"] = feature.path
-        features << gherkin
-      end
-      features.sort {|a,b| a["name"] <=> b["name"]}
-    end
-  end
-end

data/spec/wally/lists_features_spec.rb

@@ -1,28 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
-require 'fileutils'
-
-module Wally
-  describe ListsFeatures do
-    after do
-      Feature.delete_all
-    end
-
-    def create_feature path, content
-      feature = Feature.new
-      feature.path = path
-      feature.gherkin = ParsesFeatures.new.parse(content)
-      feature.save
-    end
-
-    it "returns a list of alphabeticaly ordered features" do
-      create_feature("1-sample.feature", "Feature: Zorro")
-      create_feature("2-sample.feature", "Feature: Malgor")
-      create_feature("3-sample.feature", "Feature: Adrian")
-      lists_features = ListsFeatures.new
-      lists_features.features.size.should == 3
-      lists_features.features[0]["name"].should == "Adrian"
-      lists_features.features[1]["name"].should == "Malgor"
-      lists_features.features[2]["name"].should == "Zorro"
-    end
-  end
-end