ng_on_rails 0.0.3.5 → 0.0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4dbd24da05c3703028c56e9e886bbad00d9bbfb
-  data.tar.gz: dae75d2a092dfdb1476aa085b706ebaeb8e93adf
+  metadata.gz: 83a14652f6c74791f9d5afaab7882486853cb1c6
+  data.tar.gz: bc5ae54a788ff9f45458b9da672f51ca22eec70a
 SHA512:
-  metadata.gz: e45f74e69948b5a4898ce60f597ba32210e24e9d18d2c10d2acb45830b9c2193fe457c8175de7b41657333693cc1c9a53f0ef069a4693d108753066fdfa84de6
-  data.tar.gz: 52de3d3c9eee0a6e52be64f4b12e3fe52d89fc81bcdb80b51448ef4c65927edbd26b258ac7ee7dc032eb42e8e30df3bf83b8ecaaf1144cd810a4e2885654cfe8
+  metadata.gz: b9c7d97aa5e36afc112d466752a4ffb4509c288894b2f0fc0a2b8707e27e169183e336ca57e1e8d3cd6b334384b97b334148888036d28d767025fad2d1ebc4b3
+  data.tar.gz: d053de5c3e7c2cf39ec58965f59b6430ead35998865b28dba6cfabfe534768d67b7844c59d798ec6adfa41b036aac3386b68f6d0a33bd62353640d1a464333b5

data/README.md

@@ -40,6 +40,9 @@ In your layout below the `javascript_include_tag "application"` load the Rails-s
 
 NgOnRails is now up and running!
 
+_Instructions for using NgOnRails with a **Rails Engine** can be found [here](https://github.com/brookisme/ng_on_rails/wiki/Engines)._
+
+
 <a name="#ngor_app_note"></a>
 ##### Note: NgOnRailsApp
 An angular-app, NgOnRailsApp, is automatically created if it doesn't already exsit

data/app/controllers/ng_on_rails_controller.rb

@@ -1,6 +1,6 @@
 class NgOnRailsController < ApplicationController
   def template
     @path = params[:path]
-    render template: '/angular_app/' + @path, layout: nil
+    render template: "/#{NgOnRails.engine_path}angular_app/" + @path, layout: nil
   end
 end

data/lib/generators/ng_on_rails/controller_generator.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'ng_on_rails_generator')
 module NgOnRails
   class ControllerGenerator < NgOnRails::NgOnRailsGenerator
     desc "Creates NgOnRails-style AngularJS Controller"
-    argument :model_name, type: :string, required: false, desc: "model name"    
+    argument :full_model_name, type: :string, required: false, desc: "model name"    
 
     def self.source_root
       @source_root ||= File.join(File.dirname(__FILE__), 'templates')
@@ -11,11 +11,11 @@ module NgOnRails
     def generate_controller
       if model_name.blank?
         option_copy_file "#{ControllerGenerator.source_root}/app_controller_template.js.coffee", 
-          "app/assets/javascripts/angular_app/controllers/app_controller.js.coffee",
+          "app/assets/javascripts/#{module_path}angular_app/controllers/app_controller.js.coffee",
           "app controller"
       else
         option_copy_file "#{ControllerGenerator.source_root}/controller_template.js.erb", 
-          "app/assets/javascripts/angular_app/controllers/#{plural_name}_controller.js.coffee",
+          "app/assets/javascripts/#{module_path}angular_app/controllers/#{plural_name}_controller.js.coffee",
           "#{plural_name} controller",
           true
       end
@@ -23,12 +23,5 @@ module NgOnRails
 
   private
 
-    #
-    # View Helpers
-    #
-
-    def path_to_index_page
-      Rails.application.routes.url_helpers.send("#{plural_name}_path")
-    end
   end
 end

data/lib/generators/ng_on_rails/jbuilder_generator.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'ng_on_rails_generator')
 module NgOnRails
   class JbuilderGenerator < NgOnRails::NgOnRailsGenerator
     desc "Creates jbuilder files in rails-views"
-    argument :model_name, type: :string, required: true, desc: "model name"    
+    argument :full_model_name, type: :string, required: true, desc: "model name"    
     argument :attributes, type: :array, required: false, desc: "list of attributes in json"    
 
     def self.source_root
@@ -10,22 +10,22 @@ module NgOnRails
     end
 
     def generate_index 
-      option_create "app/views/#{plural_name}/index.json.jbuilder",
-        "json.partial! '#{plural_name}/#{plural_name}.json', #{plural_name}: @#{plural_name}",
+      option_create "app/views/#{module_path}#{plural_name}/index.json.jbuilder",
+        "json.partial! '#{module_path}#{plural_name}/#{plural_name}.json', #{plural_name}: @#{plural_name}",
         "index jbuilder"
     end
     def generate_show
-      option_create "app/views/#{plural_name}/show.json.jbuilder",
-        "json.partial! '#{plural_name}/#{resource_name}.json', #{resource_name}: @#{resource_name}",
+      option_create "app/views/#{module_path}#{plural_name}/show.json.jbuilder",
+        "json.partial! '#{module_path}#{plural_name}/#{resource_name}.json', #{resource_name}: @#{resource_name}",
         "index jbuilder"    
     end
     def generate_models
-      option_create "app/views/#{plural_name}/_#{plural_name}.json.jbuilder",
-        "json.array! #{plural_name}, partial: '#{plural_name}/#{resource_name}.json', as: :#{resource_name}",
+      option_create "app/views/#{module_path}#{plural_name}/_#{plural_name}.json.jbuilder",
+        "json.array! #{plural_name}, partial: '#{module_path}#{plural_name}/#{resource_name}.json', as: :#{resource_name}",
         "models jbuilder"
     end
     def generate_model
-      option_create "app/views/#{plural_name}/_#{resource_name}.json.jbuilder",
+      option_create "app/views/#{module_path}#{plural_name}/_#{resource_name}.json.jbuilder",
       "json.extract! #{resource_name} #{attributes_string}",      
       "model jbuilder"    
     end

data/lib/generators/ng_on_rails/layout_generator.rb

@@ -4,20 +4,21 @@ module NgOnRails
     desc "Creates NgOnRails-style AngularJS layout"
     
     # arguments
+    argument :full_model_name, type: :string, required: false, desc: "model name"    
     class_option :app_controller, type: :boolean, required: false, default: true, desc: "create app_controller"
     class_option :build, type: :boolean, required: false, default: true, desc: "BUILD as ng_data default"
     class_option :layout_name, type: :string, required: false, default: "application", desc: "name of layout. defaults to 'application', creating the file application.html.<format>"
 
     def copy_layout
       option_template "#{LayoutGenerator.source_root}/#{options[:format]}/layout_template.html.#{options[:format]}.erb", 
-        "app/views/layouts/#{options[:layout_name]}.html.#{options[:format]}",
+        "app/views/layouts/#{module_path}#{options[:layout_name]}.html.#{options[:format]}",
         "layout file"  
     end
 
     def copy_app_controller
       if options[:app_controller]
         option_copy_file "#{LayoutGenerator.source_root}/app_controller_template.js.coffee", 
-          "app/assets/javascripts/angular_app/controllers/app_controller.js.coffee",
+          "app/assets/javascripts/#{module_path}angular_app/controllers/app_controller.js.coffee",
           "app controller"
       end
     end

data/lib/generators/ng_on_rails/ng_on_rails_generator.rb

@@ -1,4 +1,5 @@
 require 'rails/generators'
+require "ng_on_rails/config_manager"
 module NgOnRails
   class NgOnRailsGenerator < Rails::Generators::Base
     desc "Shared options and methods for NgOnRails Generators"
@@ -16,10 +17,36 @@ module NgOnRails
       @source_root ||= File.join(File.dirname(__FILE__), 'templates')
     end
 
+    def set_attributes
+      if (defined?(full_model_name) && !full_model_name.nil?)
+        if full_model_name.include?("::")
+          parts = full_model_name.split("::")
+          @module_name = parts[0]
+          @model_name = parts[1]
+        else
+          @model_name = full_model_name
+        end
+      end
+    end
+
   private
 
+    def module_name
+      return @module_name
+    end
+
+    def module_path
+      unless module_name.nil?
+        "#{module_name.underscore}/"
+      end
+    end
+
+    def model_name
+      @model_name
+    end
+
     def class_name
-      @class_name ||= model_name.classify
+      @class_name ||= @model_name.classify
     end
 
     def resource_name
@@ -30,12 +57,27 @@ module NgOnRails
       @plural_name ||= resource_name.pluralize
     end
 
+    #
+    # Config
+    #
+
+    def config
+      @config ||= ConfigManager.load_config
+    end
+
+    def mounted_path
+      if @mounted_path.nil? && !config['mounted_path'].blank?
+        @mounted_path = "#{config['mounted_path']}/"
+      end
+      @mounted_path
+    end
+
     #
     # View Helpers
     #
     
     def path_to_index_page
-      Rails.application.routes.url_helpers.send("#{plural_name}_path")
+      "/#{mounted_path}#{plural_name}"
     end
 
     def belongs_to_array

data/lib/generators/ng_on_rails/resource_generator.rb

@@ -2,15 +2,12 @@ require File.join(File.dirname(__FILE__), 'ng_on_rails_generator')
 module NgOnRails
   class ResourceGenerator < NgOnRails::NgOnRailsGenerator
     desc "Creates NgOnRails-style AngularJS Resource Service"
-    argument :model_name, type: :string, required: true, desc: "model name"    
+    argument :full_model_name, type: :string, required: true, desc: "model name"    
 
     def generate_layout
       option_template "#{ResourceGenerator.source_root}/resource_template.js.erb", 
-        "app/assets/javascripts/angular_app/services/#{resource_name}.js.coffee",
+        "app/assets/javascripts/#{module_path}angular_app/services/#{resource_name}.js.coffee",
         "#{resource_name} resource"
     end
-  
-  private
-
   end
 end

data/lib/generators/ng_on_rails/scaffold_generator.rb

@@ -3,7 +3,7 @@ module NgOnRails
   class ScaffoldGenerator < NgOnRails::NgOnRailsGenerator
     desc "Creates NgOnRails-style AngularJS Views"
     
-    argument :model_name, type: :string, required: true, desc: "required"
+    argument :full_model_name, type: :string, required: true, desc: "required"
     class_option :layout, type: :boolean, required: false, default: true, desc: "create layout"
     # layout generator
     class_option :app_controller, type: :boolean, required: false, default: true, desc: "create app_controller"
@@ -14,17 +14,17 @@ module NgOnRails
 
     def generate_layout
       if options[:layout]
-        generate "ng_on_rails:layout #{options_string}"
+        generate "ng_on_rails:layout #{full_model_name} #{options_string}"
       end
     end
     def generate_resource
-      generate "ng_on_rails:resource #{model_name} #{options_string}"
+      generate "ng_on_rails:resource #{full_model_name} #{options_string}"
     end
     def generate_controller
-      generate "ng_on_rails:controller #{model_name} #{options_string}"
+      generate "ng_on_rails:controller #{full_model_name} #{options_string}"
     end
     def generate_views
-      generate "ng_on_rails:views #{model_name} #{options_string}"
+      generate "ng_on_rails:views #{full_model_name} #{options_string}"
     end
     
   private

data/lib/generators/ng_on_rails/templates/controller_template.js.erb

@@ -36,8 +36,8 @@ NgOnRailsApp.controller '<%="#{class_name.pluralize}"%>Controller', [
         ctrl.data.active<%="#{class_name}"%> = {}
         ctrl.data.creating_new_<%="#{resource_name}"%> = true
         <% 
-          belongs_to_parameter_array.each do |relationship| 
-        %>ctrl.data.active<%="#{class_name}"%>.<%= relationship%> = <%= relationship %>
+          belongs_to_parameter_array.each do |owner| 
+        %>ctrl.data.active<%="#{class_name}"%>.<%= owner %> = <%= owner %>
         <% 
           end 
         %>
@@ -66,8 +66,8 @@ NgOnRailsApp.controller '<%="#{class_name.pluralize}"%>Controller', [
         ctrl.data.editing_<%="#{resource_name}"%> = true
         <%="#{resource_name}"%>.is_displayed = false
         <% 
-          belongs_to_array.each do |relationship| 
-        %>ctrl.data.active<%="#{class_name}"%>.<%= relationship%> = <%= relationship %>
+          belongs_to_parameter_array.each do |owner| 
+        %>ctrl.data.active<%="#{class_name}"%>.<%= owner %> = <%= owner %>
         <% 
           end 
         %>

data/lib/generators/ng_on_rails/templates/resource_template.js.erb

@@ -1,5 +1,5 @@
 NgOnRailsApp.factory '<%="#{class_name}"%>', ($resource) ->
-  <%="#{class_name}"%>Resource = $resource '/<%="#{plural_name}"%>/:id.json', {id: '@id'}, {
+  <%="#{class_name}"%>Resource = $resource '/<%= mounted_path %><%= plural_name %>/:id.json', {id: '@id'}, {
     update:{method: "PUT"}
   }
   class <%="#{class_name}"%> extends <%="#{class_name}"%>Resource

data/lib/generators/ng_on_rails/templates/slim/layout_template.html.slim.erb

@@ -14,7 +14,7 @@ html
   head
     title NgOnRails | TestApp
     = csrf_meta_tags 
-    = stylesheet_link_tag  "application", :media => "all"
+    = stylesheet_link_tag  "<%= module_path %>application", :media => "all"
     == yield :meta
     == yield :styles
 
@@ -23,7 +23,7 @@ html
       == yield
 
     / scripts
-    = javascript_include_tag "application"
+    = javascript_include_tag "<%= module_path %>application"
     script
       = render( partial: 'angular_app/rails_service', formats: ['js'], locals: { ng_data: ng_data} )
     == yield :javascripts

data/lib/generators/ng_on_rails/templates/views/slim/_model.html.erb

@@ -6,7 +6,7 @@
         @name_rep ||= property_hash[:name]
         if property_hash[:link]
   %>.td.<%= property_hash[:name] %><%= type_to_class(property_hash[:type]) %>
-      a href="/<%= plural_name %>/{{<%= resource_name %>.id}}"
+      a href="/<%= mounted_path %><%= plural_name %>/{{<%= resource_name %>.id}}"
         span ng-bind="<%= resource_name %>.<%= property_hash[:name] %>"
   <%
         else

data/lib/generators/ng_on_rails/views_generator.rb

@@ -4,24 +4,24 @@ module NgOnRails
     desc "Creates NgOnRails-style AngularJS Views"
     
     # arguments
-    argument :model_name, type: :string, required: true, desc: "required"
+    argument :full_model_name, type: :string, required: true, desc: "required"
     class_option :styles, type: :boolean, required: false, default: true, desc: "add ng_on_rails_styles.css"
 
     def generate_views
       option_template "#{ViewsGenerator.source_root}/views/#{options[:format]}/index.html.erb", 
-        "app/views/angular_app/#{plural_name}/index.html.#{options[:format]}",
+        "app/views/#{module_path}angular_app/#{plural_name}/index.html.#{options[:format]}",
         "index view"
       option_template "#{ViewsGenerator.source_root}/views/#{options[:format]}/show.html.erb", 
-        "app/views/angular_app/#{plural_name}/show.html.#{options[:format]}",
+        "app/views/#{module_path}angular_app/#{plural_name}/show.html.#{options[:format]}",
         "show view"
       option_template "#{ViewsGenerator.source_root}/views/#{options[:format]}/_show.html.erb", 
-        "app/views/angular_app/#{plural_name}/_show.html.#{options[:format]}",
+        "app/views/#{module_path}angular_app/#{plural_name}/_show.html.#{options[:format]}",
         "_show partial"
       option_template "#{ViewsGenerator.source_root}/views/#{options[:format]}/_form.html.erb", 
-        "app/views/angular_app/#{plural_name}/_form.html.#{options[:format]}",
+        "app/views/#{module_path}angular_app/#{plural_name}/_form.html.#{options[:format]}",
         "_form partial"
       option_template "#{ViewsGenerator.source_root}/views/#{options[:format]}/_model.html.erb", 
-        "app/views/angular_app/#{plural_name}/_#{resource_name}.html.#{options[:format]}",
+        "app/views/#{module_path}angular_app/#{plural_name}/_#{resource_name}.html.#{options[:format]}",
         "_#{resource_name} partial"
     end
 
@@ -62,7 +62,7 @@ module NgOnRails
 
     def generate_jbuilder_files
       if options[:jbuilder] || options[:rails_views]
-        generate "ng_on_rails:jbuilder #{class_name} #{jbuilder_attributes} --overwrite=#{options[:overwrite]}"
+        generate "ng_on_rails:jbuilder #{full_model_name} #{jbuilder_attributes} --overwrite=#{options[:overwrite]}"
       end
     end
 
@@ -142,11 +142,11 @@ module NgOnRails
     #
 
     def index_path
-      @index_path ||= "app/views/#{plural_name}/index.html.#{options[:format]}"
+      @index_path ||= "app/views/#{module_path}#{plural_name}/index.html.#{options[:format]}"
     end
 
     def show_path
-      @show_path ||= "app/views/#{plural_name}/show.html.#{options[:format]}"
+      @show_path ||= "app/views/#{module_path}#{plural_name}/show.html.#{options[:format]}"
     end
 
     def jbuilder_attributes

data/lib/ng_on_rails.rb

@@ -1,3 +1,8 @@
 require "ng_on_rails/engine"
 module NgOnRails
-end
+  mattr_accessor :config, :engine_path
+
+  def self.set_engine engine
+    self.engine_path = "#{engine.name.underscore}/"
+  end
+end

data/lib/ng_on_rails/config_manager.rb

@@ -0,0 +1,25 @@
+module ConfigManager
+  @@config = nil
+  
+  def self.load_config
+    config_path = "config/ng_on_rails.yml"
+    config = self.load_yaml(config_path) 
+    unless config.blank? || config['test_app_path'].blank?
+      config_path = "#{config['test_app_path']}/config/ng_on_rails.yml"
+      config = self.load_yaml(config_path) 
+    end
+    config = YAML.load("empty: true") if config.blank?
+    config
+  end
+
+  def self.load_yaml path
+    unless path.blank?
+      unless Rails.root.blank?
+        path = File.join(Rails.root.to_s,path)
+      end
+      if File.exists?(path)
+        YAML.load(File.read(path))
+      end
+    end
+  end
+end

data/lib/ng_on_rails/engine.rb

@@ -1,9 +1,12 @@
+require "ng_on_rails/config_manager"
+
 require 'angularjs-rails'
 require 'angular_rails_csrf'
 
 module NgOnRails
-  class Engine < ::Rails::Engine
+  class Engine < ::Rails::Engine    
     initializer 'ng_on_rails.load_static_assets' do |app|
+      NgOnRails.config = ConfigManager.load_config 
       app.middleware.use ::ActionDispatch::Static, "#{root}/app"
     end
 

data/lib/ng_on_rails/version.rb

@@ -1,3 +1,3 @@
 module NgOnRails
-  VERSION = "0.0.3.5"
+  VERSION = "0.0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ng_on_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3.5
+  version: 0.0.3.6
 platform: ruby
 authors:
 - Brookie Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: angularjs-rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.22
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.22
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: angular_rails_csrf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +115,7 @@ files:
 - lib/generators/ng_on_rails/templates/views/slim/show.html.erb
 - lib/generators/ng_on_rails/views_generator.rb
 - lib/ng_on_rails.rb
+- lib/ng_on_rails/config_manager.rb
 - lib/ng_on_rails/engine.rb
 - lib/ng_on_rails/version.rb
 - lib/tasks/ng_on_rails_tasks.rake