wally 0.0.2 → 0.0.3

data/features/support/env.rb

@@ -8,18 +8,18 @@ require "fakefs/spec_helpers"
 
 Capybara.app = Sinatra::Application
 
-FEATURE_PATH = File.join(File.dirname(__FILE__), "../../application-features")
-
 Before do
-  FileUtils.mkdir_p(FEATURE_PATH)
+  ARGV.clear
+  ARGV << "application-features"
+  FileUtils.mkdir_p("application-features")
 end
 
 After do
-  FileUtils.rm_rf(FEATURE_PATH)
+  FileUtils.rm_rf("application-features")
 end
 
 def create_feature_file(file_name, contents)
-  File.open(File.join(FEATURE_PATH, file_name), "w") do |file|
+  File.open(File.join("application-features", file_name), "w") do |file|
     file.write(contents)
   end
 end

data/lib/wally/application.rb

@@ -7,17 +7,26 @@ configure do
   set :haml, { :ugly=>true }
 end
 
+def features_path
+  ARGV.first || "features"
+end
+
+def lists_features
+  Wally::ListsFeatures.new(features_path)
+end
+
 before do
-  @features = Wally::ListsFeatures.features
+  #probably remove this if not needed
+  @features = lists_features.features
 end
 
 get '/?' do
-  @features = Wally::ListsFeatures.features
+  @features = lists_features.features
   haml :index
 end
 
 get '/features/:feature/?' do |feature|
-  features = Wally::ListsFeatures.features
+  features = lists_features.features
   features.each do |feature_hash|
    @feature = feature_hash if feature_hash["id"] == feature
   end
@@ -28,13 +37,13 @@ end
 
 get '/search/?' do
   if params[:q]
-    @search_results = Wally::SearchFeatures.new.find(:query => params[:q])
+    @search_results = Wally::SearchFeatures.new(lists_features).find(:query => params[:q])
   end
   haml :search
 end
 
 get '/features/:feature/scenario/:scenario/?'  do  |feature_id, scenario_id|
-  Wally::ListsFeatures.features.each do |feature|
+  lists_features.features.each do |feature|
     if feature["id"] == feature_id
       feature["elements"].each do |element|
         if element["type"] == "background"

data/lib/wally/lists_features.rb

@@ -11,26 +11,27 @@ end
 
 module Wally
   class ListsFeatures
-    class << self
-      def features
-        features = []
-        Dir.glob("application-features/*.feature").each do |path|
-          uri = "/features/#{path.gsub("application-features/", "")}"
-          features << parse_gherkin(uri, File.read(path))
-        end
-        features.sort {|a,b| a["name"] <=> b["name"]}
+    def initialize feature_path
+      @feature_path = feature_path
+    end
+
+    def features
+      features = []
+      Dir.glob("#{@feature_path}/*.feature").each do |path|
+        features << parse_gherkin(File.read(path))
       end
+      features.sort {|a,b| a["name"] <=> b["name"]}
+    end
 
-      private
+    private
 
-      def parse_gherkin(uri, text)
-        io = StringIO.new
-        formatter = Gherkin::Formatter::JSONFormatter.new(io)
-        parser = Gherkin::Parser::Parser.new(formatter, false, 'root')
-        parser.parse(text, uri, 0)
-        hash = formatter.to_hash
-        hash
-      end
+    def parse_gherkin(text)
+      io = StringIO.new
+      formatter = Gherkin::Formatter::JSONFormatter.new(io)
+      parser = Gherkin::Parser::Parser.new(formatter, false, 'root')
+      parser.parse(text, nil, 0)
+      hash = formatter.to_hash
+      hash
     end
   end
 end

data/lib/wally/search_features.rb

@@ -1,8 +1,12 @@
 module Wally
   class SearchFeatures
+    def initialize lists_features
+      @lists_features = lists_features
+    end
+
     def find(query)
       results = []
-      ListsFeatures.features.each do |feature|
+      @lists_features.features.each do |feature|
         result = SearchResult.new(feature)
 
         if feature["tags"]

data/lib/wally/version.rb

@@ -1,3 +1,3 @@
 module Wally
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/spec_helper.rb

@@ -4,3 +4,8 @@ require "rack/test"
 require "fakefs/spec_helpers"
 require "fileutils"
 require "wally"
+
+before do
+  ARGV.clear
+  ARGV << "application-features"
+end

data/spec/wally/lists_features_spec.rb

@@ -21,10 +21,11 @@ module Wally
       File.open("application-features/3-sample.feature", "w") do |file|
         file.write "Feature: Adrian"
       end
-      ListsFeatures.features.size.should == 3
-      ListsFeatures.features[0]["name"].should == "Adrian"
-      ListsFeatures.features[1]["name"].should == "Malgor"
-      ListsFeatures.features[2]["name"].should == "Zorro"
+      lists_features = ListsFeatures.new("application-features")
+      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

data/spec/wally/search_features_spec.rb

@@ -16,18 +16,22 @@ module Wally
       end
     end
 
+    let :lists_features do
+      ListsFeatures.new("application-features")
+    end
+
     it "finds features containing text" do
       write_feature("sample1.feature", "Feature: Bla")
       write_feature("sample2.feature", "Feature: Meh")
 
-      results = SearchFeatures.new.find(:query => "Meh")
+      results = SearchFeatures.new(lists_features).find(:query => "Meh")
       results.size.should == 1
       results.first.matched_feature["name"].should == "Meh"
     end
 
     it "stores the original feature in the result" do
       write_feature("sample1.feature", "Feature: Bla")
-      results = SearchFeatures.new.find(:query => "Bla")
+      results = SearchFeatures.new(lists_features).find(:query => "Bla")
       results.first.feature["name"].should == "Bla"
     end
 
@@ -35,7 +39,7 @@ module Wally
       write_feature("sample1.feature", "Feature: Bla")
       write_feature("sample2.feature", "Feature: Meh")
 
-      results = SearchFeatures.new.find(:query => "MEH")
+      results = SearchFeatures.new(lists_features).find(:query => "MEH")
       results.size.should == 1
       results.first.matched_feature["name"].should == "Meh"
     end
@@ -53,13 +57,13 @@ module Wally
       end
 
       it "finds scenarios containing text" do
-        results = SearchFeatures.new.find(:query => "Matched SCENARIO")
+        results = SearchFeatures.new(lists_features).find(:query => "Matched SCENARIO")
         results.first.matched_scenarios.size.should == 1
         results.first.matched_scenarios.first["name"].should == "Matched Scenario"
       end
 
       it "finds scenario steps" do
-        results = SearchFeatures.new.find(:query => "I DO SOME THINGS")
+        results = SearchFeatures.new(lists_features).find(:query => "I DO SOME THINGS")
         results.first.matched_scenarios.size.should == 1
         results.first.matched_scenarios.first["name"].should == "Matched Scenario"
       end
@@ -68,13 +72,13 @@ module Wally
     context "feature with tags" do
       it "finds features by tag" do
         write_feature("example-feature.feature", "@tag_name\nFeature: Example Feature")
-        results = SearchFeatures.new.find(:query => "@tag_NAME")
+        results = SearchFeatures.new(lists_features).find(:query => "@tag_NAME")
         results.first.matched_feature["name"].should == "Example Feature"
       end
 
       it "finds scenarios by tag" do
         write_feature("example-feature.feature", "Feature: Example Feature\n@scenario_tag\nScenario: Example Scenario")
-        results = SearchFeatures.new.find(:query => "@scenario_TAG")
+        results = SearchFeatures.new(lists_features).find(:query => "@scenario_TAG")
         results.first.matched_scenarios.first["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.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70333215809020 !ruby/object:Gem::Requirement
+  requirement: &70228063971540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333215809020
+  version_requirements: *70228063971540
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70333215872740 !ruby/object:Gem::Requirement
+  requirement: &70228063971120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333215872740
+  version_requirements: *70228063971120
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70333215910180 !ruby/object:Gem::Requirement
+  requirement: &70228063970700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333215910180
+  version_requirements: *70228063970700
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70333215986980 !ruby/object:Gem::Requirement
+  requirement: &70228063970280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333215986980
+  version_requirements: *70228063970280
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70333216042940 !ruby/object:Gem::Requirement
+  requirement: &70228063969860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333216042940
+  version_requirements: *70228063969860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70333216115680 !ruby/object:Gem::Requirement
+  requirement: &70228063969440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333216115680
+  version_requirements: *70228063969440
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70333216187680 !ruby/object:Gem::Requirement
+  requirement: &70228063969020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333216187680
+  version_requirements: *70228063969020
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -98,7 +98,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile