cucumber_scaffold 0.1.1 → 0.1.2

data/Manifest

@@ -2,6 +2,7 @@ Manifest
 README.rdoc
 Rakefile
 TODO
+cucumber_scaffold.gemspec
 lib/generators/cucumber_scaffold/feature/USAGE
 lib/generators/cucumber_scaffold/feature/feature_generator.rb
 lib/generators/cucumber_scaffold/feature/templates/feature.feature

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'  
 require 'echoe'  
   
-Echoe.new('cucumber_scaffold', '0.1.1') do |p|  
+Echoe.new('cucumber_scaffold', '0.1.2') do |p|  
   p.description     = "Generate scaffolding for Cucumber features and steps definitions"  
   p.url             = "http://github.com/andyw8/cucumber_scaffold"  
   p.author          = "Andy Waite"  

data/TODO

@@ -8,4 +8,5 @@
 * Add support for belongs_to associations
 * Test for model names containing more than one word (e.g. DocumentCategory)
 * Add automated test suite
-* Prevent excess whitespace in generated files
+* Prevent excess whitespace in generated files
+* Better interaction with Pickle

data/cucumber_scaffold.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cucumber_scaffold}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andy Waite"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Generate scaffolding for Cucumber features and steps definitions}
   s.email = %q{andy@andywaite.com}
   s.extra_rdoc_files = ["README.rdoc", "TODO", "lib/generators/cucumber_scaffold/feature/USAGE", "lib/generators/cucumber_scaffold/feature/feature_generator.rb", "lib/generators/cucumber_scaffold/feature/templates/feature.feature", "lib/generators/cucumber_scaffold/feature/templates/steps.rb", "lib/generators/cucumber_scaffold/install/USAGE", "lib/generators/cucumber_scaffold/install/install_generator.rb", "lib/generators/cucumber_scaffold/install/templates/shared/web_steps_additional.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "TODO", "lib/generators/cucumber_scaffold/feature/USAGE", "lib/generators/cucumber_scaffold/feature/feature_generator.rb", "lib/generators/cucumber_scaffold/feature/templates/feature.feature", "lib/generators/cucumber_scaffold/feature/templates/steps.rb", "lib/generators/cucumber_scaffold/install/USAGE", "lib/generators/cucumber_scaffold/install/install_generator.rb", "lib/generators/cucumber_scaffold/install/templates/shared/web_steps_additional.rb", "cucumber_scaffold.gemspec"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "TODO", "cucumber_scaffold.gemspec", "lib/generators/cucumber_scaffold/feature/USAGE", "lib/generators/cucumber_scaffold/feature/feature_generator.rb", "lib/generators/cucumber_scaffold/feature/templates/feature.feature", "lib/generators/cucumber_scaffold/feature/templates/steps.rb", "lib/generators/cucumber_scaffold/install/USAGE", "lib/generators/cucumber_scaffold/install/install_generator.rb", "lib/generators/cucumber_scaffold/install/templates/shared/web_steps_additional.rb"]
   s.homepage = %q{http://github.com/andyw8/cucumber_scaffold}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cucumber_scaffold", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/generators/cucumber_scaffold/feature/feature_generator.rb

@@ -10,14 +10,11 @@ module CucumberScaffold
     source_root File.expand_path('../templates', __FILE__)
 
     def initialize(args, *options)
-      # copied setup from
-      # http://apidock.com/rails/Rails/Generators/NamedBase/new/class
-      args[0] = args[0].dup if args[0].is_a?(String) && args[0].frozen?
       super
-      assign_names!(self.name)
-      parse!
       args.shift
       @args = args
+      # seems to be a conflict if I call this @options
+      @x_options = options
     end
 
     def do_it
@@ -54,141 +51,142 @@ EOF
 
     private
 
-    def generated_by
-      '# Generated by cucumber_scaffold - http://github.com/andyw8/cucumber_scaffold'
-    end
+      def generated_by
+        '# Generated by cucumber_scaffold - http://github.com/andyw8/cucumber_scaffold'
+      end
 
-    def nifty?
-      options[:nifty].present?
-    end
+      def nifty?
+        # there's probably a better way to do this
+        @x_options.include?(["--nifty"])
+      end
 
-    def singular
-      name.underscore.downcase
-    end
+      def singular
+        name.underscore.downcase
+      end
 
-    def plural
-      singular.pluralize
-    end
+      def plural
+        singular.pluralize
+      end
 
-    def singular_title
-      singular.titleize
-    end
+      def singular_title
+        singular.titleize
+      end
 
-    def plural_title
-      plural.titleize
-    end
+      def plural_title
+        plural.titleize
+      end
 
-    def activerecord_table_header_row
-      make_row(attribute_names)
-    end
+      def activerecord_table_header_row
+        make_row(attribute_names)
+      end
 
-    def html_table_header_row
-      make_row(attribute_names.map(&:titleize))
-    end
+      def html_table_header_row
+        make_row(attribute_names.map(&:titleize))
+      end
 
-    def attribute_names
-      @attributes.collect {|a| a.first[0]}
-    end
+      def attribute_names
+        @attributes.collect {|a| a.first[0]}
+      end
 
-    def html_single_resource(updated=nil, commented=nil)
-      lines = []
-      @attributes.each do |pair|
-        attribute_name = pair.first[0]
-        attribute_value = pair.first[1]
-        lines << "| #{attribute_name.titleize}: | #{default_value(attribute_name, attribute_value, updated)} |"
+      def html_single_resource(updated=nil, commented=nil)
+        lines = []
+        @attributes.each do |pair|
+          attribute_name = pair.first[0]
+          attribute_value = pair.first[1]
+          lines << "| #{attribute_name.titleize}: | #{default_value(attribute_name, attribute_value, updated)} |"
+        end
+        lines.join(commented ? LINE_BREAK_WITH_INDENT_COMMENTED : LINE_BREAK_WITH_INDENT)
       end
-      lines.join(commented ? LINE_BREAK_WITH_INDENT_COMMENTED : LINE_BREAK_WITH_INDENT)
-    end
 
-    def form_single_resource_commented
-      form_single_resource(false, true)
-    end
+      def form_single_resource_commented
+        form_single_resource(false, true)
+      end
 
-    def html_single_resource_commented
-      html_single_resource(false, true)
-    end
+      def html_single_resource_commented
+        html_single_resource(false, true)
+      end
 
-    def form_single_resource(updated=nil, commented=nil)
-      lines = []
-      @attributes.each do |pair|
-        attribute_name = pair.first[0]
-        attribute_value = pair.first[1]
-        lines << "| #{attribute_name.titleize} | #{default_value(attribute_name, attribute_value, updated)} |"
+      def form_single_resource(updated=nil, commented=nil)
+        lines = []
+        @attributes.each do |pair|
+          attribute_name = pair.first[0]
+          attribute_value = pair.first[1]
+          lines << "| #{attribute_name.titleize} | #{default_value(attribute_name, attribute_value, updated)} |"
+        end
+        result = lines.join(commented ? LINE_BREAK_WITH_INDENT_COMMENTED : LINE_BREAK_WITH_INDENT)
       end
-      result = lines.join(commented ? LINE_BREAK_WITH_INDENT_COMMENTED : LINE_BREAK_WITH_INDENT)
-    end
 
-    def activerecord_single_resource(updated=nil)
-      lines = []
-      @attributes.each do |pair|
-        attribute_name = pair.first[0]
-        attribute_value = pair.first[1]
-        lines << "| #{attribute_name} | #{default_value(attribute_name, attribute_value, updated)} |"
+      def activerecord_single_resource(updated=nil)
+        lines = []
+        @attributes.each do |pair|
+          attribute_name = pair.first[0]
+          attribute_value = pair.first[1]
+          lines << "| #{attribute_name} | #{default_value(attribute_name, attribute_value, updated)} |"
+        end
+        lines.join(LINE_BREAK_WITH_INDENT)
       end
-      lines.join(LINE_BREAK_WITH_INDENT)
-    end
 
-    def html_resources
-      [html_table_header_row,
-        html_table_row(1),
-        html_table_row(2),
-        html_table_row(3)].join(LINE_BREAK_WITH_INDENT)
-    end
+      def html_resources
+        [html_table_header_row,
+          html_table_row(1),
+          html_table_row(2),
+          html_table_row(3)].join(LINE_BREAK_WITH_INDENT)
+      end
 
-    def activerecord_resources
-      [activerecord_table_header_row,
-         activerecord_table_row(1),
-         activerecord_table_row(2),
-         activerecord_table_row(3)].join(LINE_BREAK_WITH_INDENT)
-    end
+      def activerecord_resources
+        [activerecord_table_header_row,
+           activerecord_table_row(1),
+           activerecord_table_row(2),
+           activerecord_table_row(3)].join(LINE_BREAK_WITH_INDENT)
+      end
 
-    def activerecord_single_resource_updated
-      activerecord_single_resource(true)
-    end
+      def activerecord_single_resource_updated
+        activerecord_single_resource(true)
+      end
 
-    def form_single_resource_updated
-      form_single_resource(true)
-    end
+      def form_single_resource_updated
+        form_single_resource(true)
+      end
 
-    def html_single_resource_updated
-      html_single_resource(true)
-    end
+      def html_single_resource_updated
+        html_single_resource(true)
+      end
 
-    def default_value(attribute_name, attribute_type, updated=false, index=1)
-      # TODO use an options hash instead of all these arguments
-      if ['string', 'text'].include?(attribute_type)
-        result = "#{attribute_name} #{index}"
-        result += ' updated' if updated
-      elsif attribute_type == 'integer'
-        result = 10 + index
-        result = -result if updated
-      else
-        raise "Cannot create default value for attribute type '#{attribute_type}'"
-      end
-      result
-    end
+      def default_value(attribute_name, attribute_type, updated=false, index=1)
+        # TODO use an options hash instead of all these arguments
+        if ['string', 'text'].include?(attribute_type)
+          result = "#{attribute_name} #{index}"
+          result += ' updated' if updated
+        elsif attribute_type == 'integer'
+          result = 10 + index
+          result = -result if updated
+        else
+          raise "Cannot create default value for attribute type '#{attribute_type}'"
+        end
+        result
+      end
 
-    def activerecord_table_row(n)
-      data = []
-      @attributes.each do |attribute|
-        attribute_name = attribute.first[0]
-        attribute_type = attribute.first[1]
-        data << default_value(attribute_name, attribute_type, false, n)
+      def activerecord_table_row(n)
+        data = []
+        @attributes.each do |attribute|
+          attribute_name = attribute.first[0]
+          attribute_type = attribute.first[1]
+          data << default_value(attribute_name, attribute_type, false, n)
+        end
+        make_row(data)
       end
-      make_row(data)
-    end
 
-    def html_table_row(n)
-      activerecord_table_row(n)
-    end
+      def html_table_row(n)
+        activerecord_table_row(n)
+      end
 
-    def tags(tags)
-      tags
-    end
+      def tags(tags)
+        tags
+      end
   
-    def make_row(data)
-      "| #{data.join(' | ')} |"
-    end
+      def make_row(data)
+        "| #{data.join(' | ')} |"
+      end
   
   end
 end

data/lib/generators/cucumber_scaffold/feature/templates/feature.feature

@@ -279,4 +279,4 @@ Feature: Manage <%= plural_title %>
       Then the heading should be "<%= edit_heading %>"
       <% if index_title %>
       And the title should be "<%= edit_title %>"
-      <% end -%>
+      <% end %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Andy Waite
@@ -40,6 +40,7 @@ files:
 - README.rdoc
 - Rakefile
 - TODO
+- cucumber_scaffold.gemspec
 - lib/generators/cucumber_scaffold/feature/USAGE
 - lib/generators/cucumber_scaffold/feature/feature_generator.rb
 - lib/generators/cucumber_scaffold/feature/templates/feature.feature
@@ -47,7 +48,6 @@ files:
 - lib/generators/cucumber_scaffold/install/USAGE
 - lib/generators/cucumber_scaffold/install/install_generator.rb
 - lib/generators/cucumber_scaffold/install/templates/shared/web_steps_additional.rb
-- cucumber_scaffold.gemspec
 has_rdoc: true
 homepage: http://github.com/andyw8/cucumber_scaffold
 licenses: []