ngi 0.2.3 → 0.3.0

data/test/templates/script/es5/default/config.js

@@ -0,0 +1,13 @@
+;(function(app) {
+
+	'use strict';
+
+	app.{{type}}({{type}});
+
+	{{type}}.$inject = {{inject | array_string}};
+
+	function {{type}}({{inject | comma_delimited_variables}}) {
+
+	}
+
+})(angular.module('{{module}}'));

data/test/templates/script/es5/default/constant.js

@@ -0,0 +1,7 @@
+;(function(app) {
+
+	'use strict';
+
+	app.constant('{{name}}',/* data */);
+	
+})(angular.module('{{module}}'));

data/test/templates/script/es5/default/module.js

@@ -0,0 +1,7 @@
+;(function(angular) {
+
+	'use strict';
+
+	angular.module('{{name}}',{{inject | array_string}});
+	
+})(angular);

data/test/test_ngi.rb

@@ -1,91 +1,309 @@
 require_relative '../lib/ngi'
+# require_relative 'testing_utils'
 require 'minitest/autorun'
-require 'json'
+require 'memfs'
+
+# Overwrite output so that we don't see it when testing
+def puts(_)
+  nil
+end
+
+def print(_)
+  nil
+end
 
 describe Ngi do
-  DIR = File.dirname(__FILE__)
+  before do
+    ############ SETUP ##############
+    @dir = File.dirname(__FILE__)
 
-  describe Ngi::Delegate::Configure do
-    before do
-      @path = "#{DIR}/sup/test.config.json"
-      @config = Ngi::Delegate::Configure.new(@path)
-    end
+    @components_file = "#{@dir}/config/config.components.yml"
+    @components_hash = Ngi::Delegate::Configure
+                       .new(@components_file)
+                       .to_ruby(from: 'yaml')
+    @components = @components_hash.collect { |c| c['name'] }
+
+    @config_file = "#{@dir}/config/config.yml"
+    @config_hash = Ngi::Delegate::Configure
+                   .new(@config_file).to_ruby(from: 'yaml')
 
-    describe 'when initialized' do
-      it 'must read the file given from the path' do
-        @config.file.must_equal IO.read(@path)
+    @languages_file = "#{@dir}/config/config.languages.yml"
+    @languages_hash = Ngi::Delegate::Configure
+                      .new(@languages_file).to_ruby(from: 'yaml')
+
+    @configurable_file = "#{@dir}/config/config.configurable.yml"
+    @configurable = Ngi::Delegate::Configure
+                    .new(@configurable_file).to_ruby(from: 'yaml')
+
+    module Utils
+      class CommandParser
+        # Redefine the output so we can test it
+        class Output
+          def to_s
+            @str
+          end
+        end
       end
     end
 
-    describe '#from_json' do
-      it 'must convert the file to a Ruby hash' do
-        file_parsed_from_json_to_ruby = @config.from_json
-        regular_file = IO.read(@path)
+    # Open this up to redefine some stuff
+    module Ngi
+      # Be able to mock $stdin
+      class MockedInput
+        @@input = []
+
+        def self.input=(input)
+          @@input = input
+        end
 
-        file_parsed_from_json_to_ruby.must_equal JSON.parse(regular_file)
+        def self.input
+          return @@input
+        end
+      end
+
+      class GeneratorMockedInput < MockedInput; end
+      class ConfigureMockedInput < MockedInput; end
+
+      class Delegate
+        # Redefine some methods/classes
+        class Generator
+          Utils::CurrentDir.dir = @dir
+
+          # Redefine the $stdin in Generator
+          class AcceptInput
+            def self.str(type)
+              case type
+              when :condensed
+                GeneratorMockedInput.input.shift
+              when :comma_delimited_to_array
+                GeneratorMockedInput.input.shift
+              when :downcased
+                GeneratorMockedInput.input.shift
+              end
+            end
+          end
+        end
+
+        # Redefine
+        class Configure
+          Utils::CurrentDir.dir = @dir
+
+          # Redefine the $stdin in Generator
+          class AcceptInput
+            def self.str(type)
+              case type
+              when :stripped
+                ConfigureMockedInput.input.shift
+              end
+            end
+          end
+        end
       end
     end
 
-    # describe '#self.run' do
-    #   it 'must create an instance of Configure' do
+    # Expected file output
+    @finished_files = {
+      'directive' => {
+        'es5' => IO.read("#{@dir}/finished_files/script/es5/directive.finished.js"),
+        'coffee' => IO.read("#{@dir}/finished_files/script/coffee/directive.finished.coffee")
+      },
+      'controller' => {
+        'es5' => IO.read("#{@dir}/finished_files/script/es5/controller.finished.js")
+      },
+      'filter' => {
+        'es5' => IO.read("#{@dir}/finished_files/script/es5/filter.finished.js")
+      }
+    }
+
+    @generator_mocked_input = {
+      'directive' => [
+        'test.directive.js',
+        'myModule',
+        'myDirective',
+        %w(someService anotherService)
+      ],
+      'controller' => [
+        'test.controller.js',
+        'myModule',
+        'MyController',
+        %w(someService anotherService)
+      ],
+      'filter' => [
+        'test.filter.js',
+        'myModule',
+        'someFilter',
+        %w(aService andAnotherOne)
+      ]
+    }
+
+    # Now we can activate MemFs so that we don't
+    # actually create any files in the file system
+    MemFs.activate!
+
+    # Make this directory in memory using MemFs (won't
+    # actually create this directory in the file system)
+    FileUtils.mkdir_p('templates/script/es5/default')
+    FileUtils.mkdir_p('templates/script/coffee/default')
+
+    # Make the default template in memory from the actual one using IO.read
+    # since MemFs doesn't use IO (it only uses File)
+    # This will just save me from having to write the whole template
+    # out as a string inside a variable right here...
+    dir_str = 'templates/script/es5/default/basic.js'
+    File.open(dir_str, 'w') do |f|
+      f.write(IO.read("#{@dir}/templates/script/es5/default/basic.js"))
+      f.close
+    end
+
+    dir_str = 'templates/script/coffee/default/basic.js'
+    File.open(dir_str, 'w') do |f|
+      f.write(IO.read("#{@dir}/templates/script/coffee/default/basic.js"))
+      f.close
+    end
 
-    #   end
-    # end
+    def check_generated_content(type, language, file, comparison)
+      # Now we're going to "create" a new directive using the default template
+      if Ngi::GeneratorMockedInput.input.size == 0
+        Ngi::GeneratorMockedInput.input = @generator_mocked_input[type].dup
+      end
 
-    describe '#to_json' do
-      it 'must convert the file to a prettified JSON file if file is a hash' do
-        regular_file = IO.read(@path)
+      type = type
+      component = Ngi::Parser::ComponentChooser
+                  .new(
+                    type: type,
+                    components_hash: @components_hash,
+                    config_hash: @config_hash
+                  )
+                  .component
 
-        # set the file to a Ruby hash version of the JSON file
-        @config.file = @config.from_json
+      Ngi::Delegate::Generator.run(
+        type: type,
+        config: @config_hash,
+        component: component
+      )
 
-        # convert the file back to a prettified JSON representation
-        # if the file was a Ruby hash
-        back_to_json = @config.to_json
+      ###### ASSERTIONS ########
+      # It should've created the directive
+      File.exist?(file).must_equal true
 
-        back_to_json.must_equal regular_file
+      # The directive should match the expected output,
+      # which is shown in @finished_file
+      File.open(file, 'r') do |f|
+        content = f.read.to_s.gsub(/\s/, '')
+        assert content == comparison
+        f.close
+      end
+      ##########################
+    end
+    #########################################################
+  end
 
-        # set the file to a JSON version
-        @config.file = regular_file
-        attempt_to_generate_json = @config.to_json
+  after { MemFs.deactivate! }
 
-        attempt_to_generate_json.must_equal regular_file
+  describe 'Parser' do
+    describe '-v' do
+      it 'should show the version of ngi' do
+        assert Parser.parse(['-v']) == "ngi #{Ngi::VERSION}"
       end
     end
+  end
 
-    describe '::Configurable' do
-      before do
-        c = Ngi::Delegate::Configure
-        @hash_config_file = @config.from_json
-        @questioner = c::Questioner.new(@hash_config_file)
+  describe 'Generator' do
+    describe 'Default Templates' do
+      it 'should make a directive' do
+        type = 'directive'
+        language = 'es5'
+        check_generated_content(
+          type, language,
+          'test.directive.js', @finished_files[type][language].gsub(/\s/, '')
+        )
       end
 
-      describe '#language' do
-        it 'must output a hash' do
-          output = Configure::Configurable.language(@questioner)
+      it 'should make a controller' do
+        type = 'controller'
+        language = 'es5'
+        check_generated_content(
+          type, language, 'test.controller.js',
+          @finished_files[type][language].gsub(/\s/, '')
+        )
+      end
 
-          output.must_be_instance_of Hash
-        end
+      it 'should make a filter' do
+        type = 'filter'
+        language = 'es5'
+        check_generated_content(
+          type, language,
+          'test.filter.js', @finished_files[type][language].gsub(/\s/, '')
+        )
       end
     end
 
-    describe '::Questioner' do
-      before do
-        c = Ngi::Delegate::Configure
-        @hash_config_file = @config.from_json
-        @configurable_properties = @hash_config_file['global']['configurable'].collect { |_, v| v }
-        @questioner = c::Questioner.new(@hash_config_file)
+    it 'should use the custom template if one was set for that language (and it should use the default for all other languages not set)' do
+      # First we'll create our custom template in memory
+      # using MemFs to mock it
+      File.open('test.template.js', 'w') do |f|
+        f.write('hello {{name}}')
+        f.close
       end
 
-      describe '#initialize' do
-        it 'must set its file in JSON format' do
-          @questioner.file.must_equal @config.from_json
-        end
+      # Make this directory in memory with MemFs
+      FileUtils.mkdir_p('test/config')
 
-        it 'must collect all the configurable properties in an array' do
-          @questioner.configurable_properties.must_equal @configurable_properties
-        end
-      end
+      Ngi::ConfigureMockedInput
+        .input = %w(templates directive test.template.js es5)
+
+      # We're going to configure ngi,
+      # according to CONFIGURE_MOCKED_INPUT
+      # It'll basically create a custom template
+      # for use with es5
+      Ngi::Delegate::Configure.run(
+        write: true,
+        to: 'yaml',
+        destination: @config_file,
+        languages: @languages_hash,
+        config: @config_hash,
+        components: @components,
+        components_hash: @components_hash,
+        configurable: @configurable
+      )
+
+      check_generated_content(
+        'directive', 'es5',
+        'test.directive.js', 'hellomyDirective'
+      )
+
+      # Change the language to coffee so we can
+      # make sure that it will use the default
+      # coffee template, since only the es5
+      # custom template was set
+      Ngi::ConfigureMockedInput
+        .input = %w(language script coffee)
+
+      Ngi::Delegate::Configure.run(
+        write: true,
+        to: 'yaml',
+        destination: @config_file,
+        languages: @languages_hash,
+        config: @config_hash,
+        components: @components,
+        components_hash: @components_hash,
+        configurable: @configurable
+      )
+
+      type = 'directive'
+      language = 'coffee'
+      Ngi::GeneratorMockedInput
+        .input = [
+          'second.test.directive.js',
+          'myModule',
+          'myDirective',
+          %w(someService anotherService)
+        ]
+      check_generated_content(
+        type, language,
+        'second.test.directive.js',
+        @finished_files[type][language].gsub(/\s/, '')
+      )
     end
   end
 end

data/test/testing_utils.rb

@@ -0,0 +1,26 @@
+# Some testing utilities
+module TestingUtils
+  # Turn output on or off
+  class ToggleOutput
+    def initialize(bool)
+      case bool
+      when true
+        def puts(o)
+          super(o)
+        end
+
+        def print(o)
+          super(o)
+        end
+      when false
+        def puts(_)
+          nil
+        end
+
+        def print(_)
+          nil
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ngi
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Joshua Beam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: memfs
+  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'
 description: This tool can make (for example) an AngularJS controller template file
   for you (.js), so that whenever you want to make a new controller for your app,
   you don't have to type the same starting code over and over again (by the way, this
@@ -71,49 +85,59 @@ files:
 - LICENSE.txt
 - Rakefile
 - bin/ngi
-- lib/config/angular_init.config.json
-- lib/dep/json.rb
-- lib/dep/json/add/bigdecimal.rb
-- lib/dep/json/add/complex.rb
-- lib/dep/json/add/core.rb
-- lib/dep/json/add/date.rb
-- lib/dep/json/add/date_time.rb
-- lib/dep/json/add/exception.rb
-- lib/dep/json/add/ostruct.rb
-- lib/dep/json/add/range.rb
-- lib/dep/json/add/rational.rb
-- lib/dep/json/add/regexp.rb
-- lib/dep/json/add/struct.rb
-- lib/dep/json/add/symbol.rb
-- lib/dep/json/add/time.rb
-- lib/dep/json/common.rb
-- lib/dep/json/ext.rb
-- lib/dep/json/ext/.keep
-- lib/dep/json/generic_object.rb
-- lib/dep/json/pure.rb
-- lib/dep/json/pure/generator.rb
-- lib/dep/json/pure/parser.rb
-- lib/dep/json/version.rb
+- lib/config/backup/angular_init.config.json
+- lib/config/backup/config.components.aliases.yml
+- lib/config/backup/config.components.yml
+- lib/config/backup/config.configurable.yml
+- lib/config/backup/config.languages.yml
+- lib/config/backup/config.yml
+- lib/config/backup/template-skeleton.js
+- lib/config/config.components.aliases.yml
+- lib/config/config.components.yml
+- lib/config/config.configurable.yml
+- lib/config/config.languages.yml
+- lib/config/config.yml
 - lib/ngi.rb
 - lib/ngi/configure.rb
 - lib/ngi/delegate.rb
 - lib/ngi/generator.rb
+- lib/ngi/parser.rb
+- lib/ngi/templates/markup/html/default/index.html
+- lib/ngi/templates/script/coffee/default/basic.js
+- lib/ngi/templates/script/coffee/default/config.js
+- lib/ngi/templates/script/coffee/default/constant.js
+- lib/ngi/templates/script/coffee/default/module.js
+- lib/ngi/templates/script/es5/default/basic.js
+- lib/ngi/templates/script/es5/default/config.js
+- lib/ngi/templates/script/es5/default/constant.js
+- lib/ngi/templates/script/es5/default/module.js
 - lib/ngi/utils/command_parser.rb
+- lib/ngi/utils/current_dir.rb
 - lib/ngi/utils/jser.rb
+- lib/ngi/utils/user_input.rb
 - lib/ngi/utils/utils.rb
 - lib/ngi/version.rb
-- lib/templates/markup/html/default/index.html
-- lib/templates/script/coffee/default/basic.js
-- lib/templates/script/coffee/default/config.js
-- lib/templates/script/coffee/default/constant.js
-- lib/templates/script/coffee/default/module.js
-- lib/templates/script/es5/default/basic.js
-- lib/templates/script/es5/default/config.js
-- lib/templates/script/es5/default/constant.js
-- lib/templates/script/es5/default/module.js
 - ngi.gemspec
-- test/sup/test.config.json
+- test/config/config.components.aliases.yml
+- test/config/config.components.yml
+- test/config/config.configurable.yml
+- test/config/config.languages.yml
+- test/config/config.yml
+- test/finished_files/script/coffee/directive.finished.coffee
+- test/finished_files/script/es5/controller.finished.js
+- test/finished_files/script/es5/directive.finished.js
+- test/finished_files/script/es5/filter.finished.js
+- test/templates/markup/html/default/index.html
+- test/templates/script/coffee/default/basic.js
+- test/templates/script/coffee/default/config.js
+- test/templates/script/coffee/default/constant.js
+- test/templates/script/coffee/default/module.js
+- test/templates/script/es5/default/basic.js
+- test/templates/script/es5/default/config.js
+- test/templates/script/es5/default/constant.js
+- test/templates/script/es5/default/module.js
 - test/test_ngi.rb
+- test/testing_utils.rb
 homepage: https://github.com/joshbeam/angular_init
 licenses:
 - MIT
@@ -140,5 +164,23 @@ specification_version: 4
 summary: Speed up AngularJS development by creating templates for all your components
   from the command line.
 test_files:
-- test/sup/test.config.json
+- test/config/config.components.aliases.yml
+- test/config/config.components.yml
+- test/config/config.configurable.yml
+- test/config/config.languages.yml
+- test/config/config.yml
+- test/finished_files/script/coffee/directive.finished.coffee
+- test/finished_files/script/es5/controller.finished.js
+- test/finished_files/script/es5/directive.finished.js
+- test/finished_files/script/es5/filter.finished.js
+- test/templates/markup/html/default/index.html
+- test/templates/script/coffee/default/basic.js
+- test/templates/script/coffee/default/config.js
+- test/templates/script/coffee/default/constant.js
+- test/templates/script/coffee/default/module.js
+- test/templates/script/es5/default/basic.js
+- test/templates/script/es5/default/config.js
+- test/templates/script/es5/default/constant.js
+- test/templates/script/es5/default/module.js
 - test/test_ngi.rb
+- test/testing_utils.rb