wally 0.0.28 → 0.0.29

data/bin/wally

@@ -7,9 +7,11 @@ if ARGV.first == "server"
 elsif ARGV[0] == "push"
   require "restclient"
   require "json"
+  require "wally"
   features = []
   Dir.glob(File.join("#{ARGV[2]}", "**/*.feature")).each do |feature_path|
-    features << {:path => feature_path, :content => File.read(feature_path)}
+    gherkin = Wally::ParsesFeatures.new.parse(File.read(feature_path))
+    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}
 end

data/features/counts.feature

@@ -14,5 +14,5 @@ Feature: Counts
     Scenario: Tag Bar 2
     """
     When I visit the home page
-    Then I should see a heading "Features (1)"
-    And I should see a heading "Tags (5)"
+    Then I should see "Features (1)"
+    And I should see "Tags (5)"

data/features/step_definitions/browse_features_steps.rb

@@ -45,8 +45,3 @@ end
 Then /^the features are ordered alphabetically$/ do
   page.body.should =~ /Elle Macpherson.*Jessica-Jane Clement.*Kate Moss.*Katie Price/m
 end
-
-
-Then /^I should see a heading "([^"]*)"$/ do |text|
-  page.body.should have_content text
-end

data/features/step_definitions/push_features_steps.rb

@@ -13,7 +13,8 @@ Given /^I have a \.wally authentication file$/ do
 end
 
 When /^I put data to \/features with the authentication code$/ do
-  data = [{:path => "feature-name.feature", :content => "Feature: Feature Name"}].to_json
+  gherkin = Wally::ParsesFeatures.new.parse("Feature: Feature Name")
+  data = [{:path => "feature-name.feature", :gherkin => gherkin}].to_json
   page.driver.put "/features?authentication_code=#{@authentication_code}", data
 end
 

data/features/support/env.rb

@@ -15,6 +15,6 @@ end
 def create_feature path, content
   feature = Wally::Feature.new
   feature.path = path
-  feature.content = content
+  feature.gherkin = Wally::ParsesFeatures.new.parse(content)
   feature.save
 end

data/lib/wally.rb

@@ -8,3 +8,4 @@ require "wally/application"
 require "wally/lists_features"
 require "wally/search_features"
 require "wally/counts_tags"
+require "wally/parses_features"

data/lib/wally/application.rb

@@ -55,7 +55,7 @@ put '/features/?' do
     JSON.parse(request.body.read).each do |json|
       feature = Wally::Feature.new
       feature.path = json["path"]
-      feature.content = json["content"]
+      feature.gherkin = json["gherkin"]
       feature.save
     end
     halt 201

data/lib/wally/feature.rb

@@ -3,6 +3,6 @@ module Wally
     include MongoMapper::Document
 
     key :path, String
-    key :content, String
+    key :gherkin, Hash
   end
 end

data/lib/wally/lists_features.rb

@@ -14,22 +14,11 @@ module Wally
     def features
       features = []
       Feature.all.each do |feature|
-        gherkinese = parse_gherkin(feature.content)
-        gherkinese["path"] = feature.path
-        features << gherkinese
+        gherkin = feature.gherkin
+        gherkin["path"] = feature.path
+        features << gherkin
       end
       features.sort {|a,b| a["name"] <=> b["name"]}
     end
-
-    private
-
-    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/parses_features.rb

@@ -0,0 +1,23 @@
+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 ParsesFeatures
+    def parse 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/version.rb

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

data/spec/wally/counts_tags_spec.rb

@@ -1,6 +1,5 @@
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
 require 'fileutils'
-require "wally/counts_tags"
 
 module Wally
   describe CountsTags do
@@ -11,7 +10,7 @@ module Wally
     def create_feature path, content
       feature = Feature.new
       feature.path = path
-      feature.content = content
+      feature.gherkin = ParsesFeatures.new.parse(content)
       feature.save
     end
 

data/spec/wally/feature_spec.rb

@@ -6,19 +6,18 @@ module Wally
       Feature.delete_all
     end
 
-    it "stores a feature" do
-      feature = Feature.new
-      feature.content = "Feature: Bla"
-      feature.save
-
-      Feature.all.first.content.should == "Feature: Bla"
-    end
+    subject { Feature.new }
 
     it "stores a feature path" do
-      feature = Feature.new
-      feature.path = "hello.feature"
-      feature.save
+      subject.path = "hello.feature"
+      subject.save
       Feature.all.first.path.should == "hello.feature"
     end
+
+    it "stores the feature content" do
+      subject.gherkin = {"meh" => "ble"}
+      subject.save
+      Feature.all.first.gherkin.should == {"meh" => "ble"}
+    end
   end
 end

data/spec/wally/lists_features_spec.rb

@@ -10,7 +10,7 @@ module Wally
     def create_feature path, content
       feature = Feature.new
       feature.path = path
-      feature.content = content
+      feature.gherkin = ParsesFeatures.new.parse(content)
       feature.save
     end
 

data/spec/wally/parses_features_spec.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+module Wally
+  describe ParsesFeatures do
+    it "parses feature files" do
+      feature = "Feature: Do stuff!"
+      ParsesFeatures.new.parse(feature).should == {
+        "keyword"     => "Feature",
+        "name"        => "Do stuff!",
+        "line"        => 1,
+        "description" => "",
+        "id"          => "do-stuff!",
+        "uri"         => nil
+      }
+    end
+  end
+end

data/spec/wally/search_features_spec.rb

@@ -9,7 +9,7 @@ module Wally
     def create_feature path, content
       feature = Feature.new
       feature.path = path
-      feature.content = content
+      feature.gherkin = ParsesFeatures.new.parse(content)
       feature.save
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wally
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
   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: &70144676845360 !ruby/object:Gem::Requirement
+  requirement: &70100057374200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144676845360
+  version_requirements: *70100057374200
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70144676844820 !ruby/object:Gem::Requirement
+  requirement: &70100057373740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144676844820
+  version_requirements: *70100057373740
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70144676844340 !ruby/object:Gem::Requirement
+  requirement: &70100057373320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144676844340
+  version_requirements: *70100057373320
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70144676843860 !ruby/object:Gem::Requirement
+  requirement: &70100057372900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144676843860
+  version_requirements: *70100057372900
 - !ruby/object:Gem::Dependency
   name: gherkin
-  requirement: &70144676843320 !ruby/object:Gem::Requirement
+  requirement: &70100057372480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144676843320
+  version_requirements: *70100057372480
 - !ruby/object:Gem::Dependency
   name: komainu
-  requirement: &70144676842780 !ruby/object:Gem::Requirement
+  requirement: &70100057372060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144676842780
+  version_requirements: *70100057372060
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70144676842240 !ruby/object:Gem::Requirement
+  requirement: &70100057371600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144676842240
+  version_requirements: *70100057371600
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70144676841700 !ruby/object:Gem::Requirement
+  requirement: &70100057371180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144676841700
+  version_requirements: *70100057371180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70144676807080 !ruby/object:Gem::Requirement
+  requirement: &70100057370760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144676807080
+  version_requirements: *70100057370760
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70144676806660 !ruby/object:Gem::Requirement
+  requirement: &70100057370340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144676806660
+  version_requirements: *70100057370340
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70144676806240 !ruby/object:Gem::Requirement
+  requirement: &70100057369880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144676806240
+  version_requirements: *70100057369880
 description: ''
 email:
 - andrew.vos@gmail.com
@@ -172,6 +172,7 @@ files:
 - 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
 - lib/wally/public/wally-logo.png
@@ -189,6 +190,7 @@ files:
 - 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
 homepage: ''
@@ -234,4 +236,5 @@ test_files:
 - 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